Fix a race in LRUCacheShard::Promote (#8717 )

Summary: In ```LRUCacheShard::Promote```, a reference is released outside the LRU mutex. Fix the race condition. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8717 Reviewed By: zhichao-cao Differential Revision: D30649206 Pulled By: anand1976 fbshipit-source-id: 09c0af05b2294a7fe2c02876a61b0bad6e3ada61
rocksdb: don't call LZ4_loadDictHC with null dictionary
2026-11-07 03:22:34 -05:00 · 2021-08-31 18:06:53 -07:00 · 2021-08-09 16:13:49 -07:00 · 2021-08-09 11:34:36 -07:00 · 2021-08-09 10:59:11 -07:00 · 2021-08-04 17:27:29 -07:00
770 changed files with 15825 additions and 56277 deletions
@@ -5,9 +5,9 @@ orbs:
  slack: circleci/slack@3.4.2

 aliases:
-  - &notify-on-main-failure
+  - &notify-on-master-failure
    fail_only: true
-    only_for_branches: main
+    only_for_branches: master

 commands:
  install-pyenv-on-macos:
@@ -24,13 +24,6 @@ commands:
          command: |
            HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake

-  install-jdk8-on-macos:
-    steps:
-      - run:
-          name: Install JDK 8 on macos
-          command: |
-            brew install --cask adoptopenjdk/openjdk/adoptopenjdk8
-
  increase-max-open-files-on-macos:
    steps:
      - run:
@@ -55,6 +48,7 @@ commands:
            echo "export GTEST_THROW_ON_FAILURE=0" >> $BASH_ENV
            echo "export GTEST_OUTPUT=\"xml:/tmp/test-results/\"" >> $BASH_ENV
            echo "export SKIP_FORMAT_BUCK_CHECKS=1" >> $BASH_ENV
+            echo "export PRINT_PARALLEL_OUTPUTS=1" >> $BASH_ENV
            echo "export GTEST_COLOR=1" >> $BASH_ENV
            echo "export CTEST_OUTPUT_ON_FAILURE=1" >> $BASH_ENV
            echo "export CTEST_TEST_TIMEOUT=300" >> $BASH_ENV
@@ -62,11 +56,11 @@ commands:
  pre-steps-macos:
      steps:
        - pre-steps:
-            python-version: "3.7.8"
+            python-version: "3.6.0"

  post-steps:
    steps:
-      - slack/status: *notify-on-main-failure
+      - slack/status: *notify-on-master-failure
      - store_test_results: # store test result if there's any
          path: /tmp/test-results
      - store_artifacts: # store LOG for debugging if there's any
@@ -104,13 +98,6 @@ commands:
          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:
@@ -151,21 +138,19 @@ executors:
 jobs:
  build-macos:
    macos:
-      xcode: 12.5.1
+      xcode: 11.3.0
    resource_class: large
-    environment:
-      DISABLE_JEMALLOC: 1 # jemalloc cause env_test hang, disable it for now
    steps:
      - increase-max-open-files-on-macos
      - install-pyenv-on-macos
      - install-gflags-on-macos
      - pre-steps-macos
-      - run: ulimit -S -n 1048576 && OPT=-DCIRCLECI make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
+      - run: ulimit -S -n 1048576 && OPT=-DCIRCLECI make V=1 J=32 -j32 check | .circleci/cat_ignore_eagain
      - post-steps

  build-macos-cmake:
    macos:
-      xcode: 12.5.1
+      xcode: 11.3.0
    resource_class: large
    steps:
      - increase-max-open-files-on-macos
@@ -173,7 +158,7 @@ jobs:
      - install-cmake-on-macos
      - install-gflags-on-macos
      - pre-steps-macos
-      - 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
+      - run: ulimit -S -n 1048576 && (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j32 && ctest -j10) | .circleci/cat_ignore_eagain
      - post-steps

  build-linux:
@@ -183,18 +168,17 @@ jobs:
    steps:
      - pre-steps
      - install-gflags
-      - run: make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
+      - run: make V=1 J=32 -j32 check | .circleci/cat_ignore_eagain
      - post-steps

-  build-linux-mem-env-librados:
+  build-linux-mem-env:
    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
+      - run: MEM_ENV=1 make V=1 J=32 -j32 check | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-encrypted-env:
@@ -204,7 +188,7 @@ jobs:
    steps:
      - pre-steps
      - install-gflags
-      - run: ENCRYPTED_ENV=1 make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
+      - run: ENCRYPTED_ENV=1 make V=1 J=32 -j32 check | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-shared_lib-alt_namespace-status_checked:
@@ -214,7 +198,7 @@ jobs:
    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 2>&1 | .circleci/cat_ignore_eagain
+      - 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 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-release:
@@ -223,10 +207,10 @@ jobs:
    resource_class: large
    steps:
      - checkout # check out the code in the project directory
-      - run: make V=1 -j8 release 2>&1 | .circleci/cat_ignore_eagain
+      - run: make V=1 -j8 release | .circleci/cat_ignore_eagain
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
      - install-gflags
-      - run: make V=1 -j8 release 2>&1 | .circleci/cat_ignore_eagain
+      - run: make V=1 -j8 release | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags
      - post-steps

@@ -237,11 +221,11 @@ jobs:
    steps:
      - checkout # check out the code in the project directory
      - run: make clean
-      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j8 static_lib tools db_bench 2>&1 | .circleci/cat_ignore_eagain
+      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j8 static_lib tools db_bench | .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 -j8 static_lib tools db_bench 2>&1 | .circleci/cat_ignore_eagain
+      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j8 static_lib tools db_bench | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags

  build-linux-lite:
@@ -251,7 +235,7 @@ jobs:
    steps:
      - pre-steps
      - install-gflags
-      - run: LITE=1 make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
+      - run: LITE=1 make V=1 J=32 -j32 check | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-lite-release:
@@ -260,10 +244,10 @@ jobs:
    resource_class: large
    steps:
      - checkout # check out the code in the project directory
-      - run: LITE=1 make V=1 -j8 release 2>&1 | .circleci/cat_ignore_eagain
+      - run: LITE=1 make V=1 -j8 release | .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 2>&1 | .circleci/cat_ignore_eagain
+      - run: LITE=1 make V=1 -j8 release | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags
      - post-steps

@@ -274,7 +258,7 @@ jobs:
    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 2>&1 | .circleci/cat_ignore_eagain
+      - run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 make V=1 -j16 all | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-clang10-asan:
@@ -285,7 +269,7 @@ jobs:
      - pre-steps
      - install-gflags
      - install-clang-10
-      - 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
+      - run: COMPILE_WITH_ASAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check | .circleci/cat_ignore_eagain # aligned new doesn't work for reason we haven't figured out
      - post-steps

  build-linux-clang10-mini-tsan:
@@ -296,7 +280,7 @@ jobs:
      - pre-steps
      - install-gflags
      - install-clang-10
-      - 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.
+      - run: COMPILE_WITH_TSAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check | .circleci/cat_ignore_eagain # aligned new doesn't work for reason we haven't figured out.
      - post-steps

  build-linux-clang10-ubsan:
@@ -307,7 +291,7 @@ jobs:
      - 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 2>&1 | .circleci/cat_ignore_eagain # 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 | .circleci/cat_ignore_eagain # aligned new doesn't work for reason we haven't figured out
      - post-steps

  build-linux-clang10-clang-analyze:
@@ -319,7 +303,7 @@ jobs:
      - 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 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.
+      - 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 | .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:
@@ -330,7 +314,7 @@ jobs:
      - pre-steps
      - install-gflags
      - upgrade-cmake
-      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j20 && ctest -j20) 2>&1 | .circleci/cat_ignore_eagain
+      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j20 && ctest -j20) | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-cmake-ubuntu-20:
@@ -341,18 +325,17 @@ jobs:
      - pre-steps
      - install-gflags
      - install-benchmark
-      - 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
+      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20 && make microbench) | .circleci/cat_ignore_eagain
      - post-steps

-  build-linux-unity-and-headers:
+  build-linux-unity:
    docker: # executor type
      - image: gcc:latest
    resource_class: large
    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 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
+      - run: TEST_TMPDIR=/dev/shm && make V=1 -j8 unity_test | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-gcc-4_8-no_test_run:
@@ -362,7 +345,7 @@ jobs:
    steps:
      - pre-steps
      - 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
+      - run: CC=gcc-4.8 CXX=g++-4.8 V=1 SKIP_LINK=1 make -j8 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - post-steps

  build-linux-gcc-8-no_test_run:
@@ -372,7 +355,7 @@ jobs:
    steps:
      - pre-steps
      - 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
+      - run: CC=gcc-8 CXX=g++-8 V=1 SKIP_LINK=1 make -j8 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - post-steps

  build-linux-gcc-9-no_test_run:
@@ -382,7 +365,7 @@ jobs:
    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
+      - run: CC=gcc-9 CXX=g++-9 V=1 SKIP_LINK=1 make -j8 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - post-steps

  build-linux-gcc-10-cxx20-no_test_run:
@@ -392,17 +375,7 @@ jobs:
    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 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:202010-01
-    resource_class: xlarge
-    steps:
-      - pre-steps
-      - 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
+      - run: CC=gcc-10 CXX=g++-10 V=1 SKIP_LINK=1 ROCKSDB_CXX_STANDARD=c++20 make -j16 all | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - 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.
@@ -413,7 +386,7 @@ jobs:
    steps:
      - pre-steps
      - install-benchmark
-      - run: DEBUG_LEVEL=0 make microbench 2>&1 | .circleci/cat_ignore_eagain
+      - run: DEBUG_LEVEL=0 make microbench | .circleci/cat_ignore_eagain
      - post-steps

  build-windows:
@@ -502,10 +475,10 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava Shared Library"
-          command: make V=1 J=8 -j8 rocksdbjava 2>&1 | .circleci/cat_ignore_eagain
+          command: make V=1 J=8 -j8 rocksdbjava | .circleci/cat_ignore_eagain
      - run:
          name: "Test RocksDBJava"
-          command: make V=1 J=8 -j8 jtest 2>&1 | .circleci/cat_ignore_eagain
+          command: make V=1 J=8 -j8 jtest | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-java-static:
@@ -526,21 +499,19 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava Static Library"
-          command: make V=1 J=8 -j8 rocksdbjavastatic 2>&1 | .circleci/cat_ignore_eagain
+          command: make V=1 J=8 -j8 rocksdbjavastatic | .circleci/cat_ignore_eagain
      - post-steps

  build-macos-java:
    macos:
-      xcode: 12.5.1
+      xcode: 11.3.0
    resource_class: medium
    environment:
      JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
-      DISABLE_JEMALLOC: 1 # jemalloc causes java 8 crash, maybe a known issue
    steps:
      - increase-max-open-files-on-macos
      - install-pyenv-on-macos
      - install-gflags-on-macos
-      - install-jdk8-on-macos
      - pre-steps-macos
      - run:
          name: "Set Java Environment"
@@ -551,15 +522,15 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava Shared Library"
-          command: make V=1 J=8 -j8 rocksdbjava 2>&1 | .circleci/cat_ignore_eagain
+          command: make V=1 J=8 -j8 rocksdbjava | .circleci/cat_ignore_eagain
      - run:
          name: "Test RocksDBJava"
-          command: make V=1 J=8 -j8 jtest 2>&1 | .circleci/cat_ignore_eagain
+          command: make V=1 J=8 -j8 jtest | .circleci/cat_ignore_eagain
      - post-steps

  build-macos-java-static:
    macos:
-      xcode: 12.5.1
+      xcode: 11.3.0
    resource_class: medium
    environment:
      JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
@@ -567,7 +538,6 @@ jobs:
      - increase-max-open-files-on-macos
      - install-pyenv-on-macos
      - install-gflags-on-macos
-      - install-jdk8-on-macos
      - install-cmake-on-macos
      - pre-steps-macos
      - run:
@@ -579,7 +549,7 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava Static Library"
-          command: make V=1 J=8 -j8 rocksdbjavastatic 2>&1 | .circleci/cat_ignore_eagain
+          command: make V=1 J=8 -j8 rocksdbjavastatic | .circleci/cat_ignore_eagain
      - post-steps

  build-examples:
@@ -655,7 +625,7 @@ jobs:
    steps:
      - pre-steps
      - install-gflags
-      - run: make V=1 J=4 -j4 check 2>&1 | .circleci/cat_ignore_eagain
+      - run: make V=1 J=4 -j4 check | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-arm:
@@ -665,7 +635,7 @@ jobs:
    steps:
      - pre-steps
      - install-gflags
-      - run: ROCKSDBTESTS_PLATFORM_DEPENDENT=only make V=1 J=4 -j4 all_but_some_tests check_some 2>&1 | .circleci/cat_ignore_eagain
+      - run: ROCKSDBTESTS_PLATFORM_DEPENDENT=only make V=1 J=4 -j4 all_but_some_tests check_some | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-arm-cmake-no_test_run:
@@ -727,9 +697,9 @@ workflows:
    jobs:
      - build-linux-cmake
      - build-linux-cmake-ubuntu-20
-  build-linux-mem-env-librados:
+  build-linux-mem-env:
    jobs:
-      - build-linux-mem-env-librados
+      - build-linux-mem-env
  build-linux-encrypted-env:
    jobs:
      - build-linux-encrypted-env
@@ -760,9 +730,9 @@ workflows:
  build-linux-clang10-clang-analyze:
    jobs:
      - build-linux-clang10-clang-analyze
-  build-linux-unity-and-headers:
+  build-linux-unity:
    jobs:
-      - build-linux-unity-and-headers
+      - build-linux-unity
  build-windows-vs2019:
    jobs:
      - build-windows:
@@ -808,7 +778,6 @@ workflows:
      - 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:
@@ -832,7 +801,7 @@ workflows:
          filters:
            branches:
              only:
-                - main
+                - master
    jobs:
      - build-format-compatible
      - build-linux-arm-test-full
@@ -39,6 +39,3 @@ jobs:

    - name: Compare buckify output
      run: make check-buck-targets
-
-    - name: Simple source code checks
-      run: make check-sources
@@ -5,7 +5,6 @@ os:
 arch:
  - arm64
  - ppc64le
-  - s390x
 compiler:
  - clang
  - gcc
@@ -60,12 +59,6 @@ matrix:
  - 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/
@@ -80,10 +73,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: TEST_GROUP=1
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: TEST_GROUP=1
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -92,10 +81,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: TEST_GROUP=2
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: TEST_GROUP=2
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -104,10 +89,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: TEST_GROUP=3
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: TEST_GROUP=3
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -116,10 +97,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: TEST_GROUP=4
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: TEST_GROUP=4
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -132,10 +109,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=java_test
-  - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/
-    os: linux
-    arch: s390x
-    env: JOB_NAME=java_test
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -144,10 +117,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=lite_build
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: JOB_NAME=lite_build
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -156,10 +125,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=examples
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: JOB_NAME=examples
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -168,10 +133,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=cmake-gcc8
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: JOB_NAME=cmake-gcc8
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -180,10 +141,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=cmake-gcc9
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: JOB_NAME=cmake-gcc9
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -192,10 +149,6 @@ matrix:
    os: linux
    arch: ppc64le
    env: JOB_NAME=cmake-gcc9-c++20
-  - if: type = pull_request AND commit_message !~ /FULL_CI/
-    os: linux
-    arch: s390x
-    env: JOB_NAME=cmake-gcc9-c++20
  - if: type = pull_request AND commit_message !~ /FULL_CI/
    os : linux
    arch: arm64
@@ -204,10 +157,6 @@ matrix:
    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:
  - if [ "${JOB_NAME}" == cmake-gcc8 ]; then
@@ -267,13 +267,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")
  endif(HAS_ARMV8_CRC)
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64|AARCH64")

-if(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
-  CHECK_C_COMPILER_FLAG("-march=native" HAS_S390X_MARCH_NATIVE)
-  if(HAS_S390X_MARCH_NATIVE)
-    message(STATUS " HAS_S390X_MARCH_NATIVE yes")
-  endif(HAS_S390X_MARCH_NATIVE)
-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
-
 option(PORTABLE "build a portable binary" OFF)
 option(FORCE_SSE42 "force building with SSE4.2, even when PORTABLE=ON" OFF)
 option(FORCE_AVX "force building with AVX, even when PORTABLE=ON" OFF)
@@ -299,17 +292,12 @@ if(PORTABLE)
    if(FORCE_AVX2)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2 -mbmi -mlzcnt")
    endif()
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390x")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=z196")
-    endif()
  endif()
 else()
  if(MSVC)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
  else()
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390x" AND NOT HAS_S390X_MARCH_NATIVE)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=z196")
-    elseif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64" AND NOT HAS_ARMV8_CRC)
+    if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64" AND NOT HAS_ARMV8_CRC)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
    endif()
  endif()
@@ -636,8 +624,6 @@ find_package(Threads REQUIRED)
 set(SOURCES
        cache/cache.cc
        cache/cache_entry_roles.cc
-        cache/cache_key.cc
-        cache/cache_reservation_manager.cc
        cache/clock_cache.cc
        cache/lru_cache.cc
        cache/sharded_cache.cc
@@ -653,7 +639,6 @@ set(SOURCES
        db/blob/blob_log_format.cc
        db/blob/blob_log_sequential_reader.cc
        db/blob/blob_log_writer.cc
-        db/blob/prefetch_buffer_collection.cc
        db/builder.cc
        db/c.cc
        db/column_family.cc
@@ -727,7 +712,6 @@ set(SOURCES
        env/file_system_tracer.cc
        env/fs_remap.cc
        env/mock_env.cc
-        env/unique_id_gen.cc
        file/delete_scheduler.cc
        file/file_prefetch_buffer.cc
        file/file_util.cc
@@ -746,7 +730,6 @@ set(SOURCES
        memory/concurrent_arena.cc
        memory/jemalloc_nodump_allocator.cc
        memory/memkind_kmem_allocator.cc
-        memory/memory_allocator.cc
        memtable/alloc_tracker.cc
        memtable/hash_linklist_rep.cc
        memtable/hash_skiplist_rep.cc
@@ -822,7 +805,6 @@ set(SOURCES
        table/table_factory.cc
        table/table_properties.cc
        table/two_level_iterator.cc
-        table/unique_id.cc
        test_util/sync_point.cc
        test_util/sync_point_impl.cc
        test_util/testutil.cc
@@ -834,12 +816,9 @@ set(SOURCES
        tools/ldb_tool.cc
        tools/sst_dump_tool.cc
        tools/trace_analyzer_tool.cc
+        trace_replay/trace_replay.cc
        trace_replay/block_cache_tracer.cc
        trace_replay/io_tracer.cc
-        trace_replay/trace_record_handler.cc
-        trace_replay/trace_record_result.cc
-        trace_replay/trace_record.cc
-        trace_replay/trace_replay.cc
        util/coding.cc
        util/compaction_job_stats_impl.cc
        util/comparator.cc
@@ -852,7 +831,6 @@ 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
@@ -867,23 +845,18 @@ set(SOURCES
        utilities/blob_db/blob_db_impl_filesnapshot.cc
        utilities/blob_db/blob_dump_tool.cc
        utilities/blob_db/blob_file.cc
-        utilities/cache_dump_load.cc
-        utilities/cache_dump_load_impl.cc
        utilities/cassandra/cassandra_compaction_filter.cc
        utilities/cassandra/format.cc
        utilities/cassandra/merge_operator.cc
        utilities/checkpoint/checkpoint_impl.cc
-        utilities/compaction_filters.cc
        utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
        utilities/debug.cc
        utilities/env_mirror.cc
        utilities/env_timed.cc
        utilities/fault_injection_env.cc
        utilities/fault_injection_fs.cc
-        utilities/fault_injection_secondary_cache.cc
        utilities/leveldb_options/leveldb_options.cc
        utilities/memory/memory_util.cc
-        utilities/merge_operators.cc
        utilities/merge_operators/bytesxor.cc
        utilities/merge_operators/max.cc
        utilities/merge_operators/put.cc
@@ -903,7 +876,6 @@ set(SOURCES
        utilities/simulator_cache/sim_cache.cc
        utilities/table_properties_collectors/compact_on_deletion_collector.cc
        utilities/trace/file_trace_reader_writer.cc
-        utilities/trace/replayer_impl.cc
        utilities/transactions/lock/lock_manager.cc
        utilities/transactions/lock/point/point_lock_tracker.cc
        utilities/transactions/lock/point/point_lock_manager.cc
@@ -922,7 +894,6 @@ set(SOURCES
        utilities/transactions/write_unprepared_txn.cc
        utilities/transactions/write_unprepared_txn_db.cc
        utilities/ttl/db_ttl_impl.cc
-        utilities/wal_filter.cc
        utilities/write_batch_with_index/write_batch_with_index.cc
        utilities/write_batch_with_index/write_batch_with_index_internal.cc)

@@ -940,31 +911,6 @@ list(APPEND SOURCES
  utilities/transactions/lock/range/range_tree/lib/util/dbt.cc
  utilities/transactions/lock/range/range_tree/lib/util/memarena.cc)

-message(STATUS "ROCKSDB_PLUGINS: ${ROCKSDB_PLUGINS}")
-if ( ROCKSDB_PLUGINS )
-  string(REPLACE " " ";" PLUGINS ${ROCKSDB_PLUGINS})
-  foreach (plugin ${PLUGINS})
-    add_subdirectory("plugin/${plugin}")
-    foreach (src ${${plugin}_SOURCES})
-      list(APPEND SOURCES plugin/${plugin}/${src})
-      set_source_files_properties(
-        plugin/${plugin}/${src}
-        PROPERTIES COMPILE_FLAGS "${${plugin}_COMPILE_FLAGS}")
-    endforeach()
-    foreach (path ${${plugin}_INCLUDE_PATHS})
-      include_directories(${path})
-    endforeach()
-    foreach (lib ${${plugin}_LIBS})
-      list(APPEND THIRDPARTY_LIBS ${lib})
-    endforeach()
-    foreach (link_path ${${plugin}_LINK_PATHS})
-      link_directories(AFTER ${link_path})
-    endforeach()
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${${plugin}_CMAKE_SHARED_LINKER_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${${plugin}_CMAKE_EXE_LINKER_FLAGS}")
-  endforeach()
-endif()
-
 if(HAVE_SSE42 AND NOT MSVC)
  set_source_files_properties(
    util/crc32c.cc
@@ -1171,7 +1117,6 @@ if(WITH_TESTS)
  )
  if(WITH_ALL_TESTS)
    list(APPEND TESTS
-        cache/cache_reservation_manager_test.cc
        cache/cache_test.cc
        cache/lru_cache_test.cc
        db/blob/blob_counting_iterator_test.cc
@@ -1271,7 +1216,7 @@ if(WITH_TESTS)
        logging/env_logger_test.cc
        logging/event_logger_test.cc
        memory/arena_test.cc
-        memory/memory_allocator_test.cc
+        memory/memkind_kmem_allocator_test.cc
        memtable/inlineskiplist_test.cc
        memtable/skiplist_test.cc
        memtable/write_buffer_manager_test.cc
@@ -1,221 +1,33 @@
 # Rocksdb Change Log
-## 6.28.2 (2022-01-31)
+## 6.23.4 (2021-08-31)
 ### 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.28.1 (2022-01-10)
-### Bug Fixes
-* Fixed compilation errors on newer compiler, e.g. clang-12
-
-## 6.28.0 (2021-12-17)
-### New Features
-* Introduced 'CommitWithTimestamp' as a new tag. Currently, there is no API for user to trigger a write with this tag to the WAL. This is part of the efforts to support write-commited transactions with user-defined timestamps.
-
-### Bug Fixes
-* Fixed a bug in rocksdb automatic implicit prefetching which got broken because of new feature adaptive_readahead and internal prefetching got disabled when iterator moves from one file to next.
-* Fixed a bug in TableOptions.prepopulate_block_cache which causes segmentation fault when used with TableOptions.partition_filters = true and TableOptions.cache_index_and_filter_blocks = true.
-* Fixed a bug affecting custom memtable factories which are not registered with the `ObjectRegistry`. The bug could result in failure to save the OPTIONS file.
-* Fixed a bug causing two duplicate entries to be appended to a file opened in non-direct mode and tracked by `FaultInjectionTestFS`.
-* Fixed a bug in TableOptions.prepopulate_block_cache to support block-based filters also.
-* Block cache keys no longer use `FSRandomAccessFile::GetUniqueId()` (previously used when available), so a filesystem recycling unique ids can no longer lead to incorrect result or crash (#7405). For files generated by RocksDB >= 6.24, the cache keys are stable across DB::Open and DB directory move / copy / import / export / migration, etc. Although collisions are still theoretically possible, they are (a) impossible in many common cases, (b) not dependent on environmental factors, and (c) much less likely than a CPU miscalculation while executing RocksDB.
-
-### Behavior Changes
-* MemTableList::TrimHistory now use allocated bytes when max_write_buffer_size_to_maintain > 0(default in TrasactionDB, introduced in PR#5022) Fix #8371.
-
-### Public API change
-* Extend WriteBatch::AssignTimestamp and AssignTimestamps API so that both functions can accept an optional `checker` argument that performs additional checking on timestamp sizes.
-* Introduce a new EventListener callback that will be called upon the end of automatic error recovery.
-
-### Performance Improvements
-* Replaced map property `TableProperties::properties_offsets`  with uint64_t property `external_sst_file_global_seqno_offset` to save table properties's memory.
-* Block cache accesses are faster by RocksDB using cache keys of fixed size (16 bytes).
-
-### Java API Changes
-* Removed Java API `TableProperties.getPropertiesOffsets()` as it exposed internal details to external users.
-
-## 6.27.0 (2021-11-19)
-### New Features
-* Added new ChecksumType kXXH3 which is faster than kCRC32c on almost all x86\_64 hardware.
-* Added a new online consistency check for BlobDB which validates that the number/total size of garbage blobs does not exceed the number/total size of all blobs in any given blob file.
-* Provided support for tracking per-sst user-defined timestamp information in MANIFEST.
-* Added new option "adaptive_readahead" in ReadOptions. For iterators, RocksDB does auto-readahead on noticing sequential reads and by enabling this option, readahead_size of current file (if reads are sequential) will be carried forward to next file instead of starting from the scratch at each level (except L0 level files). If reads are not sequential it will fall back to 8KB. This option is applicable only for RocksDB internal prefetch buffer and isn't supported with underlying file system prefetching.
-* Added the read count and read bytes related stats to Statistics for tiered storage hot, warm, and cold file reads.
-* Added an option to dynamically charge an updating estimated memory usage of block-based table building to block cache if block cache available. It currently only includes charging memory usage of constructing (new) Bloom Filter and Ribbon Filter to block cache. To enable this feature, set `BlockBasedTableOptions::reserve_table_builder_memory = true`.
-* Add a new API OnIOError in listener.h that notifies listeners when an IO error occurs during FileSystem operation along with filename, status etc.
-* Added compaction readahead support for blob files to the integrated BlobDB implementation, which can improve compaction performance when the database resides on higher-latency storage like HDDs or remote filesystems. Readahead can be configured using the column family option `blob_compaction_readahead_size`.
-
-### Bug Fixes
-* Prevent a `CompactRange()` with `CompactRangeOptions::change_level == true` from possibly causing corruption to the LSM state (overlapping files within a level) when run in parallel with another manual compaction. Note that setting `force_consistency_checks == true` (the default) would cause the DB to enter read-only mode in this scenario and return `Status::Corruption`, rather than committing any corruption.
-* Fixed a bug in CompactionIterator when write-prepared transaction is used. A released earliest write conflict snapshot may cause assertion failure in dbg mode and unexpected key in opt mode.
-* Fix ticker WRITE_WITH_WAL("rocksdb.write.wal"), this bug is caused by a bad extra `RecordTick(stats_, WRITE_WITH_WAL)` (at 2 place), this fix remove the extra `RecordTick`s and fix the corresponding test case.
-* EventListener::OnTableFileCreated was previously called with OK status and file_size==0 in cases of no SST file contents written (because there was no content to add) and the empty file deleted before calling the listener. Now the status is Aborted.
-* Fixed a bug in CompactionIterator when write-preared transaction is used. Releasing earliest_snapshot during compaction may cause a SingleDelete to be output after a PUT of the same user key whose seq has been zeroed.
-* Added input sanitization on negative bytes passed into `GenericRateLimiter::Request`.
-* Fixed an assertion failure in CompactionIterator when write-prepared transaction is used. We prove that certain operations can lead to a Delete being followed by a SingleDelete (same user key). We can drop the SingleDelete.
-* Fixed a bug of timestamp-based GC which can cause all versions of a key under full_history_ts_low to be dropped. This bug will be triggered when some of the ikeys' timestamps are lower than full_history_ts_low, while others are newer.
-* In some cases outside of the DB read and compaction paths, SST block checksums are now checked where they were not before.
-* Explicitly check for and disallow the `BlockBasedTableOptions` if insertion into one of {`block_cache`, `block_cache_compressed`, `persistent_cache`} can show up in another of these. (RocksDB expects to be able to use the same key for different physical data among tiers.)
-* Users who configured a dedicated thread pool for bottommost compactions by explicitly adding threads to the `Env::Priority::BOTTOM` pool will no longer see RocksDB schedule automatic compactions exceeding the DB's compaction concurrency limit. For details on per-DB compaction concurrency limit, see API docs of `max_background_compactions` and `max_background_jobs`.
-* Fixed a bug of background flush thread picking more memtables to flush and prematurely advancing column family's log_number.
-* Fixed an assertion failure in ManifestTailer.
-* Fixed a bug that could, with WAL enabled, cause backups, checkpoints, and `GetSortedWalFiles()` to fail randomly with an error like `IO error: 001234.log: No such file or directory`
-
-### Behavior Changes
-* `NUM_FILES_IN_SINGLE_COMPACTION` was only counting the first input level files, now it's including all input files.
-* `TransactionUtil::CheckKeyForConflicts` can also perform conflict-checking based on user-defined timestamps in addition to sequence numbers.
-* Removed `GenericRateLimiter`'s minimum refill bytes per period previously enforced.
-
-### Public API change
-* When options.ttl is used with leveled compaction with compactinon priority kMinOverlappingRatio, files exceeding half of TTL value will be prioritized more, so that by the time TTL is reached, fewer extra compactions will be scheduled to clear them up. At the same time, when compacting files with data older than half of TTL, output files may be cut off based on those files' boundaries, in order for the early TTL compaction to work properly.
-* Made FileSystem and RateLimiter extend the Customizable class and added a CreateFromString method.  Implementations need to be registered with the ObjectRegistry and to implement a Name() method in order to be created via this method.
-* Clarified in API comments that RocksDB is not exception safe for callbacks and custom extensions. An exception propagating into RocksDB can lead to undefined behavior, including data loss, unreported corruption, deadlocks, and more.
-* Marked `WriteBufferManager` as `final` because it is not intended for extension.
-* Removed unimportant implementation details from table_properties.h
-* Add API `FSDirectory::FsyncWithDirOptions()`, which provides extra information like directory fsync reason in `DirFsyncOptions`. File system like btrfs is using that to skip directory fsync for creating a new file, or when renaming a file, fsync the target file instead of the directory, which improves the `DB::Open()` speed by ~20%.
-* `DB::Open()` is not going be blocked by obsolete file purge if `DBOptions::avoid_unnecessary_blocking_io` is set to true.
-* In builds where glibc provides `gettid()`, info log ("LOG" file) lines now print a system-wide thread ID from `gettid()` instead of the process-local `pthread_self()`. For all users, the thread ID format is changed from hexadecimal to decimal integer.
-* In builds where glibc provides `pthread_setname_np()`, the background thread names no longer contain an ID suffix. For example, "rocksdb:bottom7" (and all other threads in the `Env::Priority::BOTTOM` pool) are now named "rocksdb:bottom". Previously large thread pools could breach the name size limit (e.g., naming "rocksdb:bottom10" would fail).
-* Deprecating `ReadOptions::iter_start_seqnum` and `DBOptions::preserve_deletes`, please try using user defined timestamp feature instead. The options will be removed in a future release, currently it logs a warning message when using.
-
-### Performance Improvements
-* Released some memory related to filter construction earlier in `BlockBasedTableBuilder` for `FullFilter` and `PartitionedFilter` case (#9070)
-
-### Behavior Changes
-* `NUM_FILES_IN_SINGLE_COMPACTION` was only counting the first input level files, now it's including all input files.
-
-## 6.26.0 (2021-10-20)
-### Bug Fixes
-* Fixes a bug in directed IO mode when calling MultiGet() for blobs in the same blob file. The bug is caused by not sorting the blob read requests by file offsets.
-* Fix the incorrect disabling of SST rate limited deletion when the WAL and DB are in different directories. Only WAL rate limited deletion should be disabled if its in a different directory.
-* Fix `DisableManualCompaction()` to cancel compactions even when they are waiting on automatic compactions to drain due to `CompactRangeOptions::exclusive_manual_compactions == true`.
-* Fix contract of `Env::ReopenWritableFile()` and `FileSystem::ReopenWritableFile()` to specify any existing file must not be deleted or truncated.
-* Fixed bug in calls to `IngestExternalFiles()` with files for multiple column families. The bug could have introduced a delay in ingested file keys becoming visible after `IngestExternalFiles()` returned. Furthermore, mutations to ingested file keys while they were invisible could have been dropped (not necessarily immediately).
-* Fixed a possible race condition impacting users of `WriteBufferManager` who constructed it with `allow_stall == true`. The race condition led to undefined behavior (in our experience, typically a process crash).
-* Fixed a bug where stalled writes would remain stalled forever after the user calls `WriteBufferManager::SetBufferSize()` with `new_size == 0` to dynamically disable memory limiting.
-* Make `DB::close()` thread-safe.
-* Fix a bug in atomic flush where one bg flush thread will wait forever for a preceding bg flush thread to commit its result to MANIFEST but encounters an error which is mapped to a soft error (DB not stopped).
-* Fix a bug in `BackupEngine` where some internal callers of `GenericRateLimiter::Request()` do not honor `bytes <= GetSingleBurstBytes()`.
-
-### New Features
-* Print information about blob files when using "ldb list_live_files_metadata"
-* Provided support for SingleDelete with user defined timestamp.
-* Experimental new function DB::GetLiveFilesStorageInfo offers essentially a unified version of other functions like GetLiveFiles, GetLiveFilesChecksumInfo, and GetSortedWalFiles. Checkpoints and backups could show small behavioral changes and/or improved performance as they now use this new API.
-* Add remote compaction read/write bytes statistics: `REMOTE_COMPACT_READ_BYTES`, `REMOTE_COMPACT_WRITE_BYTES`.
-* Introduce an experimental feature to dump out the blocks from block cache and insert them to the secondary cache to reduce the cache warmup time (e.g., used while migrating DB instance). More information are in `class CacheDumper` and `CacheDumpedLoader` at `rocksdb/utilities/cache_dump_load.h` Note that, this feature is subject to the potential change in the future, it is still experimental.
-* Introduced a new BlobDB configuration option `blob_garbage_collection_force_threshold`, which can be used to trigger compactions targeting the SST files which reference the oldest blob files when the ratio of garbage in those blob files meets or exceeds the specified threshold. This can reduce space amplification with skewed workloads where the affected SST files might not otherwise get picked up for compaction.
-* Added EXPERIMENTAL support for table file (SST) unique identifiers that are stable and universally unique, available with new function `GetUniqueIdFromTableProperties`. Only SST files from RocksDB >= 6.24 support unique IDs.
-* Added `GetMapProperty()` support for "rocksdb.dbstats" (`DB::Properties::kDBStats`). As a map property, it includes DB-level internal stats accumulated over the DB's lifetime, such as user write related stats and uptime.
-
-### Public API change
-* Made SystemClock extend the Customizable class and added a CreateFromString method.  Implementations need to be registered with the ObjectRegistry and to implement a Name() method in order to be created via this method.
-* Made SliceTransform extend the Customizable class and added a CreateFromString method.  Implementations need to be registered with the ObjectRegistry and to implement a Name() method in order to be created via this method.  The Capped and Prefixed transform classes return a short name (no length); use GetId for the fully qualified name.
-* Made FileChecksumGenFactory, SstPartitionerFactory, TablePropertiesCollectorFactory, and WalFilter extend the Customizable class and added a CreateFromString method.
-* Some fields of SstFileMetaData are deprecated for compatibility with new base class FileStorageInfo.
-* Add `file_temperature` to `IngestExternalFileArg` such that when ingesting SST files, we are able to indicate the temperature of the this batch of files.
-* If `DB::Close()` failed with a non aborted status, calling `DB::Close()` again will return the original status instead of Status::OK.
-* Add CacheTier to advanced_options.h to describe the cache tier we used. Add a `lowest_used_cache_tier` option to `DBOptions` (immutable) and pass it to BlockBasedTableReader. By default it is `CacheTier::kNonVolatileBlockTier`, which means, we always use both block cache (kVolatileTier) and secondary cache (kNonVolatileBlockTier). By set it to `CacheTier::kVolatileTier`, the DB will not use the secondary cache.
-* Even when options.max_compaction_bytes is hit, compaction output files are only cut when it aligns with grandparent files' boundaries. options.max_compaction_bytes could be slightly violated with the change, but the violation is no more than one target SST file size, which is usually much smaller.
-
-### Performance Improvements
-* Improved CPU efficiency of building block-based table (SST) files (#9039 and #9040).
-
-### Java API Changes
-* Add Java API bindings for new integrated BlobDB options
-* `keyMayExist()` supports ByteBuffer.
-* Fix multiget throwing Null Pointer Exception for num of keys > 70k (https://github.com/facebook/rocksdb/issues/8039).
-
-## 6.25.0 (2021-09-20)
-### Bug Fixes
-* Allow secondary instance to refresh iterator. Assign read seq after referencing SuperVersion.
-* Fixed a bug of secondary instance's last_sequence going backward, and reads on the secondary fail to see recent updates from the primary.
-* Fixed a bug that could lead to duplicate DB ID or DB session ID in POSIX environments without /proc/sys/kernel/random/uuid.
-* Fix a race in DumpStats() with column family destruction due to not taking a Ref on each entry while iterating the ColumnFamilySet.
 * Fix a race in item ref counting in LRUCache when promoting an item from the SecondaryCache.
-* Fix a race in BackupEngine if RateLimiter is reconfigured during concurrent Restore operations.
-* Fix a bug on POSIX in which failure to create a lock file (e.g. out of space) can prevent future LockFile attempts in the same process on the same file from succeeding.
-* Fix a bug that backup_rate_limiter and restore_rate_limiter in BackupEngine could not limit read rates.
-* Fix the implementation of `prepopulate_block_cache = kFlushOnly` to only apply to flushes rather than to all generated files.
-* Fix WAL log data corruption when using DBOptions.manual_wal_flush(true) and WriteOptions.sync(true) together. The sync WAL should work with locked log_write_mutex_.
-* Add checks for validity of the IO uring completion queue entries, and fail the BlockBasedTableReader MultiGet sub-batch if there's an invalid completion
-* Add an interface RocksDbIOUringEnable() that, if defined by the user, will allow them to enable/disable the use of IO uring by RocksDB
-* Fix the bug that when direct I/O is used and MultiRead() returns a short result, RandomAccessFileReader::MultiRead() still returns full size buffer, with returned short value together with some data in original buffer. This bug is unlikely cause incorrect results, because (1) since FileSystem layer is expected to retry on short result, returning short results is only possible when asking more bytes in the end of the file, which RocksDB doesn't do when using MultiRead(); (2) checksum is unlikely to match.

-### New Features
-* RemoteCompaction's interface now includes `db_name`, `db_id`, `session_id`, which could help the user uniquely identify compaction job between db instances and sessions.
-* Added a ticker statistic, "rocksdb.verify_checksum.read.bytes", reporting how many bytes were read from file to serve `VerifyChecksum()` and `VerifyFileChecksums()` queries.
-* Added ticker statistics, "rocksdb.backup.read.bytes" and "rocksdb.backup.write.bytes", reporting how many bytes were read and written during backup.
-* Added properties for BlobDB: `rocksdb.num-blob-files`, `rocksdb.blob-stats`, `rocksdb.total-blob-file-size`, and `rocksdb.live-blob-file-size`. The existing property `rocksdb.estimate_live-data-size` was also extended to include live bytes residing in blob files.
-* Added two new RateLimiter IOPriorities: `Env::IO_USER`,`Env::IO_MID`. `Env::IO_USER` will have superior priority over all other RateLimiter IOPriorities without being subject to fair scheduling constraint.
-* `SstFileWriter` now supports `Put`s and `Delete`s with user-defined timestamps. Note that the ingestion logic itself is not timestamp-aware yet.
-* Allow a single write batch to include keys from multiple column families whose timestamps' formats can differ. For example, some column families may disable timestamp, while others enable timestamp.
-* Add compaction priority information in RemoteCompaction, which can be used to schedule high priority job first.
-* Added new callback APIs `OnBlobFileCreationStarted`,`OnBlobFileCreated`and `OnBlobFileDeleted` in `EventListener` class of listener.h. It notifies listeners during creation/deletion of individual blob files in Integrated BlobDB. It also log blob file creation finished event and deletion event in LOG file.
-* Batch blob read requests for `DB::MultiGet` using `MultiRead`.
-* Add support for fallback to local compaction, the user can return `CompactionServiceJobStatus::kUseLocal` to instruct RocksDB to run the compaction locally instead of waiting for the remote compaction result.
-* Add built-in rate limiter's implementation of `RateLimiter::GetTotalPendingRequest(int64_t* total_pending_requests, const Env::IOPriority pri)` for the total number of requests that are pending for bytes in the rate limiter.
-* Charge memory usage during data buffering, from which training samples are gathered for dictionary compression, to block cache. Unbuffering data can now be triggered if the block cache becomes full and `strict_capacity_limit=true` for the block cache, in addition to existing conditions that can trigger unbuffering.
-
-### Public API change
-* Remove obsolete implementation details FullKey and ParseFullKey from public API
-* Change `SstFileMetaData::size` from `size_t` to `uint64_t`.
-* Made Statistics extend the Customizable class and added a CreateFromString method.  Implementations of Statistics need to be registered with the ObjectRegistry and to implement a Name() method in order to be created via this method.
-* Extended `FlushJobInfo` and `CompactionJobInfo` in listener.h to provide information about the blob files generated by a flush/compaction and garbage collected during compaction in Integrated BlobDB. Added struct members `blob_file_addition_infos` and `blob_file_garbage_infos` that contain this information.
-* Extended parameter `output_file_names` of `CompactFiles` API to also include paths of the blob files generated by the compaction in Integrated BlobDB.
-* Most `BackupEngine` functions now return `IOStatus` instead of `Status`. Most existing code should be compatible with this change but some calls might need to be updated.
-* Add a new field `level_at_creation` in `TablePropertiesCollectorFactory::Context` to capture the level at creating the SST file (i.e, table), of which the properties are being collected.
-
-### Miscellaneous
-* Add a paranoid check where in case FileSystem layer doesn't fill the buffer but returns succeed, checksum is unlikely to match even if buffer contains a previous block. The byte modified is not useful anyway, so it isn't expected to change any behavior when FileSystem is satisfying its contract.
-
-## 6.24.0 (2021-08-20)
+## 6.23.3 (2021-08-09)
 ### Bug Fixes
-* If the primary's CURRENT file is missing or inaccessible, the secondary instance should not hang repeatedly trying to switch to a new MANIFEST. It should instead return the error code encountered while accessing the file.
-* Restoring backups with BackupEngine is now a logically atomic operation, so that if a restore operation is interrupted, DB::Open on it will fail. Using BackupEngineOptions::sync (default) ensures atomicity even in case of power loss or OS crash.
-* Fixed a race related to the destruction of `ColumnFamilyData` objects. The earlier logic unlocked the DB mutex before destroying the thread-local `SuperVersion` pointers, which could result in a process crash if another thread managed to get a reference to the `ColumnFamilyData` object.
 * Removed a call to `RenameFile()` on a non-existent info log file ("LOG") when opening a new DB. Such a call was guaranteed to fail though did not impact applications since we swallowed the error. Now we also stopped swallowing errors in renaming "LOG" file.
-* Fixed an issue where `OnFlushCompleted` was not called for atomic flush.
 * Fixed a bug affecting the batched `MultiGet` API when used with keys spanning multiple column families and `sorted_input == false`.
-* Fixed a potential incorrect result in opt mode and assertion failures caused by releasing snapshot(s) during compaction.
-* Fixed passing of BlobFileCompletionCallback to Compaction job and Atomic flush job which was default paramter (nullptr). BlobFileCompletitionCallback is internal callback that manages addition of blob files to SSTFileManager.
-* Fixed MultiGet not updating the block_read_count and block_read_byte PerfContext counters.

-### New Features
-* Made the EventListener extend the Customizable class.
-* EventListeners that have a non-empty Name() and that are registered with the ObjectRegistry can now be serialized to/from the OPTIONS file.
-* Insert warm blocks (data blocks, uncompressed dict blocks, index and filter blocks) in Block cache during flush under option BlockBasedTableOptions.prepopulate_block_cache. Previously it was enabled for only data blocks.
-* BlockBasedTableOptions.prepopulate_block_cache can be dynamically configured using DB::SetOptions.
-* Add CompactionOptionsFIFO.age_for_warm, which allows RocksDB to move old files to warm tier in FIFO compactions. Note that file temperature is still an experimental feature.
-* Add a comment to suggest btrfs user to disable file preallocation by setting `options.allow_fallocate=false`.
-* Fast forward option in Trace replay changed to double type to allow replaying at a lower speed, by settings the value between 0 and 1. This option can be set via `ReplayOptions` in `Replayer::Replay()`, or via `--trace_replay_fast_forward` in db_bench.
-* Add property `LiveSstFilesSizeAtTemperature` to retrieve sst file size at different temperature.
-* Added a stat rocksdb.secondary.cache.hits.
-* Added a PerfContext counter secondary_cache_hit_count.
-* The integrated BlobDB implementation now supports the tickers `BLOB_DB_BLOB_FILE_BYTES_READ`, `BLOB_DB_GC_NUM_KEYS_RELOCATED`, and `BLOB_DB_GC_BYTES_RELOCATED`, as well as the histograms `BLOB_DB_COMPRESSION_MICROS` and `BLOB_DB_DECOMPRESSION_MICROS`.
-* Added hybrid configuration of Ribbon filter and Bloom filter where some LSM levels use Ribbon for memory space efficiency and some use Bloom for speed. See NewRibbonFilterPolicy. This also changes the default behavior of NewRibbonFilterPolicy to use Bloom for flushes under Leveled and Universal compaction and Ribbon otherwise. The C API function `rocksdb_filterpolicy_create_ribbon` is unchanged but adds new `rocksdb_filterpolicy_create_ribbon_hybrid`.
+## 6.23.2 (2021-08-04)
+### Bug Fixes
+* Fixed a race related to the destruction of `ColumnFamilyData` objects. The earlier logic unlocked the DB mutex before destroying the thread-local `SuperVersion` pointers, which could result in a process crash if another thread managed to get a reference to the `ColumnFamilyData` object.
+* Fixed an issue where `OnFlushCompleted` was not called for atomic flush.

-### Public API change
-* Added APIs to decode and replay trace file via Replayer class. Added `DB::NewDefaultReplayer()` to create a default Replayer instance. Added `TraceReader::Reset()` to restart reading a trace file. Created trace_record.h, trace_record_result.h and utilities/replayer.h files to access the decoded Trace records, replay them, and query the actual operation results.
-* Added Configurable::GetOptionsMap to the public API for use in creating new Customizable classes.
-* Generalized bits_per_key parameters in C API from int to double for greater configurability. Although this is a compatible change for existing C source code, anything depending on C API signatures, such as foreign function interfaces, will need to be updated.
-
-### Performance Improvements
-* Try to avoid updating DBOptions if `SetDBOptions()` does not change any option value.
-
-### Behavior Changes
-* `StringAppendOperator` additionally accepts a string as the delimiter.
-* BackupEngineOptions::sync (default true) now applies to restoring backups in addition to creating backups. This could slow down restores, but ensures they are fully persisted before returning OK. (Consider increasing max_background_operations to improve performance.)
+## 6.23.1 (2021-07-22)
+### Bug Fixes
+* Fix a race condition during multiple DB instances opening.

 ## 6.23.0 (2021-07-16)
 ### Behavior Changes
 * Obsolete keys in the bottommost level that were preserved for a snapshot will now be cleaned upon snapshot release in all cases. This form of compaction (snapshot release triggered compaction) previously had an artificial limitation that multiple tombstones needed to be present.
+
 ### Bug Fixes
 * Blob file checksums are now printed in hexadecimal format when using the `manifest_dump` `ldb` command.
 * `GetLiveFilesMetaData()` now populates the `temperature`, `oldest_ancester_time`, and `file_creation_time` fields of its `LiveFileMetaData` results when the information is available. Previously these fields always contained zero indicating unknown.
 * Fix mismatches of OnCompaction{Begin,Completed} in case of DisableManualCompaction().
 * Fix continuous logging of an existing background error on every user write
-* Fix a bug that `Get()` return Status::OK() and an empty value for non-existent key when `read_options.read_tier = kBlockCacheTier`.
+* Fix a bug that `Get()` return Status::OK() and an empty value for non-existent key when `read_options.read_tier = kBlockCacheTier`. 
 * Fix a bug that stat in `get_context` didn't accumulate to statistics when query is failed.
-* Fixed handling of DBOptions::wal_dir with LoadLatestOptions() or ldb --try_load_options on a copied or moved DB. Previously, when the WAL directory is same as DB directory (default), a copied or moved DB would reference the old path of the DB as the WAL directory, potentially corrupting both copies. Under this change, the wal_dir from DB::GetOptions() or LoadLatestOptions() may now be empty, indicating that the current DB directory is used for WALs. This is also a subtle API change.

 ### New Features
 * ldb has a new feature, `list_live_files_metadata`, that shows the live SST files, as well as their LSM storage level and the column family they belong to.
@@ -227,7 +39,6 @@
 ### Public API change
 * Added APIs to the Customizable class to allow developers to create their own Customizable classes.  Created the utilities/customizable_util.h file to contain helper methods for developing new Customizable classes.
 * Change signature of SecondaryCache::Name().  Make SecondaryCache customizable and add SecondaryCache::CreateFromString method.
-
 ## 6.22.0 (2021-06-18)
 ### Behavior Changes
 * Added two additional tickers, MEMTABLE_PAYLOAD_BYTES_AT_FLUSH and MEMTABLE_GARBAGE_BYTES_AT_FLUSH. These stats can be used to estimate the ratio of "garbage" (outdated) bytes in the memtable that are discarded at flush time.
@@ -1,6 +1,6 @@
 This is the list of all known third-party language bindings for RocksDB. If something is missing, please open a pull request to add it.

-* Java - https://github.com/facebook/rocksdb/tree/main/java
+* Java - https://github.com/facebook/rocksdb/tree/master/java
 * Python
    * http://python-rocksdb.readthedocs.io/en/latest/
    * http://pyrocksdb.readthedocs.org/en/latest/ (unmaintained)
@@ -222,7 +222,6 @@ 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

@@ -249,20 +248,7 @@ ROCKSDB_PLUGIN_MKS = $(foreach plugin, $(ROCKSDB_PLUGINS), plugin/$(plugin)/*.mk
 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))
-
-ifneq ($(ROCKSDB_PLUGIN_PKGCONFIG_REQUIRES),)
-LDFLAGS := $(LDFLAGS) $(shell pkg-config --libs $(ROCKSDB_PLUGIN_PKGCONFIG_REQUIRES))
-ifneq ($(.SHELLSTATUS),0)
-$(error pkg-config failed)
-endif
-CXXFLAGS := $(CXXFLAGS) $(shell pkg-config --cflags $(ROCKSDB_PLUGIN_PKGCONFIG_REQUIRES))
-ifneq ($(.SHELLSTATUS),0)
-$(error pkg-config failed)
-endif
-endif

 export JAVAC_ARGS
 CLEAN_FILES += make_config.mk rocksdb.pc
@@ -319,13 +305,6 @@ ifdef COMPILE_WITH_ASAN
 	EXEC_LDFLAGS += -fsanitize=address
 	PLATFORM_CCFLAGS += -fsanitize=address
 	PLATFORM_CXXFLAGS += -fsanitize=address
-ifeq ($(LIB_MODE),shared)
-ifdef USE_CLANG
-# Fix false ODR violation; see https://github.com/google/sanitizers/issues/1017
-	EXEC_LDFLAGS += -mllvm -asan-use-private-alias=1
-	PLATFORM_CXXFLAGS += -mllvm -asan-use-private-alias=1
-endif
-endif
 endif

 # TSAN doesn't work well with jemalloc. If we're compiling with TSAN, we should use regular malloc.
@@ -528,7 +507,6 @@ STRESS_OBJECTS =  $(patsubst %.cc, $(OBJ_DIR)/%.o, $(STRESS_LIB_SOURCES))
 ALL_SOURCES  = $(filter-out util/build_version.cc, $(LIB_SOURCES)) $(TEST_LIB_SOURCES) $(MOCK_LIB_SOURCES) $(GTEST_DIR)/gtest/gtest-all.cc
 ALL_SOURCES += $(TOOL_LIB_SOURCES) $(BENCH_LIB_SOURCES) $(CACHE_BENCH_LIB_SOURCES) $(ANALYZER_LIB_SOURCES) $(STRESS_LIB_SOURCES)
 ALL_SOURCES += $(TEST_MAIN_SOURCES) $(TOOL_MAIN_SOURCES) $(BENCH_MAIN_SOURCES)
-ALL_SOURCES += $(ROCKSDB_PLUGIN_SOURCES)

 TESTS = $(patsubst %.cc, %, $(notdir $(TEST_MAIN_SOURCES)))
 TESTS += $(patsubst %.c, %, $(notdir $(TEST_MAIN_SOURCES_C)))
@@ -538,29 +516,6 @@ ifeq ($(USE_FOLLY_DISTRIBUTED_MUTEX),1)
 	ALL_SOURCES += third-party/folly/folly/synchronization/test/DistributedMutexTest.cc
 endif

-# `make check-headers` to very that each header file includes its own
-# dependencies
-ifneq ($(filter check-headers, $(MAKECMDGOALS)),)
-# TODO: add/support JNI headers
-	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/|tools/rdb/db_wrapper.h|include/rocksdb/utilities/env_librados.h')
-else
-	DEV_HEADERS :=
-endif
-HEADER_OK_FILES = $(patsubst %.h, %.h.ok, $(DEV_HEADERS))
-
-AM_V_CCH = $(am__v_CCH_$(V))
-am__v_CCH_ = $(am__v_CCH_$(AM_DEFAULT_VERBOSITY))
-am__v_CCH_0 = @echo "  CC.h    " $<;
-am__v_CCH_1 =
-
-%.h.ok: %.h # .h.ok not actually created, so re-checked on each invocation
-# -DROCKSDB_NAMESPACE=42 ensures the namespace header is included
-	$(AM_V_CCH) echo '#include "$<"' | $(CXX) $(CXXFLAGS) -DROCKSDB_NAMESPACE=42 -x c++ -c - -o /dev/null
-
-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')
@@ -569,6 +524,8 @@ ifdef ASSERT_STATUS_CHECKED
 	# TODO: finish fixing all tests to pass this check
 	TESTS_FAILING_ASC = \
 		c_test \
+		db_test \
+		db_test2 \
 		env_test \
 		range_locking_test \
 		testutil_test \
@@ -760,7 +717,7 @@ endif  # PLATFORM_SHARED_EXT
 .PHONY: blackbox_crash_test check clean coverage crash_test ldb_tests package \
 	release tags tags0 valgrind_check whitebox_crash_test format static_lib shared_lib all \
 	dbg rocksdbjavastatic rocksdbjava gen-pc install install-static install-shared uninstall \
-	analyze tools tools_lib check-headers \
+	analyze tools tools_lib \
 	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 \
@@ -844,11 +801,14 @@ parallel_tests = $(patsubst %,parallel_%,$(PARALLEL_TEST))
 $(parallel_tests): $(PARALLEL_TEST)
 	$(AM_V_at)TEST_BINARY=$(patsubst parallel_%,%,$@); \
  TEST_NAMES=` \
-    (./$$TEST_BINARY --gtest_list_tests || echo "  $${TEST_BINARY}__list_tests_failure") \
-    | awk '/^[^ ]/ { prefix = $$1 } /^[ ]/ { print prefix $$1 }'`; \
-	echo "  Generating parallel test scripts for $$TEST_BINARY"; \
+    ./$$TEST_BINARY --gtest_list_tests \
+    | perl -n \
+      -e 's/ *\#.*//;' \
+      -e '/^(\s*)(\S+)/; !$$1 and do {$$p=$$2; break};'	\
+      -e 'print qq! $$p$$2!'`; \
 	for TEST_NAME in $$TEST_NAMES; do \
 		TEST_SCRIPT=t/run-$$TEST_BINARY-$${TEST_NAME//\//-}; \
+		echo "  GEN     " $$TEST_SCRIPT; \
    printf '%s\n' \
      '#!/bin/sh' \
      "d=\$(TMPD)$$TEST_SCRIPT" \
@@ -895,18 +855,12 @@ J ?= 100%

 # Use this regexp to select the subset of tests whose names match.
 tests-regexp = .
-EXCLUDE_TESTS_REGEX ?= "^$$"
+EXCLUDE_TESTS_REGEX ?= "^$"

 ifeq ($(PRINT_PARALLEL_OUTPUTS), 1)
-	parallel_redir =
-else ifeq ($(QUIET_PARALLEL_TESTS), 1)
-	parallel_redir = >& t/$(test_log_prefix)log-{/}
+	parallel_com = '{}'
 else
-# Default: print failure output only, as it happens
-# Note: gnu_parallel --eta is now always used, but has been modified to provide
-# only infrequent updates when not connected to a terminal. (CircleCI will
-# kill a job if no output for 10min.)
-	parallel_redir = >& t/$(test_log_prefix)log-{/} || bash -c "cat t/$(test_log_prefix)log-{/}; exit $$?"
+	parallel_com = '{} >& t/log-{/}'
 endif

 .PHONY: check_0
@@ -915,6 +869,7 @@ check_0:
 	printf '%s\n' ''						\
 	  'To monitor subtest <duration,pass/fail,name>,'		\
 	  '  run "make watch-log" in a separate window' '';		\
+	test -t 1 && eta=--eta || eta=; \
 	{ \
 		printf './%s\n' $(filter-out $(PARALLEL_TEST),$(TESTS)); \
 		find t -name 'run-*' -print; \
@@ -922,7 +877,7 @@ check_0:
 	  | $(prioritize_long_running_tests)				\
 	  | grep -E '$(tests-regexp)'					\
 	  | grep -E -v '$(EXCLUDE_TESTS_REGEX)'					\
-	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG --eta --gnu '{} $(parallel_redir)' ; \
+	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu  $(parallel_com) ; \
 	parallel_retcode=$$? ; \
 	awk '{ if ($$7 != 0 || $$8 != 0) { if ($$7 == "Exitval") { h = $$0; } else { if (!f) print h; print; f = 1 } } } END { if(f) exit 1; }' < LOG ; \
 	awk_retcode=$$?; \
@@ -931,12 +886,12 @@ check_0:
 valgrind-exclude-regexp = InlineSkipTest.ConcurrentInsert|TransactionStressTest.DeadlockStress|DBCompactionTest.SuggestCompactRangeNoTwoLevel0Compactions|BackupableDBTest.RateLimiting|DBTest.CloseSpeedup|DBTest.ThreadStatusFlush|DBTest.RateLimitingTest|DBTest.EncodeDecompressedBlockSizeTest|FaultInjectionTest.UninstalledCompaction|HarnessTest.Randomized|ExternalSSTFileTest.CompactDuringAddFileRandom|ExternalSSTFileTest.IngestFileWithGlobalSeqnoRandomized|MySQLStyleTransactionTest.TransactionStressTest

 .PHONY: valgrind_check_0
-valgrind_check_0: test_log_prefix := valgrind_
 valgrind_check_0:
 	$(AM_V_GEN)export TEST_TMPDIR=$(TMPD);				\
 	printf '%s\n' ''						\
 	  'To monitor subtest <duration,pass/fail,name>,'		\
 	  '  run "make watch-log" in a separate window' '';		\
+	test -t 1 && eta=--eta || eta=;					\
 	{								\
 	  printf './%s\n' $(filter-out $(PARALLEL_TEST) %skiplist_test options_settable_test, $(TESTS));		\
 	  find t -name 'run-*' -print; \
@@ -944,9 +899,9 @@ valgrind_check_0:
 	  | $(prioritize_long_running_tests)				\
 	  | grep -E '$(tests-regexp)'					\
 	  | grep -E -v '$(valgrind-exclude-regexp)'					\
-	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG --eta --gnu \
-	  '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) \
-	  $(parallel_redir)' \
+	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu \
+	  '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) ' \
+	  '>& t/valgrind_log-{/}'

 CLEAN_FILES += t LOG $(TMPD)

@@ -989,7 +944,6 @@ endif
 ifndef SKIP_FORMAT_BUCK_CHECKS
 	$(MAKE) check-format
 	$(MAKE) check-buck-targets
-	$(MAKE) check-sources
 endif

 # TODO add ldb_tests
@@ -1000,27 +954,15 @@ check_some: $(ROCKSDBTESTS_SUBSET)
 ldb_tests: ldb
 	$(PYTHON) tools/ldb_test.py

-crash_test:
-# Do not parallelize
-	$(MAKE) whitebox_crash_test
-	$(MAKE) blackbox_crash_test
+crash_test: whitebox_crash_test 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_atomic_flush: whitebox_crash_test_with_atomic_flush 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_txn: whitebox_crash_test_with_txn 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
+crash_test_with_ts: whitebox_crash_test_with_ts blackbox_crash_test_with_ts

 blackbox_crash_test: db_stress
 	$(PYTHON) -u tools/db_crashtest.py --simple blackbox $(CRASH_TEST_EXT_ARGS)
@@ -1279,9 +1221,6 @@ check-format:
 check-buck-targets:
 	buckifier/check_buck_targets.sh

-check-sources:
-	build_tools/check-sources.sh
-
 package:
 	bash build_tools/make_package.sh $(SHARED_MAJOR).$(SHARED_MINOR)

@@ -1361,7 +1300,7 @@ db_repl_stress: $(OBJ_DIR)/tools/db_repl_stress.o $(LIBRARY)
 arena_test: $(OBJ_DIR)/memory/arena_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-memory_allocator_test: memory/memory_allocator_test.o $(TEST_LIBRARY) $(LIBRARY)
+memkind_kmem_allocator_test: memory/memkind_kmem_allocator_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

 autovector_test: $(OBJ_DIR)/util/autovector_test.o $(TEST_LIBRARY) $(LIBRARY)
@@ -1960,11 +1899,6 @@ clipping_iterator_test: $(OBJ_DIR)/db/compaction/clipping_iterator_test.o $(TEST
 ribbon_bench: $(OBJ_DIR)/microbench/ribbon_bench.o $(LIBRARY)
 	$(AM_LINK)

-db_basic_bench: $(OBJ_DIR)/microbench/db_basic_bench.o $(LIBRARY)
-	$(AM_LINK)
-
-cache_reservation_manager_test: $(OBJ_DIR)/cache/cache_reservation_manager_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
 #-------------------------------------------------
 # make install related stuff
 PREFIX ?= /usr/local
@@ -2023,7 +1957,6 @@ gen-pc:
 	-echo 'Libs: -L$${libdir} $(EXEC_LDFLAGS) -lrocksdb' >> rocksdb.pc
 	-echo 'Libs.private: $(PLATFORM_LDFLAGS)' >> rocksdb.pc
 	-echo 'Cflags: -I$${includedir} $(PLATFORM_CXXFLAGS)' >> rocksdb.pc
-	-echo 'Requires: $(subst ",,$(ROCKSDB_PLUGIN_PKGCONFIG_REQUIRES))' >> rocksdb.pc

 #-------------------------------------------------

@@ -2036,7 +1969,7 @@ JAVA_INCLUDE = -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux
 ifeq ($(PLATFORM), OS_SOLARIS)
 	ARCH := $(shell isainfo -b)
 else ifeq ($(PLATFORM), OS_OPENBSD)
-	ifneq (,$(filter amd64 ppc64 ppc64le s390x arm64 aarch64 sparc64, $(MACHINE)))
+	ifneq (,$(filter amd64 ppc64 ppc64le arm64 aarch64 sparc64, $(MACHINE)))
 		ARCH := 64
 	else
 		ARCH := 32
@@ -2056,7 +1989,7 @@ ifneq ($(origin JNI_LIBC), undefined)
  JNI_LIBC_POSTFIX = -$(JNI_LIBC)
 endif

-ifneq (,$(filter ppc% s390x arm64 aarch64 sparc64, $(MACHINE)))
+ifneq (,$(filter ppc% arm64 aarch64 sparc64, $(MACHINE)))
 	ROCKSDBJNILIB = librocksdbjni-linux-$(MACHINE)$(JNI_LIBC_POSTFIX).so
 else
 	ROCKSDBJNILIB = librocksdbjni-linux$(ARCH)$(JNI_LIBC_POSTFIX).so
@@ -2073,7 +2006,7 @@ ZLIB_SHA256 ?= c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
 ZLIB_DOWNLOAD_BASE ?= http://zlib.net
 BZIP2_VER ?= 1.0.8
 BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
-BZIP2_DOWNLOAD_BASE ?= http://sourceware.org/pub/bzip2
+BZIP2_DOWNLOAD_BASE ?= https://sourceware.org/pub/bzip2
 SNAPPY_VER ?= 1.1.8
 SNAPPY_SHA256 ?= 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f
 SNAPPY_DOWNLOAD_BASE ?= https://github.com/google/snappy/archive
@@ -2281,26 +2214,20 @@ rocksdbjavastaticpublish: rocksdbjavastaticrelease rocksdbjavastaticpublishcentr

 rocksdbjavastaticpublishdocker: rocksdbjavastaticreleasedocker rocksdbjavastaticpublishcentral

-ROCKSDB_JAVA_RELEASE_CLASSIFIERS = javadoc sources linux64 linux32 linux64-musl linux32-musl osx win64
-
 rocksdbjavastaticpublishcentral: rocksdbjavageneratepom
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-javadoc.jar -Dclassifier=javadoc
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-sources.jar -Dclassifier=sources
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-linux64.jar -Dclassifier=linux64
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-linux32.jar -Dclassifier=linux32
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-linux64-musl.jar -Dclassifier=linux64-musl
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-linux32-musl.jar -Dclassifier=linux32-musl
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-osx.jar -Dclassifier=osx
+	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-win64.jar -Dclassifier=win64
 	mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar
-	$(foreach classifier, $(ROCKSDB_JAVA_RELEASE_CLASSIFIERS), mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DrepositoryId=sonatype-nexus-staging -DpomFile=java/pom.xml -Dfile=java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-$(classifier).jar -Dclassifier=$(classifier);)

 rocksdbjavageneratepom:
 	cd java;cat pom.xml.template | sed 's/\$${ROCKSDB_JAVA_VERSION}/$(ROCKSDB_JAVA_VERSION)/' > pom.xml

-rocksdbjavastaticnexusbundlejar: rocksdbjavageneratepom
-	openssl sha1 -r java/pom.xml | awk '{  print $$1 }' > java/target/pom.xml.sha1
-	openssl sha1 -r java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar | awk '{  print $$1 }' > java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar.sha1
-	$(foreach classifier, $(ROCKSDB_JAVA_RELEASE_CLASSIFIERS), openssl sha1 -r java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-$(classifier).jar | awk '{  print $$1 }' > java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-$(classifier).jar.sha1;)
-	gpg --yes --output java/target/pom.xml.asc -ab java/pom.xml
-	gpg --yes -ab java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar
-	$(foreach classifier, $(ROCKSDB_JAVA_RELEASE_CLASSIFIERS), gpg --yes -ab java/target/rocksdbjni-$(ROCKSDB_JAVA_VERSION)-$(classifier).jar;)
-	jar cvf java/target/nexus-bundle-rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar -C java pom.xml -C java/target pom.xml.sha1 -C java/target pom.xml.asc -C java/target rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar -C java/target rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar.sha1 -C java/target rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar.asc
-	 $(foreach classifier, $(ROCKSDB_JAVA_RELEASE_CLASSIFIERS), jar uf java/target/nexus-bundle-rocksdbjni-$(ROCKSDB_JAVA_VERSION).jar -C java/target rocksdbjni-$(ROCKSDB_JAVA_VERSION)-$(classifier).jar -C java/target rocksdbjni-$(ROCKSDB_JAVA_VERSION)-$(classifier).jar.sha1 -C java/target rocksdbjni-$(ROCKSDB_JAVA_VERSION)-$(classifier).jar.asc;)
-
-
 # A version of each $(LIBOBJECTS) compiled with -fPIC

 jl/%.o: %.cc
@@ -2436,7 +2363,7 @@ build_subset_tests: $(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))
+ROCKS_DEP_RULES=$(filter-out clean format check-format check-buck-targets jclean jtest package analyze tags rocksdbjavastatic% unity.% unity_test, $(MAKECMDGOALS))
 ifneq ("$(ROCKS_DEP_RULES)", "")
 -include $(DEPFILES)
 endif
@@ -1,8 +1,8 @@
 ## RocksDB: A Persistent Key-Value Store for Flash and RAM Storage

 [![CircleCI Status](https://circleci.com/gh/facebook/rocksdb.svg?style=svg)](https://circleci.com/gh/facebook/rocksdb)
-[![TravisCI Status](https://api.travis-ci.com/facebook/rocksdb.svg?branch=main)](https://travis-ci.com/github/facebook/rocksdb)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/fbgfu0so3afcno78/branch/main?svg=true)](https://ci.appveyor.com/project/Facebook/rocksdb/branch/main)
+[![TravisCI Status](https://travis-ci.org/facebook/rocksdb.svg?branch=master)](https://travis-ci.org/facebook/rocksdb)
+[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/fbgfu0so3afcno78/branch/master?svg=true)](https://ci.appveyor.com/project/Facebook/rocksdb/branch/master)
 [![PPC64le Build Status](http://140-211-168-68-openstack.osuosl.org:8080/buildStatus/icon?job=rocksdb&style=plastic)](http://140-211-168-68-openstack.osuosl.org:8080/job/rocksdb)

 RocksDB is developed and maintained by Facebook Database Engineering Team.
@@ -17,7 +17,7 @@ and Space-Amplification-Factor (SAF). It has multi-threaded compactions,
 making it especially suitable for storing multiple terabytes of data in a
 single database.

-Start with example usage here: https://github.com/facebook/rocksdb/tree/main/examples
+Start with example usage here: https://github.com/facebook/rocksdb/tree/master/examples

 See the [github wiki](https://github.com/facebook/rocksdb/wiki) for more explanation.

@@ -31,11 +31,7 @@ ROCKSDB_EXTERNAL_DEPS = [
 ROCKSDB_OS_DEPS_0 = [
    (
        "linux",
-        [
-            "third-party//numa:numa",
-            "third-party//liburing:uring",
-            "third-party//tbb:tbb",
-        ],
+        ["third-party//numa:numa", "third-party//liburing:uring", "third-party//tbb:tbb"],
    ),
    (
        "macos",
@@ -73,13 +69,7 @@ ROCKSDB_OS_PREPROCESSOR_FLAGS_0 = [
    ),
    (
        "windows",
-        [
-            "-DOS_WIN",
-            "-DWIN32",
-            "-D_MBCS",
-            "-DWIN64",
-            "-DNOMINMAX",
-        ],
+        [ "-DOS_WIN", "-DWIN32", "-D_MBCS", "-DWIN64", "-DNOMINMAX" ]
    ),
 ]

@@ -143,8 +133,6 @@ cpp_library(
    srcs = [
        "cache/cache.cc",
        "cache/cache_entry_roles.cc",
-        "cache/cache_key.cc",
-        "cache/cache_reservation_manager.cc",
        "cache/clock_cache.cc",
        "cache/lru_cache.cc",
        "cache/sharded_cache.cc",
@@ -160,7 +148,6 @@ cpp_library(
        "db/blob/blob_log_format.cc",
        "db/blob/blob_log_sequential_reader.cc",
        "db/blob/blob_log_writer.cc",
-        "db/blob/prefetch_buffer_collection.cc",
        "db/builder.cc",
        "db/c.cc",
        "db/column_family.cc",
@@ -237,7 +224,6 @@ cpp_library(
        "env/fs_remap.cc",
        "env/io_posix.cc",
        "env/mock_env.cc",
-        "env/unique_id_gen.cc",
        "file/delete_scheduler.cc",
        "file/file_prefetch_buffer.cc",
        "file/file_util.cc",
@@ -256,7 +242,6 @@ cpp_library(
        "memory/concurrent_arena.cc",
        "memory/jemalloc_nodump_allocator.cc",
        "memory/memkind_kmem_allocator.cc",
-        "memory/memory_allocator.cc",
        "memtable/alloc_tracker.cc",
        "memtable/hash_linklist_rep.cc",
        "memtable/hash_skiplist_rep.cc",
@@ -340,7 +325,6 @@ cpp_library(
        "table/table_factory.cc",
        "table/table_properties.cc",
        "table/two_level_iterator.cc",
-        "table/unique_id.cc",
        "test_util/sync_point.cc",
        "test_util/sync_point_impl.cc",
        "test_util/transaction_test_util.cc",
@@ -351,9 +335,6 @@ cpp_library(
        "tools/sst_dump_tool.cc",
        "trace_replay/block_cache_tracer.cc",
        "trace_replay/io_tracer.cc",
-        "trace_replay/trace_record.cc",
-        "trace_replay/trace_record_handler.cc",
-        "trace_replay/trace_record_result.cc",
        "trace_replay/trace_replay.cc",
        "util/build_version.cc",
        "util/coding.cc",
@@ -369,7 +350,6 @@ cpp_library(
        "util/murmurhash.cc",
        "util/random.cc",
        "util/rate_limiter.cc",
-        "util/regex.cc",
        "util/ribbon_config.cc",
        "util/slice.cc",
        "util/status.cc",
@@ -384,13 +364,10 @@ cpp_library(
        "utilities/blob_db/blob_db_impl_filesnapshot.cc",
        "utilities/blob_db/blob_dump_tool.cc",
        "utilities/blob_db/blob_file.cc",
-        "utilities/cache_dump_load.cc",
-        "utilities/cache_dump_load_impl.cc",
        "utilities/cassandra/cassandra_compaction_filter.cc",
        "utilities/cassandra/format.cc",
        "utilities/cassandra/merge_operator.cc",
        "utilities/checkpoint/checkpoint_impl.cc",
-        "utilities/compaction_filters.cc",
        "utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc",
        "utilities/convenience/info_log_finder.cc",
        "utilities/debug.cc",
@@ -398,10 +375,8 @@ cpp_library(
        "utilities/env_timed.cc",
        "utilities/fault_injection_env.cc",
        "utilities/fault_injection_fs.cc",
-        "utilities/fault_injection_secondary_cache.cc",
        "utilities/leveldb_options/leveldb_options.cc",
        "utilities/memory/memory_util.cc",
-        "utilities/merge_operators.cc",
        "utilities/merge_operators/bytesxor.cc",
        "utilities/merge_operators/max.cc",
        "utilities/merge_operators/put.cc",
@@ -421,7 +396,6 @@ cpp_library(
        "utilities/simulator_cache/sim_cache.cc",
        "utilities/table_properties_collectors/compact_on_deletion_collector.cc",
        "utilities/trace/file_trace_reader_writer.cc",
-        "utilities/trace/replayer_impl.cc",
        "utilities/transactions/lock/lock_manager.cc",
        "utilities/transactions/lock/point/point_lock_manager.cc",
        "utilities/transactions/lock/point/point_lock_tracker.cc",
@@ -452,20 +426,19 @@ cpp_library(
        "utilities/transactions/write_unprepared_txn.cc",
        "utilities/transactions/write_unprepared_txn_db.cc",
        "utilities/ttl/db_ttl_impl.cc",
-        "utilities/wal_filter.cc",
        "utilities/write_batch_with_index/write_batch_with_index.cc",
        "utilities/write_batch_with_index/write_batch_with_index_internal.cc",
    ],
    auto_headers = AutoHeaders.RECURSIVE_GLOB,
    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
    compiler_flags = ROCKSDB_COMPILER_FLAGS,
-    include_paths = ROCKSDB_INCLUDE_PATHS,
-    link_whole = False,
    os_deps = ROCKSDB_OS_DEPS,
    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
-    exported_deps = [],
-    exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = [],
+    external_deps = ROCKSDB_EXTERNAL_DEPS,
+    link_whole = False,
 )

 cpp_library(
@@ -473,8 +446,6 @@ cpp_library(
    srcs = [
        "cache/cache.cc",
        "cache/cache_entry_roles.cc",
-        "cache/cache_key.cc",
-        "cache/cache_reservation_manager.cc",
        "cache/clock_cache.cc",
        "cache/lru_cache.cc",
        "cache/sharded_cache.cc",
@@ -490,7 +461,6 @@ cpp_library(
        "db/blob/blob_log_format.cc",
        "db/blob/blob_log_sequential_reader.cc",
        "db/blob/blob_log_writer.cc",
-        "db/blob/prefetch_buffer_collection.cc",
        "db/builder.cc",
        "db/c.cc",
        "db/column_family.cc",
@@ -567,7 +537,6 @@ cpp_library(
        "env/fs_remap.cc",
        "env/io_posix.cc",
        "env/mock_env.cc",
-        "env/unique_id_gen.cc",
        "file/delete_scheduler.cc",
        "file/file_prefetch_buffer.cc",
        "file/file_util.cc",
@@ -586,7 +555,6 @@ cpp_library(
        "memory/concurrent_arena.cc",
        "memory/jemalloc_nodump_allocator.cc",
        "memory/memkind_kmem_allocator.cc",
-        "memory/memory_allocator.cc",
        "memtable/alloc_tracker.cc",
        "memtable/hash_linklist_rep.cc",
        "memtable/hash_skiplist_rep.cc",
@@ -670,7 +638,6 @@ cpp_library(
        "table/table_factory.cc",
        "table/table_properties.cc",
        "table/two_level_iterator.cc",
-        "table/unique_id.cc",
        "test_util/sync_point.cc",
        "test_util/sync_point_impl.cc",
        "test_util/transaction_test_util.cc",
@@ -681,9 +648,6 @@ cpp_library(
        "tools/sst_dump_tool.cc",
        "trace_replay/block_cache_tracer.cc",
        "trace_replay/io_tracer.cc",
-        "trace_replay/trace_record.cc",
-        "trace_replay/trace_record_handler.cc",
-        "trace_replay/trace_record_result.cc",
        "trace_replay/trace_replay.cc",
        "util/build_version.cc",
        "util/coding.cc",
@@ -699,7 +663,6 @@ cpp_library(
        "util/murmurhash.cc",
        "util/random.cc",
        "util/rate_limiter.cc",
-        "util/regex.cc",
        "util/ribbon_config.cc",
        "util/slice.cc",
        "util/status.cc",
@@ -714,13 +677,10 @@ cpp_library(
        "utilities/blob_db/blob_db_impl_filesnapshot.cc",
        "utilities/blob_db/blob_dump_tool.cc",
        "utilities/blob_db/blob_file.cc",
-        "utilities/cache_dump_load.cc",
-        "utilities/cache_dump_load_impl.cc",
        "utilities/cassandra/cassandra_compaction_filter.cc",
        "utilities/cassandra/format.cc",
        "utilities/cassandra/merge_operator.cc",
        "utilities/checkpoint/checkpoint_impl.cc",
-        "utilities/compaction_filters.cc",
        "utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc",
        "utilities/convenience/info_log_finder.cc",
        "utilities/debug.cc",
@@ -728,10 +688,8 @@ cpp_library(
        "utilities/env_timed.cc",
        "utilities/fault_injection_env.cc",
        "utilities/fault_injection_fs.cc",
-        "utilities/fault_injection_secondary_cache.cc",
        "utilities/leveldb_options/leveldb_options.cc",
        "utilities/memory/memory_util.cc",
-        "utilities/merge_operators.cc",
        "utilities/merge_operators/bytesxor.cc",
        "utilities/merge_operators/max.cc",
        "utilities/merge_operators/put.cc",
@@ -751,7 +709,6 @@ cpp_library(
        "utilities/simulator_cache/sim_cache.cc",
        "utilities/table_properties_collectors/compact_on_deletion_collector.cc",
        "utilities/trace/file_trace_reader_writer.cc",
-        "utilities/trace/replayer_impl.cc",
        "utilities/transactions/lock/lock_manager.cc",
        "utilities/transactions/lock/point/point_lock_manager.cc",
        "utilities/transactions/lock/point/point_lock_tracker.cc",
@@ -782,20 +739,19 @@ cpp_library(
        "utilities/transactions/write_unprepared_txn.cc",
        "utilities/transactions/write_unprepared_txn_db.cc",
        "utilities/ttl/db_ttl_impl.cc",
-        "utilities/wal_filter.cc",
        "utilities/write_batch_with_index/write_batch_with_index.cc",
        "utilities/write_batch_with_index/write_batch_with_index_internal.cc",
    ],
    auto_headers = AutoHeaders.RECURSIVE_GLOB,
    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
    compiler_flags = ROCKSDB_COMPILER_FLAGS,
-    include_paths = ROCKSDB_INCLUDE_PATHS,
-    link_whole = True,
    os_deps = ROCKSDB_OS_DEPS,
    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
-    exported_deps = [],
-    exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = [],
+    external_deps = ROCKSDB_EXTERNAL_DEPS,
+    link_whole = True,
 )

 cpp_library(
@@ -813,15 +769,15 @@ cpp_library(
    auto_headers = AutoHeaders.RECURSIVE_GLOB,
    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
    compiler_flags = ROCKSDB_COMPILER_FLAGS,
-    include_paths = ROCKSDB_INCLUDE_PATHS,
-    link_whole = False,
    os_deps = ROCKSDB_OS_DEPS,
    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
-    exported_deps = [":rocksdb_lib"],
-    exported_external_deps = ROCKSDB_EXTERNAL_DEPS + [
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = [":rocksdb_lib"],
+    external_deps = ROCKSDB_EXTERNAL_DEPS + [
        ("googletest", None, "gtest"),
    ],
+    link_whole = False,
 )

 cpp_library(
@@ -836,13 +792,13 @@ cpp_library(
    auto_headers = AutoHeaders.RECURSIVE_GLOB,
    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
    compiler_flags = ROCKSDB_COMPILER_FLAGS,
-    include_paths = ROCKSDB_INCLUDE_PATHS,
-    link_whole = False,
    os_deps = ROCKSDB_OS_DEPS,
    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
-    exported_deps = [":rocksdb_lib"],
-    exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = [":rocksdb_lib"],
+    external_deps = ROCKSDB_EXTERNAL_DEPS,
+    link_whole = False,
 )

 cpp_library(
@@ -851,13 +807,13 @@ cpp_library(
    auto_headers = AutoHeaders.RECURSIVE_GLOB,
    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
    compiler_flags = ROCKSDB_COMPILER_FLAGS,
-    include_paths = ROCKSDB_INCLUDE_PATHS,
-    link_whole = False,
    os_deps = ROCKSDB_OS_DEPS,
    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
-    exported_deps = [":rocksdb_lib"],
-    exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = [":rocksdb_lib"],
+    external_deps = ROCKSDB_EXTERNAL_DEPS,
+    link_whole = False,
 )

 cpp_library(
@@ -868,13 +824,9 @@ cpp_library(
        "db_stress_tool/db_stress_common.cc",
        "db_stress_tool/db_stress_driver.cc",
        "db_stress_tool/db_stress_gflags.cc",
-        "db_stress_tool/db_stress_listener.cc",
        "db_stress_tool/db_stress_shared_state.cc",
-        "db_stress_tool/db_stress_stat.cc",
        "db_stress_tool/db_stress_test_base.cc",
        "db_stress_tool/db_stress_tool.cc",
-        "db_stress_tool/expected_state.cc",
-        "db_stress_tool/multi_ops_txns_stress.cc",
        "db_stress_tool/no_batched_ops_stress.cc",
        "test_util/testutil.cc",
        "tools/block_cache_analyzer/block_cache_trace_analyzer.cc",
@@ -883,22 +835,22 @@ cpp_library(
    auto_headers = AutoHeaders.RECURSIVE_GLOB,
    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,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = ROCKSDB_LIB_DEPS,
+    external_deps = ROCKSDB_EXTERNAL_DEPS,
 )

 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,
+    compiler_flags = ROCKSDB_COMPILER_FLAGS,
    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
    deps = [":rocksdb_test_lib"],
 ) if not is_opt_mode else None

@@ -917,13 +869,13 @@ cpp_library(
    auto_headers = AutoHeaders.RECURSIVE_GLOB,
    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
    compiler_flags = ROCKSDB_COMPILER_FLAGS,
-    include_paths = ROCKSDB_INCLUDE_PATHS,
-    link_whole = False,
    os_deps = ROCKSDB_OS_DEPS,
    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
-    exported_deps = [":rocksdb_test_lib"],
-    exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = [":rocksdb_test_lib"],
+    external_deps = ROCKSDB_EXTERNAL_DEPS,
+    link_whole = False,
 )

 # [test_name, test_src, test_type, extra_deps, extra_compiler_flags]
@@ -1061,13 +1013,6 @@ ROCKS_TESTS = [
        [],
        [],
    ],
-    [
-        "cache_reservation_manager_test",
-        "cache/cache_reservation_manager_test.cc",
-        "parallel",
-        [],
-        [],
-    ],
    [
        "cache_simulator_test",
        "utilities/simulator_cache/cache_simulator_test.cc",
@@ -1776,8 +1721,8 @@ ROCKS_TESTS = [
        [],
    ],
    [
-        "memory_allocator_test",
-        "memory/memory_allocator_test.cc",
+        "memkind_kmem_allocator_test",
+        "memory/memkind_kmem_allocator_test.cc",
        "parallel",
        [],
        [],
@@ -2240,10 +2185,10 @@ ROCKS_TESTS = [
        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,
+        compiler_flags = ROCKSDB_COMPILER_FLAGS + extra_compiler_flags,
        preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+        include_paths = ROCKSDB_INCLUDE_PATHS,
        deps = [":rocksdb_test_lib"] + extra_deps,
        external_deps = ROCKSDB_EXTERNAL_DEPS + [
            ("googletest", None, "gtest"),
@@ -113,14 +113,5 @@ LzLabs is using RocksDB as a storage engine in their multi-database distributed
 [YugabyteDB](https://www.yugabyte.com/) is an open source, high performance, distributed SQL database that uses RocksDB as its storage layer. For more information, please see https://github.com/yugabyte/yugabyte-db/.

 ## ArangoDB
-[ArangoDB](https://www.arangodb.com/) is a native multi-model database with flexible data models for documents, graphs, and key-values, for building high performance applications using a convenient SQL-like query language or JavaScript extensions. It uses RocksDB as its storage engine.
-
-## Milvus
-[Milvus](https://milvus.io/) is an open source vector database for unstructured data. It uses RocksDB not only as one of the supported kv storage engines, but also as a message queue.
-
-## 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/.
-
-## Others
-More databases using RocksDB can be found at [dbdb.io](https://dbdb.io/browse?embeds=rocksdb).
+[ArangoDB](https://www.arangodb.com/) is a native multi-model database with flexible data models for documents, graphs, and key-values, for building high performance applications using a convenient SQL-like query language or JavaScript extensions. It uses RocksDB as its sotrage engine.

@@ -24,7 +24,7 @@ We strive to achieve the following goals:
 * make all unit test pass both in debug and release builds. 
  * Note: latest introduction of SyncPoint seems to disable running db_test in Release.
 * make performance on par with published benchmarks accounting for HW differences
-* we would like to keep the port code inline with the main branch with no forking
+* we would like to keep the port code inline with the master branch with no forking

 ## Build system
 We have chosen CMake as a widely accepted build system to build the Windows port. It is very fast and convenient. 
@@ -66,7 +66,7 @@ We endeavored to make it functionally on par with posix_env. This means we repli
 Even though Windows provides its own efficient thread-pool implementation we chose to replicate posix logic using `std::thread` primitives. This allows anyone to quickly detect any changes within the posix source code and replicate them within windows env. This has proven to work very well. At the same time for anyone who wishes to replace the built-in thread-pool can do so using RocksDB stackable environments.

 For disk access we implemented all of the functionality present within the posix_env which includes memory mapped files, random access, rate-limiter support etc.
-The `use_os_buffer` flag on Posix platforms currently denotes disabling read-ahead log via `fadvise` mechanism. Windows does not have `fadvise` system call. What is more, it implements disk cache in a way that differs from Linux greatly. It's not an uncommon practice on Windows to perform un-buffered disk access to gain control of the memory consumption. We think that in our use case this may also be a good configuration option at the expense of disk throughput. To compensate one may increase the configured in-memory cache size instead. Thus we have chosen  `use_os_buffer=false` to disable OS disk buffering for `WinWritableFile` and `WinRandomAccessFile`. The OS imposes restrictions on the alignment of the disk offsets, buffers used and the amount of data that is read/written when accessing files in un-buffered mode. When the option is true, the classes behave in a standard way. This allows to perform writes and reads in cases when un-buffered access does not make sense such as WAL and MANIFEST.
+The `use_os_buffer` flag on Posix platforms currently denotes disabling read-ahead log via `fadvise` mechanism. Windows does not have `fadvise` system call. What is more, it implements disk cache in a way that differs from Linux greatly. It’s not an uncommon practice on Windows to perform un-buffered disk access to gain control of the memory consumption. We think that in our use case this may also be a good configuration option at the expense of disk throughput. To compensate one may increase the configured in-memory cache size instead. Thus we have chosen  `use_os_buffer=false` to disable OS disk buffering for `WinWritableFile` and `WinRandomAccessFile`. The OS imposes restrictions on the alignment of the disk offsets, buffers used and the amount of data that is read/written when accessing files in un-buffered mode. When the option is true, the classes behave in a standard way. This allows to perform writes and reads in cases when un-buffered access does not make sense such as WAL and MANIFEST.

 We have replaced `pread/pwrite` with `WriteFile/ReadFile` with `OVERLAPPED` structure so we can atomically seek to the position of the disk operation but still perform the operation synchronously. Thus we able to emulate that functionality of `pread/pwrite` reasonably well. The only difference is that the file pointer is not returned to its original position but that hardly matters given the random nature of access.

@@ -84,10 +84,10 @@ 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,
+    compiler_flags = ROCKSDB_COMPILER_FLAGS,
    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
    deps = [":rocksdb_test_lib"],
 ) if not is_opt_mode else None

@@ -38,11 +38,7 @@ ROCKSDB_EXTERNAL_DEPS = [
 ROCKSDB_OS_DEPS_0 = [
    (
        "linux",
-        [
-            "third-party//numa:numa",
-            "third-party//liburing:uring",
-            "third-party//tbb:tbb",
-        ],
+        ["third-party//numa:numa", "third-party//liburing:uring", "third-party//tbb:tbb"],
    ),
    (
        "macos",
@@ -80,13 +76,7 @@ ROCKSDB_OS_PREPROCESSOR_FLAGS_0 = [
    ),
    (
        "windows",
-        [
-            "-DOS_WIN",
-            "-DWIN32",
-            "-D_MBCS",
-            "-DWIN64",
-            "-DNOMINMAX",
-        ],
+        [ "-DOS_WIN", "-DWIN32", "-D_MBCS", "-DWIN64", "-DNOMINMAX" ]
    ),
 ]

@@ -154,13 +144,13 @@ cpp_library(
    {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},
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = [{deps}],
+    external_deps = ROCKSDB_EXTERNAL_DEPS{extra_external_deps},
+    link_whole = {link_whole},
 )
 """

@@ -171,12 +161,12 @@ cpp_library(
    {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,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = ROCKSDB_LIB_DEPS,
+    external_deps = ROCKSDB_EXTERNAL_DEPS,
 )
 """

@@ -215,10 +205,10 @@ ROCKS_TESTS = [
        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,
+        compiler_flags = ROCKSDB_COMPILER_FLAGS + extra_compiler_flags,
        preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+        include_paths = ROCKSDB_INCLUDE_PATHS,
        deps = [":rocksdb_test_lib"] + extra_deps,
        external_deps = ROCKSDB_EXTERNAL_DEPS + [
            ("googletest", None, "gtest"),
@@ -189,6 +189,9 @@ EOF
                COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_IOURING_PRESENT"
            fi
        fi
+        if test -z "$USE_FOLLY_DISTRIBUTED_MUTEX"; then
+          USE_FOLLY_DISTRIBUTED_MUTEX=1
+        fi
        # PORT_FILES=port/linux/linux_specific.cc
        ;;
    SunOS)
@@ -606,8 +609,8 @@ EOF
 fi

 # TODO(tec): Fix -Wshorten-64-to-32 errors on FreeBSD and enable the warning.
-# -Wshorten-64-to-32 breaks compilation on FreeBSD aarch64 and i386
-if ! { [ "$TARGET_OS" = FreeBSD ] && [ "$TARGET_ARCHITECTURE" = arm64 -o "$TARGET_ARCHITECTURE" = i386 ]; }; then
+# -Wshorten-64-to-32 breaks compilation on FreeBSD i386
+if ! [ "$TARGET_OS" = FreeBSD -a "$TARGET_ARCHITECTURE" = i386 ]; then
  # Test whether -Wshorten-64-to-32 is available
  $CXX $PLATFORM_CXXFLAGS -x c++ - -o /dev/null -Wshorten-64-to-32 2>/dev/null  <<EOF
    int main() {}
@@ -638,19 +641,13 @@ if test "0$PORTABLE" -eq 0; then
    # Tune for this POWER processor, treating '+' models as base models
    POWER=`LD_SHOW_AUXV=1 /bin/true | grep AT_PLATFORM | grep -E -o power[0-9]+`
    COMMON_FLAGS="$COMMON_FLAGS -mcpu=$POWER -mtune=$POWER "
+  elif test -n "`echo $TARGET_ARCHITECTURE | grep ^s390x`"; then
+    COMMON_FLAGS="$COMMON_FLAGS -march=z10 "
  elif test -n "`echo $TARGET_ARCHITECTURE | grep -e^arm -e^aarch64`"; then
    # TODO: Handle this with approprite options.
    COMMON_FLAGS="$COMMON_FLAGS"
  elif test -n "`echo $TARGET_ARCHITECTURE | grep ^aarch64`"; then
    COMMON_FLAGS="$COMMON_FLAGS"
-  elif test -n "`echo $TARGET_ARCHITECTURE | grep ^s390x`"; then
-    if echo 'int main() {}' | $CXX $PLATFORM_CXXFLAGS -x c++ \
-      -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 [ "$TARGET_OS" == "IOS" ]; then
    COMMON_FLAGS="$COMMON_FLAGS"
  elif [ "$TARGET_OS" == "AIX" ] || [ "$TARGET_OS" == "SunOS" ]; then
@@ -667,16 +664,11 @@ else
    TRY_SSE_ETC="1"
  fi

-  if test -n "`echo $TARGET_ARCHITECTURE | grep ^s390x`"; then
-    COMMON_FLAGS="$COMMON_FLAGS -march=z196 "
-  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"
    PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -mmacosx-version-min=10.12"
-    # -mmacosx-version-min must come first here.
-    PLATFORM_SHARED_LDFLAGS="-mmacosx-version-min=10.12 $PLATFORM_SHARED_LDFLAGS"
+    PLATFORM_SHARED_LDFLAGS="$PLATFORM_SHARED_LDFLAGS -mmacosx-version-min=10.12"
    PLATFORM_CMAKE_FLAGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12"
    JAVA_STATIC_DEPS_COMMON_FLAGS="-mmacosx-version-min=10.12"
    JAVA_STATIC_DEPS_LDFLAGS="$JAVA_STATIC_DEPS_COMMON_FLAGS"
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-#
-# Check for some simple mistakes that should prevent commit or push
-
-BAD=""
-
-git grep 'namespace rocksdb' -- '*.[ch]*'
-if [ "$?" != "1" ]; then
-  echo "^^^^^ Do not hardcode namespace rocksdb. Use ROCKSDB_NAMESPACE"
-  BAD=1
-fi
-
-git grep -i 'nocommit' -- ':!build_tools/check-sources.sh'
-if [ "$?" != "1" ]; then
-  echo "^^^^^ Code was not intended to be committed"
-  BAD=1
-fi
-
-git grep '<rocksdb/' -- ':!build_tools/check-sources.sh'
-if [ "$?" != "1" ]; then
-  echo '^^^^^ Use double-quotes as in #include "rocksdb/something.h"'
-  BAD=1
-fi
-
-if [ "$BAD" ]; then
-  exit 1
-fi
@@ -18,4 +18,3 @@ KERNEL_HEADERS_BASE=/mnt/gvfs/third-party2/kernel-headers/32b8a2407b634df3f8f948
 BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/08634589372fa5f237bfd374e8c644a8364e78c1/2.32/platform009/ba86d1f/
 VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/6ae525939ad02e5e676855082fbbc7828dbafeac/3.15.0/platform009/7f3b187
 LUA_BASE=/mnt/gvfs/third-party2/lua/162efd9561a3d21f6869f4814011e9cf1b3ff4dc/5.3.4/platform009/a6271c4
-BENCHMARK_BASE=/mnt/gvfs/third-party2/benchmark/bce8d9564eaf161700aa3a20b1051564acf555fb/1.5.5/platform009/7f3b187
@@ -167,4 +167,6 @@ VALGRIND_VER="$VALGRIND_BASE/bin/"
 LUA_PATH=
 LUA_LIB=

+USE_FOLLY_DISTRIBUTED_MUTEX=1
+
 export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB
@@ -63,13 +63,6 @@ else
 fi
 CFLAGS+=" -DGFLAGS=gflags"

-BENCHMARK_INCLUDE=" -I $BENCHMARK_BASE/include/"
-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.a"
@@ -109,9 +102,8 @@ export PORTABLE

 BINUTILS="$BINUTILS_BASE/bin"
 AR="$BINUTILS/ar"
-AS="$BINUTILS/as"

-DEPS_INCLUDE="$SNAPPY_INCLUDE $ZLIB_INCLUDE $BZIP_INCLUDE $LZ4_INCLUDE $ZSTD_INCLUDE $GFLAGS_INCLUDE $NUMA_INCLUDE $TBB_INCLUDE $LIBURING_INCLUDE $BENCHMARK_INCLUDE"
+DEPS_INCLUDE="$SNAPPY_INCLUDE $ZLIB_INCLUDE $BZIP_INCLUDE $LZ4_INCLUDE $ZSTD_INCLUDE $GFLAGS_INCLUDE $NUMA_INCLUDE $TBB_INCLUDE $LIBURING_INCLUDE"

 STDLIBS="-L $GCC_BASE/lib64"

@@ -157,7 +149,8 @@ CFLAGS+=" $DEPS_INCLUDE"
 CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_SCHED_GETCPU_PRESENT -DROCKSDB_SUPPORT_THREAD_LOCAL -DHAVE_SSE42 -DROCKSDB_IOURING_PRESENT"
 CXXFLAGS+=" $CFLAGS"

-EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $TBB_LIBS $LIBURING_LIBS $BENCHMARK_LIBS"
+EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $TBB_LIBS $LIBURING_LIBS"
+EXEC_LDFLAGS+=" -B$BINUTILS"
 EXEC_LDFLAGS+=" -Wl,--dynamic-linker,/usr/local/fbcode/platform009/lib/ld.so"
 EXEC_LDFLAGS+=" $LIBUNWIND"
 EXEC_LDFLAGS+=" -Wl,-rpath=/usr/local/fbcode/platform009/lib"
@@ -166,9 +159,8 @@ EXEC_LDFLAGS+=" -Wl,-rpath=$GCC_BASE/lib64"
 EXEC_LDFLAGS+=" -ldl"

 PLATFORM_LDFLAGS="$LIBGCC_LIBS $GLIBC_LIBS $STDLIBS -lgcc -lstdc++"
-PLATFORM_LDFLAGS+=" -B$BINUTILS"

-EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $TBB_LIBS $LIBURING_LIBS $BENCHMARK_LIBS"
+EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $TBB_LIBS $LIBURING_LIBS"

 VALGRIND_VER="$VALGRIND_BASE/bin/"

@@ -176,4 +168,6 @@ VALGRIND_VER="$VALGRIND_BASE/bin/"
 LUA_PATH=
 LUA_LIB=

-export CC CXX AR AS CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB
+USE_FOLLY_DISTRIBUTED_MUTEX=1
+
+export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB
@@ -38,9 +38,7 @@ if [ "$CLANG_FORMAT_DIFF" ]; then
  fi
 else
  # First try directly executing the possibilities
-  if clang-format-diff --help &> /dev/null < /dev/null; then
-    CLANG_FORMAT_DIFF=clang-format-diff
-  elif clang-format-diff.py --help &> /dev/null < /dev/null; then
+  if clang-format-diff.py --help &> /dev/null < /dev/null; then
    CLANG_FORMAT_DIFF=clang-format-diff.py
  elif $REPO_ROOT/clang-format-diff.py --help &> /dev/null < /dev/null; then
    CLANG_FORMAT_DIFF=$REPO_ROOT/clang-format-diff.py
@@ -122,16 +120,16 @@ uncommitted_code=`git diff HEAD`

 # If there's no uncommitted changes, we assume user are doing post-commit
 # format check, in which case we'll try to check the modified lines vs. the
-# facebook/rocksdb.git main branch. Otherwise, we'll check format of the
+# facebook/rocksdb.git master branch. Otherwise, we'll check format of the
 # uncommitted code only.
 if [ -z "$uncommitted_code" ]
 then
  # Attempt to get name of facebook/rocksdb.git remote.
-  [ "$FORMAT_REMOTE" ] || FORMAT_REMOTE="$(LC_ALL=POSIX LANG=POSIX git remote -v | grep 'facebook/rocksdb.git' | head -n 1 | cut -f 1)"
+  [ "$FORMAT_REMOTE" ] || FORMAT_REMOTE="$(git remote -v | grep 'facebook/rocksdb.git' | head -n 1 | cut -f 1)"
  # Fall back on 'origin' if that fails
  [ "$FORMAT_REMOTE" ] || FORMAT_REMOTE=origin
-  # Use main branch from that remote
-  [ "$FORMAT_UPSTREAM" ] || FORMAT_UPSTREAM="$FORMAT_REMOTE/$(LC_ALL=POSIX LANG=POSIX git remote show $FORMAT_REMOTE | sed -n '/HEAD branch/s/.*: //p')"
+  # Use master branch from that remote
+  [ "$FORMAT_UPSTREAM" ] || FORMAT_UPSTREAM="$FORMAT_REMOTE/master"
  # Get the common ancestor with that remote branch. Everything after that
  # common ancestor would be considered the contents of a pull request, so
  # should be relevant for formatting fixes.
@@ -1561,7 +1561,6 @@ 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);
 }

 sub enough_file_handles {
@@ -1841,17 +1840,12 @@ sub start_another_job {
 }
 }

-$opt::min_progress_interval = 0;
-
 sub init_progress {
    # Uses:
    #   $opt::bar
    # Returns:
    #   list of computers for progress output
    $|=1;
-    if (not $Global::is_terminal) {
-      $opt::min_progress_interval = 30;
-    }
    if($opt::bar) {
 	return("","");
    }
@@ -1876,9 +1870,6 @@ sub drain_job_queue {
    }
    my $last_header="";
    my $sleep = 0.2;
-    my $last_left = 1000000000;
-    my $last_progress_time = 0;
-    my $ps_reported = 0;
    do {
        while($Global::total_running > 0) {
            debug($Global::total_running, "==", scalar
@@ -1889,38 +1880,14 @@ sub drain_job_queue {
 		    close $job->fh(0,"w");
 		}
 	    }
-            # When not connected to terminal, assume CI (e.g. CircleCI). In
-            # that case we want occasional progress output to prevent abort
-            # due to timeout with no output, but we also need to stop sending
-            # progress output if there has been no actual progress, so that
-            # the job can time out appropriately (CirecleCI: 10m) in case of
-            # a hung test. But without special output, it is extremely
-            # annoying to diagnose which test is hung, so we add that using
-            # `ps` below.
-            if($opt::progress and
-               ($Global::is_terminal or (time() - $last_progress_time) >= 30)) {
+            if($opt::progress) {
                my %progress = progress();
                if($last_header ne $progress{'header'}) {
                    print $Global::original_stderr "\n", $progress{'header'}, "\n";
                    $last_header = $progress{'header'};
                }
-                if ($Global::is_terminal) {
-                    print $Global::original_stderr "\r",$progress{'status'};
-                }
-                if ($last_left > $Global::left) {
-                    if (not $Global::is_terminal) {
-                        print $Global::original_stderr $progress{'status'},"\n";
-                    }
-                    $last_progress_time = time();
-                    $ps_reported = 0;
-                } elsif (not $ps_reported and (time() - $last_progress_time) >= 60) {
-                    # No progress in at least 60 seconds: run ps
-                    print $Global::original_stderr "\n";
-                    system("ps", "-wf");
-                    $ps_reported = 1;
-                }
-                $last_left = $Global::left;
-                flush $Global::original_stderr;
+                print $Global::original_stderr "\r",$progress{'status'};
+		flush $Global::original_stderr;
            }
 	    if($Global::total_running < $Global::max_jobs_running
 	       and not $Global::JobQueue->empty()) {
@@ -1954,7 +1921,7 @@ sub drain_job_queue {
 	     not $Global::start_no_new_jobs and not $Global::JobQueue->empty());
    if($opt::progress) {
 	my %progress = progress();
-	print $Global::original_stderr $opt::progress_sep, $progress{'status'}, "\n";
+	print $Global::original_stderr "\r", $progress{'status'}, "\n";
 	flush $Global::original_stderr;
    }
 }
@@ -1987,11 +1954,10 @@ sub progress {
    my $eta = "";
    my ($status,$header)=("","");
    if($opt::eta) {
-      my($total, $completed, $left, $pctcomplete, $avgtime, $this_eta) =
-        compute_eta();
-      $eta = sprintf("ETA: %ds Left: %d AVG: %.2fs  ",
-        $this_eta, $left, $avgtime);
-      $Global::left = $left;
+	my($total, $completed, $left, $pctcomplete, $avgtime, $this_eta) =
+	    compute_eta();
+	$eta = sprintf("ETA: %ds Left: %d AVG: %.2fs  ",
+		       $this_eta, $left, $avgtime);
    }
    my $termcols = terminal_columns();
    my @workers = sort keys %Global::host;
@@ -20,11 +20,26 @@ STAT_FILE=${STAT_FILE:-$(mktemp -t -u rocksdb_test_stats_XXXX)}

 function cleanup {
  rm -rf $DATA_DIR
-  rm -f $STAT_FILE.*
+  rm -f $STAT_FILE.fillseq
+  rm -f $STAT_FILE.readrandom
+  rm -f $STAT_FILE.overwrite
+  rm -f $STAT_FILE.memtablefillreadrandom
 }

 trap cleanup EXIT

+if [ -z $GIT_BRANCH ]; then
+  git_br=`git rev-parse --abbrev-ref HEAD`
+else
+  git_br=$(basename $GIT_BRANCH)
+fi
+
+if [ $git_br == "master" ]; then
+  git_br=""
+else
+  git_br="."$git_br
+fi
+
 make release

 # measure fillseq + fill up the DB for overwrite benchmark
@@ -271,10 +286,12 @@ common_in_mem_args="--db=/dev/shm/rocksdb \
    --sync=0 \
    --verify_checksum=1 \
    --delete_obsolete_files_period_micros=314572800 \
+    --max_grandparent_overlap_factor=10 \
    --use_plain_table=1 \
    --open_files=-1 \
    --mmap_read=1 \
    --mmap_write=0 \
+    --memtablerep=prefix_hash \
    --bloom_bits=10 \
    --bloom_locality=1 \
    --perf_level=0"
@@ -361,7 +378,7 @@ function send_to_ods {
    echo >&2 "ERROR: Key $key doesn't have a value."
    return
  fi
-  curl --silent "https://www.intern.facebook.com/intern/agent/ods_set.php?entity=rocksdb_build&key=$key&value=$value" \
+  curl --silent "https://www.intern.facebook.com/intern/agent/ods_set.php?entity=rocksdb_build$git_br&key=$key&value=$value" \
    --connect-timeout 60
 }

@@ -13,7 +13,7 @@ int main() {
  return 1;
 }
 #else
-#include "rocksdb/cache_bench_tool.h"
+#include <rocksdb/cache_bench_tool.h>
 int main(int argc, char** argv) {
  return ROCKSDB_NAMESPACE::cache_bench_tool(argc, argv);
 }
@@ -5,14 +5,11 @@

 #ifdef GFLAGS
 #include <cinttypes>
-#include <cstddef>
 #include <cstdio>
 #include <limits>
-#include <memory>
 #include <set>
 #include <sstream>

-#include "db/db_impl/db_impl.h"
 #include "monitoring/histogram.h"
 #include "port/port.h"
 #include "rocksdb/cache.h"
@@ -21,8 +18,6 @@
 #include "rocksdb/env.h"
 #include "rocksdb/secondary_cache.h"
 #include "rocksdb/system_clock.h"
-#include "rocksdb/table_properties.h"
-#include "table/block_based/block_based_table_reader.h"
 #include "table/block_based/cachable_entry.h"
 #include "util/coding.h"
 #include "util/gflags_compat.h"
@@ -78,36 +73,6 @@ static class std::shared_ptr<ROCKSDB_NAMESPACE::SecondaryCache> secondary_cache;

 DEFINE_bool(use_clock_cache, false, "");

-// ## BEGIN stress_cache_key sub-tool options ##
-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 day");
-DEFINE_uint32(sck_duration, 90,
-              "(-stress_cache_key) Number of days to simulate in each run");
-DEFINE_uint32(
-    sck_min_collision, 15,
-    "(-stress_cache_key) Keep running until this many collisions seen");
-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) Re-opens DB average every n files");
-DEFINE_uint32(
-    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");
-DEFINE_bool(sck_footer_unique_id, false,
-            "(-stress_cache_key) Simulate using proposed footer unique id");
-// ## END stress_cache_key sub-tool options ##
-
 namespace ROCKSDB_NAMESPACE {

 class CacheBench;
@@ -255,7 +220,7 @@ class CacheBench {
    if (skewed_) {
      uint64_t max_key = max_key_;
      while (max_key >>= 1) max_log_++;
-      if (max_key > (static_cast<uint64_t>(1) << max_log_)) max_log_++;
+      if (max_key > (1u << max_log_)) max_log_++;
    }

    if (FLAGS_use_clock_cache) {
@@ -415,8 +380,7 @@ class CacheBench {
                 << "Average key size: "
                 << (1.0 * total_key_size / total_entry_count) << "\n"
                 << "Average charge: "
-                 << BytesToHumanString(static_cast<uint64_t>(
-                        1.0 * total_charge / total_entry_count))
+                 << BytesToHumanString(1.0 * total_charge / total_entry_count)
                 << "\n"
                 << "Unique deleters: " << deleters.size() << "\n";
            *stats_report = ostr.str();
@@ -583,195 +547,9 @@ class CacheBench {
  }
 };

-// TODO: better description (see PR #9126 for some info)
-class StressCacheKey {
- public:
-  void Run() {
-    if (FLAGS_sck_footer_unique_id) {
-      FLAGS_sck_db_count = 1;
-    }
-
-    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);
-    multiplier_ = std::pow(2.0, 128 - FLAGS_sck_keep_bits) /
-                  (FLAGS_sck_file_size_mb * 1024.0 * 1024.0);
-    printf(
-        "Multiply by %g to correct for simulation losses (but still assume "
-        "whole file cached)\n",
-        multiplier_);
-    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;
-    printf(
-        "Without ejection, expect random collision after %g days (%g "
-        "corrected)\n",
-        without_ejection, without_ejection * multiplier_);
-    double with_full_table =
-        std::pow(2.0, FLAGS_sck_keep_bits - FLAGS_sck_table_bits) /
-        FLAGS_sck_files_per_day;
-    printf(
-        "With ejection and full table, expect random collision after %g "
-        "days (%g corrected)\n",
-        with_full_table, with_full_table * multiplier_);
-    collisions_ = 0;
-
-    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_duration);
-      } else {
-        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_duration, est, est * multiplier_);
-      }
-    }
-  }
-
-  void RunOnce() {
-    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;
-    table_.reset(new uint64_t[table_mask + 1]{});
-    if (FLAGS_sck_keep_bits > 64) {
-      FLAGS_sck_keep_bits = 64;
-    }
-    uint32_t shift_away = 64 - FLAGS_sck_keep_bits;
-    uint32_t shift_away_b = shift_away / 3;
-    uint32_t shift_away_a = shift_away - shift_away_b;
-
-    process_count_ = 0;
-    session_count_ = 0;
-    ResetProcess();
-
-    Random64 r{std::random_device{}()};
-
-    uint64_t max_file_count =
-        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;
-    // Round robin through DBs
-    for (size_t db_i = 0;; ++db_i) {
-      if (db_i >= db_count) {
-        db_i = 0;
-      }
-      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();
-      }
-      OffsetableCacheKey ock;
-      dbs_[db_i].orig_file_number += 1;
-      // 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);
-      }
-      BlockBasedTable::SetupBaseCacheKey(&dbs_[db_i], "", 42, 42, &ock);
-      CacheKey ck = ock.WithOffset(0);
-      uint64_t stripped;
-      if (FLAGS_sck_randomize) {
-        stripped = GetSliceHash64(ck.AsSlice()) >> shift_away;
-      } else if (FLAGS_sck_footer_unique_id) {
-        uint32_t a = DecodeFixed32(ck.AsSlice().data() + 4) >> shift_away_a;
-        uint32_t b = DecodeFixed32(ck.AsSlice().data() + 12) >> shift_away_b;
-        stripped = (uint64_t{a} << 32) + b;
-      } else {
-        uint32_t a = DecodeFixed32(ck.AsSlice().data()) << shift_away_a;
-        uint32_t b = DecodeFixed32(ck.AsSlice().data() + 12) >> shift_away_b;
-        stripped = (uint64_t{a} << 32) + b;
-      }
-      if (stripped == 0) {
-        // Unlikely, but we need to exclude tracking this value
-        printf("Hit Zero!                                                  \n");
-        continue;
-      }
-      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] == stripped) {
-        collisions_this_run++;
-        // To predict probability of no collisions, we have to get rid of
-        // correlated collisions, which this takes care of:
-        ResetProcess();
-      } else {
-        // Replace
-        table_[pos] = stripped;
-      }
-
-      if (++report_count == FLAGS_sck_files_per_day) {
-        report_count = 0;
-        // Estimate fill %
-        size_t incr = table_mask / 1000;
-        size_t sampled_count = 0;
-        for (size_t i = 0; i <= table_mask; i += incr) {
-          if (table_[i] != 0) {
-            sampled_count++;
-          }
-        }
-        // Report
-        printf(
-            "%" PRIu64 " days, %" PRIu64 " proc, %" PRIu64
-            " sess, %u coll, occ %g%%, ejected %g%%   \r",
-            file_count / FLAGS_sck_files_per_day, process_count_,
-            session_count_, collisions_this_run, 100.0 * sampled_count / 1000.0,
-            100.0 * (1.0 - sampled_count / 1000.0 * table_mask / file_count));
-        fflush(stdout);
-      }
-    }
-    collisions_ += collisions_this_run;
-  }
-
-  void ResetSession(size_t i) {
-    dbs_[i].db_session_id = DBImpl::GenerateDbSessionId(nullptr);
-    session_count_++;
-  }
-
-  void ResetProcess() {
-    process_count_++;
-    DBImpl::TEST_ResetDbSessionIdGen();
-    for (size_t i = 0; i < FLAGS_sck_db_count; ++i) {
-      ResetSession(i);
-    }
-    if (FLAGS_sck_footer_unique_id) {
-      dbs_[0].orig_file_number = 0;
-    }
-  }
-
- private:
-  // Use db_session_id and orig_file_number from TableProperties
-  std::unique_ptr<TableProperties[]> dbs_;
-  std::unique_ptr<uint64_t[]> table_;
-  uint64_t process_count_ = 0;
-  uint64_t session_count_ = 0;
-  uint64_t collisions_ = 0;
-  uint32_t restart_nfiles_ = 0;
-  double multiplier_ = 0.0;
-};
-
 int cache_bench_tool(int argc, char** argv) {
  ParseCommandLineFlags(&argc, &argv, true);

-  if (FLAGS_stress_cache_key) {
-    // Alternate tool
-    StressCacheKey().Run();
-    return 0;
-  }
-
  if (FLAGS_threads <= 0) {
    fprintf(stderr, "threads number <= 0\n");
    exit(1);
@@ -19,8 +19,6 @@ std::array<const char*, kNumCacheEntryRoles> kCacheEntryRoleToCamelString{{
    "IndexBlock",
    "OtherBlock",
    "WriteBuffer",
-    "CompressionDictionaryBuildingBuffer",
-    "FilterConstruction",
    "Misc",
 }};

@@ -32,8 +30,6 @@ std::array<const char*, kNumCacheEntryRoles> kCacheEntryRoleToHyphenString{{
    "index-block",
    "other-block",
    "write-buffer",
-    "compression-dictionary-building-buffer",
-    "filter-construction",
    "misc",
 }};

@@ -7,8 +7,6 @@

 #include <array>
 #include <cstdint>
-#include <memory>
-#include <type_traits>
 #include <unordered_map>

 #include "rocksdb/cache.h"
@@ -16,8 +14,6 @@
 namespace ROCKSDB_NAMESPACE {

 // Classifications of block cache entries, for reporting statistics
-// Adding new enum to this class requires corresponding updates to
-// kCacheEntryRoleToCamelString and kCacheEntryRoleToHyphenString
 enum class CacheEntryRole {
  // Block-based table data block
  kDataBlock,
@@ -33,12 +29,6 @@ enum class CacheEntryRole {
  kOtherBlock,
  // WriteBufferManager reservations to account for memtable usage
  kWriteBuffer,
-  // BlockBasedTableBuilder reservations to account for
-  // compression dictionary building buffer's memory usage
-  kCompressionDictionaryBuildingBuffer,
-  // Filter reservations to account for
-  // (new) bloom and ribbon filter construction's memory usage
-  kFilterConstruction,
  // Default bucket, for miscellaneous cache entries. Do not use for
  // entries that could potentially add up to large usage.
  kMisc,
@@ -95,9 +85,7 @@ struct RegisteredDeleter {
  // These have global linkage to help ensure compiler optimizations do not
  // break uniqueness for each <T,R>
  static void Delete(const Slice& /* key */, void* value) {
-    // Supports T == Something[], unlike delete operator
-    std::default_delete<T>()(
-        static_cast<typename std::remove_extent<T>::type*>(value));
+    delete static_cast<T*>(value);
  }
 };

@@ -105,9 +93,9 @@ template <CacheEntryRole R>
 struct RegisteredNoopDeleter {
  RegisteredNoopDeleter() { RegisterCacheDeleterRole(Delete, R); }

-  static void Delete(const Slice& /* key */, void* /* value */) {
-    // Here was `assert(value == nullptr);` but we can also put pointers
-    // to static data in Cache, for testing at least.
+  static void Delete(const Slice& /* key */, void* value) {
+    (void)value;
+    assert(value == nullptr);
  }
 };

@@ -11,12 +11,10 @@
 #include <mutex>

 #include "cache/cache_helpers.h"
-#include "cache/cache_key.h"
 #include "port/lang.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/status.h"
 #include "rocksdb/system_clock.h"
-#include "test_util/sync_point.h"
 #include "util/coding_lean.h"

 namespace ROCKSDB_NAMESPACE {
@@ -113,7 +111,13 @@ class CacheEntryStatsCollector {
  // entry in cache until all refs are destroyed.
  static Status GetShared(Cache *cache, SystemClock *clock,
                          std::shared_ptr<CacheEntryStatsCollector> *ptr) {
-    const Slice &cache_key = GetCacheKey();
+    std::array<uint64_t, 3> cache_key_data{
+        {// First 16 bytes == md5 of class name
+         0x7eba5a8fb5437c90U, 0x8ca68c9b11655855U,
+         // Last 8 bytes based on a function pointer to make unique for each
+         // template instantiation
+         reinterpret_cast<uint64_t>(&CacheEntryStatsCollector::GetShared)}};
+    Slice cache_key = GetSlice(&cache_key_data);

    Cache::Handle *h = cache->Lookup(cache_key);
    if (h == nullptr) {
@@ -161,13 +165,6 @@ class CacheEntryStatsCollector {
    delete static_cast<CacheEntryStatsCollector *>(value);
  }

-  static const Slice &GetCacheKey() {
-    // For each template instantiation
-    static CacheKey ckey = CacheKey::CreateUniqueForProcessLifetime();
-    static Slice ckey_slice = ckey.AsSlice();
-    return ckey_slice;
-  }
-
  std::mutex saved_mutex_;
  Stats saved_stats_;

@@ -1,271 +0,0 @@
-//  Copyright (c) Facebook, Inc. and its affiliates. 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/cache_key.h"
-
-#include <algorithm>
-#include <atomic>
-
-#include "rocksdb/cache.h"
-#include "table/unique_id_impl.h"
-#include "util/hash.h"
-#include "util/math.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-// Value space plan for CacheKey:
-//
-// session_etc64_ | offset_etc64_ | Only generated by
-// ---------------+---------------+------------------------------------------
-//              0 |             0 | Reserved for "empty" CacheKey()
-//              0 |  > 0, < 1<<63 | CreateUniqueForCacheLifetime
-//              0 |      >= 1<<63 | CreateUniqueForProcessLifetime
-//            > 0 |           any | OffsetableCacheKey.WithOffset
-
-CacheKey CacheKey::CreateUniqueForCacheLifetime(Cache *cache) {
-  // +1 so that we can reserve all zeros for "unset" cache key
-  uint64_t id = cache->NewId() + 1;
-  // Ensure we don't collide with CreateUniqueForProcessLifetime
-  assert((id >> 63) == 0U);
-  return CacheKey(0, id);
-}
-
-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 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
-  assert((id >> 63) == 1U);
-  return CacheKey(0, id);
-}
-
-// Value plan for CacheKeys from OffsetableCacheKey, assuming that
-// db_session_ids are generated from a base_session_id and
-// session_id_counter (by SemiStructuredUniqueIdGen+EncodeSessionId
-// in DBImpl::GenerateDbSessionId):
-//
-// Conceptual inputs:
-//   db_id                   (unstructured, from GenerateRawUniqueId or equiv)
-//                           * could be shared between cloned DBs but rare
-//                           * could be constant, if session id suffices
-//   base_session_id         (unstructured, from GenerateRawUniqueId)
-//   session_id_counter      (structured)
-//                           * usually much smaller than 2**24
-//   file_number             (structured)
-//                           * usually smaller than 2**24
-//   offset_in_file          (structured, might skip lots of values)
-//                           * usually smaller than 2**32
-//   max_offset              determines placement of file_number to prevent
-//                           overlapping with offset
-//
-// Outputs come from bitwise-xor of the constituent pieces, low bits on left:
-//
-// |------------------------- session_etc64 -------------------------|
-// | +++++++++++++++ base_session_id (lower 64 bits) +++++++++++++++ |
-// |-----------------------------------------------------------------|
-// | session_id_counter ...|                                         |
-// |-----------------------------------------------------------------|
-// |                                               | ... file_number |
-// |                                               | overflow & meta |
-// |-----------------------------------------------------------------|
-//
-//
-// |------------------------- offset_etc64 --------------------------|
-// | hash of: ++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
-// |  * base_session_id (upper ~39 bits)                             |
-// |  * db_id (~122 bits entropy)                                    |
-// |-----------------------------------------------------------------|
-// | offset_in_file ............... |                                |
-// |-----------------------------------------------------------------|
-// |                                              | file_number, 0-3 |
-// |                                              | lower bytes      |
-// |-----------------------------------------------------------------|
-//
-// Based on max_offset, a maximal number of bytes 0..3 is chosen for
-// including from lower bits of file_number in offset_etc64. The choice
-// is encoded in two bits of metadata going into session_etc64, though
-// the common case of 3 bytes is encoded as 0 so that session_etc64
-// is unmodified by file_number concerns in the common case.
-//
-// There is nothing preventing "file number overflow & meta" from meeting
-// and overlapping with session_id_counter, but reaching such a case requires
-// an intractable combination of large file offsets (thus at least some large
-// files), large file numbers (thus large number of files generated), and
-// large number of session IDs generated in a single process. A trillion each
-// (2**40) of session ids, offsets, and file numbers comes to 120 bits.
-// With two bits of metadata and byte granularity, this is on the verge of
-// overlap, but even in the overlap case, it doesn't seem likely that
-// a file from billions of files or session ids ago will still be live
-// or cached.
-//
-// 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. Even at that point, to
-// see a collision we would need a miraculous re-synchronization of session
-// id and file number, along with a live file or stale cache entry from
-// trillions of files ago.
-//
-// How https://github.com/pdillinger/unique_id applies here:
-// Every bit of output always includes "unstructured" uniqueness bits and
-// often combines with "structured" uniqueness bits. The "unstructured" bits
-// change infrequently: only when we cannot guarantee our state tracking for
-// "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.) 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
-// degenerate case of completely new session for each tiny file, we still
-// have strong uniqueness properties from the birthday paradox, with ~103
-// bit session IDs or up to 128 bits entropy with different DB IDs sharing a
-// cache.
-//
-// More collision probability analysis:
-// Suppose a RocksDB host generates (generously) 2 GB/s (10TB data, 17 DWPD)
-// with average process/session lifetime of (pessimistically) 4 minutes.
-// In 180 days (generous allowable data lifespan), we generate 31 million GB
-// of data, or 2^55 bytes, and 2^16 "all new" session IDs.
-//
-// First, suppose this is in a single DB (lifetime 180 days):
-// 128 bits cache key size
-// - 55 <- ideal size for byte offsets + file numbers
-// -  2 <- bits for offsets and file numbers not exactly powers of two
-// -  2 <- bits for file number encoding metadata
-// +  2 <- bits saved not using byte offsets in BlockBasedTable::GetCacheKey
-// ----
-//   71 <- bits remaining for distinguishing session IDs
-// The probability of a collision in 71 bits of session ID data is less than
-// 1 in 2**(71 - (2 * 16)), or roughly 1 in a trillion. And this assumes all
-// data from the last 180 days is in cache for potential collision, and that
-// cache keys under each session id exhaustively cover the remaining 57 bits
-// while in reality they'll only cover a small fraction of it.
-//
-// Although data could be transferred between hosts, each host has its own
-// cache and we are already assuming a high rate of "all new" session ids.
-// So this doesn't really change the collision calculation. Across a fleet
-// of 1 million, each with <1 in a trillion collision possibility,
-// fleetwide collision probability is <1 in a million.
-//
-// Now suppose we have many DBs per host, say 2**10, with same host-wide write
-// rate and process/session lifetime. File numbers will be ~10 bits smaller
-// and we will have 2**10 times as many session IDs because of simultaneous
-// lifetimes. So now collision chance is less than 1 in 2**(81 - (2 * 26)),
-// or roughly 1 in a billion.
-//
-// Suppose instead we generated random or hashed cache keys for each
-// (compressed) block. For 1KB compressed block size, that is 2^45 cache keys
-// in 180 days. Collision probability is more easily estimated at roughly
-// 1 in 2**(128 - (2 * 45)) or roughly 1 in a trillion (assuming all
-// 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.
-//
-OffsetableCacheKey::OffsetableCacheKey(const std::string &db_id,
-                                       const std::string &db_session_id,
-                                       uint64_t file_number,
-                                       uint64_t max_offset) {
-#ifndef NDEBUG
-  max_offset_ = max_offset;
-#endif
-  // Closely related to GetSstInternalUniqueId, but only need 128 bits and
-  // need to include an offset within the file.
-  // See also https://github.com/pdillinger/unique_id for background.
-  uint64_t session_upper = 0;  // Assignment to appease clang-analyze
-  uint64_t session_lower = 0;  // Assignment to appease clang-analyze
-  {
-    Status s = DecodeSessionId(db_session_id, &session_upper, &session_lower);
-    if (!s.ok()) {
-      // A reasonable fallback in case malformed
-      Hash2x64(db_session_id.data(), db_session_id.size(), &session_upper,
-               &session_lower);
-    }
-  }
-
-  // Hash the session upper (~39 bits entropy) and DB id (120+ bits entropy)
-  // for more global uniqueness entropy.
-  // (It is possible that many DBs descended from one common DB id are copied
-  // around and proliferate, in which case session id is critical, but it is
-  // more common for different DBs to have different DB ids.)
-  uint64_t db_hash = Hash64(db_id.data(), db_id.size(), session_upper);
-
-  // This establishes the db+session id part of the cache key.
-  //
-  // Exactly preserve (in common cases; see modifiers below) session lower to
-  // ensure that session ids generated during the same process lifetime are
-  // guaranteed unique.
-  //
-  // We put this first for CommonPrefixSlice(), so that a small-ish set of
-  // cache key prefixes to cover entries relevant to any DB.
-  session_etc64_ = session_lower;
-  // This provides extra entopy in case of different DB id or process
-  // generating a session id, but is also partly/variably obscured by
-  // file_number and offset (see below).
-  offset_etc64_ = db_hash;
-
-  // Into offset_etc64_ we are (eventually) going to pack & xor in an offset and
-  // a file_number, but we might need the file_number to overflow into
-  // session_etc64_. (There must only be one session_etc64_ value per
-  // file, and preferably shared among many files.)
-  //
-  // Figure out how many bytes of file_number we are going to be able to
-  // pack in with max_offset, though our encoding will only support packing
-  // in up to 3 bytes of file_number. (16M file numbers is enough for a new
-  // file number every second for half a year.)
-  int file_number_bytes_in_offset_etc =
-      (63 - FloorLog2(max_offset | 0x100000000U)) / 8;
-  int file_number_bits_in_offset_etc = file_number_bytes_in_offset_etc * 8;
-
-  // Assert two bits of metadata
-  assert(file_number_bytes_in_offset_etc >= 0 &&
-         file_number_bytes_in_offset_etc <= 3);
-  // Assert we couldn't have used a larger allowed number of bytes (shift
-  // would chop off bytes).
-  assert(file_number_bytes_in_offset_etc == 3 ||
-         (max_offset << (file_number_bits_in_offset_etc + 8) >>
-          (file_number_bits_in_offset_etc + 8)) != max_offset);
-
-  uint64_t mask = (uint64_t{1} << (file_number_bits_in_offset_etc)) - 1;
-  // Pack into high bits of etc so that offset can go in low bits of etc
-  // TODO: could be EndianSwapValue?
-  uint64_t offset_etc_modifier = ReverseBits(file_number & mask);
-  assert(offset_etc_modifier << file_number_bits_in_offset_etc == 0U);
-
-  // Overflow and 3 - byte count (likely both zero) go into session_id part
-  uint64_t session_etc_modifier =
-      (file_number >> file_number_bits_in_offset_etc << 2) |
-      static_cast<uint64_t>(3 - file_number_bytes_in_offset_etc);
-  // Packed into high bits to minimize interference with session id counter.
-  session_etc_modifier = ReverseBits(session_etc_modifier);
-
-  // Assert session_id part is only modified in extreme cases
-  assert(session_etc_modifier == 0 || file_number > /*3 bytes*/ 0xffffffU ||
-         max_offset > /*5 bytes*/ 0xffffffffffU);
-
-  // Xor in the modifiers
-  session_etc64_ ^= session_etc_modifier;
-  offset_etc64_ ^= offset_etc_modifier;
-
-  // Although DBImpl guarantees (in recent versions) that session_lower is not
-  // zero, that's not entirely sufficient to guarantee that session_etc64_ is
-  // not zero (so that the 0 case can be used by CacheKey::CreateUnique*)
-  if (session_etc64_ == 0U) {
-    session_etc64_ = session_upper | 1U;
-  }
-  assert(session_etc64_ != 0);
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,132 +0,0 @@
-//  Copyright (c) Facebook, Inc. and its affiliates. 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 <cstdint>
-
-#include "rocksdb/rocksdb_namespace.h"
-#include "rocksdb/slice.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-class Cache;
-
-// A standard holder for fixed-size block cache keys (and for related caches).
-// They are created through one of these, each using its own range of values:
-// * CacheKey::CreateUniqueForCacheLifetime
-// * CacheKey::CreateUniqueForProcessLifetime
-// * Default ctor ("empty" cache key)
-// * OffsetableCacheKey->WithOffset
-//
-// The first two use atomic counters to guarantee uniqueness over the given
-// lifetime and the last uses a form of universally unique identifier for
-// uniqueness with very high probabilty (and guaranteed for files generated
-// during a single process lifetime).
-//
-// CacheKeys are currently used by calling AsSlice() to pass as a key to
-// Cache. For performance, the keys are endianness-dependent (though otherwise
-// portable). (Persistable cache entries are not intended to cross platforms.)
-class CacheKey {
- public:
-  // For convenience, constructs an "empty" cache key that is never returned
-  // by other means.
-  inline CacheKey() : session_etc64_(), offset_etc64_() {}
-
-  inline bool IsEmpty() const {
-    return (session_etc64_ == 0) & (offset_etc64_ == 0);
-  }
-
-  // Use this cache key as a Slice (byte order is endianness-dependent)
-  inline Slice AsSlice() const {
-    static_assert(sizeof(*this) == 16, "Standardized on 16-byte cache key");
-    assert(!IsEmpty());
-    return Slice(reinterpret_cast<const char *>(this), sizeof(*this));
-  }
-
-  // Create a CacheKey that is unique among others associated with this Cache
-  // instance. Depends on Cache::NewId. This is useful for block cache
-  // "reservations".
-  static CacheKey CreateUniqueForCacheLifetime(Cache *cache);
-
-  // Create a CacheKey that is unique among others for the lifetime of this
-  // process. This is useful for saving in a static data member so that
-  // different DB instances can agree on a cache key for shared entities,
-  // such as for CacheEntryStatsCollector.
-  static CacheKey CreateUniqueForProcessLifetime();
-
- protected:
-  friend class OffsetableCacheKey;
-  CacheKey(uint64_t session_etc64, uint64_t offset_etc64)
-      : session_etc64_(session_etc64), offset_etc64_(offset_etc64) {}
-  uint64_t session_etc64_;
-  uint64_t offset_etc64_;
-};
-
-// A file-specific generator of cache keys, sometimes referred to as the
-// "base" cache key for a file because all the cache keys for various offsets
-// within the file are computed using simple arithmetic. The basis for the
-// general approach is dicussed here: https://github.com/pdillinger/unique_id
-// Heavily related to GetUniqueIdFromTableProperties.
-//
-// If the db_id, db_session_id, and file_number come from the file's table
-// properties, then the keys will be stable across DB::Open/Close, backup/
-// restore, import/export, etc.
-//
-// This class "is a" CacheKey only privately so that it is not misused as
-// a ready-to-use CacheKey.
-class OffsetableCacheKey : private CacheKey {
- public:
-  // For convenience, constructs an "empty" cache key that should not be used.
-  inline OffsetableCacheKey() : CacheKey() {}
-
-  // Constructs an OffsetableCacheKey with the given information about a file.
-  // max_offset is based on file size (see WithOffset) and is required here to
-  // choose an appropriate (sub-)encoding. This constructor never generates an
-  // "empty" base key.
-  OffsetableCacheKey(const std::string &db_id, const std::string &db_session_id,
-                     uint64_t file_number, uint64_t max_offset);
-
-  inline bool IsEmpty() const {
-    bool result = session_etc64_ == 0;
-    assert(!(offset_etc64_ > 0 && result));
-    return result;
-  }
-
-  // Construct a CacheKey for an offset within a file, which must be
-  // <= max_offset provided in constructor. An offset is not necessarily a
-  // byte offset if a smaller unique identifier of keyable offsets is used.
-  //
-  // This class was designed to make this hot code extremely fast.
-  inline CacheKey WithOffset(uint64_t offset) const {
-    assert(!IsEmpty());
-    assert(offset <= max_offset_);
-    return CacheKey(session_etc64_, offset_etc64_ ^ offset);
-  }
-
-  // The "common prefix" is a shared prefix for all the returned CacheKeys,
-  // that also happens to usually be the same among many files in the same DB,
-  // so is efficient and highly accurate (not perfectly) for DB-specific cache
-  // dump selection (but not file-specific).
-  static constexpr size_t kCommonPrefixSize = 8;
-  inline Slice CommonPrefixSlice() const {
-    static_assert(sizeof(session_etc64_) == kCommonPrefixSize,
-                  "8 byte common prefix expected");
-    assert(!IsEmpty());
-    assert(&this->session_etc64_ == static_cast<const void *>(this));
-
-    return Slice(reinterpret_cast<const char *>(this), kCommonPrefixSize);
-  }
-
-  // For any max_offset <= this value, the same encoding scheme is guaranteed.
-  static constexpr uint64_t kMaxOffsetStandardEncoding = 0xffffffffffU;
-
- private:
-#ifndef NDEBUG
-  uint64_t max_offset_ = 0;
-#endif
-};
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,188 +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).
-//
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-#include "cache/cache_reservation_manager.h"
-
-#include <cassert>
-#include <cstddef>
-#include <cstring>
-#include <memory>
-
-#include "cache/cache_entry_roles.h"
-#include "rocksdb/cache.h"
-#include "rocksdb/slice.h"
-#include "rocksdb/status.h"
-#include "table/block_based/block_based_table_reader.h"
-#include "util/coding.h"
-
-namespace ROCKSDB_NAMESPACE {
-CacheReservationManager::CacheReservationManager(std::shared_ptr<Cache> cache,
-                                                 bool delayed_decrease)
-    : delayed_decrease_(delayed_decrease),
-      cache_allocated_size_(0),
-      memory_used_(0) {
-  assert(cache != nullptr);
-  cache_ = cache;
-}
-
-CacheReservationManager::~CacheReservationManager() {
-  for (auto* handle : dummy_handles_) {
-    cache_->Release(handle, true);
-  }
-}
-
-template <CacheEntryRole R>
-Status CacheReservationManager::UpdateCacheReservation(
-    std::size_t new_mem_used) {
-  memory_used_ = new_mem_used;
-  std::size_t cur_cache_allocated_size =
-      cache_allocated_size_.load(std::memory_order_relaxed);
-  if (new_mem_used == cur_cache_allocated_size) {
-    return Status::OK();
-  } else if (new_mem_used > cur_cache_allocated_size) {
-    Status s = IncreaseCacheReservation<R>(new_mem_used);
-    return s;
-  } else {
-    // In delayed decrease mode, we don't decrease cache reservation
-    // untill the memory usage is less than 3/4 of what we reserve
-    // in the cache.
-    // We do this because
-    // (1) Dummy entry insertion is expensive in block cache
-    // (2) Delayed releasing previously inserted dummy entries can save such
-    // expensive dummy entry insertion on memory increase in the near future,
-    // which is likely to happen when the memory usage is greater than or equal
-    // to 3/4 of what we reserve
-    if (delayed_decrease_ && new_mem_used >= cur_cache_allocated_size / 4 * 3) {
-      return Status::OK();
-    } else {
-      Status s = DecreaseCacheReservation(new_mem_used);
-      return s;
-    }
-  }
-}
-
-// Explicitly instantiate templates for "CacheEntryRole" values we use.
-// This makes it possible to keep the template definitions in the .cc file.
-template Status CacheReservationManager::UpdateCacheReservation<
-    CacheEntryRole::kWriteBuffer>(std::size_t new_mem_used);
-template Status CacheReservationManager::UpdateCacheReservation<
-    CacheEntryRole::kCompressionDictionaryBuildingBuffer>(
-    std::size_t new_mem_used);
-// For cache reservation manager unit tests
-template Status CacheReservationManager::UpdateCacheReservation<
-    CacheEntryRole::kMisc>(std::size_t new_mem_used);
-
-template <CacheEntryRole R>
-Status CacheReservationManager::MakeCacheReservation(
-    std::size_t incremental_memory_used,
-    std::unique_ptr<CacheReservationHandle<R>>* handle) {
-  assert(handle != nullptr);
-  Status s =
-      UpdateCacheReservation<R>(GetTotalMemoryUsed() + incremental_memory_used);
-  (*handle).reset(new CacheReservationHandle<R>(incremental_memory_used,
-                                                shared_from_this()));
-  return s;
-}
-
-template Status
-CacheReservationManager::MakeCacheReservation<CacheEntryRole::kMisc>(
-    std::size_t incremental_memory_used,
-    std::unique_ptr<CacheReservationHandle<CacheEntryRole::kMisc>>* handle);
-template Status CacheReservationManager::MakeCacheReservation<
-    CacheEntryRole::kFilterConstruction>(
-    std::size_t incremental_memory_used,
-    std::unique_ptr<
-        CacheReservationHandle<CacheEntryRole::kFilterConstruction>>* handle);
-
-template <CacheEntryRole R>
-Status CacheReservationManager::IncreaseCacheReservation(
-    std::size_t new_mem_used) {
-  Status return_status = Status::OK();
-  while (new_mem_used > cache_allocated_size_.load(std::memory_order_relaxed)) {
-    Cache::Handle* handle = nullptr;
-    return_status = cache_->Insert(GetNextCacheKey(), nullptr, kSizeDummyEntry,
-                                   GetNoopDeleterForRole<R>(), &handle);
-
-    if (return_status != Status::OK()) {
-      return return_status;
-    }
-
-    dummy_handles_.push_back(handle);
-    cache_allocated_size_ += kSizeDummyEntry;
-  }
-  return return_status;
-}
-
-Status CacheReservationManager::DecreaseCacheReservation(
-    std::size_t new_mem_used) {
-  Status return_status = Status::OK();
-
-  // Decrease to the smallest multiple of kSizeDummyEntry that is greater than
-  // or equal to new_mem_used We do addition instead of new_mem_used <=
-  // cache_allocated_size_.load(std::memory_order_relaxed) - kSizeDummyEntry to
-  // avoid underflow of size_t when cache_allocated_size_ = 0
-  while (new_mem_used + kSizeDummyEntry <=
-         cache_allocated_size_.load(std::memory_order_relaxed)) {
-    assert(!dummy_handles_.empty());
-    auto* handle = dummy_handles_.back();
-    cache_->Release(handle, true);
-    dummy_handles_.pop_back();
-    cache_allocated_size_ -= kSizeDummyEntry;
-  }
-  return return_status;
-}
-
-std::size_t CacheReservationManager::GetTotalReservedCacheSize() {
-  return cache_allocated_size_.load(std::memory_order_relaxed);
-}
-
-std::size_t CacheReservationManager::GetTotalMemoryUsed() {
-  return memory_used_;
-}
-
-Slice CacheReservationManager::GetNextCacheKey() {
-  // Calling this function will have the side-effect of changing the
-  // underlying cache_key_ that is shared among other keys generated from this
-  // fucntion. Therefore please make sure the previous keys are saved/copied
-  // before calling this function.
-  cache_key_ = CacheKey::CreateUniqueForCacheLifetime(cache_.get());
-  return cache_key_.AsSlice();
-}
-
-template <CacheEntryRole R>
-Cache::DeleterFn CacheReservationManager::TEST_GetNoopDeleterForRole() {
-  return GetNoopDeleterForRole<R>();
-}
-
-template Cache::DeleterFn CacheReservationManager::TEST_GetNoopDeleterForRole<
-    CacheEntryRole::kFilterConstruction>();
-
-template <CacheEntryRole R>
-CacheReservationHandle<R>::CacheReservationHandle(
-    std::size_t incremental_memory_used,
-    std::shared_ptr<CacheReservationManager> cache_res_mgr)
-    : incremental_memory_used_(incremental_memory_used) {
-  assert(cache_res_mgr != nullptr);
-  cache_res_mgr_ = cache_res_mgr;
-}
-
-template <CacheEntryRole R>
-CacheReservationHandle<R>::~CacheReservationHandle() {
-  assert(cache_res_mgr_ != nullptr);
-  assert(cache_res_mgr_->GetTotalMemoryUsed() >= incremental_memory_used_);
-
-  Status s = cache_res_mgr_->UpdateCacheReservation<R>(
-      cache_res_mgr_->GetTotalMemoryUsed() - incremental_memory_used_);
-  s.PermitUncheckedError();
-}
-
-// Explicitly instantiate templates for "CacheEntryRole" values we use.
-// This makes it possible to keep the template definitions in the .cc file.
-template class CacheReservationHandle<CacheEntryRole::kMisc>;
-template class CacheReservationHandle<CacheEntryRole::kFilterConstruction>;
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,191 +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).
-//
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-
-#pragma once
-
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <vector>
-
-#include "cache/cache_entry_roles.h"
-#include "rocksdb/cache.h"
-#include "rocksdb/slice.h"
-#include "rocksdb/status.h"
-#include "table/block_based/block_based_table_reader.h"
-#include "util/coding.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-template <CacheEntryRole R>
-class CacheReservationHandle;
-
-// CacheReservationManager is for reserving cache space for the memory used
-// through inserting/releasing dummy entries in the cache.
-//
-// This class is NOT thread-safe, except that GetTotalReservedCacheSize()
-// can be called without external synchronization.
-class CacheReservationManager
-    : public std::enable_shared_from_this<CacheReservationManager> {
- public:
-  // Construct a CacheReservationManager
-  // @param cache The cache where dummy entries are inserted and released for
-  // reserving cache space
-  // @param delayed_decrease If set true, then dummy entries won't be released
-  // immediately when memory usage decreases.
-  //                         Instead, it will be released when the memory usage
-  //                         decreases to 3/4 of what we have reserved so far.
-  //                         This is for saving some future dummy entry
-  //                         insertion when memory usage increases are likely to
-  //                         happen in the near future.
-  explicit CacheReservationManager(std::shared_ptr<Cache> cache,
-                                   bool delayed_decrease = false);
-
-  // no copy constructor, copy assignment, move constructor, move assignment
-  CacheReservationManager(const CacheReservationManager &) = delete;
-  CacheReservationManager &operator=(const CacheReservationManager &) = delete;
-  CacheReservationManager(CacheReservationManager &&) = delete;
-  CacheReservationManager &operator=(CacheReservationManager &&) = delete;
-
-  ~CacheReservationManager();
-
-  template <CacheEntryRole R>
-
-  // One of the two ways of reserving/releasing cache,
-  // see CacheReservationManager::MakeCacheReservation() for the other.
-  // Use ONLY one of them to prevent unexpected behavior.
-  //
-  // Insert and release dummy entries in the cache to
-  // match the size of total dummy entries with the least multiple of
-  // kSizeDummyEntry greater than or equal to new_mem_used
-  //
-  // Insert dummy entries if new_memory_used > cache_allocated_size_;
-  //
-  // Release dummy entries if new_memory_used < cache_allocated_size_
-  // (and new_memory_used < cache_allocated_size_ * 3/4
-  // when delayed_decrease is set true);
-  //
-  // Keey dummy entries the same if (1) new_memory_used == cache_allocated_size_
-  // or (2) new_memory_used is in the interval of
-  // [cache_allocated_size_ * 3/4, cache_allocated_size) when delayed_decrease
-  // is set true.
-  //
-  // @param new_memory_used The number of bytes used by new memory
-  //        The most recent new_memoy_used passed in will be returned
-  //        in GetTotalMemoryUsed() even when the call return non-ok status.
-  //
-  //        Since the class is NOT thread-safe, external synchronization on the
-  //        order of calling UpdateCacheReservation() is needed if you want
-  //        GetTotalMemoryUsed() indeed returns the latest memory used.
-  //
-  // @return On inserting dummy entries, it returns Status::OK() if all dummy
-  //         entry insertions succeed.
-  //         Otherwise, it returns the first non-ok status;
-  //         On releasing dummy entries, it always returns Status::OK().
-  //         On keeping dummy entries the same, it always returns Status::OK().
-  Status UpdateCacheReservation(std::size_t new_memory_used);
-
-  // One of the two ways of reserving/releasing cache,
-  // see CacheReservationManager::UpdateCacheReservation() for the other.
-  // Use ONLY one of them to prevent unexpected behavior.
-  //
-  // Insert dummy entries in the cache for the incremental memory usage
-  // to match the size of total dummy entries with the least multiple of
-  // kSizeDummyEntry greater than or equal to the total memory used.
-  //
-  // A CacheReservationHandle is returned as an output parameter.
-  // The reserved dummy entries are automatically released on the destruction of
-  // this handle, which achieves better RAII per cache reservation.
-  //
-  // WARNING: Deallocate all the handles of the CacheReservationManager object
-  //          before deallocating the object to prevent unexpected behavior.
-  //
-  // @param incremental_memory_used The number of bytes increased in memory
-  //        usage.
-  //
-  //        Calling GetTotalMemoryUsed() afterward will return the total memory
-  //        increased by this number, even when calling MakeCacheReservation()
-  //        returns non-ok status.
-  //
-  //        Since the class is NOT thread-safe, external synchronization in
-  //        calling MakeCacheReservation() is needed if you want
-  //        GetTotalMemoryUsed() indeed returns the latest memory used.
-  //
-  // @param handle An pointer to std::unique_ptr<CacheReservationHandle<R>> that
-  //        manages the lifetime of the handle and its cache reservation.
-  //
-  // @return It returns Status::OK() if all dummy
-  //         entry insertions succeed.
-  //         Otherwise, it returns the first non-ok status;
-  //
-  // REQUIRES: handle != nullptr
-  // REQUIRES: The CacheReservationManager object is NOT managed by
-  //           std::unique_ptr as CacheReservationHandle needs to
-  //           shares ownership to the CacheReservationManager object.
-  template <CacheEntryRole R>
-  Status MakeCacheReservation(
-      std::size_t incremental_memory_used,
-      std::unique_ptr<CacheReservationHandle<R>> *handle);
-
-  // Return the size of the cache (which is a multiple of kSizeDummyEntry)
-  // successfully reserved by calling UpdateCacheReservation().
-  //
-  // When UpdateCacheReservation() returns non-ok status,
-  // calling GetTotalReservedCacheSize() after that might return a slightly
-  // smaller number than the actual reserved cache size due to
-  // the returned number will always be a multiple of kSizeDummyEntry
-  // and cache full might happen in the middle of inserting a dummy entry.
-  std::size_t GetTotalReservedCacheSize();
-
-  // Return the latest total memory used indicated by the most recent call of
-  // UpdateCacheReservation(std::size_t new_memory_used);
-  std::size_t GetTotalMemoryUsed();
-
-  static constexpr std::size_t GetDummyEntrySize() { return kSizeDummyEntry; }
-
-  // For testing only - it is to help ensure the NoopDeleterForRole<R>
-  // accessed from CacheReservationManager and the one accessed from the test
-  // are from the same translation units
-  template <CacheEntryRole R>
-  static Cache::DeleterFn TEST_GetNoopDeleterForRole();
-
- private:
-  static constexpr std::size_t kSizeDummyEntry = 256 * 1024;
-
-  Slice GetNextCacheKey();
-  template <CacheEntryRole R>
-  Status IncreaseCacheReservation(std::size_t new_mem_used);
-  Status DecreaseCacheReservation(std::size_t new_mem_used);
-
-  std::shared_ptr<Cache> cache_;
-  bool delayed_decrease_;
-  std::atomic<std::size_t> cache_allocated_size_;
-  std::size_t memory_used_;
-  std::vector<Cache::Handle *> dummy_handles_;
-  CacheKey cache_key_;
-};
-
-// CacheReservationHandle is for managing the lifetime of a cache reservation
-// This class is NOT thread-safe
-template <CacheEntryRole R>
-class CacheReservationHandle {
- public:
-  // REQUIRES: cache_res_mgr != nullptr
-  explicit CacheReservationHandle(
-      std::size_t incremental_memory_used,
-      std::shared_ptr<CacheReservationManager> cache_res_mgr);
-
-  ~CacheReservationHandle();
-
- private:
-  std::size_t incremental_memory_used_;
-  std::shared_ptr<CacheReservationManager> cache_res_mgr_;
-};
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,506 +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).
-//
-// Copyright (c) 2011 The LevelDB Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file. See the AUTHORS file for names of contributors.
-#include "cache/cache_reservation_manager.h"
-
-#include <cstddef>
-#include <cstring>
-#include <memory>
-
-#include "cache/cache_entry_roles.h"
-#include "rocksdb/cache.h"
-#include "rocksdb/slice.h"
-#include "table/block_based/block_based_table_reader.h"
-#include "test_util/testharness.h"
-#include "util/coding.h"
-
-namespace ROCKSDB_NAMESPACE {
-class CacheReservationManagerTest : public ::testing::Test {
- protected:
-  static constexpr std::size_t kSizeDummyEntry =
-      CacheReservationManager::GetDummyEntrySize();
-  static constexpr std::size_t kCacheCapacity = 4096 * kSizeDummyEntry;
-  static constexpr int kNumShardBits = 0;  // 2^0 shard
-  static constexpr std::size_t kMetaDataChargeOverhead = 10000;
-
-  std::shared_ptr<Cache> cache = NewLRUCache(kCacheCapacity, kNumShardBits);
-  std::unique_ptr<CacheReservationManager> test_cache_rev_mng;
-
-  CacheReservationManagerTest() {
-    test_cache_rev_mng.reset(new CacheReservationManager(cache));
-  }
-};
-
-TEST_F(CacheReservationManagerTest, GenerateCacheKey) {
-  std::size_t new_mem_used = 1 * kSizeDummyEntry;
-  Status s =
-      test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  ASSERT_EQ(s, Status::OK());
-  ASSERT_GE(cache->GetPinnedUsage(), 1 * kSizeDummyEntry);
-  ASSERT_LT(cache->GetPinnedUsage(),
-            1 * kSizeDummyEntry + kMetaDataChargeOverhead);
-
-  // Next unique Cache key
-  CacheKey ckey = CacheKey::CreateUniqueForCacheLifetime(cache.get());
-  // Back it up to the one used by CRM (using CacheKey implementation details)
-  using PairU64 = std::pair<uint64_t, uint64_t>;
-  auto& ckey_pair = *reinterpret_cast<PairU64*>(&ckey);
-  ckey_pair.second--;
-
-  // Specific key (subject to implementation details)
-  EXPECT_EQ(ckey_pair, PairU64(0, 2));
-
-  Cache::Handle* handle = cache->Lookup(ckey.AsSlice());
-  EXPECT_NE(handle, nullptr)
-      << "Failed to generate the cache key for the dummy entry correctly";
-  // Clean up the returned handle from Lookup() to prevent memory leak
-  cache->Release(handle);
-}
-
-TEST_F(CacheReservationManagerTest, KeepCacheReservationTheSame) {
-  std::size_t new_mem_used = 1 * kSizeDummyEntry;
-  Status s =
-      test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  ASSERT_EQ(s, Status::OK());
-  ASSERT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            1 * kSizeDummyEntry);
-  ASSERT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used);
-  std::size_t initial_pinned_usage = cache->GetPinnedUsage();
-  ASSERT_GE(initial_pinned_usage, 1 * kSizeDummyEntry);
-  ASSERT_LT(initial_pinned_usage,
-            1 * kSizeDummyEntry + kMetaDataChargeOverhead);
-
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK())
-      << "Failed to keep cache reservation the same when new_mem_used equals "
-         "to current cache reservation";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            1 * kSizeDummyEntry)
-      << "Failed to bookkeep correctly when new_mem_used equals to current "
-         "cache reservation";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly when new_mem_used "
-         "equals to current cache reservation";
-  EXPECT_EQ(cache->GetPinnedUsage(), initial_pinned_usage)
-      << "Failed to keep underlying dummy entries the same when new_mem_used "
-         "equals to current cache reservation";
-}
-
-TEST_F(CacheReservationManagerTest,
-       IncreaseCacheReservationByMultiplesOfDummyEntrySize) {
-  std::size_t new_mem_used = 2 * kSizeDummyEntry;
-  Status s =
-      test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK())
-      << "Failed to increase cache reservation correctly";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            2 * kSizeDummyEntry)
-      << "Failed to bookkeep cache reservation increase correctly";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 2 * kSizeDummyEntry)
-      << "Failed to increase underlying dummy entries in cache correctly";
-  EXPECT_LT(cache->GetPinnedUsage(),
-            2 * kSizeDummyEntry + kMetaDataChargeOverhead)
-      << "Failed to increase underlying dummy entries in cache correctly";
-}
-
-TEST_F(CacheReservationManagerTest,
-       IncreaseCacheReservationNotByMultiplesOfDummyEntrySize) {
-  std::size_t new_mem_used = 2 * kSizeDummyEntry + kSizeDummyEntry / 2;
-  Status s =
-      test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK())
-      << "Failed to increase cache reservation correctly";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            3 * kSizeDummyEntry)
-      << "Failed to bookkeep cache reservation increase correctly";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 3 * kSizeDummyEntry)
-      << "Failed to increase underlying dummy entries in cache correctly";
-  EXPECT_LT(cache->GetPinnedUsage(),
-            3 * kSizeDummyEntry + kMetaDataChargeOverhead)
-      << "Failed to increase underlying dummy entries in cache correctly";
-}
-
-TEST(CacheReservationManagerIncreaseReservcationOnFullCacheTest,
-     IncreaseCacheReservationOnFullCache) {
-  ;
-  constexpr std::size_t kSizeDummyEntry =
-      CacheReservationManager::GetDummyEntrySize();
-  constexpr std::size_t kSmallCacheCapacity = 4 * kSizeDummyEntry;
-  constexpr std::size_t kBigCacheCapacity = 4096 * kSizeDummyEntry;
-  constexpr std::size_t kMetaDataChargeOverhead = 10000;
-
-  LRUCacheOptions lo;
-  lo.capacity = kSmallCacheCapacity;
-  lo.num_shard_bits = 0;  // 2^0 shard
-  lo.strict_capacity_limit = true;
-  std::shared_ptr<Cache> cache = NewLRUCache(lo);
-  std::unique_ptr<CacheReservationManager> test_cache_rev_mng(
-      new CacheReservationManager(cache));
-
-  std::size_t new_mem_used = kSmallCacheCapacity + 1;
-  Status s =
-      test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::Incomplete())
-      << "Failed to return status to indicate failure of dummy entry insertion "
-         "during cache reservation on full cache";
-  EXPECT_GE(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            1 * kSizeDummyEntry)
-      << "Failed to bookkeep correctly before cache resevation failure happens "
-         "due to full cache";
-  EXPECT_LE(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            kSmallCacheCapacity)
-      << "Failed to bookkeep correctly (i.e, bookkeep only successful dummy "
-         "entry insertions) when encountering cache resevation failure due to "
-         "full cache";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 1 * kSizeDummyEntry)
-      << "Failed to insert underlying dummy entries correctly when "
-         "encountering cache resevation failure due to full cache";
-  EXPECT_LE(cache->GetPinnedUsage(), kSmallCacheCapacity)
-      << "Failed to insert underlying dummy entries correctly when "
-         "encountering cache resevation failure due to full cache";
-
-  new_mem_used = kSmallCacheCapacity / 2;  // 2 dummy entries
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK())
-      << "Failed to decrease cache reservation after encountering cache "
-         "reservation failure due to full cache";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            2 * kSizeDummyEntry)
-      << "Failed to bookkeep cache reservation decrease correctly after "
-         "encountering cache reservation due to full cache";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 2 * kSizeDummyEntry)
-      << "Failed to release underlying dummy entries correctly on cache "
-         "reservation decrease after encountering cache resevation failure due "
-         "to full cache";
-  EXPECT_LT(cache->GetPinnedUsage(),
-            2 * kSizeDummyEntry + kMetaDataChargeOverhead)
-      << "Failed to release underlying dummy entries correctly on cache "
-         "reservation decrease after encountering cache resevation failure due "
-         "to full cache";
-
-  // Create cache full again for subsequent tests
-  new_mem_used = kSmallCacheCapacity + 1;
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::Incomplete())
-      << "Failed to return status to indicate failure of dummy entry insertion "
-         "during cache reservation on full cache";
-  EXPECT_GE(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            1 * kSizeDummyEntry)
-      << "Failed to bookkeep correctly before cache resevation failure happens "
-         "due to full cache";
-  EXPECT_LE(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            kSmallCacheCapacity)
-      << "Failed to bookkeep correctly (i.e, bookkeep only successful dummy "
-         "entry insertions) when encountering cache resevation failure due to "
-         "full cache";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 1 * kSizeDummyEntry)
-      << "Failed to insert underlying dummy entries correctly when "
-         "encountering cache resevation failure due to full cache";
-  EXPECT_LE(cache->GetPinnedUsage(), kSmallCacheCapacity)
-      << "Failed to insert underlying dummy entries correctly when "
-         "encountering cache resevation failure due to full cache";
-
-  // Increase cache capacity so the previously failed insertion can fully
-  // succeed
-  cache->SetCapacity(kBigCacheCapacity);
-  new_mem_used = kSmallCacheCapacity + 1;
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK())
-      << "Failed to increase cache reservation after increasing cache capacity "
-         "and mitigating cache full error";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            5 * kSizeDummyEntry)
-      << "Failed to bookkeep cache reservation increase correctly after "
-         "increasing cache capacity and mitigating cache full error";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 5 * kSizeDummyEntry)
-      << "Failed to insert underlying dummy entries correctly after increasing "
-         "cache capacity and mitigating cache full error";
-  EXPECT_LT(cache->GetPinnedUsage(),
-            5 * kSizeDummyEntry + kMetaDataChargeOverhead)
-      << "Failed to insert underlying dummy entries correctly after increasing "
-         "cache capacity and mitigating cache full error";
-}
-
-TEST_F(CacheReservationManagerTest,
-       DecreaseCacheReservationByMultiplesOfDummyEntrySize) {
-  std::size_t new_mem_used = 2 * kSizeDummyEntry;
-  Status s =
-      test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  ASSERT_EQ(s, Status::OK());
-  ASSERT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            2 * kSizeDummyEntry);
-  ASSERT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used);
-  ASSERT_GE(cache->GetPinnedUsage(), 2 * kSizeDummyEntry);
-  ASSERT_LT(cache->GetPinnedUsage(),
-            2 * kSizeDummyEntry + kMetaDataChargeOverhead);
-
-  new_mem_used = 1 * kSizeDummyEntry;
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK())
-      << "Failed to decrease cache reservation correctly";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            1 * kSizeDummyEntry)
-      << "Failed to bookkeep cache reservation decrease correctly";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 1 * kSizeDummyEntry)
-      << "Failed to decrease underlying dummy entries in cache correctly";
-  EXPECT_LT(cache->GetPinnedUsage(),
-            1 * kSizeDummyEntry + kMetaDataChargeOverhead)
-      << "Failed to decrease underlying dummy entries in cache correctly";
-}
-
-TEST_F(CacheReservationManagerTest,
-       DecreaseCacheReservationNotByMultiplesOfDummyEntrySize) {
-  std::size_t new_mem_used = 2 * kSizeDummyEntry;
-  Status s =
-      test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  ASSERT_EQ(s, Status::OK());
-  ASSERT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            2 * kSizeDummyEntry);
-  ASSERT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used);
-  ASSERT_GE(cache->GetPinnedUsage(), 2 * kSizeDummyEntry);
-  ASSERT_LT(cache->GetPinnedUsage(),
-            2 * kSizeDummyEntry + kMetaDataChargeOverhead);
-
-  new_mem_used = kSizeDummyEntry / 2;
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK())
-      << "Failed to decrease cache reservation correctly";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            1 * kSizeDummyEntry)
-      << "Failed to bookkeep cache reservation decrease correctly";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 1 * kSizeDummyEntry)
-      << "Failed to decrease underlying dummy entries in cache correctly";
-  EXPECT_LT(cache->GetPinnedUsage(),
-            1 * kSizeDummyEntry + kMetaDataChargeOverhead)
-      << "Failed to decrease underlying dummy entries in cache correctly";
-}
-
-TEST(CacheReservationManagerWithDelayedDecreaseTest,
-     DecreaseCacheReservationWithDelayedDecrease) {
-  constexpr std::size_t kSizeDummyEntry =
-      CacheReservationManager::GetDummyEntrySize();
-  constexpr std::size_t kCacheCapacity = 4096 * kSizeDummyEntry;
-  constexpr std::size_t kMetaDataChargeOverhead = 10000;
-
-  LRUCacheOptions lo;
-  lo.capacity = kCacheCapacity;
-  lo.num_shard_bits = 0;
-  std::shared_ptr<Cache> cache = NewLRUCache(lo);
-  std::unique_ptr<CacheReservationManager> test_cache_rev_mng(
-      new CacheReservationManager(cache, true /* delayed_decrease */));
-
-  std::size_t new_mem_used = 8 * kSizeDummyEntry;
-  Status s =
-      test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  ASSERT_EQ(s, Status::OK());
-  ASSERT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            8 * kSizeDummyEntry);
-  ASSERT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used);
-  std::size_t initial_pinned_usage = cache->GetPinnedUsage();
-  ASSERT_GE(initial_pinned_usage, 8 * kSizeDummyEntry);
-  ASSERT_LT(initial_pinned_usage,
-            8 * kSizeDummyEntry + kMetaDataChargeOverhead);
-
-  new_mem_used = 6 * kSizeDummyEntry;
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK()) << "Failed to delay decreasing cache reservation";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            8 * kSizeDummyEntry)
-      << "Failed to bookkeep correctly when delaying cache reservation "
-         "decrease";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_EQ(cache->GetPinnedUsage(), initial_pinned_usage)
-      << "Failed to delay decreasing underlying dummy entries in cache";
-
-  new_mem_used = 7 * kSizeDummyEntry;
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK()) << "Failed to delay decreasing cache reservation";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            8 * kSizeDummyEntry)
-      << "Failed to bookkeep correctly when delaying cache reservation "
-         "decrease";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_EQ(cache->GetPinnedUsage(), initial_pinned_usage)
-      << "Failed to delay decreasing underlying dummy entries in cache";
-
-  new_mem_used = 6 * kSizeDummyEntry - 1;
-  s = test_cache_rev_mng
-          ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-              new_mem_used);
-  EXPECT_EQ(s, Status::OK())
-      << "Failed to decrease cache reservation correctly when new_mem_used < "
-         "GetTotalReservedCacheSize() * 3 / 4 on delayed decrease mode";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(),
-            6 * kSizeDummyEntry)
-      << "Failed to bookkeep correctly when new_mem_used < "
-         "GetTotalReservedCacheSize() * 3 / 4 on delayed decrease mode";
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), new_mem_used)
-      << "Failed to bookkeep the used memory correctly";
-  EXPECT_GE(cache->GetPinnedUsage(), 6 * kSizeDummyEntry)
-      << "Failed to decrease underlying dummy entries in cache when "
-         "new_mem_used < GetTotalReservedCacheSize() * 3 / 4 on delayed "
-         "decrease mode";
-  EXPECT_LT(cache->GetPinnedUsage(),
-            6 * kSizeDummyEntry + kMetaDataChargeOverhead)
-      << "Failed to decrease underlying dummy entries in cache when "
-         "new_mem_used < GetTotalReservedCacheSize() * 3 / 4 on delayed "
-         "decrease mode";
-}
-
-TEST(CacheReservationManagerDestructorTest,
-     ReleaseRemainingDummyEntriesOnDestruction) {
-  constexpr std::size_t kSizeDummyEntry =
-      CacheReservationManager::GetDummyEntrySize();
-  constexpr std::size_t kCacheCapacity = 4096 * kSizeDummyEntry;
-  constexpr std::size_t kMetaDataChargeOverhead = 10000;
-
-  LRUCacheOptions lo;
-  lo.capacity = kCacheCapacity;
-  lo.num_shard_bits = 0;
-  std::shared_ptr<Cache> cache = NewLRUCache(lo);
-  {
-    std::unique_ptr<CacheReservationManager> test_cache_rev_mng(
-        new CacheReservationManager(cache));
-    std::size_t new_mem_used = 1 * kSizeDummyEntry;
-    Status s =
-        test_cache_rev_mng
-            ->UpdateCacheReservation<ROCKSDB_NAMESPACE::CacheEntryRole::kMisc>(
-                new_mem_used);
-    ASSERT_EQ(s, Status::OK());
-    ASSERT_GE(cache->GetPinnedUsage(), 1 * kSizeDummyEntry);
-    ASSERT_LT(cache->GetPinnedUsage(),
-              1 * kSizeDummyEntry + kMetaDataChargeOverhead);
-  }
-  EXPECT_EQ(cache->GetPinnedUsage(), 0 * kSizeDummyEntry)
-      << "Failed to release remaining underlying dummy entries in cache in "
-         "CacheReservationManager's destructor";
-}
-
-TEST(CacheReservationHandleTest, HandleTest) {
-  constexpr std::size_t kOneGigabyte = 1024 * 1024 * 1024;
-  constexpr std::size_t kSizeDummyEntry = 256 * 1024;
-  constexpr std::size_t kMetaDataChargeOverhead = 10000;
-
-  LRUCacheOptions lo;
-  lo.capacity = kOneGigabyte;
-  lo.num_shard_bits = 0;
-  std::shared_ptr<Cache> cache = NewLRUCache(lo);
-
-  std::shared_ptr<CacheReservationManager> test_cache_rev_mng(
-      std::make_shared<CacheReservationManager>(cache));
-
-  std::size_t mem_used = 0;
-  const std::size_t incremental_mem_used_handle_1 = 1 * kSizeDummyEntry;
-  const std::size_t incremental_mem_used_handle_2 = 2 * kSizeDummyEntry;
-  std::unique_ptr<CacheReservationHandle<CacheEntryRole::kMisc>> handle_1,
-      handle_2;
-
-  // To test consecutive CacheReservationManager::MakeCacheReservation works
-  // correctly in terms of returning the handle as well as updating cache
-  // reservation and the latest total memory used
-  Status s = test_cache_rev_mng->MakeCacheReservation<CacheEntryRole::kMisc>(
-      incremental_mem_used_handle_1, &handle_1);
-  mem_used = mem_used + incremental_mem_used_handle_1;
-  ASSERT_EQ(s, Status::OK());
-  EXPECT_TRUE(handle_1 != nullptr);
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(), mem_used);
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), mem_used);
-  EXPECT_GE(cache->GetPinnedUsage(), mem_used);
-  EXPECT_LT(cache->GetPinnedUsage(), mem_used + kMetaDataChargeOverhead);
-
-  s = test_cache_rev_mng->MakeCacheReservation<CacheEntryRole::kMisc>(
-      incremental_mem_used_handle_2, &handle_2);
-  mem_used = mem_used + incremental_mem_used_handle_2;
-  ASSERT_EQ(s, Status::OK());
-  EXPECT_TRUE(handle_2 != nullptr);
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(), mem_used);
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), mem_used);
-  EXPECT_GE(cache->GetPinnedUsage(), mem_used);
-  EXPECT_LT(cache->GetPinnedUsage(), mem_used + kMetaDataChargeOverhead);
-
-  // To test CacheReservationHandle::~CacheReservationHandle() works correctly
-  // in releasing the cache reserved for the handle
-  handle_1.reset();
-  EXPECT_TRUE(handle_1 == nullptr);
-  mem_used = mem_used - incremental_mem_used_handle_1;
-  EXPECT_EQ(test_cache_rev_mng->GetTotalReservedCacheSize(), mem_used);
-  EXPECT_EQ(test_cache_rev_mng->GetTotalMemoryUsed(), mem_used);
-  EXPECT_GE(cache->GetPinnedUsage(), mem_used);
-  EXPECT_LT(cache->GetPinnedUsage(), mem_used + kMetaDataChargeOverhead);
-
-  // To test the actual CacheReservationManager object won't be deallocated
-  // as long as there remain handles pointing to it.
-  // We strongly recommend deallocating CacheReservationManager object only
-  // after all its handles are deallocated to keep things easy to reasonate
-  test_cache_rev_mng.reset();
-  EXPECT_GE(cache->GetPinnedUsage(), mem_used);
-  EXPECT_LT(cache->GetPinnedUsage(), mem_used + kMetaDataChargeOverhead);
-
-  handle_2.reset();
-  // The CacheReservationManager object is now deallocated since all the handles
-  // and its original pointer is gone
-  mem_used = mem_used - incremental_mem_used_handle_2;
-  EXPECT_EQ(mem_used, 0);
-  EXPECT_EQ(cache->GetPinnedUsage(), mem_used);
-}
-}  // namespace ROCKSDB_NAMESPACE
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
@@ -609,9 +609,6 @@ TEST_P(CacheTest, SetCapacity) {
  for (size_t i = 5; i < 10; i++) {
    cache->Release(handles[i]);
  }
-
-  // Make sure this doesn't crash or upset ASAN/valgrind
-  cache->DisownData();
 }

 TEST_P(LRUCacheTest, SetStrictCapacityLimit) {
@@ -33,11 +33,11 @@ std::shared_ptr<Cache> NewClockCache(
 #ifndef ROCKSDB_USE_RTTI
 #define TBB_USE_EXCEPTIONS 0
 #endif
+#include "tbb/concurrent_hash_map.h"
+
 #include "cache/sharded_cache.h"
-#include "port/lang.h"
 #include "port/malloc.h"
 #include "port/port.h"
-#include "tbb/concurrent_hash_map.h"
 #include "util/autovector.h"
 #include "util/mutexlock.h"

@@ -228,22 +228,22 @@ struct CacheHandle {
 };

 // Key of hash map. We store hash value with the key for convenience.
-struct ClockCacheKey {
+struct CacheKey {
  Slice key;
  uint32_t hash_value;

-  ClockCacheKey() = default;
+  CacheKey() = default;

-  ClockCacheKey(const Slice& k, uint32_t h) {
+  CacheKey(const Slice& k, uint32_t h) {
    key = k;
    hash_value = h;
  }

-  static bool equal(const ClockCacheKey& a, const ClockCacheKey& b) {
+  static bool equal(const CacheKey& a, const CacheKey& b) {
    return a.hash_value == b.hash_value && a.key == b.key;
  }

-  static size_t hash(const ClockCacheKey& a) {
+  static size_t hash(const CacheKey& a) {
    return static_cast<size_t>(a.hash_value);
  }
 };
@@ -260,8 +260,7 @@ struct CleanupContext {
 class ClockCacheShard final : public CacheShard {
 public:
  // Hash map type.
-  using HashTable =
-      tbb::concurrent_hash_map<ClockCacheKey, CacheHandle*, ClockCacheKey>;
+  typedef tbb::concurrent_hash_map<CacheKey, CacheHandle*, CacheKey> HashTable;

  ClockCacheShard();
  ~ClockCacheShard() override;
@@ -281,8 +280,7 @@ class ClockCacheShard final : public CacheShard {
  Cache::Handle* Lookup(const Slice& key, uint32_t hash,
                        const Cache::CacheItemHelper* /*helper*/,
                        const Cache::CreateCallback& /*create_cb*/,
-                        Cache::Priority /*priority*/, bool /*wait*/,
-                        Statistics* /*stats*/) override {
+                        Cache::Priority /*priority*/, bool /*wait*/) override {
    return Lookup(key, hash);
  }
  bool Release(Cache::Handle* handle, bool /*useful*/,
@@ -560,7 +558,7 @@ bool ClockCacheShard::TryEvict(CacheHandle* handle, CleanupContext* context) {
  if (handle->flags.compare_exchange_strong(flags, 0, std::memory_order_acquire,
                                            std::memory_order_relaxed)) {
    bool erased __attribute__((__unused__)) =
-        table_.erase(ClockCacheKey(handle->key, handle->hash));
+        table_.erase(CacheKey(handle->key, handle->hash));
    assert(erased);
    RecycleHandle(handle, context);
    return true;
@@ -657,13 +655,13 @@ CacheHandle* ClockCacheShard::Insert(
  // relative updates (fetch_add, etc).
  handle->flags.store(flags, std::memory_order_relaxed);
  HashTable::accessor accessor;
-  if (table_.find(accessor, ClockCacheKey(key, hash))) {
+  if (table_.find(accessor, CacheKey(key, hash))) {
    *overwritten = true;
    CacheHandle* existing_handle = accessor->second;
    table_.erase(accessor);
    UnsetInCache(existing_handle, context);
  }
-  table_.insert(HashTable::value_type(ClockCacheKey(key, hash), handle));
+  table_.insert(HashTable::value_type(CacheKey(key, hash), handle));
  if (hold_reference) {
    pinned_usage_.fetch_add(total_charge, std::memory_order_relaxed);
  }
@@ -702,7 +700,7 @@ Status ClockCacheShard::Insert(const Slice& key, uint32_t hash, void* value,

 Cache::Handle* ClockCacheShard::Lookup(const Slice& key, uint32_t hash) {
  HashTable::const_accessor accessor;
-  if (!table_.find(accessor, ClockCacheKey(key, hash))) {
+  if (!table_.find(accessor, CacheKey(key, hash))) {
    return nullptr;
  }
  CacheHandle* handle = accessor->second;
@@ -747,7 +745,7 @@ bool ClockCacheShard::EraseAndConfirm(const Slice& key, uint32_t hash,
  MutexLock l(&mutex_);
  HashTable::accessor accessor;
  bool erased = false;
-  if (table_.find(accessor, ClockCacheKey(key, hash))) {
+  if (table_.find(accessor, CacheKey(key, hash))) {
    CacheHandle* handle = accessor->second;
    table_.erase(accessor);
    erased = UnsetInCache(handle, context);
@@ -810,10 +808,9 @@ class ClockCache final : public ShardedCache {
  }

  void DisownData() override {
-    // Leak data only if that won't generate an ASAN/valgrind warning
-    if (!kMustFreeHeapAllocations) {
-      shards_ = nullptr;
-    }
+#ifndef MUST_FREE_HEAP_ALLOCATIONS
+    shards_ = nullptr;
+#endif
  }

  void WaitAll(std::vector<Handle*>& /*handles*/) override {}
@@ -13,9 +13,6 @@
 #include <cstdint>
 #include <cstdio>

-#include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
-#include "port/lang.h"
 #include "util/mutexlock.h"

 namespace ROCKSDB_NAMESPACE {
@@ -420,7 +417,7 @@ Cache::Handle* LRUCacheShard::Lookup(
    const Slice& key, uint32_t hash,
    const ShardedCache::CacheItemHelper* helper,
    const ShardedCache::CreateCallback& create_cb, Cache::Priority priority,
-    bool wait, Statistics* stats) {
+    bool wait) {
  LRUHandle* e = nullptr;
  {
    MutexLock l(&mutex_);
@@ -473,18 +470,11 @@ Cache::Handle* LRUCacheShard::Lookup(
          e->Unref();
          e->Free();
          e = nullptr;
-        } else {
-          PERF_COUNTER_ADD(secondary_cache_hit_count, 1);
-          RecordTick(stats, SECONDARY_CACHE_HITS);
        }
      } else {
        // If wait is false, we always return a handle and let the caller
        // release the handle after checking for success or failure
        e->SetIncomplete(true);
-        // This may be slightly inaccurate, if the lookup eventually fails.
-        // But the probability is very low.
-        PERF_COUNTER_ADD(secondary_cache_hit_count, 1);
-        RecordTick(stats, SECONDARY_CACHE_HITS);
      }
    }
  }
@@ -705,11 +695,11 @@ uint32_t LRUCache::GetHash(Handle* handle) const {
 }

 void LRUCache::DisownData() {
-  // Leak data only if that won't generate an ASAN/valgrind warning
-  if (!kMustFreeHeapAllocations) {
-    shards_ = nullptr;
-    num_shards_ = 0;
-  }
+// Do not drop data if compile with ASAN to suppress leak warning.
+#ifndef MUST_FREE_HEAP_ALLOCATIONS
+  shards_ = nullptr;
+  num_shards_ = 0;
+#endif
 }

 size_t LRUCache::TEST_GetLRUSize() {
@@ -319,11 +319,10 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShard {
  virtual Cache::Handle* Lookup(const Slice& key, uint32_t hash,
                                const ShardedCache::CacheItemHelper* helper,
                                const ShardedCache::CreateCallback& create_cb,
-                                ShardedCache::Priority priority, bool wait,
-                                Statistics* stats) override;
+                                ShardedCache::Priority priority,
+                                bool wait) override;
  virtual Cache::Handle* Lookup(const Slice& key, uint32_t hash) override {
-    return Lookup(key, hash, nullptr, nullptr, Cache::Priority::LOW, true,
-                  nullptr);
+    return Lookup(key, hash, nullptr, nullptr, Cache::Priority::LOW, true);
  }
  virtual bool Release(Cache::Handle* handle, bool /*useful*/,
                       bool force_erase) override {
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>

-#include "cache/cache_key.h"
 #include "db/db_test_util.h"
 #include "file/sst_file_manager_impl.h"
 #include "port/port.h"
@@ -16,11 +15,9 @@
 #include "rocksdb/cache.h"
 #include "rocksdb/io_status.h"
 #include "rocksdb/sst_file_manager.h"
-#include "rocksdb/utilities/cache_dump_load.h"
 #include "test_util/testharness.h"
 #include "util/coding.h"
 #include "util/random.h"
-#include "utilities/cache_dump_load_impl.h"
 #include "utilities/fault_injection_fs.h"

 namespace ROCKSDB_NAMESPACE {
@@ -234,10 +231,7 @@ class TestSecondaryCache : public SecondaryCache {
  void ResetInjectFailure() { inject_failure_ = false; }

  void SetDbSessionId(const std::string& db_session_id) {
-    // NOTE: we assume the file is smaller than kMaxFileSizeStandardEncoding
-    // for this to work, but that's safe in a test.
-    auto base = OffsetableCacheKey("unknown", db_session_id, 1, 1);
-    ckey_prefix_ = base.CommonPrefixSlice().ToString();
+    db_session_id_ = db_session_id;
  }

  Status Insert(const Slice& key, void* value,
@@ -245,7 +239,7 @@ class TestSecondaryCache : public SecondaryCache {
    if (inject_failure_) {
      return Status::Corruption("Insertion Data Corrupted");
    }
-    EXPECT_TRUE(IsDbSessionLowerAsKeyPrefix(key));
+    assert(IsDbSessionIdAsKeyPrefix(key) == true);
    size_t size;
    char* buf;
    Status s;
@@ -321,8 +315,18 @@ class TestSecondaryCache : public SecondaryCache {

  uint32_t num_lookups() { return num_lookups_; }

-  bool IsDbSessionLowerAsKeyPrefix(const Slice& key) {
-    return key.starts_with(ckey_prefix_);
+  bool IsDbSessionIdAsKeyPrefix(const Slice& key) {
+    if (db_session_id_.size() == 0) {
+      return true;
+    }
+    if (key.size() < 20) {
+      return false;
+    }
+    std::string s_key = key.ToString();
+    if (s_key.substr(0, 20) != db_session_id_) {
+      return false;
+    }
+    return true;
  }

 private:
@@ -367,14 +371,14 @@ class TestSecondaryCache : public SecondaryCache {
  uint32_t num_inserts_;
  uint32_t num_lookups_;
  bool inject_failure_;
-  std::string ckey_prefix_;
+  std::string db_session_id_;
  ResultMap result_map_;
 };

 class DBSecondaryCacheTest : public DBTestBase {
 public:
  DBSecondaryCacheTest()
-      : DBTestBase("db_secondary_cache_test", /*env_do_fsync=*/true) {
+      : DBTestBase("/db_secondary_cache_test", /*env_do_fsync=*/true) {
    fault_fs_.reset(new FaultInjectionTestFS(env_->GetFileSystem()));
    fault_env_.reset(new CompositeEnvWrapper(env_, fault_fs_));
  }
@@ -464,7 +468,6 @@ TEST_F(LRUSecondaryCacheTest, BasicTest) {
      std::make_shared<TestSecondaryCache>(2048);
  opts.secondary_cache = secondary_cache;
  std::shared_ptr<Cache> cache = NewLRUCache(opts);
-  std::shared_ptr<Statistics> stats = CreateDBStatistics();

  Random rnd(301);
  std::string str1 = rnd.RandomString(1020);
@@ -473,29 +476,22 @@ TEST_F(LRUSecondaryCacheTest, BasicTest) {
                          str1.length()));
  std::string str2 = rnd.RandomString(1020);
  TestItem* item2 = new TestItem(str2.data(), str2.length());
-  // k1 should be demoted to NVM
+  // k2 should be demoted to NVM
  ASSERT_OK(cache->Insert("k2", item2, &LRUSecondaryCacheTest::helper_,
                          str2.length()));

-  get_perf_context()->Reset();
  Cache::Handle* handle;
-  handle =
-      cache->Lookup("k2", &LRUSecondaryCacheTest::helper_, test_item_creator,
-                    Cache::Priority::LOW, true, stats.get());
+  handle = cache->Lookup("k2", &LRUSecondaryCacheTest::helper_,
+                         test_item_creator, Cache::Priority::LOW, true);
  ASSERT_NE(handle, nullptr);
  cache->Release(handle);
  // This lookup should promote k1 and demote k2
-  handle =
-      cache->Lookup("k1", &LRUSecondaryCacheTest::helper_, test_item_creator,
-                    Cache::Priority::LOW, true, stats.get());
+  handle = cache->Lookup("k1", &LRUSecondaryCacheTest::helper_,
+                         test_item_creator, Cache::Priority::LOW, true);
  ASSERT_NE(handle, nullptr);
  cache->Release(handle);
  ASSERT_EQ(secondary_cache->num_inserts(), 2u);
  ASSERT_EQ(secondary_cache->num_lookups(), 1u);
-  ASSERT_EQ(stats->getTickerCount(SECONDARY_CACHE_HITS),
-            secondary_cache->num_lookups());
-  PerfContext perf_ctx = *get_perf_context();
-  ASSERT_EQ(perf_ctx.secondary_cache_hit_count, secondary_cache->num_lookups());

  cache.reset();
  secondary_cache.reset();
@@ -689,7 +685,7 @@ TEST_F(DBSecondaryCacheTest, TestSecondaryCacheCorrectness1) {
  }

  ASSERT_OK(Flush());
-  // After Flush is successful, RocksDB will do the paranoid check for the new
+  // After Flush is successful, RocksDB do the paranoid check for the new
  // SST file. Meta blocks are always cached in the block cache and they
  // will not be evicted. When block_2 is cache miss and read out, it is
  // inserted to the block cache. Note that, block_1 is never successfully
@@ -783,7 +779,7 @@ TEST_F(DBSecondaryCacheTest, TestSecondaryCacheCorrectness2) {
  }

  ASSERT_OK(Flush());
-  // After Flush is successful, RocksDB will do the paranoid check for the new
+  // After Flush is successful, RocksDB do the paranoid check for the new
  // SST file. Meta blocks are always cached in the block cache and they
  // will not be evicted. When block_2 is cache miss and read out, it is
  // inserted to the block cache. Thefore, block_1 is evicted from block
@@ -877,7 +873,7 @@ TEST_F(DBSecondaryCacheTest, NoSecondaryCacheInsertion) {
  }

  ASSERT_OK(Flush());
-  // After Flush is successful, RocksDB will do the paranoid check for the new
+  // After Flush is successful, RocksDB do the paranoid check for the new
  // SST file. Meta blocks are always cached in the block cache and they
  // will not be evicted. Now, block cache is large enough, it cache
  // both block_1 and block_2. When first time read block_1 and block_2
@@ -979,7 +975,7 @@ TEST_F(DBSecondaryCacheTest, SecondaryCacheFailureTest) {
  }

  ASSERT_OK(Flush());
-  // After Flush is successful, RocksDB will do the paranoid check for the new
+  // After Flush is successful, RocksDB do the paranoid check for the new
  // SST file. Meta blocks are always cached in the block cache and they
  // will not be evicted. When block_2 is cache miss and read out, it is
  // inserted to the block cache. Note that, block_1 is never successfully
@@ -1178,668 +1174,6 @@ TEST_F(DBSecondaryCacheTest, TestSecondaryCacheMultiGet) {
  Destroy(options);
 }

-class LRUCacheWithStat : public LRUCache {
- public:
-  LRUCacheWithStat(
-      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,
-      const std::shared_ptr<SecondaryCache>& _secondary_cache = nullptr)
-      : LRUCache(_capacity, _num_shard_bits, _strict_capacity_limit,
-                 _high_pri_pool_ratio, _memory_allocator, _use_adaptive_mutex,
-                 _metadata_charge_policy, _secondary_cache) {
-    insert_count_ = 0;
-    lookup_count_ = 0;
-  }
-  ~LRUCacheWithStat() {}
-
-  Status Insert(const Slice& key, void* value, size_t charge, DeleterFn deleter,
-                Handle** handle, Priority priority) override {
-    insert_count_++;
-    return LRUCache::Insert(key, value, charge, deleter, handle, priority);
-  }
-  Status Insert(const Slice& key, void* value, const CacheItemHelper* helper,
-                size_t chargge, Handle** handle = nullptr,
-                Priority priority = Priority::LOW) override {
-    insert_count_++;
-    return LRUCache::Insert(key, value, helper, chargge, handle, priority);
-  }
-  Handle* Lookup(const Slice& key, Statistics* stats) override {
-    lookup_count_++;
-    return LRUCache::Lookup(key, stats);
-  }
-  Handle* Lookup(const Slice& key, const CacheItemHelper* helper,
-                 const CreateCallback& create_cb, Priority priority, bool wait,
-                 Statistics* stats = nullptr) override {
-    lookup_count_++;
-    return LRUCache::Lookup(key, helper, create_cb, priority, wait, stats);
-  }
-
-  uint32_t GetInsertCount() { return insert_count_; }
-  uint32_t GetLookupcount() { return lookup_count_; }
-  void ResetCount() {
-    insert_count_ = 0;
-    lookup_count_ = 0;
-  }
-
- private:
-  uint32_t insert_count_;
-  uint32_t lookup_count_;
-};
-
-#ifndef ROCKSDB_LITE
-
-TEST_F(DBSecondaryCacheTest, LRUCacheDumpLoadBasic) {
-  LRUCacheOptions cache_opts(1024 * 1024, 0, false, 0.5, nullptr,
-                             kDefaultToAdaptiveMutex, kDontChargeCacheMetadata);
-  LRUCacheWithStat* tmp_cache = new LRUCacheWithStat(
-      cache_opts.capacity, cache_opts.num_shard_bits,
-      cache_opts.strict_capacity_limit, cache_opts.high_pri_pool_ratio,
-      cache_opts.memory_allocator, cache_opts.use_adaptive_mutex,
-      cache_opts.metadata_charge_policy, cache_opts.secondary_cache);
-  std::shared_ptr<Cache> cache(tmp_cache);
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = cache;
-  table_options.block_size = 4 * 1024;
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.env = fault_env_.get();
-  DestroyAndReopen(options);
-  fault_fs_->SetFailGetUniqueId(true);
-
-  Random rnd(301);
-  const int N = 256;
-  std::vector<std::string> value;
-  char buf[1000];
-  memset(buf, 'a', 1000);
-  value.resize(N);
-  for (int i = 0; i < N; i++) {
-    // std::string p_v = rnd.RandomString(1000);
-    std::string p_v(buf, 1000);
-    value[i] = p_v;
-    ASSERT_OK(Put(Key(i), p_v));
-  }
-  ASSERT_OK(Flush());
-  Compact("a", "z");
-
-  // do th eread for all the key value pairs, so all the blocks should be in
-  // cache
-  uint32_t start_insert = tmp_cache->GetInsertCount();
-  uint32_t start_lookup = tmp_cache->GetLookupcount();
-  std::string v;
-  for (int i = 0; i < N; i++) {
-    v = Get(Key(i));
-    ASSERT_EQ(v, value[i]);
-  }
-  uint32_t dump_insert = tmp_cache->GetInsertCount() - start_insert;
-  uint32_t dump_lookup = tmp_cache->GetLookupcount() - start_lookup;
-  ASSERT_EQ(63,
-            static_cast<int>(dump_insert));  // the insert in the block cache
-  ASSERT_EQ(256,
-            static_cast<int>(dump_lookup));  // the lookup in the block cache
-  // We have enough blocks in the block cache
-
-  CacheDumpOptions cd_options;
-  cd_options.clock = fault_env_->GetSystemClock().get();
-  std::string dump_path = db_->GetName() + "/cache_dump";
-  std::unique_ptr<CacheDumpWriter> dump_writer;
-  Status s = NewToFileCacheDumpWriter(fault_fs_, FileOptions(), dump_path,
-                                      &dump_writer);
-  ASSERT_OK(s);
-  std::unique_ptr<CacheDumper> cache_dumper;
-  s = NewDefaultCacheDumper(cd_options, cache, std::move(dump_writer),
-                            &cache_dumper);
-  ASSERT_OK(s);
-  std::vector<DB*> db_list;
-  db_list.push_back(db_);
-  s = cache_dumper->SetDumpFilter(db_list);
-  ASSERT_OK(s);
-  s = cache_dumper->DumpCacheEntriesToWriter();
-  ASSERT_OK(s);
-  cache_dumper.reset();
-
-  // we have a new cache it is empty, then, before we do the Get, we do the
-  // dumpload
-  std::shared_ptr<TestSecondaryCache> secondary_cache =
-      std::make_shared<TestSecondaryCache>(2048 * 1024);
-  cache_opts.secondary_cache = secondary_cache;
-  tmp_cache = new LRUCacheWithStat(
-      cache_opts.capacity, cache_opts.num_shard_bits,
-      cache_opts.strict_capacity_limit, cache_opts.high_pri_pool_ratio,
-      cache_opts.memory_allocator, cache_opts.use_adaptive_mutex,
-      cache_opts.metadata_charge_policy, cache_opts.secondary_cache);
-  std::shared_ptr<Cache> cache_new(tmp_cache);
-  table_options.block_cache = cache_new;
-  table_options.block_size = 4 * 1024;
-  options.create_if_missing = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.env = fault_env_.get();
-
-  // start to load the data to new block cache
-  start_insert = secondary_cache->num_inserts();
-  start_lookup = secondary_cache->num_lookups();
-  std::unique_ptr<CacheDumpReader> dump_reader;
-  s = NewFromFileCacheDumpReader(fault_fs_, FileOptions(), dump_path,
-                                 &dump_reader);
-  ASSERT_OK(s);
-  std::unique_ptr<CacheDumpedLoader> cache_loader;
-  s = NewDefaultCacheDumpedLoader(cd_options, table_options, secondary_cache,
-                                  std::move(dump_reader), &cache_loader);
-  ASSERT_OK(s);
-  s = cache_loader->RestoreCacheEntriesToSecondaryCache();
-  ASSERT_OK(s);
-  uint32_t load_insert = secondary_cache->num_inserts() - start_insert;
-  uint32_t load_lookup = secondary_cache->num_lookups() - start_lookup;
-  // check the number we inserted
-  ASSERT_EQ(64, static_cast<int>(load_insert));
-  ASSERT_EQ(0, static_cast<int>(load_lookup));
-  ASSERT_OK(s);
-
-  Reopen(options);
-
-  // After load, we do the Get again
-  start_insert = secondary_cache->num_inserts();
-  start_lookup = secondary_cache->num_lookups();
-  uint32_t cache_insert = tmp_cache->GetInsertCount();
-  uint32_t cache_lookup = tmp_cache->GetLookupcount();
-  for (int i = 0; i < N; i++) {
-    v = Get(Key(i));
-    ASSERT_EQ(v, value[i]);
-  }
-  uint32_t final_insert = secondary_cache->num_inserts() - start_insert;
-  uint32_t final_lookup = secondary_cache->num_lookups() - start_lookup;
-  // no insert to secondary cache
-  ASSERT_EQ(0, static_cast<int>(final_insert));
-  // lookup the secondary to get all blocks
-  ASSERT_EQ(64, static_cast<int>(final_lookup));
-  uint32_t block_insert = tmp_cache->GetInsertCount() - cache_insert;
-  uint32_t block_lookup = tmp_cache->GetLookupcount() - cache_lookup;
-  // Check the new block cache insert and lookup, should be no insert since all
-  // blocks are from the secondary cache.
-  ASSERT_EQ(0, static_cast<int>(block_insert));
-  ASSERT_EQ(256, static_cast<int>(block_lookup));
-
-  fault_fs_->SetFailGetUniqueId(false);
-  Destroy(options);
-}
-
-TEST_F(DBSecondaryCacheTest, LRUCacheDumpLoadWithFilter) {
-  LRUCacheOptions cache_opts(1024 * 1024, 0, false, 0.5, nullptr,
-                             kDefaultToAdaptiveMutex, kDontChargeCacheMetadata);
-  LRUCacheWithStat* tmp_cache = new LRUCacheWithStat(
-      cache_opts.capacity, cache_opts.num_shard_bits,
-      cache_opts.strict_capacity_limit, cache_opts.high_pri_pool_ratio,
-      cache_opts.memory_allocator, cache_opts.use_adaptive_mutex,
-      cache_opts.metadata_charge_policy, cache_opts.secondary_cache);
-  std::shared_ptr<Cache> cache(tmp_cache);
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = cache;
-  table_options.block_size = 4 * 1024;
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.env = fault_env_.get();
-  std::string dbname1 = test::PerThreadDBPath("db_1");
-  ASSERT_OK(DestroyDB(dbname1, options));
-  DB* db1 = nullptr;
-  ASSERT_OK(DB::Open(options, dbname1, &db1));
-  std::string dbname2 = test::PerThreadDBPath("db_2");
-  ASSERT_OK(DestroyDB(dbname2, options));
-  DB* db2 = nullptr;
-  ASSERT_OK(DB::Open(options, dbname2, &db2));
-  fault_fs_->SetFailGetUniqueId(true);
-
-  // write the KVs to db1
-  Random rnd(301);
-  const int N = 256;
-  std::vector<std::string> value1;
-  WriteOptions wo;
-  char buf[1000];
-  memset(buf, 'a', 1000);
-  value1.resize(N);
-  for (int i = 0; i < N; i++) {
-    std::string p_v(buf, 1000);
-    value1[i] = p_v;
-    ASSERT_OK(db1->Put(wo, Key(i), p_v));
-  }
-  ASSERT_OK(db1->Flush(FlushOptions()));
-  Slice bg("a");
-  Slice ed("b");
-  ASSERT_OK(db1->CompactRange(CompactRangeOptions(), &bg, &ed));
-
-  // Write the KVs to DB2
-  std::vector<std::string> value2;
-  memset(buf, 'b', 1000);
-  value2.resize(N);
-  for (int i = 0; i < N; i++) {
-    std::string p_v(buf, 1000);
-    value2[i] = p_v;
-    ASSERT_OK(db2->Put(wo, Key(i), p_v));
-  }
-  ASSERT_OK(db2->Flush(FlushOptions()));
-  ASSERT_OK(db2->CompactRange(CompactRangeOptions(), &bg, &ed));
-
-  // do th eread for all the key value pairs, so all the blocks should be in
-  // cache
-  uint32_t start_insert = tmp_cache->GetInsertCount();
-  uint32_t start_lookup = tmp_cache->GetLookupcount();
-  ReadOptions ro;
-  std::string v;
-  for (int i = 0; i < N; i++) {
-    ASSERT_OK(db1->Get(ro, Key(i), &v));
-    ASSERT_EQ(v, value1[i]);
-  }
-  for (int i = 0; i < N; i++) {
-    ASSERT_OK(db2->Get(ro, Key(i), &v));
-    ASSERT_EQ(v, value2[i]);
-  }
-  uint32_t dump_insert = tmp_cache->GetInsertCount() - start_insert;
-  uint32_t dump_lookup = tmp_cache->GetLookupcount() - start_lookup;
-  ASSERT_EQ(128,
-            static_cast<int>(dump_insert));  // the insert in the block cache
-  ASSERT_EQ(512,
-            static_cast<int>(dump_lookup));  // the lookup in the block cache
-  // We have enough blocks in the block cache
-
-  CacheDumpOptions cd_options;
-  cd_options.clock = fault_env_->GetSystemClock().get();
-  std::string dump_path = db1->GetName() + "/cache_dump";
-  std::unique_ptr<CacheDumpWriter> dump_writer;
-  Status s = NewToFileCacheDumpWriter(fault_fs_, FileOptions(), dump_path,
-                                      &dump_writer);
-  ASSERT_OK(s);
-  std::unique_ptr<CacheDumper> cache_dumper;
-  s = NewDefaultCacheDumper(cd_options, cache, std::move(dump_writer),
-                            &cache_dumper);
-  ASSERT_OK(s);
-  std::vector<DB*> db_list;
-  db_list.push_back(db1);
-  s = cache_dumper->SetDumpFilter(db_list);
-  ASSERT_OK(s);
-  s = cache_dumper->DumpCacheEntriesToWriter();
-  ASSERT_OK(s);
-  cache_dumper.reset();
-
-  // we have a new cache it is empty, then, before we do the Get, we do the
-  // dumpload
-  std::shared_ptr<TestSecondaryCache> secondary_cache =
-      std::make_shared<TestSecondaryCache>(2048 * 1024);
-  cache_opts.secondary_cache = secondary_cache;
-  tmp_cache = new LRUCacheWithStat(
-      cache_opts.capacity, cache_opts.num_shard_bits,
-      cache_opts.strict_capacity_limit, cache_opts.high_pri_pool_ratio,
-      cache_opts.memory_allocator, cache_opts.use_adaptive_mutex,
-      cache_opts.metadata_charge_policy, cache_opts.secondary_cache);
-  std::shared_ptr<Cache> cache_new(tmp_cache);
-  table_options.block_cache = cache_new;
-  table_options.block_size = 4 * 1024;
-  options.create_if_missing = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.env = fault_env_.get();
-
-  // Start the cache loading process
-  start_insert = secondary_cache->num_inserts();
-  start_lookup = secondary_cache->num_lookups();
-  std::unique_ptr<CacheDumpReader> dump_reader;
-  s = NewFromFileCacheDumpReader(fault_fs_, FileOptions(), dump_path,
-                                 &dump_reader);
-  ASSERT_OK(s);
-  std::unique_ptr<CacheDumpedLoader> cache_loader;
-  s = NewDefaultCacheDumpedLoader(cd_options, table_options, secondary_cache,
-                                  std::move(dump_reader), &cache_loader);
-  ASSERT_OK(s);
-  s = cache_loader->RestoreCacheEntriesToSecondaryCache();
-  ASSERT_OK(s);
-  uint32_t load_insert = secondary_cache->num_inserts() - start_insert;
-  uint32_t load_lookup = secondary_cache->num_lookups() - start_lookup;
-  // check the number we inserted
-  ASSERT_EQ(64, static_cast<int>(load_insert));
-  ASSERT_EQ(0, static_cast<int>(load_lookup));
-  ASSERT_OK(s);
-
-  ASSERT_OK(db1->Close());
-  delete db1;
-  ASSERT_OK(DB::Open(options, dbname1, &db1));
-
-  // After load, we do the Get again. To validate the cache, we do not allow any
-  // I/O, so we set the file system to false.
-  IOStatus error_msg = IOStatus::IOError("Retryable IO Error");
-  fault_fs_->SetFilesystemActive(false, error_msg);
-  start_insert = secondary_cache->num_inserts();
-  start_lookup = secondary_cache->num_lookups();
-  uint32_t cache_insert = tmp_cache->GetInsertCount();
-  uint32_t cache_lookup = tmp_cache->GetLookupcount();
-  for (int i = 0; i < N; i++) {
-    ASSERT_OK(db1->Get(ro, Key(i), &v));
-    ASSERT_EQ(v, value1[i]);
-  }
-  uint32_t final_insert = secondary_cache->num_inserts() - start_insert;
-  uint32_t final_lookup = secondary_cache->num_lookups() - start_lookup;
-  // no insert to secondary cache
-  ASSERT_EQ(0, static_cast<int>(final_insert));
-  // lookup the secondary to get all blocks
-  ASSERT_EQ(64, static_cast<int>(final_lookup));
-  uint32_t block_insert = tmp_cache->GetInsertCount() - cache_insert;
-  uint32_t block_lookup = tmp_cache->GetLookupcount() - cache_lookup;
-  // Check the new block cache insert and lookup, should be no insert since all
-  // blocks are from the secondary cache.
-  ASSERT_EQ(0, static_cast<int>(block_insert));
-  ASSERT_EQ(256, static_cast<int>(block_lookup));
-  fault_fs_->SetFailGetUniqueId(false);
-  fault_fs_->SetFilesystemActive(true);
-  delete db1;
-  delete db2;
-  ASSERT_OK(DestroyDB(dbname1, options));
-  ASSERT_OK(DestroyDB(dbname2, options));
-}
-
-// Test the option not to use the secondary cache in a certain DB.
-TEST_F(DBSecondaryCacheTest, TestSecondaryCacheOptionBasic) {
-  LRUCacheOptions opts(4 * 1024, 0, false, 0.5, nullptr,
-                       kDefaultToAdaptiveMutex, kDontChargeCacheMetadata);
-  std::shared_ptr<TestSecondaryCache> secondary_cache(
-      new TestSecondaryCache(2048 * 1024));
-  opts.secondary_cache = secondary_cache;
-  std::shared_ptr<Cache> cache = NewLRUCache(opts);
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = cache;
-  table_options.block_size = 4 * 1024;
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.env = fault_env_.get();
-  fault_fs_->SetFailGetUniqueId(true);
-  options.lowest_used_cache_tier = CacheTier::kVolatileTier;
-
-  // Set the file paranoid check, so after flush, the file will be read
-  // all the blocks will be accessed.
-  options.paranoid_file_checks = true;
-  DestroyAndReopen(options);
-  std::string session_id;
-  ASSERT_OK(db_->GetDbSessionId(session_id));
-  secondary_cache->SetDbSessionId(session_id);
-  Random rnd(301);
-  const int N = 6;
-  for (int i = 0; i < N; i++) {
-    std::string p_v = rnd.RandomString(1007);
-    ASSERT_OK(Put(Key(i), p_v));
-  }
-
-  ASSERT_OK(Flush());
-
-  for (int i = 0; i < N; i++) {
-    std::string p_v = rnd.RandomString(1007);
-    ASSERT_OK(Put(Key(i + 70), p_v));
-  }
-
-  ASSERT_OK(Flush());
-
-  // Flush will trigger the paranoid check and read blocks. But only block cache
-  // will be read. No operations for secondary cache.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  Compact("a", "z");
-
-  // Compaction will also insert and evict blocks, no operations to the block
-  // cache. No operations for secondary cache.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  std::string v = Get(Key(0));
-  ASSERT_EQ(1007, v.size());
-
-  // Check the data in first block. Cache miss, direclty read from SST file.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  v = Get(Key(5));
-  ASSERT_EQ(1007, v.size());
-
-  // Check the second block.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  v = Get(Key(5));
-  ASSERT_EQ(1007, v.size());
-
-  // block cache hit
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  v = Get(Key(70));
-  ASSERT_EQ(1007, v.size());
-
-  // Check the first block in the second SST file. Cache miss and trigger SST
-  // file read. No operations for secondary cache.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  v = Get(Key(75));
-  ASSERT_EQ(1007, v.size());
-
-  // Check the second block in the second SST file. Cache miss and trigger SST
-  // file read. No operations for secondary cache.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  Destroy(options);
-}
-
-// We disable the secondary cache in DBOptions at first. Close and reopen the DB
-// with new options, which set the lowest_used_cache_tier to
-// kNonVolatileBlockTier. So secondary cache will be used.
-TEST_F(DBSecondaryCacheTest, TestSecondaryCacheOptionChange) {
-  LRUCacheOptions opts(4 * 1024, 0, false, 0.5, nullptr,
-                       kDefaultToAdaptiveMutex, kDontChargeCacheMetadata);
-  std::shared_ptr<TestSecondaryCache> secondary_cache(
-      new TestSecondaryCache(2048 * 1024));
-  opts.secondary_cache = secondary_cache;
-  std::shared_ptr<Cache> cache = NewLRUCache(opts);
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = cache;
-  table_options.block_size = 4 * 1024;
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.env = fault_env_.get();
-  fault_fs_->SetFailGetUniqueId(true);
-  options.lowest_used_cache_tier = CacheTier::kVolatileTier;
-
-  // Set the file paranoid check, so after flush, the file will be read
-  // all the blocks will be accessed.
-  options.paranoid_file_checks = true;
-  DestroyAndReopen(options);
-  std::string session_id;
-  ASSERT_OK(db_->GetDbSessionId(session_id));
-  secondary_cache->SetDbSessionId(session_id);
-  Random rnd(301);
-  const int N = 6;
-  for (int i = 0; i < N; i++) {
-    std::string p_v = rnd.RandomString(1007);
-    ASSERT_OK(Put(Key(i), p_v));
-  }
-
-  ASSERT_OK(Flush());
-
-  for (int i = 0; i < N; i++) {
-    std::string p_v = rnd.RandomString(1007);
-    ASSERT_OK(Put(Key(i + 70), p_v));
-  }
-
-  ASSERT_OK(Flush());
-
-  // Flush will trigger the paranoid check and read blocks. But only block cache
-  // will be read.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  Compact("a", "z");
-
-  // Compaction will also insert and evict blocks, no operations to the block
-  // cache.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  std::string v = Get(Key(0));
-  ASSERT_EQ(1007, v.size());
-
-  // Check the data in first block. Cache miss, direclty read from SST file.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  v = Get(Key(5));
-  ASSERT_EQ(1007, v.size());
-
-  // Check the second block.
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  v = Get(Key(5));
-  ASSERT_EQ(1007, v.size());
-
-  // block cache hit
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-
-  // Change the option to enable secondary cache after we Reopen the DB
-  options.lowest_used_cache_tier = CacheTier::kNonVolatileBlockTier;
-  Reopen(options);
-
-  v = Get(Key(70));
-  ASSERT_EQ(1007, v.size());
-
-  // Enable the secondary cache, trigger lookup of the first block in second SST
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 1u);
-
-  v = Get(Key(75));
-  ASSERT_EQ(1007, v.size());
-
-  // trigger lookup of the second block in second SST
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 2u);
-  Destroy(options);
-}
-
-// Two DB test. We create 2 DBs sharing the same block cache and secondary
-// cache. We diable the secondary cache option for DB2.
-TEST_F(DBSecondaryCacheTest, TestSecondaryCacheOptionTwoDB) {
-  LRUCacheOptions opts(4 * 1024, 0, false, 0.5, nullptr,
-                       kDefaultToAdaptiveMutex, kDontChargeCacheMetadata);
-  std::shared_ptr<TestSecondaryCache> secondary_cache(
-      new TestSecondaryCache(2048 * 1024));
-  opts.secondary_cache = secondary_cache;
-  std::shared_ptr<Cache> cache = NewLRUCache(opts);
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = cache;
-  table_options.block_size = 4 * 1024;
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.env = fault_env_.get();
-  options.paranoid_file_checks = true;
-  std::string dbname1 = test::PerThreadDBPath("db_t_1");
-  ASSERT_OK(DestroyDB(dbname1, options));
-  DB* db1 = nullptr;
-  ASSERT_OK(DB::Open(options, dbname1, &db1));
-  std::string dbname2 = test::PerThreadDBPath("db_t_2");
-  ASSERT_OK(DestroyDB(dbname2, options));
-  DB* db2 = nullptr;
-  Options options2 = options;
-  options2.lowest_used_cache_tier = CacheTier::kVolatileTier;
-  ASSERT_OK(DB::Open(options2, dbname2, &db2));
-  fault_fs_->SetFailGetUniqueId(true);
-
-  // Set the file paranoid check, so after flush, the file will be read
-  // all the blocks will be accessed.
-  std::string session_id;
-  ASSERT_OK(db1->GetDbSessionId(session_id));
-  secondary_cache->SetDbSessionId(session_id);
-
-  WriteOptions wo;
-  Random rnd(301);
-  const int N = 6;
-  for (int i = 0; i < N; i++) {
-    std::string p_v = rnd.RandomString(1007);
-    ASSERT_OK(db1->Put(wo, Key(i), p_v));
-  }
-
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 0u);
-  ASSERT_OK(db1->Flush(FlushOptions()));
-
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 2u);
-
-  for (int i = 0; i < N; i++) {
-    std::string p_v = rnd.RandomString(1007);
-    ASSERT_OK(db2->Put(wo, Key(i), p_v));
-  }
-
-  // No change in the secondary cache, since it is disabled in DB2
-  ASSERT_EQ(secondary_cache->num_inserts(), 0u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 2u);
-  ASSERT_OK(db2->Flush(FlushOptions()));
-  ASSERT_EQ(secondary_cache->num_inserts(), 1u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 2u);
-
-  Slice bg("a");
-  Slice ed("b");
-  ASSERT_OK(db1->CompactRange(CompactRangeOptions(), &bg, &ed));
-  ASSERT_OK(db2->CompactRange(CompactRangeOptions(), &bg, &ed));
-
-  ASSERT_EQ(secondary_cache->num_inserts(), 1u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 2u);
-
-  ReadOptions ro;
-  std::string v;
-  ASSERT_OK(db1->Get(ro, Key(0), &v));
-  ASSERT_EQ(1007, v.size());
-
-  // DB 1 has lookup block 1 and it is miss in block cache, trigger secondary
-  // cache lookup
-  ASSERT_EQ(secondary_cache->num_inserts(), 1u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 3u);
-
-  ASSERT_OK(db1->Get(ro, Key(5), &v));
-  ASSERT_EQ(1007, v.size());
-
-  // DB 1 lookup the second block and it is miss in block cache, trigger
-  // secondary cache lookup
-  ASSERT_EQ(secondary_cache->num_inserts(), 1u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 4u);
-
-  ASSERT_OK(db2->Get(ro, Key(0), &v));
-  ASSERT_EQ(1007, v.size());
-
-  // For db2, it is not enabled with secondary cache, so no search in the
-  // secondary cache
-  ASSERT_EQ(secondary_cache->num_inserts(), 1u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 4u);
-
-  ASSERT_OK(db2->Get(ro, Key(5), &v));
-  ASSERT_EQ(1007, v.size());
-
-  // For db2, it is not enabled with secondary cache, so no search in the
-  // secondary cache
-  ASSERT_EQ(secondary_cache->num_inserts(), 1u);
-  ASSERT_EQ(secondary_cache->num_lookups(), 4u);
-
-  fault_fs_->SetFailGetUniqueId(false);
-  fault_fs_->SetFilesystemActive(true);
-  delete db1;
-  delete db2;
-  ASSERT_OK(DestroyDB(dbname1, options));
-  ASSERT_OK(DestroyDB(dbname2, options));
-}
-
-#endif  // ROCKSDB_LITE
-
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
@@ -83,10 +83,10 @@ Cache::Handle* ShardedCache::Lookup(const Slice& key,
                                    const CacheItemHelper* helper,
                                    const CreateCallback& create_cb,
                                    Priority priority, bool wait,
-                                    Statistics* stats) {
+                                    Statistics* /*stats*/) {
  uint32_t hash = HashSlice(key);
  return GetShard(Shard(hash))
-      ->Lookup(key, hash, helper, create_cb, priority, wait, stats);
+      ->Lookup(key, hash, helper, create_cb, priority, wait);
 }

 bool ShardedCache::IsReady(Handle* handle) {
@@ -34,8 +34,7 @@ class CacheShard {
  virtual Cache::Handle* Lookup(const Slice& key, uint32_t hash,
                                const Cache::CacheItemHelper* helper,
                                const Cache::CreateCallback& create_cb,
-                                Cache::Priority priority, bool wait,
-                                Statistics* stats) = 0;
+                                Cache::Priority priority, bool wait) = 0;
  virtual bool Release(Cache::Handle* handle, bool useful,
                       bool force_erase) = 0;
  virtual bool IsReady(Cache::Handle* handle) = 0;
@@ -24,7 +24,7 @@ mkdir -p $COVERAGE_DIR

 # Find all gcno files to generate the coverage report

-PYTHON=${1:-`which python3`}
+PYTHON=${1:-`which python`}
 echo -e "Using $PYTHON"
 GCNO_FILES=`find $ROOT -name "*.gcno"`
 $GCOV --preserve-paths --relative-only --no-output $GCNO_FILES 2>/dev/null |
@@ -12,6 +12,7 @@
 #include <string>
 #include "db/db_impl/db_impl.h"
 #include "db/db_iter.h"
+#include "db/dbformat.h"
 #include "db/range_del_aggregator.h"
 #include "memory/arena.h"
 #include "options/cf_options.h"
@@ -33,13 +34,7 @@ class Version;
 // the same as the inner DBIter.
 class ArenaWrappedDBIter : public Iterator {
 public:
-  ~ArenaWrappedDBIter() override {
-    if (db_iter_ != nullptr) {
-      db_iter_->~DBIter();
-    } else {
-      assert(false);
-    }
-  }
+  virtual ~ArenaWrappedDBIter() { db_iter_->~DBIter(); }

  // Get the arena to be used to allocate memory for DBIter to be wrapped,
  // as well as child iterators in it.
@@ -95,7 +90,7 @@ class ArenaWrappedDBIter : public Iterator {
  }

 private:
-  DBIter* db_iter_ = nullptr;
+  DBIter* db_iter_;
  Arena arena_;
  uint64_t sv_number_;
  ColumnFamilyData* cfd_ = nullptr;
@@ -14,7 +14,6 @@
 #include "db/dbformat.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
-#include "util/vector_iterator.h"

 namespace ROCKSDB_NAMESPACE {

@@ -68,7 +67,7 @@ TEST(BlobCountingIteratorTest, CountBlobs) {

  assert(keys.size() == values.size());

-  VectorIterator input(keys, values);
+  test::VectorIterator input(keys, values);
  BlobGarbageMeter blob_garbage_meter;

  BlobCountingIterator blob_counter(&input, &blob_garbage_meter);
@@ -308,7 +307,7 @@ TEST(BlobCountingIteratorTest, CorruptBlobIndex) {

  assert(keys.size() == values.size());

-  VectorIterator input(keys, values);
+  test::VectorIterator input(keys, values);
  BlobGarbageMeter blob_garbage_meter;

  BlobCountingIterator blob_counter(&input, &blob_garbage_meter);
@@ -9,26 +9,14 @@

 namespace ROCKSDB_NAMESPACE {

-Status BlobFetcher::FetchBlob(const Slice& user_key,
-                              const Slice& blob_index_slice,
-                              FilePrefetchBuffer* prefetch_buffer,
-                              PinnableSlice* blob_value,
-                              uint64_t* bytes_read) const {
+Status BlobFetcher::FetchBlob(const Slice& user_key, const Slice& blob_index,
+                              PinnableSlice* blob_value) {
+  Status s;
  assert(version_);
-
-  return version_->GetBlob(read_options_, user_key, blob_index_slice,
-                           prefetch_buffer, blob_value, bytes_read);
+  constexpr uint64_t* bytes_read = nullptr;
+  s = version_->GetBlob(read_options_, user_key, blob_index, blob_value,
+                        bytes_read);
+  return s;
 }

-Status BlobFetcher::FetchBlob(const Slice& user_key,
-                              const BlobIndex& blob_index,
-                              FilePrefetchBuffer* prefetch_buffer,
-                              PinnableSlice* blob_value,
-                              uint64_t* bytes_read) const {
-  assert(version_);
-
-  return version_->GetBlob(read_options_, user_key, blob_index, prefetch_buffer,
-                           blob_value, bytes_read);
-}
-
-}  // namespace ROCKSDB_NAMESPACE
+}  // namespace ROCKSDB_NAMESPACE
@@ -9,29 +9,18 @@
 #include "rocksdb/status.h"

 namespace ROCKSDB_NAMESPACE {
-
 class Version;
-class Slice;
-class FilePrefetchBuffer;
-class PinnableSlice;
-class BlobIndex;

-// A thin wrapper around the blob retrieval functionality of Version.
 class BlobFetcher {
 public:
-  BlobFetcher(const Version* version, const ReadOptions& read_options)
+  BlobFetcher(Version* version, const ReadOptions& read_options)
      : version_(version), read_options_(read_options) {}

-  Status FetchBlob(const Slice& user_key, const Slice& blob_index_slice,
-                   FilePrefetchBuffer* prefetch_buffer,
-                   PinnableSlice* blob_value, uint64_t* bytes_read) const;
-
-  Status FetchBlob(const Slice& user_key, const BlobIndex& blob_index,
-                   FilePrefetchBuffer* prefetch_buffer,
-                   PinnableSlice* blob_value, uint64_t* bytes_read) const;
+  Status FetchBlob(const Slice& user_key, const Slice& blob_index,
+                   PinnableSlice* blob_value);

 private:
-  const Version* version_;
+  Version* version_;
  ReadOptions read_options_;
 };
-}  // namespace ROCKSDB_NAMESPACE
+}  // namespace ROCKSDB_NAMESPACE
@@ -12,7 +12,6 @@
 #include "db/blob/blob_index.h"
 #include "db/blob/blob_log_format.h"
 #include "db/blob/blob_log_writer.h"
-#include "db/event_helpers.h"
 #include "db/version_set.h"
 #include "file/filename.h"
 #include "file/read_write_util.h"
@@ -37,14 +36,13 @@ BlobFileBuilder::BlobFileBuilder(
    Env::WriteLifeTimeHint write_hint,
    const std::shared_ptr<IOTracer>& io_tracer,
    BlobFileCompletionCallback* blob_callback,
-    BlobFileCreationReason creation_reason,
    std::vector<std::string>* blob_file_paths,
    std::vector<BlobFileAddition>* blob_file_additions)
    : BlobFileBuilder([versions]() { return versions->NewFileNumber(); }, fs,
                      immutable_options, mutable_cf_options, file_options,
                      job_id, column_family_id, column_family_name, io_priority,
-                      write_hint, io_tracer, blob_callback, creation_reason,
-                      blob_file_paths, blob_file_additions) {}
+                      write_hint, io_tracer, blob_callback, blob_file_paths,
+                      blob_file_additions) {}

 BlobFileBuilder::BlobFileBuilder(
    std::function<uint64_t()> file_number_generator, FileSystem* fs,
@@ -55,7 +53,6 @@ BlobFileBuilder::BlobFileBuilder(
    Env::WriteLifeTimeHint write_hint,
    const std::shared_ptr<IOTracer>& io_tracer,
    BlobFileCompletionCallback* blob_callback,
-    BlobFileCreationReason creation_reason,
    std::vector<std::string>* blob_file_paths,
    std::vector<BlobFileAddition>* blob_file_additions)
    : file_number_generator_(std::move(file_number_generator)),
@@ -72,7 +69,6 @@ BlobFileBuilder::BlobFileBuilder(
      write_hint_(write_hint),
      io_tracer_(io_tracer),
      blob_callback_(blob_callback),
-      creation_reason_(creation_reason),
      blob_file_paths_(blob_file_paths),
      blob_file_additions_(blob_file_additions),
      blob_count_(0),
@@ -165,11 +161,6 @@ Status BlobFileBuilder::OpenBlobFileIfNeeded() {
  std::string blob_file_path =
      BlobFileName(immutable_options_->cf_paths.front().path, blob_file_number);

-  if (blob_callback_) {
-    blob_callback_->OnBlobFileCreationStarted(
-        blob_file_path, column_family_name_, job_id_, creation_reason_);
-  }
-
  std::unique_ptr<FSWritableFile> file;

  {
@@ -237,7 +228,6 @@ Status BlobFileBuilder::CompressBlobIfNeeded(
  assert(blob);
  assert(compressed_blob);
  assert(compressed_blob->empty());
-  assert(immutable_options_);

  if (blob_compression_type_ == kNoCompression) {
    return Status::OK();
@@ -252,16 +242,7 @@ Status BlobFileBuilder::CompressBlobIfNeeded(

  constexpr uint32_t compression_format_version = 2;

-  bool success = false;
-
-  {
-    StopWatch stop_watch(immutable_options_->clock, immutable_options_->stats,
-                         BLOB_DB_COMPRESSION_MICROS);
-    success =
-        CompressData(*blob, info, compression_format_version, compressed_blob);
-  }
-
-  if (!success) {
+  if (!CompressData(*blob, info, compression_format_version, compressed_blob)) {
    return Status::Corruption("Error compressing blob");
  }

@@ -314,13 +295,6 @@ Status BlobFileBuilder::CloseBlobFile() {

  const uint64_t blob_file_number = writer_->get_log_number();

-  if (blob_callback_) {
-    s = blob_callback_->OnBlobFileCompleted(
-        blob_file_paths_->back(), column_family_name_, job_id_,
-        blob_file_number, creation_reason_, s, checksum_value, checksum_method,
-        blob_count_, blob_bytes_);
-  }
-
  assert(blob_file_additions_);
  blob_file_additions_->emplace_back(blob_file_number, blob_count_, blob_bytes_,
                                     std::move(checksum_method),
@@ -332,6 +306,9 @@ Status BlobFileBuilder::CloseBlobFile() {
                 " total blobs, %" PRIu64 " total bytes",
                 column_family_name_.c_str(), job_id_, blob_file_number,
                 blob_count_, blob_bytes_);
+  if (blob_callback_) {
+    s = blob_callback_->OnBlobFileCompleted(blob_file_paths_->back());
+  }

  writer_.reset();
  blob_count_ = 0;
@@ -353,18 +330,15 @@ Status BlobFileBuilder::CloseBlobFileIfNeeded() {
  return CloseBlobFile();
 }

-void BlobFileBuilder::Abandon(const Status& s) {
+void BlobFileBuilder::Abandon() {
  if (!IsBlobFileOpen()) {
    return;
  }
+
  if (blob_callback_) {
    // BlobFileBuilder::Abandon() is called because of error while writing to
    // Blob files. So we can ignore the below error.
-    blob_callback_
-        ->OnBlobFileCompleted(blob_file_paths_->back(), column_family_name_,
-                              job_id_, writer_->get_log_number(),
-                              creation_reason_, s, "", "", blob_count_,
-                              blob_bytes_)
+    blob_callback_->OnBlobFileCompleted(blob_file_paths_->back())
        .PermitUncheckedError();
  }

@@ -13,7 +13,6 @@
 #include "rocksdb/compression_type.h"
 #include "rocksdb/env.h"
 #include "rocksdb/rocksdb_namespace.h"
-#include "rocksdb/types.h"

 namespace ROCKSDB_NAMESPACE {

@@ -42,7 +41,6 @@ class BlobFileBuilder {
                  Env::WriteLifeTimeHint write_hint,
                  const std::shared_ptr<IOTracer>& io_tracer,
                  BlobFileCompletionCallback* blob_callback,
-                  BlobFileCreationReason creation_reason,
                  std::vector<std::string>* blob_file_paths,
                  std::vector<BlobFileAddition>* blob_file_additions);

@@ -56,7 +54,6 @@ class BlobFileBuilder {
                  Env::WriteLifeTimeHint write_hint,
                  const std::shared_ptr<IOTracer>& io_tracer,
                  BlobFileCompletionCallback* blob_callback,
-                  BlobFileCreationReason creation_reason,
                  std::vector<std::string>* blob_file_paths,
                  std::vector<BlobFileAddition>* blob_file_additions);

@@ -67,7 +64,7 @@ class BlobFileBuilder {

  Status Add(const Slice& key, const Slice& value, std::string* blob_index);
  Status Finish();
-  void Abandon(const Status& s);
+  void Abandon();

 private:
  bool IsBlobFileOpen() const;
@@ -92,7 +89,6 @@ class BlobFileBuilder {
  Env::WriteLifeTimeHint write_hint_;
  std::shared_ptr<IOTracer> io_tracer_;
  BlobFileCompletionCallback* blob_callback_;
-  BlobFileCreationReason creation_reason_;
  std::vector<std::string>* blob_file_paths_;
  std::vector<BlobFileAddition>* blob_file_additions_;
  std::unique_ptr<BlobLogWriter> writer_;
@@ -39,10 +39,9 @@ class TestFileNumberGenerator {

 class BlobFileBuilderTest : public testing::Test {
 protected:
-  BlobFileBuilderTest() {
-    mock_env_.reset(MockEnv::Create(Env::Default()));
-    fs_ = mock_env_->GetFileSystem().get();
-    clock_ = mock_env_->GetSystemClock().get();
+  BlobFileBuilderTest() : mock_env_(Env::Default()) {
+    fs_ = mock_env_.GetFileSystem().get();
+    clock_ = mock_env_.GetSystemClock().get();
  }

  void VerifyBlobFile(uint64_t blob_file_number,
@@ -109,7 +108,7 @@ class BlobFileBuilderTest : public testing::Test {
    ASSERT_EQ(footer.expiration_range, ExpirationRange());
  }

-  std::unique_ptr<Env> mock_env_;
+  MockEnv mock_env_;
  FileSystem* fs_;
  SystemClock* clock_;
  FileOptions file_options_;
@@ -124,11 +123,11 @@ TEST_F(BlobFileBuilderTest, BuildAndCheckOneFile) {

  Options options;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileBuilderTest_BuildAndCheckOneFile"),
      0);
  options.enable_blob_files = true;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;

  ImmutableOptions immutable_options(options);
  MutableCFOptions mutable_cf_options(options);
@@ -146,7 +145,7 @@ TEST_F(BlobFileBuilderTest, BuildAndCheckOneFile) {
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
      &file_options_, job_id, column_family_id, column_family_name, io_priority,
      write_hint, nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
-      BlobFileCreationReason::kFlush, &blob_file_paths, &blob_file_additions);
+      &blob_file_paths, &blob_file_additions);

  std::vector<std::pair<std::string, std::string>> expected_key_value_pairs(
      number_of_blobs);
@@ -207,12 +206,12 @@ TEST_F(BlobFileBuilderTest, BuildAndCheckMultipleFiles) {

  Options options;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileBuilderTest_BuildAndCheckMultipleFiles"),
      0);
  options.enable_blob_files = true;
  options.blob_file_size = value_size;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;

  ImmutableOptions immutable_options(options);
  MutableCFOptions mutable_cf_options(options);
@@ -230,7 +229,7 @@ TEST_F(BlobFileBuilderTest, BuildAndCheckMultipleFiles) {
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
      &file_options_, job_id, column_family_id, column_family_name, io_priority,
      write_hint, nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
-      BlobFileCreationReason::kFlush, &blob_file_paths, &blob_file_additions);
+      &blob_file_paths, &blob_file_additions);

  std::vector<std::pair<std::string, std::string>> expected_key_value_pairs(
      number_of_blobs);
@@ -294,12 +293,11 @@ TEST_F(BlobFileBuilderTest, InlinedValues) {

  Options options;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
-                            "BlobFileBuilderTest_InlinedValues"),
+      test::PerThreadDBPath(&mock_env_, "BlobFileBuilderTest_InlinedValues"),
      0);
  options.enable_blob_files = true;
  options.min_blob_size = 1024;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;

  ImmutableOptions immutable_options(options);
  MutableCFOptions mutable_cf_options(options);
@@ -317,7 +315,7 @@ TEST_F(BlobFileBuilderTest, InlinedValues) {
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
      &file_options_, job_id, column_family_id, column_family_name, io_priority,
      write_hint, nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
-      BlobFileCreationReason::kFlush, &blob_file_paths, &blob_file_additions);
+      &blob_file_paths, &blob_file_additions);

  for (size_t i = 0; i < number_of_blobs; ++i) {
    const std::string key = std::to_string(i);
@@ -349,11 +347,10 @@ TEST_F(BlobFileBuilderTest, Compression) {

  Options options;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(), "BlobFileBuilderTest_Compression"),
-      0);
+      test::PerThreadDBPath(&mock_env_, "BlobFileBuilderTest_Compression"), 0);
  options.enable_blob_files = true;
  options.blob_compression_type = kSnappyCompression;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;

  ImmutableOptions immutable_options(options);
  MutableCFOptions mutable_cf_options(options);
@@ -371,7 +368,7 @@ TEST_F(BlobFileBuilderTest, Compression) {
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
      &file_options_, job_id, column_family_id, column_family_name, io_priority,
      write_hint, nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
-      BlobFileCreationReason::kFlush, &blob_file_paths, &blob_file_additions);
+      &blob_file_paths, &blob_file_additions);

  const std::string key("1");
  const std::string uncompressed_value(value_size, 'x');
@@ -432,12 +429,11 @@ TEST_F(BlobFileBuilderTest, CompressionError) {

  Options options;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
-                            "BlobFileBuilderTest_CompressionError"),
+      test::PerThreadDBPath(&mock_env_, "BlobFileBuilderTest_CompressionError"),
      0);
  options.enable_blob_files = true;
  options.blob_compression_type = kSnappyCompression;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  ImmutableOptions immutable_options(options);
  MutableCFOptions mutable_cf_options(options);

@@ -454,7 +450,7 @@ TEST_F(BlobFileBuilderTest, CompressionError) {
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
      &file_options_, job_id, column_family_id, column_family_name, io_priority,
      write_hint, nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
-      BlobFileCreationReason::kFlush, &blob_file_paths, &blob_file_additions);
+      &blob_file_paths, &blob_file_additions);

  SyncPoint::GetInstance()->SetCallBack("CompressData:TamperWithReturnValue",
                                        [](void* arg) {
@@ -510,12 +506,11 @@ TEST_F(BlobFileBuilderTest, Checksum) {

  Options options;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(), "BlobFileBuilderTest_Checksum"),
-      0);
+      test::PerThreadDBPath(&mock_env_, "BlobFileBuilderTest_Checksum"), 0);
  options.enable_blob_files = true;
  options.file_checksum_gen_factory =
      std::make_shared<DummyFileChecksumGenFactory>();
-  options.env = mock_env_.get();
+  options.env = &mock_env_;

  ImmutableOptions immutable_options(options);
  MutableCFOptions mutable_cf_options(options);
@@ -533,7 +528,7 @@ TEST_F(BlobFileBuilderTest, Checksum) {
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
      &file_options_, job_id, column_family_id, column_family_name, io_priority,
      write_hint, nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
-      BlobFileCreationReason::kFlush, &blob_file_paths, &blob_file_additions);
+      &blob_file_paths, &blob_file_additions);

  const std::string key("1");
  const std::string value("deadbeef");
@@ -580,12 +575,12 @@ class BlobFileBuilderIOErrorTest
    : public testing::Test,
      public testing::WithParamInterface<std::string> {
 protected:
-  BlobFileBuilderIOErrorTest() : sync_point_(GetParam()) {
-    mock_env_.reset(MockEnv::Create(Env::Default()));
-    fs_ = mock_env_->GetFileSystem().get();
-  }
+  BlobFileBuilderIOErrorTest()
+      : mock_env_(Env::Default()),
+        fs_(mock_env_.GetFileSystem().get()),
+        sync_point_(GetParam()) {}

-  std::unique_ptr<Env> mock_env_;
+  MockEnv mock_env_;
  FileSystem* fs_;
  FileOptions file_options_;
  std::string sync_point_;
@@ -607,12 +602,11 @@ TEST_P(BlobFileBuilderIOErrorTest, IOError) {

  Options options;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
-                            "BlobFileBuilderIOErrorTest_IOError"),
+      test::PerThreadDBPath(&mock_env_, "BlobFileBuilderIOErrorTest_IOError"),
      0);
  options.enable_blob_files = true;
  options.blob_file_size = value_size;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;

  ImmutableOptions immutable_options(options);
  MutableCFOptions mutable_cf_options(options);
@@ -630,7 +624,7 @@ TEST_P(BlobFileBuilderIOErrorTest, IOError) {
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
      &file_options_, job_id, column_family_id, column_family_name, io_priority,
      write_hint, nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
-      BlobFileCreationReason::kFlush, &blob_file_paths, &blob_file_additions);
+      &blob_file_paths, &blob_file_additions);

  SyncPoint::GetInstance()->SetCallBack(sync_point_, [this](void* arg) {
    Status* const s = static_cast<Status*>(arg);
@@ -84,18 +84,17 @@ void WriteBlobFile(uint32_t column_family_id,

 class BlobFileCacheTest : public testing::Test {
 protected:
-  BlobFileCacheTest() { mock_env_.reset(MockEnv::Create(Env::Default())); }
+  BlobFileCacheTest() : mock_env_(Env::Default()) {}

-  std::unique_ptr<Env> mock_env_;
+  MockEnv mock_env_;
 };

 TEST_F(BlobFileCacheTest, GetBlobFileReader) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.statistics = CreateDBStatistics();
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
-                            "BlobFileCacheTest_GetBlobFileReader"),
+      test::PerThreadDBPath(&mock_env_, "BlobFileCacheTest_GetBlobFileReader"),
      0);
  options.enable_blob_files = true;

@@ -136,10 +135,10 @@ TEST_F(BlobFileCacheTest, GetBlobFileReader) {

 TEST_F(BlobFileCacheTest, GetBlobFileReader_Race) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.statistics = CreateDBStatistics();
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileCacheTest_GetBlobFileReader_Race"),
      0);
  options.enable_blob_files = true;
@@ -188,10 +187,10 @@ TEST_F(BlobFileCacheTest, GetBlobFileReader_Race) {

 TEST_F(BlobFileCacheTest, GetBlobFileReader_IOError) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.statistics = CreateDBStatistics();
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileCacheTest_GetBlobFileReader_IOError"),
      0);
  options.enable_blob_files = true;
@@ -222,10 +221,10 @@ TEST_F(BlobFileCacheTest, GetBlobFileReader_IOError) {

 TEST_F(BlobFileCacheTest, GetBlobFileReader_CacheFull) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.statistics = CreateDBStatistics();
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileCacheTest_GetBlobFileReader_CacheFull"),
      0);
  options.enable_blob_files = true;
@@ -9,7 +9,6 @@
 #pragma once

 #include "db/error_handler.h"
-#include "db/event_helpers.h"
 #include "file/sst_file_manager_impl.h"
 #include "rocksdb/status.h"

@@ -17,51 +16,23 @@ namespace ROCKSDB_NAMESPACE {

 class BlobFileCompletionCallback {
 public:
-  BlobFileCompletionCallback(
-      SstFileManager* sst_file_manager, InstrumentedMutex* mutex,
-      ErrorHandler* error_handler, EventLogger* event_logger,
-      const std::vector<std::shared_ptr<EventListener>>& listeners,
-      const std::string& dbname)
-      : event_logger_(event_logger), listeners_(listeners), dbname_(dbname) {
-#ifndef ROCKSDB_LITE
-    sst_file_manager_ = sst_file_manager;
-    mutex_ = mutex;
-    error_handler_ = error_handler;
-#else
-    (void)sst_file_manager;
-    (void)mutex;
-    (void)error_handler;
-#endif  // ROCKSDB_LITE
+#ifdef ROCKSDB_LITE
+  BlobFileCompletionCallback(SstFileManager* /*sst_file_manager*/,
+                             InstrumentedMutex* /*mutex*/,
+                             ErrorHandler* /*error_handler*/) {}
+  Status OnBlobFileCompleted(const std::string& /*file_name*/) {
+    return Status::OK();
  }
-
-  void OnBlobFileCreationStarted(const std::string& file_name,
-                                 const std::string& column_family_name,
-                                 int job_id,
-                                 BlobFileCreationReason creation_reason) {
-#ifndef ROCKSDB_LITE
-    // Notify the listeners.
-    EventHelpers::NotifyBlobFileCreationStarted(listeners_, dbname_,
-                                                column_family_name, file_name,
-                                                job_id, creation_reason);
 #else
-    (void)file_name;
-    (void)column_family_name;
-    (void)job_id;
-    (void)creation_reason;
-#endif
-  }
+  BlobFileCompletionCallback(SstFileManager* sst_file_manager,
+                             InstrumentedMutex* mutex,
+                             ErrorHandler* error_handler)
+      : sst_file_manager_(sst_file_manager),
+        mutex_(mutex),
+        error_handler_(error_handler) {}

-  Status OnBlobFileCompleted(const std::string& file_name,
-                             const std::string& column_family_name, int job_id,
-                             uint64_t file_number,
-                             BlobFileCreationReason creation_reason,
-                             const Status& report_status,
-                             const std::string& checksum_value,
-                             const std::string& checksum_method,
-                             uint64_t blob_count, uint64_t blob_bytes) {
+  Status OnBlobFileCompleted(const std::string& file_name) {
    Status s;
-
-#ifndef ROCKSDB_LITE
    auto sfm = static_cast<SstFileManagerImpl*>(sst_file_manager_);
    if (sfm) {
      // Report new blob files to SstFileManagerImpl
@@ -74,28 +45,13 @@ class BlobFileCompletionCallback {
        error_handler_->SetBGError(s, BackgroundErrorReason::kFlush);
      }
    }
-#endif  // !ROCKSDB_LITE
-
-    // Notify the listeners.
-    EventHelpers::LogAndNotifyBlobFileCreationFinished(
-        event_logger_, listeners_, dbname_, column_family_name, file_name,
-        job_id, file_number, creation_reason,
-        (!report_status.ok() ? report_status : s),
-        (checksum_value.empty() ? kUnknownFileChecksum : checksum_value),
-        (checksum_method.empty() ? kUnknownFileChecksumFuncName
-                                 : checksum_method),
-        blob_count, blob_bytes);
    return s;
  }

 private:
-#ifndef ROCKSDB_LITE
  SstFileManager* sst_file_manager_;
  InstrumentedMutex* mutex_;
  ErrorHandler* error_handler_;
 #endif  // ROCKSDB_LITE
-  EventLogger* event_logger_;
-  std::vector<std::shared_ptr<EventListener>> listeners_;
-  std::string dbname_;
 };
 }  // namespace ROCKSDB_NAMESPACE
@@ -9,9 +9,7 @@
 #include <string>

 #include "db/blob/blob_log_format.h"
-#include "file/file_prefetch_buffer.h"
 #include "file/filename.h"
-#include "monitoring/statistics.h"
 #include "options/cf_options.h"
 #include "rocksdb/file_system.h"
 #include "rocksdb/slice.h"
@@ -19,7 +17,6 @@
 #include "test_util/sync_point.h"
 #include "util/compression.h"
 #include "util/crc32c.h"
-#include "util/stop_watch.h"

 namespace ROCKSDB_NAMESPACE {

@@ -45,28 +42,25 @@ Status BlobFileReader::Create(

  assert(file_reader);

-  Statistics* const statistics = immutable_options.stats;
-
  CompressionType compression_type = kNoCompression;

  {
-    const Status s = ReadHeader(file_reader.get(), column_family_id, statistics,
-                                &compression_type);
+    const Status s =
+        ReadHeader(file_reader.get(), column_family_id, &compression_type);
    if (!s.ok()) {
      return s;
    }
  }

  {
-    const Status s = ReadFooter(file_reader.get(), file_size, statistics);
+    const Status s = ReadFooter(file_size, file_reader.get());
    if (!s.ok()) {
      return s;
    }
  }

  blob_file_reader->reset(
-      new BlobFileReader(std::move(file_reader), file_size, compression_type,
-                         immutable_options.clock, statistics));
+      new BlobFileReader(std::move(file_reader), file_size, compression_type));

  return Status::OK();
 }
@@ -133,7 +127,6 @@ Status BlobFileReader::OpenFile(

 Status BlobFileReader::ReadHeader(const RandomAccessFileReader* file_reader,
                                  uint32_t column_family_id,
-                                  Statistics* statistics,
                                  CompressionType* compression_type) {
  assert(file_reader);
  assert(compression_type);
@@ -148,9 +141,8 @@ Status BlobFileReader::ReadHeader(const RandomAccessFileReader* file_reader,
    constexpr uint64_t read_offset = 0;
    constexpr size_t read_size = BlobLogHeader::kSize;

-    const Status s =
-        ReadFromFile(file_reader, read_offset, read_size, statistics,
-                     &header_slice, &buf, &aligned_buf);
+    const Status s = ReadFromFile(file_reader, read_offset, read_size,
+                                  &header_slice, &buf, &aligned_buf);
    if (!s.ok()) {
      return s;
    }
@@ -183,8 +175,8 @@ Status BlobFileReader::ReadHeader(const RandomAccessFileReader* file_reader,
  return Status::OK();
 }

-Status BlobFileReader::ReadFooter(const RandomAccessFileReader* file_reader,
-                                  uint64_t file_size, Statistics* statistics) {
+Status BlobFileReader::ReadFooter(uint64_t file_size,
+                                  const RandomAccessFileReader* file_reader) {
  assert(file_size >= BlobLogHeader::kSize + BlobLogFooter::kSize);
  assert(file_reader);

@@ -198,9 +190,8 @@ Status BlobFileReader::ReadFooter(const RandomAccessFileReader* file_reader,
    const uint64_t read_offset = file_size - BlobLogFooter::kSize;
    constexpr size_t read_size = BlobLogFooter::kSize;

-    const Status s =
-        ReadFromFile(file_reader, read_offset, read_size, statistics,
-                     &footer_slice, &buf, &aligned_buf);
+    const Status s = ReadFromFile(file_reader, read_offset, read_size,
+                                  &footer_slice, &buf, &aligned_buf);
    if (!s.ok()) {
      return s;
    }
@@ -229,16 +220,14 @@ 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) {
+                                    Slice* slice, Buffer* buf,
+                                    AlignedBuf* aligned_buf) {
  assert(slice);
  assert(buf);
  assert(aligned_buf);

  assert(file_reader);

-  RecordTick(statistics, BLOB_DB_BLOB_FILE_BYTES_READ, read_size);
-
  Status s;

  if (file_reader->use_direct_io()) {
@@ -267,13 +256,10 @@ Status BlobFileReader::ReadFromFile(const RandomAccessFileReader* file_reader,

 BlobFileReader::BlobFileReader(
    std::unique_ptr<RandomAccessFileReader>&& file_reader, uint64_t file_size,
-    CompressionType compression_type, SystemClock* clock,
-    Statistics* statistics)
+    CompressionType compression_type)
    : file_reader_(std::move(file_reader)),
      file_size_(file_size),
-      compression_type_(compression_type),
-      clock_(clock),
-      statistics_(statistics) {
+      compression_type_(compression_type) {
  assert(file_reader_);
 }

@@ -283,7 +269,6 @@ Status BlobFileReader::GetBlob(const ReadOptions& read_options,
                               const Slice& user_key, uint64_t offset,
                               uint64_t value_size,
                               CompressionType compression_type,
-                               FilePrefetchBuffer* prefetch_buffer,
                               PinnableSlice* value,
                               uint64_t* bytes_read) const {
  assert(value);
@@ -315,33 +300,19 @@ Status BlobFileReader::GetBlob(const ReadOptions& read_options,
  Buffer buf;
  AlignedBuf aligned_buf;

-  bool prefetched = false;
-
-  if (prefetch_buffer) {
-    Status s;
-    constexpr bool for_compaction = true;
-
-    prefetched = prefetch_buffer->TryReadFromCache(
-        IOOptions(), file_reader_.get(), record_offset,
-        static_cast<size_t>(record_size), &record_slice, &s, for_compaction);
-    if (!s.ok()) {
-      return s;
-    }
-  }
-
-  if (!prefetched) {
+  {
    TEST_SYNC_POINT("BlobFileReader::GetBlob:ReadFromFile");

    const Status s = ReadFromFile(file_reader_.get(), record_offset,
-                                  static_cast<size_t>(record_size), statistics_,
+                                  static_cast<size_t>(record_size),
                                  &record_slice, &buf, &aligned_buf);
    if (!s.ok()) {
      return s;
    }
-  }

-  TEST_SYNC_POINT_CALLBACK("BlobFileReader::GetBlob:TamperWithResult",
-                           &record_slice);
+    TEST_SYNC_POINT_CALLBACK("BlobFileReader::GetBlob:TamperWithResult",
+                             &record_slice);
+  }

  if (read_options.verify_checksums) {
    const Status s = VerifyBlob(record_slice, user_key, value_size);
@@ -353,8 +324,8 @@ Status BlobFileReader::GetBlob(const ReadOptions& read_options,
  const Slice value_slice(record_slice.data() + adjustment, value_size);

  {
-    const Status s = UncompressBlobIfNeeded(value_slice, compression_type,
-                                            clock_, statistics_, value);
+    const Status s =
+        UncompressBlobIfNeeded(value_slice, compression_type, value);
    if (!s.ok()) {
      return s;
    }
@@ -367,124 +338,6 @@ Status BlobFileReader::GetBlob(const ReadOptions& read_options,
  return Status::OK();
 }

-void BlobFileReader::MultiGetBlob(
-    const ReadOptions& read_options,
-    const autovector<std::reference_wrapper<const Slice>>& user_keys,
-    const autovector<uint64_t>& offsets,
-    const autovector<uint64_t>& value_sizes, autovector<Status*>& statuses,
-    autovector<PinnableSlice*>& values, uint64_t* bytes_read) const {
-  const size_t num_blobs = user_keys.size();
-  assert(num_blobs > 0);
-  assert(num_blobs == offsets.size());
-  assert(num_blobs == value_sizes.size());
-  assert(num_blobs == statuses.size());
-  assert(num_blobs == values.size());
-
-#ifndef NDEBUG
-  for (size_t i = 0; i < offsets.size() - 1; ++i) {
-    assert(offsets[i] <= offsets[i + 1]);
-  }
-#endif  // !NDEBUG
-
-  std::vector<FSReadRequest> read_reqs(num_blobs);
-  autovector<uint64_t> adjustments;
-  uint64_t total_len = 0;
-  for (size_t i = 0; i < num_blobs; ++i) {
-    const size_t key_size = user_keys[i].get().size();
-    assert(IsValidBlobOffset(offsets[i], key_size, value_sizes[i], file_size_));
-    const uint64_t adjustment =
-        read_options.verify_checksums
-            ? BlobLogRecord::CalculateAdjustmentForRecordHeader(key_size)
-            : 0;
-    assert(offsets[i] >= adjustment);
-    adjustments.push_back(adjustment);
-    read_reqs[i].offset = offsets[i] - adjustment;
-    read_reqs[i].len = value_sizes[i] + adjustment;
-    total_len += read_reqs[i].len;
-  }
-
-  RecordTick(statistics_, BLOB_DB_BLOB_FILE_BYTES_READ, total_len);
-
-  Buffer buf;
-  AlignedBuf aligned_buf;
-
-  Status s;
-  bool direct_io = file_reader_->use_direct_io();
-  if (direct_io) {
-    for (size_t i = 0; i < read_reqs.size(); ++i) {
-      read_reqs[i].scratch = nullptr;
-    }
-  } else {
-    buf.reset(new char[total_len]);
-    std::ptrdiff_t pos = 0;
-    for (size_t i = 0; i < read_reqs.size(); ++i) {
-      read_reqs[i].scratch = buf.get() + pos;
-      pos += read_reqs[i].len;
-    }
-  }
-  TEST_SYNC_POINT("BlobFileReader::MultiGetBlob:ReadFromFile");
-  s = file_reader_->MultiRead(IOOptions(), read_reqs.data(), read_reqs.size(),
-                              direct_io ? &aligned_buf : nullptr);
-  if (!s.ok()) {
-    for (auto& req : read_reqs) {
-      req.status.PermitUncheckedError();
-    }
-    for (size_t i = 0; i < num_blobs; ++i) {
-      assert(statuses[i]);
-      *statuses[i] = s;
-    }
-    return;
-  }
-
-  assert(s.ok());
-  for (size_t i = 0; i < num_blobs; ++i) {
-    auto& req = read_reqs[i];
-    assert(statuses[i]);
-    if (req.status.ok() && req.result.size() != req.len) {
-      req.status = IOStatus::Corruption("Failed to read data from blob file");
-    }
-    *statuses[i] = req.status;
-  }
-
-  if (read_options.verify_checksums) {
-    for (size_t i = 0; i < num_blobs; ++i) {
-      assert(statuses[i]);
-      if (!statuses[i]->ok()) {
-        continue;
-      }
-      const Slice& record_slice = read_reqs[i].result;
-      s = VerifyBlob(record_slice, user_keys[i], value_sizes[i]);
-      if (!s.ok()) {
-        assert(statuses[i]);
-        *statuses[i] = s;
-      }
-    }
-  }
-
-  for (size_t i = 0; i < num_blobs; ++i) {
-    assert(statuses[i]);
-    if (!statuses[i]->ok()) {
-      continue;
-    }
-    const Slice& record_slice = read_reqs[i].result;
-    const Slice value_slice(record_slice.data() + adjustments[i],
-                            value_sizes[i]);
-    s = UncompressBlobIfNeeded(value_slice, compression_type_, clock_,
-                               statistics_, values[i]);
-    if (!s.ok()) {
-      *statuses[i] = s;
-    }
-  }
-
-  if (bytes_read) {
-    uint64_t total_bytes = 0;
-    for (const auto& req : read_reqs) {
-      total_bytes += req.result.size();
-    }
-    *bytes_read = total_bytes;
-  }
-}
-
 Status BlobFileReader::VerifyBlob(const Slice& record_slice,
                                  const Slice& user_key, uint64_t value_size) {
  BlobLogRecord record;
@@ -529,8 +382,6 @@ Status BlobFileReader::VerifyBlob(const Slice& record_slice,

 Status BlobFileReader::UncompressBlobIfNeeded(const Slice& value_slice,
                                              CompressionType compression_type,
-                                              SystemClock* clock,
-                                              Statistics* statistics,
                                              PinnableSlice* value) {
  assert(value);

@@ -548,14 +399,9 @@ Status BlobFileReader::UncompressBlobIfNeeded(const Slice& value_slice,
  constexpr uint32_t compression_format_version = 2;
  constexpr MemoryAllocator* allocator = nullptr;

-  CacheAllocationPtr output;
-
-  {
-    StopWatch stop_watch(clock, statistics, BLOB_DB_DECOMPRESSION_MICROS);
-    output = UncompressData(info, value_slice.data(), value_slice.size(),
-                            &uncompressed_size, compression_format_version,
-                            allocator);
-  }
+  CacheAllocationPtr output =
+      UncompressData(info, value_slice.data(), value_slice.size(),
+                     &uncompressed_size, compression_format_version, allocator);

  TEST_SYNC_POINT_CALLBACK(
      "BlobFileReader::UncompressBlobIfNeeded:TamperWithResult", &output);
@@ -11,7 +11,6 @@
 #include "file/random_access_file_reader.h"
 #include "rocksdb/compression_type.h"
 #include "rocksdb/rocksdb_namespace.h"
-#include "util/autovector.h"

 namespace ROCKSDB_NAMESPACE {

@@ -21,9 +20,7 @@ struct FileOptions;
 class HistogramImpl;
 struct ReadOptions;
 class Slice;
-class FilePrefetchBuffer;
 class PinnableSlice;
-class Statistics;

 class BlobFileReader {
 public:
@@ -42,26 +39,12 @@ class BlobFileReader {

  Status GetBlob(const ReadOptions& read_options, const Slice& user_key,
                 uint64_t offset, uint64_t value_size,
-                 CompressionType compression_type,
-                 FilePrefetchBuffer* prefetch_buffer, PinnableSlice* value,
+                 CompressionType compression_type, PinnableSlice* value,
                 uint64_t* bytes_read) const;

-  // offsets must be sorted in ascending order by caller.
-  void MultiGetBlob(
-      const ReadOptions& read_options,
-      const autovector<std::reference_wrapper<const Slice>>& user_keys,
-      const autovector<uint64_t>& offsets,
-      const autovector<uint64_t>& value_sizes, autovector<Status*>& statuses,
-      autovector<PinnableSlice*>& values, uint64_t* bytes_read) const;
-
-  CompressionType GetCompressionType() const { return compression_type_; }
-
-  uint64_t GetFileSize() const { return file_size_; }
-
 private:
  BlobFileReader(std::unique_ptr<RandomAccessFileReader>&& file_reader,
-                 uint64_t file_size, CompressionType compression_type,
-                 SystemClock* clock, Statistics* statistics);
+                 uint64_t file_size, CompressionType compression_type);

  static Status OpenFile(const ImmutableOptions& immutable_options,
                         const FileOptions& file_opts,
@@ -72,17 +55,17 @@ class BlobFileReader {
                         std::unique_ptr<RandomAccessFileReader>* file_reader);

  static Status ReadHeader(const RandomAccessFileReader* file_reader,
-                           uint32_t column_family_id, Statistics* statistics,
+                           uint32_t column_family_id,
                           CompressionType* compression_type);

-  static Status ReadFooter(const RandomAccessFileReader* file_reader,
-                           uint64_t file_size, Statistics* statistics);
+  static Status ReadFooter(uint64_t file_size,
+                           const RandomAccessFileReader* file_reader);

  using Buffer = std::unique_ptr<char[]>;

  static Status ReadFromFile(const RandomAccessFileReader* file_reader,
                             uint64_t read_offset, size_t read_size,
-                             Statistics* statistics, Slice* slice, Buffer* buf,
+                             Slice* slice, Buffer* buf,
                             AlignedBuf* aligned_buf);

  static Status VerifyBlob(const Slice& record_slice, const Slice& user_key,
@@ -90,8 +73,6 @@ class BlobFileReader {

  static Status UncompressBlobIfNeeded(const Slice& value_slice,
                                       CompressionType compression_type,
-                                       SystemClock* clock,
-                                       Statistics* statistics,
                                       PinnableSlice* value);

  static void SaveValue(const Slice& src, PinnableSlice* dst);
@@ -99,8 +80,6 @@ class BlobFileReader {
  std::unique_ptr<RandomAccessFileReader> file_reader_;
  uint64_t file_size_;
  CompressionType compression_type_;
-  SystemClock* clock_;
-  Statistics* statistics_;
 };

 }  // namespace ROCKSDB_NAMESPACE
@@ -27,23 +27,23 @@ namespace ROCKSDB_NAMESPACE {

 namespace {

-// Creates a test blob file with `num` blobs in it.
+// Creates a test blob file with a single blob in it. Note: this method
+// makes it possible to test various corner cases by allowing the caller
+// to specify the contents of various blob file header/footer fields.
 void WriteBlobFile(const ImmutableOptions& immutable_options,
                   uint32_t column_family_id, bool has_ttl,
                   const ExpirationRange& expiration_range_header,
                   const ExpirationRange& expiration_range_footer,
-                   uint64_t blob_file_number, const std::vector<Slice>& keys,
-                   const std::vector<Slice>& blobs, CompressionType compression,
-                   std::vector<uint64_t>& blob_offsets,
-                   std::vector<uint64_t>& blob_sizes) {
+                   uint64_t blob_file_number, const Slice& key,
+                   const Slice& blob, CompressionType compression_type,
+                   uint64_t* blob_offset, uint64_t* blob_size) {
  assert(!immutable_options.cf_paths.empty());
-  size_t num = keys.size();
-  assert(num == blobs.size());
-  assert(num == blob_offsets.size());
-  assert(num == blob_sizes.size());
+  assert(blob_offset);
+  assert(blob_size);

  const std::string blob_file_path =
      BlobFileName(immutable_options.cf_paths.front().path, blob_file_number);
+
  std::unique_ptr<FSWritableFile> file;
  ASSERT_OK(NewWritableFile(immutable_options.fs.get(), blob_file_path, &file,
                            FileOptions()));
@@ -59,90 +59,64 @@ void WriteBlobFile(const ImmutableOptions& immutable_options,
                                statistics, blob_file_number, use_fsync,
                                do_flush);

-  BlobLogHeader header(column_family_id, compression, has_ttl,
+  BlobLogHeader header(column_family_id, compression_type, has_ttl,
                       expiration_range_header);

  ASSERT_OK(blob_log_writer.WriteHeader(header));

-  std::vector<std::string> compressed_blobs(num);
-  std::vector<Slice> blobs_to_write(num);
-  if (kNoCompression == compression) {
-    for (size_t i = 0; i < num; ++i) {
-      blobs_to_write[i] = blobs[i];
-      blob_sizes[i] = blobs[i].size();
-    }
+  std::string compressed_blob;
+  Slice blob_to_write;
+
+  if (compression_type == kNoCompression) {
+    blob_to_write = blob;
+    *blob_size = blob.size();
  } else {
    CompressionOptions opts;
-    CompressionContext context(compression);
+    CompressionContext context(compression_type);
    constexpr uint64_t sample_for_compression = 0;
+
    CompressionInfo info(opts, context, CompressionDict::GetEmptyDict(),
-                         compression, sample_for_compression);
+                         compression_type, sample_for_compression);

    constexpr uint32_t compression_format_version = 2;

-    for (size_t i = 0; i < num; ++i) {
-      ASSERT_TRUE(CompressData(blobs[i], info, compression_format_version,
-                               &compressed_blobs[i]));
-      blobs_to_write[i] = compressed_blobs[i];
-      blob_sizes[i] = compressed_blobs[i].size();
-    }
+    ASSERT_TRUE(
+        CompressData(blob, info, compression_format_version, &compressed_blob));
+
+    blob_to_write = compressed_blob;
+    *blob_size = compressed_blob.size();
  }

-  for (size_t i = 0; i < num; ++i) {
-    uint64_t key_offset = 0;
-    ASSERT_OK(blob_log_writer.AddRecord(keys[i], blobs_to_write[i], &key_offset,
-                                        &blob_offsets[i]));
-  }
+  uint64_t key_offset = 0;
+
+  ASSERT_OK(
+      blob_log_writer.AddRecord(key, blob_to_write, &key_offset, blob_offset));

  BlobLogFooter footer;
-  footer.blob_count = num;
+  footer.blob_count = 1;
  footer.expiration_range = expiration_range_footer;

  std::string checksum_method;
  std::string checksum_value;
+
  ASSERT_OK(
      blob_log_writer.AppendFooter(footer, &checksum_method, &checksum_value));
 }

-// Creates a test blob file with a single blob in it. Note: this method
-// makes it possible to test various corner cases by allowing the caller
-// to specify the contents of various blob file header/footer fields.
-void WriteBlobFile(const ImmutableOptions& immutable_options,
-                   uint32_t column_family_id, bool has_ttl,
-                   const ExpirationRange& expiration_range_header,
-                   const ExpirationRange& expiration_range_footer,
-                   uint64_t blob_file_number, const Slice& key,
-                   const Slice& blob, CompressionType compression,
-                   uint64_t* blob_offset, uint64_t* blob_size) {
-  std::vector<Slice> keys{key};
-  std::vector<Slice> blobs{blob};
-  std::vector<uint64_t> blob_offsets{0};
-  std::vector<uint64_t> blob_sizes{0};
-  WriteBlobFile(immutable_options, column_family_id, has_ttl,
-                expiration_range_header, expiration_range_footer,
-                blob_file_number, keys, blobs, compression, blob_offsets,
-                blob_sizes);
-  if (blob_offset) {
-    *blob_offset = blob_offsets[0];
-  }
-  if (blob_size) {
-    *blob_size = blob_sizes[0];
-  }
-}
-
 }  // anonymous namespace

 class BlobFileReaderTest : public testing::Test {
 protected:
-  BlobFileReaderTest() { mock_env_.reset(MockEnv::Create(Env::Default())); }
-  std::unique_ptr<Env> mock_env_;
+  BlobFileReaderTest() : mock_env_(Env::Default()) {}
+
+  MockEnv mock_env_;
 };

 TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileReaderTest_CreateReaderAndGetBlob"),
      0);
  options.enable_blob_files = true;
@@ -153,19 +127,15 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
  constexpr bool has_ttl = false;
  constexpr ExpirationRange expiration_range;
  constexpr uint64_t blob_file_number = 1;
-  constexpr size_t num_blobs = 3;
-  const std::vector<std::string> key_strs = {"key1", "key2", "key3"};
-  const std::vector<std::string> blob_strs = {"blob1", "blob2", "blob3"};
+  constexpr char key[] = "key";
+  constexpr char blob[] = "blob";

-  const std::vector<Slice> keys = {key_strs[0], key_strs[1], key_strs[2]};
-  const std::vector<Slice> blobs = {blob_strs[0], blob_strs[1], blob_strs[2]};
-
-  std::vector<uint64_t> blob_offsets(keys.size());
-  std::vector<uint64_t> blob_sizes(keys.size());
+  uint64_t blob_offset = 0;
+  uint64_t blob_size = 0;

  WriteBlobFile(immutable_options, column_family_id, has_ttl, expiration_range,
-                expiration_range, blob_file_number, keys, blobs, kNoCompression,
-                blob_offsets, blob_sizes);
+                expiration_range, blob_file_number, key, blob, kNoCompression,
+                &blob_offset, &blob_size);

  constexpr HistogramImpl* blob_file_read_hist = nullptr;

@@ -179,42 +149,14 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
  ReadOptions read_options;
  read_options.verify_checksums = false;

-  constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
-
  {
    PinnableSlice value;
    uint64_t bytes_read = 0;

-    ASSERT_OK(reader->GetBlob(read_options, keys[0], blob_offsets[0],
-                              blob_sizes[0], kNoCompression, prefetch_buffer,
-                              &value, &bytes_read));
-    ASSERT_EQ(value, blobs[0]);
-    ASSERT_EQ(bytes_read, blob_sizes[0]);
-
-    // MultiGetBlob
-    bytes_read = 0;
-    size_t total_size = 0;
-    autovector<std::reference_wrapper<const Slice>> key_refs;
-    for (const auto& key_ref : keys) {
-      key_refs.emplace_back(std::cref(key_ref));
-    }
-    autovector<uint64_t> offsets{blob_offsets[0], blob_offsets[1],
-                                 blob_offsets[2]};
-    autovector<uint64_t> sizes{blob_sizes[0], blob_sizes[1], blob_sizes[2]};
-    std::array<Status, num_blobs> statuses_buf;
-    autovector<Status*> statuses{&statuses_buf[0], &statuses_buf[1],
-                                 &statuses_buf[2]};
-    std::array<PinnableSlice, num_blobs> value_buf;
-    autovector<PinnableSlice*> values{&value_buf[0], &value_buf[1],
-                                      &value_buf[2]};
-    reader->MultiGetBlob(read_options, key_refs, offsets, sizes, statuses,
-                         values, &bytes_read);
-    for (size_t i = 0; i < num_blobs; ++i) {
-      ASSERT_OK(statuses_buf[i]);
-      ASSERT_EQ(value_buf[i], blobs[i]);
-      total_size += blob_sizes[i];
-    }
-    ASSERT_EQ(bytes_read, total_size);
+    ASSERT_OK(reader->GetBlob(read_options, key, blob_offset, blob_size,
+                              kNoCompression, &value, &bytes_read));
+    ASSERT_EQ(value, blob);
+    ASSERT_EQ(bytes_read, blob_size);
  }

  read_options.verify_checksums = true;
@@ -223,15 +165,14 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
    PinnableSlice value;
    uint64_t bytes_read = 0;

-    ASSERT_OK(reader->GetBlob(read_options, keys[1], blob_offsets[1],
-                              blob_sizes[1], kNoCompression, prefetch_buffer,
-                              &value, &bytes_read));
-    ASSERT_EQ(value, blobs[1]);
+    ASSERT_OK(reader->GetBlob(read_options, key, blob_offset, blob_size,
+                              kNoCompression, &value, &bytes_read));
+    ASSERT_EQ(value, blob);

-    const uint64_t key_size = keys[1].size();
+    constexpr uint64_t key_size = sizeof(key) - 1;
    ASSERT_EQ(bytes_read,
              BlobLogRecord::CalculateAdjustmentForRecordHeader(key_size) +
-                  blob_sizes[1]);
+                  blob_size);
  }

  // Invalid offset (too close to start of file)
@@ -240,9 +181,8 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
-                    ->GetBlob(read_options, keys[0], blob_offsets[0] - 1,
-                              blob_sizes[0], kNoCompression, prefetch_buffer,
-                              &value, &bytes_read)
+                    ->GetBlob(read_options, key, blob_offset - 1, blob_size,
+                              kNoCompression, &value, &bytes_read)
                    .IsCorruption());
    ASSERT_EQ(bytes_read, 0);
  }
@@ -253,9 +193,8 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
-                    ->GetBlob(read_options, keys[2], blob_offsets[2] + 1,
-                              blob_sizes[2], kNoCompression, prefetch_buffer,
-                              &value, &bytes_read)
+                    ->GetBlob(read_options, key, blob_offset + 1, blob_size,
+                              kNoCompression, &value, &bytes_read)
                    .IsCorruption());
    ASSERT_EQ(bytes_read, 0);
  }
@@ -266,9 +205,8 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
-                    ->GetBlob(read_options, keys[0], blob_offsets[0],
-                              blob_sizes[0], kZSTD, prefetch_buffer, &value,
-                              &bytes_read)
+                    ->GetBlob(read_options, key, blob_offset, blob_size, kZSTD,
+                              &value, &bytes_read)
                    .IsCorruption());
    ASSERT_EQ(bytes_read, 0);
  }
@@ -281,82 +219,23 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {

    ASSERT_TRUE(reader
                    ->GetBlob(read_options, shorter_key,
-                              blob_offsets[0] -
-                                  (keys[0].size() - sizeof(shorter_key) + 1),
-                              blob_sizes[0], kNoCompression, prefetch_buffer,
-                              &value, &bytes_read)
+                              blob_offset - (sizeof(key) - sizeof(shorter_key)),
+                              blob_size, kNoCompression, &value, &bytes_read)
                    .IsCorruption());
    ASSERT_EQ(bytes_read, 0);
-
-    // MultiGetBlob
-    autovector<std::reference_wrapper<const Slice>> key_refs;
-    for (const auto& key_ref : keys) {
-      key_refs.emplace_back(std::cref(key_ref));
-    }
-    Slice shorter_key_slice(shorter_key, sizeof(shorter_key) - 1);
-    key_refs[1] = std::cref(shorter_key_slice);
-
-    autovector<uint64_t> offsets{
-        blob_offsets[0],
-        blob_offsets[1] - (keys[1].size() - key_refs[1].get().size()),
-        blob_offsets[2]};
-    autovector<uint64_t> sizes{blob_sizes[0], blob_sizes[1], blob_sizes[2]};
-    std::array<Status, num_blobs> statuses_buf;
-    autovector<Status*> statuses{&statuses_buf[0], &statuses_buf[1],
-                                 &statuses_buf[2]};
-    std::array<PinnableSlice, num_blobs> value_buf;
-    autovector<PinnableSlice*> values{&value_buf[0], &value_buf[1],
-                                      &value_buf[2]};
-    reader->MultiGetBlob(read_options, key_refs, offsets, sizes, statuses,
-                         values, &bytes_read);
-    for (size_t i = 0; i < num_blobs; ++i) {
-      if (i == 1) {
-        ASSERT_TRUE(statuses_buf[i].IsCorruption());
-      } else {
-        ASSERT_OK(statuses_buf[i]);
-      }
-    }
  }

  // Incorrect key
  {
-    constexpr char incorrect_key[] = "foo1";
+    constexpr char incorrect_key[] = "foo";
    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
-                    ->GetBlob(read_options, incorrect_key, blob_offsets[0],
-                              blob_sizes[0], kNoCompression, prefetch_buffer,
-                              &value, &bytes_read)
+                    ->GetBlob(read_options, incorrect_key, blob_offset,
+                              blob_size, kNoCompression, &value, &bytes_read)
                    .IsCorruption());
    ASSERT_EQ(bytes_read, 0);
-
-    // MultiGetBlob
-    autovector<std::reference_wrapper<const Slice>> key_refs;
-    for (const auto& key_ref : keys) {
-      key_refs.emplace_back(std::cref(key_ref));
-    }
-    Slice wrong_key_slice(incorrect_key, sizeof(incorrect_key) - 1);
-    key_refs[2] = std::cref(wrong_key_slice);
-
-    autovector<uint64_t> offsets{blob_offsets[0], blob_offsets[1],
-                                 blob_offsets[2]};
-    autovector<uint64_t> sizes{blob_sizes[0], blob_sizes[1], blob_sizes[2]};
-    std::array<Status, num_blobs> statuses_buf;
-    autovector<Status*> statuses{&statuses_buf[0], &statuses_buf[1],
-                                 &statuses_buf[2]};
-    std::array<PinnableSlice, num_blobs> value_buf;
-    autovector<PinnableSlice*> values{&value_buf[0], &value_buf[1],
-                                      &value_buf[2]};
-    reader->MultiGetBlob(read_options, key_refs, offsets, sizes, statuses,
-                         values, &bytes_read);
-    for (size_t i = 0; i < num_blobs; ++i) {
-      if (i == num_blobs - 1) {
-        ASSERT_TRUE(statuses_buf[i].IsCorruption());
-      } else {
-        ASSERT_OK(statuses_buf[i]);
-      }
-    }
  }

  // Incorrect value size
@@ -365,35 +244,10 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
-                    ->GetBlob(read_options, keys[1], blob_offsets[1],
-                              blob_sizes[1] + 1, kNoCompression,
-                              prefetch_buffer, &value, &bytes_read)
+                    ->GetBlob(read_options, key, blob_offset, blob_size + 1,
+                              kNoCompression, &value, &bytes_read)
                    .IsCorruption());
    ASSERT_EQ(bytes_read, 0);
-
-    // MultiGetBlob
-    autovector<std::reference_wrapper<const Slice>> key_refs;
-    for (const auto& key_ref : keys) {
-      key_refs.emplace_back(std::cref(key_ref));
-    }
-    autovector<uint64_t> offsets{blob_offsets[0], blob_offsets[1],
-                                 blob_offsets[2]};
-    autovector<uint64_t> sizes{blob_sizes[0], blob_sizes[1] + 1, blob_sizes[2]};
-    std::array<Status, num_blobs> statuses_buf;
-    autovector<Status*> statuses{&statuses_buf[0], &statuses_buf[1],
-                                 &statuses_buf[2]};
-    std::array<PinnableSlice, num_blobs> value_buf;
-    autovector<PinnableSlice*> values{&value_buf[0], &value_buf[1],
-                                      &value_buf[2]};
-    reader->MultiGetBlob(read_options, key_refs, offsets, sizes, statuses,
-                         values, &bytes_read);
-    for (size_t i = 0; i < num_blobs; ++i) {
-      if (i != 1) {
-        ASSERT_OK(statuses_buf[i]);
-      } else {
-        ASSERT_TRUE(statuses_buf[i].IsCorruption());
-      }
-    }
  }
 }

@@ -402,10 +256,9 @@ TEST_F(BlobFileReaderTest, Malformed) {
  // detect the error when we open it for reading

  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(), "BlobFileReaderTest_Malformed"),
-      0);
+      test::PerThreadDBPath(&mock_env_, "BlobFileReaderTest_Malformed"), 0);
  options.enable_blob_files = true;

  ImmutableOptions immutable_options(options);
@@ -455,9 +308,9 @@ TEST_F(BlobFileReaderTest, Malformed) {

 TEST_F(BlobFileReaderTest, TTL) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(), "BlobFileReaderTest_TTL"), 0);
+      test::PerThreadDBPath(&mock_env_, "BlobFileReaderTest_TTL"), 0);
  options.enable_blob_files = true;

  ImmutableOptions immutable_options(options);
@@ -489,9 +342,9 @@ TEST_F(BlobFileReaderTest, TTL) {

 TEST_F(BlobFileReaderTest, ExpirationRangeInHeader) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileReaderTest_ExpirationRangeInHeader"),
      0);
  options.enable_blob_files = true;
@@ -528,9 +381,9 @@ TEST_F(BlobFileReaderTest, ExpirationRangeInHeader) {

 TEST_F(BlobFileReaderTest, ExpirationRangeInFooter) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileReaderTest_ExpirationRangeInFooter"),
      0);
  options.enable_blob_files = true;
@@ -567,9 +420,9 @@ TEST_F(BlobFileReaderTest, ExpirationRangeInFooter) {

 TEST_F(BlobFileReaderTest, IncorrectColumnFamily) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileReaderTest_IncorrectColumnFamily"),
      0);
  options.enable_blob_files = true;
@@ -605,10 +458,9 @@ TEST_F(BlobFileReaderTest, IncorrectColumnFamily) {

 TEST_F(BlobFileReaderTest, BlobCRCError) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(), "BlobFileReaderTest_BlobCRCError"),
-      0);
+      test::PerThreadDBPath(&mock_env_, "BlobFileReaderTest_BlobCRCError"), 0);
  options.enable_blob_files = true;

  ImmutableOptions immutable_options(options);
@@ -645,14 +497,12 @@ TEST_F(BlobFileReaderTest, BlobCRCError) {

  SyncPoint::GetInstance()->EnableProcessing();

-  constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
  PinnableSlice value;
  uint64_t bytes_read = 0;

  ASSERT_TRUE(reader
                  ->GetBlob(ReadOptions(), key, blob_offset, blob_size,
-                            kNoCompression, prefetch_buffer, &value,
-                            &bytes_read)
+                            kNoCompression, &value, &bytes_read)
                  .IsCorruption());
  ASSERT_EQ(bytes_read, 0);

@@ -666,10 +516,9 @@ TEST_F(BlobFileReaderTest, Compression) {
  }

  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(), "BlobFileReaderTest_Compression"),
-      0);
+      test::PerThreadDBPath(&mock_env_, "BlobFileReaderTest_Compression"), 0);
  options.enable_blob_files = true;

  ImmutableOptions immutable_options(options);
@@ -700,15 +549,12 @@ TEST_F(BlobFileReaderTest, Compression) {
  ReadOptions read_options;
  read_options.verify_checksums = false;

-  constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
-
  {
    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_OK(reader->GetBlob(read_options, key, blob_offset, blob_size,
-                              kSnappyCompression, prefetch_buffer, &value,
-                              &bytes_read));
+                              kSnappyCompression, &value, &bytes_read));
    ASSERT_EQ(value, blob);
    ASSERT_EQ(bytes_read, blob_size);
  }
@@ -720,8 +566,7 @@ TEST_F(BlobFileReaderTest, Compression) {
    uint64_t bytes_read = 0;

    ASSERT_OK(reader->GetBlob(read_options, key, blob_offset, blob_size,
-                              kSnappyCompression, prefetch_buffer, &value,
-                              &bytes_read));
+                              kSnappyCompression, &value, &bytes_read));
    ASSERT_EQ(value, blob);

    constexpr uint64_t key_size = sizeof(key) - 1;
@@ -737,9 +582,9 @@ TEST_F(BlobFileReaderTest, UncompressionError) {
  }

  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileReaderTest_UncompressionError"),
      0);
  options.enable_blob_files = true;
@@ -779,14 +624,12 @@ TEST_F(BlobFileReaderTest, UncompressionError) {

  SyncPoint::GetInstance()->EnableProcessing();

-  constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
  PinnableSlice value;
  uint64_t bytes_read = 0;

  ASSERT_TRUE(reader
                  ->GetBlob(ReadOptions(), key, blob_offset, blob_size,
-                            kSnappyCompression, prefetch_buffer, &value,
-                            &bytes_read)
+                            kSnappyCompression, &value, &bytes_read)
                  .IsCorruption());
  ASSERT_EQ(bytes_read, 0);

@@ -798,13 +641,13 @@ class BlobFileReaderIOErrorTest
    : public testing::Test,
      public testing::WithParamInterface<std::string> {
 protected:
-  BlobFileReaderIOErrorTest() : sync_point_(GetParam()) {
-    mock_env_.reset(MockEnv::Create(Env::Default()));
-    fault_injection_env_.reset(new FaultInjectionTestEnv(mock_env_.get()));
-  }
+  BlobFileReaderIOErrorTest()
+      : mock_env_(Env::Default()),
+        fault_injection_env_(&mock_env_),
+        sync_point_(GetParam()) {}

-  std::unique_ptr<Env> mock_env_;
-  std::unique_ptr<FaultInjectionTestEnv> fault_injection_env_;
+  MockEnv mock_env_;
+  FaultInjectionTestEnv fault_injection_env_;
  std::string sync_point_;
 };

@@ -820,9 +663,9 @@ TEST_P(BlobFileReaderIOErrorTest, IOError) {
  // Simulates an I/O error during the specified step

  Options options;
-  options.env = fault_injection_env_.get();
+  options.env = &fault_injection_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(fault_injection_env_.get(),
+      test::PerThreadDBPath(&fault_injection_env_,
                            "BlobFileReaderIOErrorTest_IOError"),
      0);
  options.enable_blob_files = true;
@@ -844,8 +687,8 @@ TEST_P(BlobFileReaderIOErrorTest, IOError) {
                &blob_offset, &blob_size);

  SyncPoint::GetInstance()->SetCallBack(sync_point_, [this](void* /* arg */) {
-    fault_injection_env_->SetFilesystemActive(false,
-                                              Status::IOError(sync_point_));
+    fault_injection_env_.SetFilesystemActive(false,
+                                             Status::IOError(sync_point_));
  });
  SyncPoint::GetInstance()->EnableProcessing();

@@ -865,14 +708,12 @@ TEST_P(BlobFileReaderIOErrorTest, IOError) {
  } else {
    ASSERT_OK(s);

-    constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
                    ->GetBlob(ReadOptions(), key, blob_offset, blob_size,
-                              kNoCompression, prefetch_buffer, &value,
-                              &bytes_read)
+                              kNoCompression, &value, &bytes_read)
                    .IsIOError());
    ASSERT_EQ(bytes_read, 0);
  }
@@ -885,11 +726,10 @@ class BlobFileReaderDecodingErrorTest
    : public testing::Test,
      public testing::WithParamInterface<std::string> {
 protected:
-  BlobFileReaderDecodingErrorTest() : sync_point_(GetParam()) {
-    mock_env_.reset(MockEnv::Create(Env::Default()));
-  }
+  BlobFileReaderDecodingErrorTest()
+      : mock_env_(Env::Default()), sync_point_(GetParam()) {}

-  std::unique_ptr<Env> mock_env_;
+  MockEnv mock_env_;
  std::string sync_point_;
 };

@@ -901,9 +741,9 @@ INSTANTIATE_TEST_CASE_P(BlobFileReaderTest, BlobFileReaderDecodingErrorTest,

 TEST_P(BlobFileReaderDecodingErrorTest, DecodingError) {
  Options options;
-  options.env = mock_env_.get();
+  options.env = &mock_env_;
  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(mock_env_.get(),
+      test::PerThreadDBPath(&mock_env_,
                            "BlobFileReaderDecodingErrorTest_DecodingError"),
      0);
  options.enable_blob_files = true;
@@ -950,14 +790,12 @@ TEST_P(BlobFileReaderDecodingErrorTest, DecodingError) {
  } else {
    ASSERT_OK(s);

-    constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
                    ->GetBlob(ReadOptions(), key, blob_offset, blob_size,
-                              kNoCompression, prefetch_buffer, &value,
-                              &bytes_read)
+                              kNoCompression, &value, &bytes_read)
                    .IsCorruption());
    ASSERT_EQ(bytes_read, 0);
  }
@@ -52,9 +52,6 @@ class BlobIndex {

  BlobIndex() : type_(Type::kUnknown) {}

-  BlobIndex(const BlobIndex&) = default;
-  BlobIndex& operator=(const BlobIndex&) = default;
-
  bool IsInlined() const { return type_ == Type::kInlinedTTL; }

  bool HasTTL() const {
@@ -10,8 +10,6 @@
 #include "db/blob/blob_log_format.h"
 #include "rocksdb/slice.h"

-#define MAX_HEADER_SIZE(a, b, c) (a > b ? (a > c ? a : c) : (b > c ? b : c))
-
 namespace ROCKSDB_NAMESPACE {

 class RandomAccessFileReader;
@@ -71,13 +69,10 @@ class BlobLogSequentialReader {
  Statistics* statistics_;

  Slice buffer_;
-  char header_buf_[MAX_HEADER_SIZE(BlobLogHeader::kSize, BlobLogFooter::kSize,
-                                   BlobLogRecord::kHeaderSize)];
+  char header_buf_[BlobLogRecord::kHeaderSize];

  // which byte to read next
  uint64_t next_byte_;
 };

 }  // namespace ROCKSDB_NAMESPACE
-
-#undef MAX_HEADER_SIZE
@@ -4,10 +4,8 @@
 //  (found in the LICENSE.Apache file in the root directory).

 #include <array>
-#include <sstream>

 #include "db/blob/blob_index.h"
-#include "db/blob/blob_log_format.h"
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
 #include "test_util/sync_point.h"
@@ -18,7 +16,7 @@ namespace ROCKSDB_NAMESPACE {
 class DBBlobBasicTest : public DBTestBase {
 protected:
  DBBlobBasicTest()
-      : DBTestBase("db_blob_basic_test", /* env_do_fsync */ false) {}
+      : DBTestBase("/db_blob_basic_test", /* env_do_fsync */ false) {}
 };

 TEST_F(DBBlobBasicTest, GetBlob) {
@@ -127,237 +125,6 @@ TEST_F(DBBlobBasicTest, MultiGetBlobs) {
  }
 }

-#ifndef ROCKSDB_LITE
-TEST_F(DBBlobBasicTest, MultiGetWithDirectIO) {
-  Options options = GetDefaultOptions();
-
-  // First, create an external SST file ["b"].
-  const std::string file_path = dbname_ + "/test.sst";
-  {
-    SstFileWriter sst_file_writer(EnvOptions(), GetDefaultOptions());
-    Status s = sst_file_writer.Open(file_path);
-    ASSERT_OK(s);
-    ASSERT_OK(sst_file_writer.Put("b", "b_value"));
-    ASSERT_OK(sst_file_writer.Finish());
-  }
-
-  options.enable_blob_files = true;
-  options.min_blob_size = 1000;
-  options.use_direct_reads = true;
-  options.allow_ingest_behind = true;
-
-  // Open DB with fixed-prefix sst-partitioner so that compaction will cut
-  // new table file when encountering a new key whose 1-byte prefix changes.
-  constexpr size_t key_len = 1;
-  options.sst_partitioner_factory =
-      NewSstPartitionerFixedPrefixFactory(key_len);
-
-  Status s = TryReopen(options);
-  if (s.IsInvalidArgument()) {
-    ROCKSDB_GTEST_SKIP("This test requires direct IO support");
-    return;
-  }
-  ASSERT_OK(s);
-
-  constexpr size_t num_keys = 3;
-  constexpr size_t blob_size = 3000;
-
-  constexpr char first_key[] = "a";
-  const std::string first_blob(blob_size, 'a');
-  ASSERT_OK(Put(first_key, first_blob));
-
-  constexpr char second_key[] = "b";
-  const std::string second_blob(2 * blob_size, 'b');
-  ASSERT_OK(Put(second_key, second_blob));
-
-  constexpr char third_key[] = "d";
-  const std::string third_blob(blob_size, 'd');
-  ASSERT_OK(Put(third_key, third_blob));
-
-  // first_blob, second_blob and third_blob in the same blob file.
-  //      SST                    Blob file
-  // L0  ["a",    "b",    "d"]   |'aaaa', 'bbbb', 'dddd'|
-  //       |       |       |         ^       ^        ^
-  //       |       |       |         |       |        |
-  //       |       |       +---------|-------|--------+
-  //       |       +-----------------|-------+
-  //       +-------------------------+
-  ASSERT_OK(Flush());
-
-  constexpr char fourth_key[] = "c";
-  const std::string fourth_blob(blob_size, 'c');
-  ASSERT_OK(Put(fourth_key, fourth_blob));
-  // fourth_blob in another blob file.
-  //      SST                    Blob file                 SST     Blob file
-  // L0  ["a",    "b",    "d"]   |'aaaa', 'bbbb', 'dddd'|  ["c"]   |'cccc'|
-  //       |       |       |         ^       ^        ^      |       ^
-  //       |       |       |         |       |        |      |       |
-  //       |       |       +---------|-------|--------+      +-------+
-  //       |       +-----------------|-------+
-  //       +-------------------------+
-  ASSERT_OK(Flush());
-
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), /*begin=*/nullptr,
-                              /*end=*/nullptr));
-
-  // Due to the above sst partitioner, we get 4 L1 files. The blob files are
-  // unchanged.
-  //                             |'aaaa', 'bbbb', 'dddd'|  |'cccc'|
-  //                                 ^       ^     ^         ^
-  //                                 |       |     |         |
-  // L0                              |       |     |         |
-  // L1  ["a"]   ["b"]   ["c"]       |       |   ["d"]       |
-  //       |       |       |         |       |               |
-  //       |       |       +---------|-------|---------------+
-  //       |       +-----------------|-------+
-  //       +-------------------------+
-  ASSERT_EQ(4, NumTableFilesAtLevel(/*level=*/1));
-
-  {
-    // Ingest the external SST file into bottommost level.
-    std::vector<std::string> ext_files{file_path};
-    IngestExternalFileOptions opts;
-    opts.ingest_behind = true;
-    ASSERT_OK(
-        db_->IngestExternalFile(db_->DefaultColumnFamily(), ext_files, opts));
-  }
-
-  // Now the database becomes as follows.
-  //                             |'aaaa', 'bbbb', 'dddd'|  |'cccc'|
-  //                                 ^       ^     ^         ^
-  //                                 |       |     |         |
-  // L0                              |       |     |         |
-  // L1  ["a"]   ["b"]   ["c"]       |       |   ["d"]       |
-  //       |       |       |         |       |               |
-  //       |       |       +---------|-------|---------------+
-  //       |       +-----------------|-------+
-  //       +-------------------------+
-  //
-  // L6          ["b"]
-
-  {
-    // Compact ["b"] to bottommost level.
-    Slice begin = Slice(second_key);
-    Slice end = Slice(second_key);
-    CompactRangeOptions cro;
-    cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-    ASSERT_OK(db_->CompactRange(cro, &begin, &end));
-  }
-
-  //                             |'aaaa', 'bbbb', 'dddd'|  |'cccc'|
-  //                                 ^       ^     ^         ^
-  //                                 |       |     |         |
-  // L0                              |       |     |         |
-  // L1  ["a"]           ["c"]       |       |   ["d"]       |
-  //       |               |         |       |               |
-  //       |               +---------|-------|---------------+
-  //       |       +-----------------|-------+
-  //       +-------|-----------------+
-  //               |
-  // L6          ["b"]
-  ASSERT_EQ(3, NumTableFilesAtLevel(/*level=*/1));
-  ASSERT_EQ(1, NumTableFilesAtLevel(/*level=*/6));
-
-  bool called = false;
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-  SyncPoint::GetInstance()->SetCallBack(
-      "RandomAccessFileReader::MultiRead:AlignedReqs", [&](void* arg) {
-        auto* aligned_reqs = static_cast<std::vector<FSReadRequest>*>(arg);
-        assert(aligned_reqs);
-        ASSERT_EQ(1, aligned_reqs->size());
-        called = true;
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  std::array<Slice, num_keys> keys{{first_key, third_key, second_key}};
-
-  {
-    std::array<PinnableSlice, num_keys> values;
-    std::array<Status, num_keys> statuses;
-
-    // The MultiGet(), when constructing the KeyContexts, will process the keys
-    // in such order: a, d, b. The reason is that ["a"] and ["d"] are in L1,
-    // while ["b"] resides in L6.
-    // Consequently, the original FSReadRequest list prepared by
-    // Version::MultiGetblob() will be for "a", "d" and "b". It is unsorted as
-    // follows:
-    //
-    // ["a", offset=30, len=3033],
-    // ["d", offset=9096, len=3033],
-    // ["b", offset=3063, len=6033]
-    //
-    // If we do not sort them before calling MultiRead() in DirectIO, then the
-    // underlying IO merging logic will yield two requests.
-    //
-    // [offset=0, len=4096] (for "a")
-    // [offset=0, len=12288] (result of merging the request for "d" and "b")
-    //
-    // We need to sort them in Version::MultiGetBlob() so that the underlying
-    // IO merging logic in DirectIO mode works as expected. The correct
-    // behavior will be one aligned request:
-    //
-    // [offset=0, len=12288]
-
-    db_->MultiGet(ReadOptions(), db_->DefaultColumnFamily(), num_keys, &keys[0],
-                  &values[0], &statuses[0]);
-
-    SyncPoint::GetInstance()->DisableProcessing();
-    SyncPoint::GetInstance()->ClearAllCallBacks();
-
-    ASSERT_TRUE(called);
-
-    ASSERT_OK(statuses[0]);
-    ASSERT_EQ(values[0], first_blob);
-
-    ASSERT_OK(statuses[1]);
-    ASSERT_EQ(values[1], third_blob);
-
-    ASSERT_OK(statuses[2]);
-    ASSERT_EQ(values[2], second_blob);
-  }
-}
-#endif  // !ROCKSDB_LITE
-
-TEST_F(DBBlobBasicTest, MultiGetBlobsFromMultipleFiles) {
-  Options options = GetDefaultOptions();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-
-  Reopen(options);
-
-  constexpr size_t kNumBlobFiles = 3;
-  constexpr size_t kNumBlobsPerFile = 3;
-  constexpr size_t kNumKeys = kNumBlobsPerFile * kNumBlobFiles;
-
-  std::vector<std::string> key_strs;
-  std::vector<std::string> value_strs;
-  for (size_t i = 0; i < kNumBlobFiles; ++i) {
-    for (size_t j = 0; j < kNumBlobsPerFile; ++j) {
-      std::string key = "key" + std::to_string(i) + "_" + std::to_string(j);
-      std::string value =
-          "value_as_blob" + std::to_string(i) + "_" + std::to_string(j);
-      ASSERT_OK(Put(key, value));
-      key_strs.push_back(key);
-      value_strs.push_back(value);
-    }
-    ASSERT_OK(Flush());
-  }
-  assert(key_strs.size() == kNumKeys);
-  std::array<Slice, kNumKeys> keys;
-  for (size_t i = 0; i < keys.size(); ++i) {
-    keys[i] = key_strs[i];
-  }
-  std::array<PinnableSlice, kNumKeys> values;
-  std::array<Status, kNumKeys> statuses;
-  db_->MultiGet(ReadOptions(), db_->DefaultColumnFamily(), kNumKeys, &keys[0],
-                &values[0], &statuses[0]);
-
-  for (size_t i = 0; i < kNumKeys; ++i) {
-    ASSERT_OK(statuses[i]);
-    ASSERT_EQ(value_strs[i], values[i]);
-  }
-}
-
 TEST_F(DBBlobBasicTest, GetBlob_CorruptIndex) {
  Options options = GetDefaultOptions();
  options.enable_blob_files = true;
@@ -381,83 +148,6 @@ TEST_F(DBBlobBasicTest, GetBlob_CorruptIndex) {
                  .IsCorruption());
 }

-TEST_F(DBBlobBasicTest, MultiGetBlob_CorruptIndex) {
-  Options options = GetDefaultOptions();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-  options.create_if_missing = true;
-
-  DestroyAndReopen(options);
-
-  constexpr size_t kNumOfKeys = 3;
-  std::array<std::string, kNumOfKeys> key_strs;
-  std::array<std::string, kNumOfKeys> value_strs;
-  std::array<Slice, kNumOfKeys + 1> keys;
-  for (size_t i = 0; i < kNumOfKeys; ++i) {
-    key_strs[i] = "foo" + std::to_string(i);
-    value_strs[i] = "blob_value" + std::to_string(i);
-    ASSERT_OK(Put(key_strs[i], value_strs[i]));
-    keys[i] = key_strs[i];
-  }
-
-  constexpr char key[] = "key";
-  {
-    // Fake a corrupt blob index.
-    const std::string blob_index("foobar");
-    WriteBatch batch;
-    ASSERT_OK(WriteBatchInternal::PutBlobIndex(&batch, 0, key, blob_index));
-    ASSERT_OK(db_->Write(WriteOptions(), &batch));
-    keys[kNumOfKeys] = Slice(static_cast<const char*>(key), sizeof(key) - 1);
-  }
-
-  ASSERT_OK(Flush());
-
-  std::array<PinnableSlice, kNumOfKeys + 1> values;
-  std::array<Status, kNumOfKeys + 1> statuses;
-  db_->MultiGet(ReadOptions(), dbfull()->DefaultColumnFamily(), kNumOfKeys + 1,
-                keys.data(), values.data(), statuses.data(),
-                /*sorted_input=*/false);
-  for (size_t i = 0; i < kNumOfKeys + 1; ++i) {
-    if (i != kNumOfKeys) {
-      ASSERT_OK(statuses[i]);
-      ASSERT_EQ("blob_value" + std::to_string(i), values[i]);
-    } else {
-      ASSERT_TRUE(statuses[i].IsCorruption());
-    }
-  }
-}
-
-TEST_F(DBBlobBasicTest, MultiGetBlob_ExceedSoftLimit) {
-  Options options = GetDefaultOptions();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-
-  Reopen(options);
-
-  constexpr size_t kNumOfKeys = 3;
-  std::array<std::string, kNumOfKeys> key_bufs;
-  std::array<std::string, kNumOfKeys> value_bufs;
-  std::array<Slice, kNumOfKeys> keys;
-  for (size_t i = 0; i < kNumOfKeys; ++i) {
-    key_bufs[i] = "foo" + std::to_string(i);
-    value_bufs[i] = "blob_value" + std::to_string(i);
-    ASSERT_OK(Put(key_bufs[i], value_bufs[i]));
-    keys[i] = key_bufs[i];
-  }
-  ASSERT_OK(Flush());
-
-  std::array<PinnableSlice, kNumOfKeys> values;
-  std::array<Status, kNumOfKeys> statuses;
-  ReadOptions read_opts;
-  read_opts.value_size_soft_limit = 1;
-  db_->MultiGet(read_opts, dbfull()->DefaultColumnFamily(), kNumOfKeys,
-                keys.data(), values.data(), statuses.data(),
-                /*sorted_input=*/true);
-  for (const auto& s : statuses) {
-    ASSERT_TRUE(s.IsAborted());
-  }
-}
-
 TEST_F(DBBlobBasicTest, GetBlob_InlinedTTLIndex) {
  constexpr uint64_t min_blob_size = 10;

@@ -677,147 +367,6 @@ TEST_F(DBBlobBasicTest, MultiGetMergeBlobWithPut) {
  ASSERT_EQ(values[2], "v2_0");
 }

-#ifndef ROCKSDB_LITE
-TEST_F(DBBlobBasicTest, Properties) {
-  Options options = GetDefaultOptions();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-
-  Reopen(options);
-
-  constexpr char key1[] = "key1";
-  constexpr size_t key1_size = sizeof(key1) - 1;
-
-  constexpr char key2[] = "key2";
-  constexpr size_t key2_size = sizeof(key2) - 1;
-
-  constexpr char key3[] = "key3";
-  constexpr size_t key3_size = sizeof(key3) - 1;
-
-  constexpr char blob[] = "0000000000";
-  constexpr size_t blob_size = sizeof(blob) - 1;
-
-  ASSERT_OK(Put(key1, 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) + blob_size +
-      BlobLogFooter::kSize;
-
-  ASSERT_OK(Put(key3, blob));
-  ASSERT_OK(Flush());
-
-  constexpr size_t second_blob_file_expected_size =
-      BlobLogHeader::kSize +
-      BlobLogRecord::CalculateAdjustmentForRecordHeader(key3_size) + blob_size +
-      BlobLogFooter::kSize;
-
-  constexpr size_t total_expected_size =
-      first_blob_file_expected_size + second_blob_file_expected_size;
-
-  // Number of blob files
-  uint64_t num_blob_files = 0;
-  ASSERT_TRUE(
-      db_->GetIntProperty(DB::Properties::kNumBlobFiles, &num_blob_files));
-  ASSERT_EQ(num_blob_files, 2);
-
-  // Total size of live blob files
-  uint64_t live_blob_file_size = 0;
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kLiveBlobFileSize,
-                                  &live_blob_file_size));
-  ASSERT_EQ(live_blob_file_size, total_expected_size);
-
-  // Total size of all blob files across all versions
-  // Note: this should be the same as above since we only have one
-  // version at this point.
-  uint64_t total_blob_file_size = 0;
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kTotalBlobFileSize,
-                                  &total_blob_file_size));
-  ASSERT_EQ(total_blob_file_size, total_expected_size);
-
-  // Delete key2 to create some garbage
-  ASSERT_OK(Delete(key2));
-  ASSERT_OK(Flush());
-
-  constexpr Slice* begin = nullptr;
-  constexpr Slice* end = nullptr;
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), begin, end));
-
-  constexpr size_t expected_garbage_size =
-      BlobLogRecord::CalculateAdjustmentForRecordHeader(key2_size) + blob_size;
-
-  // Blob file stats
-  std::string blob_stats;
-  ASSERT_TRUE(db_->GetProperty(DB::Properties::kBlobStats, &blob_stats));
-
-  std::ostringstream oss;
-  oss << "Number of blob files: 2\nTotal size of blob files: "
-      << total_expected_size
-      << "\nTotal size of garbage in blob files: " << expected_garbage_size
-      << '\n';
-
-  ASSERT_EQ(blob_stats, oss.str());
-}
-
-TEST_F(DBBlobBasicTest, PropertiesMultiVersion) {
-  Options options = GetDefaultOptions();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-
-  Reopen(options);
-
-  constexpr char key1[] = "key1";
-  constexpr char key2[] = "key2";
-  constexpr char key3[] = "key3";
-
-  constexpr size_t key_size = sizeof(key1) - 1;
-  static_assert(sizeof(key2) - 1 == key_size, "unexpected size: key2");
-  static_assert(sizeof(key3) - 1 == key_size, "unexpected size: key3");
-
-  constexpr char blob[] = "0000000000";
-  constexpr size_t blob_size = sizeof(blob) - 1;
-
-  ASSERT_OK(Put(key1, blob));
-  ASSERT_OK(Flush());
-
-  ASSERT_OK(Put(key2, blob));
-  ASSERT_OK(Flush());
-
-  // Create an iterator to keep the current version alive
-  std::unique_ptr<Iterator> iter(db_->NewIterator(ReadOptions()));
-  ASSERT_OK(iter->status());
-
-  // Note: the Delete and subsequent compaction results in the first blob file
-  // not making it to the final version. (It is still part of the previous
-  // version kept alive by the iterator though.) On the other hand, the Put
-  // results in a third blob file.
-  ASSERT_OK(Delete(key1));
-  ASSERT_OK(Put(key3, blob));
-  ASSERT_OK(Flush());
-
-  constexpr Slice* begin = nullptr;
-  constexpr Slice* end = nullptr;
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), begin, end));
-
-  // Total size of all blob files across all versions: between the two versions,
-  // we should have three blob files of the same size with one blob each.
-  // The version kept alive by the iterator contains the first and the second
-  // blob file, while the final version contains the second and the third blob
-  // file. (The second blob file is thus shared by the two versions but should
-  // be counted only once.)
-  uint64_t total_blob_file_size = 0;
-  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kTotalBlobFileSize,
-                                  &total_blob_file_size));
-  ASSERT_EQ(total_blob_file_size,
-            3 * (BlobLogHeader::kSize +
-                 BlobLogRecord::CalculateAdjustmentForRecordHeader(key_size) +
-                 blob_size + BlobLogFooter::kSize));
-}
-#endif  // !ROCKSDB_LITE
-
 class DBBlobBasicIOErrorTest : public DBBlobBasicTest,
                               public testing::WithParamInterface<std::string> {
 protected:
@@ -830,21 +379,11 @@ class DBBlobBasicIOErrorTest : public DBBlobBasicTest,
  std::string sync_point_;
 };

-class DBBlobBasicIOErrorMultiGetTest : public DBBlobBasicIOErrorTest {
- public:
-  DBBlobBasicIOErrorMultiGetTest() : DBBlobBasicIOErrorTest() {}
-};
-
 INSTANTIATE_TEST_CASE_P(DBBlobBasicTest, DBBlobBasicIOErrorTest,
                        ::testing::ValuesIn(std::vector<std::string>{
                            "BlobFileReader::OpenFile:NewRandomAccessFile",
                            "BlobFileReader::GetBlob:ReadFromFile"}));

-INSTANTIATE_TEST_CASE_P(DBBlobBasicTest, DBBlobBasicIOErrorMultiGetTest,
-                        ::testing::ValuesIn(std::vector<std::string>{
-                            "BlobFileReader::OpenFile:NewRandomAccessFile",
-                            "BlobFileReader::MultiGetBlob:ReadFromFile"}));
-
 TEST_P(DBBlobBasicIOErrorTest, GetBlob_IOError) {
  Options options;
  options.env = fault_injection_env_.get();
@@ -874,7 +413,7 @@ TEST_P(DBBlobBasicIOErrorTest, GetBlob_IOError) {
  SyncPoint::GetInstance()->ClearAllCallBacks();
 }

-TEST_P(DBBlobBasicIOErrorMultiGetTest, MultiGetBlobs_IOError) {
+TEST_P(DBBlobBasicIOErrorTest, MultiGetBlobs_IOError) {
  Options options = GetDefaultOptions();
  options.env = fault_injection_env_.get();
  options.enable_blob_files = true;
@@ -916,53 +455,6 @@ TEST_P(DBBlobBasicIOErrorMultiGetTest, MultiGetBlobs_IOError) {
  ASSERT_TRUE(statuses[1].IsIOError());
 }

-TEST_P(DBBlobBasicIOErrorMultiGetTest, MultipleBlobFiles) {
-  Options options = GetDefaultOptions();
-  options.env = fault_injection_env_.get();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-
-  Reopen(options);
-
-  constexpr size_t num_keys = 2;
-
-  constexpr char key1[] = "key1";
-  constexpr char value1[] = "blob1";
-
-  ASSERT_OK(Put(key1, value1));
-  ASSERT_OK(Flush());
-
-  constexpr char key2[] = "key2";
-  constexpr char value2[] = "blob2";
-
-  ASSERT_OK(Put(key2, value2));
-  ASSERT_OK(Flush());
-
-  std::array<Slice, num_keys> keys{{key1, key2}};
-  std::array<PinnableSlice, num_keys> values;
-  std::array<Status, num_keys> statuses;
-
-  bool first_blob_file = true;
-  SyncPoint::GetInstance()->SetCallBack(
-      sync_point_, [&first_blob_file, this](void* /* arg */) {
-        if (first_blob_file) {
-          first_blob_file = false;
-          return;
-        }
-        fault_injection_env_->SetFilesystemActive(false,
-                                                  Status::IOError(sync_point_));
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  db_->MultiGet(ReadOptions(), db_->DefaultColumnFamily(), num_keys,
-                keys.data(), values.data(), statuses.data());
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-  ASSERT_OK(statuses[0]);
-  ASSERT_EQ(value1, values[0]);
-  ASSERT_TRUE(statuses[1].IsIOError());
-}
-
 namespace {

 class ReadBlobCompactionFilter : public CompactionFilter {
@@ -1021,6 +513,5 @@ TEST_P(DBBlobBasicIOErrorTest, CompactionFilterReadBlob_IOError) {
 int main(int argc, char** argv) {
  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
-  RegisterCustomObjects(argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -8,17 +8,18 @@
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
 #include "test_util/sync_point.h"
+#include "utilities/fault_injection_env.h"

 namespace ROCKSDB_NAMESPACE {

 class DBBlobCompactionTest : public DBTestBase {
 public:
  explicit DBBlobCompactionTest()
-      : DBTestBase("db_blob_compaction_test", /*env_do_fsync=*/false) {}
+      : DBTestBase("/db_blob_compaction_test", /*env_do_fsync=*/false) {}

 #ifndef ROCKSDB_LITE
  const std::vector<InternalStats::CompactionStats>& GetCompactionStats() {
-    VersionSet* const versions = dbfull()->GetVersionSet();
+    VersionSet* const versions = dbfull()->TEST_GetVersionSet();
    assert(versions);
    assert(versions->GetColumnFamilySet());

@@ -495,7 +496,7 @@ TEST_F(DBBlobCompactionTest, TrackGarbage) {

  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), begin, end));

-  VersionSet* const versions = dbfull()->GetVersionSet();
+  VersionSet* const versions = dbfull()->TEST_GetVersionSet();
  assert(versions);
  assert(versions->GetColumnFamilySet());

@@ -590,129 +591,10 @@ TEST_F(DBBlobCompactionTest, MergeBlobWithBase) {
  Close();
 }

-TEST_F(DBBlobCompactionTest, CompactionReadaheadGarbageCollection) {
-  Options options = GetDefaultOptions();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-  options.enable_blob_garbage_collection = true;
-  options.blob_garbage_collection_age_cutoff = 1.0;
-  options.blob_compaction_readahead_size = 1 << 10;
-  options.disable_auto_compactions = true;
-
-  Reopen(options);
-
-  ASSERT_OK(Put("key", "lime"));
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Flush());
-
-  ASSERT_OK(Put("key", "pie"));
-  ASSERT_OK(Put("foo", "baz"));
-  ASSERT_OK(Flush());
-
-  size_t num_non_prefetch_reads = 0;
-  SyncPoint::GetInstance()->SetCallBack(
-      "BlobFileReader::GetBlob:ReadFromFile",
-      [&num_non_prefetch_reads](void* /* arg */) { ++num_non_prefetch_reads; });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  constexpr Slice* begin = nullptr;
-  constexpr Slice* end = nullptr;
-
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), begin, end));
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  ASSERT_EQ(Get("key"), "pie");
-  ASSERT_EQ(Get("foo"), "baz");
-  ASSERT_EQ(num_non_prefetch_reads, 0);
-
-  Close();
-}
-
-TEST_F(DBBlobCompactionTest, CompactionReadaheadFilter) {
-  Options options = GetDefaultOptions();
-
-  std::unique_ptr<CompactionFilter> compaction_filter_guard(
-      new ValueMutationFilter("pie"));
-
-  options.compaction_filter = compaction_filter_guard.get();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-  options.blob_compaction_readahead_size = 1 << 10;
-  options.disable_auto_compactions = true;
-
-  Reopen(options);
-
-  ASSERT_OK(Put("key", "lime"));
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Flush());
-
-  size_t num_non_prefetch_reads = 0;
-  SyncPoint::GetInstance()->SetCallBack(
-      "BlobFileReader::GetBlob:ReadFromFile",
-      [&num_non_prefetch_reads](void* /* arg */) { ++num_non_prefetch_reads; });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  constexpr Slice* begin = nullptr;
-  constexpr Slice* end = nullptr;
-
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), begin, end));
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  ASSERT_EQ(Get("key"), "limepie");
-  ASSERT_EQ(Get("foo"), "barpie");
-  ASSERT_EQ(num_non_prefetch_reads, 0);
-
-  Close();
-}
-
-TEST_F(DBBlobCompactionTest, CompactionReadaheadMerge) {
-  Options options = GetDefaultOptions();
-  options.enable_blob_files = true;
-  options.min_blob_size = 0;
-  options.blob_compaction_readahead_size = 1 << 10;
-  options.merge_operator = MergeOperators::CreateStringAppendOperator();
-  options.disable_auto_compactions = true;
-
-  Reopen(options);
-
-  ASSERT_OK(Put("key", "lime"));
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Flush());
-
-  ASSERT_OK(Merge("key", "pie"));
-  ASSERT_OK(Merge("foo", "baz"));
-  ASSERT_OK(Flush());
-
-  size_t num_non_prefetch_reads = 0;
-  SyncPoint::GetInstance()->SetCallBack(
-      "BlobFileReader::GetBlob:ReadFromFile",
-      [&num_non_prefetch_reads](void* /* arg */) { ++num_non_prefetch_reads; });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  constexpr Slice* begin = nullptr;
-  constexpr Slice* end = nullptr;
-
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), begin, end));
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  ASSERT_EQ(Get("key"), "lime,pie");
-  ASSERT_EQ(Get("foo"), "bar,baz");
-  ASSERT_EQ(num_non_prefetch_reads, 0);
-
-  Close();
-}
-
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
-  RegisterCustomObjects(argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -12,7 +12,7 @@ namespace ROCKSDB_NAMESPACE {
 class DBBlobCorruptionTest : public DBTestBase {
 protected:
  DBBlobCorruptionTest()
-      : DBTestBase("db_blob_corruption_test", /* env_do_fsync */ false) {}
+      : DBTestBase("/db_blob_corruption_test", /* env_do_fsync */ false) {}

  void Corrupt(FileType filetype, int offset, int bytes_to_corrupt) {
    // Pick file to corrupt
@@ -77,6 +77,5 @@ TEST_F(DBBlobCorruptionTest, VerifyWholeBlobFileChecksum) {
 int main(int argc, char** argv) {
  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
-  RegisterCustomObjects(argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -41,7 +41,8 @@ class DBBlobIndexTest : public DBTestBase {
                                       Tier::kImmutableMemtables,
                                       Tier::kL0SstFile, Tier::kLnSstFile};

-  DBBlobIndexTest() : DBTestBase("db_blob_index_test", /*env_do_fsync=*/true) {}
+  DBBlobIndexTest()
+      : DBTestBase("/db_blob_index_test", /*env_do_fsync=*/true) {}

  ColumnFamilyHandle* cfh() { return dbfull()->DefaultColumnFamily(); }

@@ -567,6 +568,5 @@ TEST_F(DBBlobIndexTest, IntegratedBlobIterate) {
 int main(int argc, char** argv) {
  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
-  RegisterCustomObjects(argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -1,21 +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 "db/blob/prefetch_buffer_collection.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-FilePrefetchBuffer* PrefetchBufferCollection::GetOrCreatePrefetchBuffer(
-    uint64_t file_number) {
-  auto& prefetch_buffer = prefetch_buffers_[file_number];
-  if (!prefetch_buffer) {
-    prefetch_buffer.reset(
-        new FilePrefetchBuffer(readahead_size_, readahead_size_));
-  }
-
-  return prefetch_buffer.get();
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,38 +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 <cassert>
-#include <cstdint>
-#include <memory>
-#include <unordered_map>
-
-#include "file/file_prefetch_buffer.h"
-#include "rocksdb/rocksdb_namespace.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-// A class that owns a collection of FilePrefetchBuffers using the file number
-// as key. Used for implementing compaction readahead for blob files. Designed
-// to be accessed by a single thread only: every (sub)compaction needs its own
-// buffers since they are guaranteed to read different blobs from different
-// positions even when reading the same file.
-class PrefetchBufferCollection {
- public:
-  explicit PrefetchBufferCollection(uint64_t readahead_size)
-      : readahead_size_(readahead_size) {
-    assert(readahead_size_ > 0);
-  }
-
-  FilePrefetchBuffer* GetOrCreatePrefetchBuffer(uint64_t file_number);
-
- private:
-  uint64_t readahead_size_;
-  std::unordered_map<uint64_t, std::unique_ptr<FilePrefetchBuffer>>
-      prefetch_buffers_;  // maps file number to prefetch buffer
-};
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -15,6 +15,7 @@

 #include "db/blob/blob_file_builder.h"
 #include "db/compaction/compaction_iterator.h"
+#include "db/dbformat.h"
 #include "db/event_helpers.h"
 #include "db/internal_stats.h"
 #include "db/merge_helper.h"
@@ -64,8 +65,7 @@ Status BuildTable(
    SequenceNumber earliest_write_conflict_snapshot,
    SnapshotChecker* snapshot_checker, bool paranoid_file_checks,
    InternalStats* internal_stats, IOStatus* io_status,
-    const std::shared_ptr<IOTracer>& io_tracer,
-    BlobFileCreationReason blob_creation_reason, EventLogger* event_logger,
+    const std::shared_ptr<IOTracer>& io_tracer, EventLogger* event_logger,
    int job_id, const Env::IOPriority io_priority,
    TableProperties* table_properties, Env::WriteLifeTimeHint write_hint,
    const std::string* full_history_ts_low,
@@ -178,12 +178,12 @@ Status BuildTable(

    std::unique_ptr<BlobFileBuilder> blob_file_builder(
        (mutable_cf_options.enable_blob_files && blob_file_additions)
-            ? new BlobFileBuilder(
-                  versions, fs, &ioptions, &mutable_cf_options, &file_options,
-                  job_id, tboptions.column_family_id,
-                  tboptions.column_family_name, io_priority, write_hint,
-                  io_tracer, blob_callback, blob_creation_reason,
-                  &blob_file_paths, blob_file_additions)
+            ? new BlobFileBuilder(versions, fs, &ioptions, &mutable_cf_options,
+                                  &file_options, job_id,
+                                  tboptions.column_family_id,
+                                  tboptions.column_family_name, io_priority,
+                                  write_hint, io_tracer, blob_callback,
+                                  &blob_file_paths, blob_file_additions)
            : nullptr);

    CompactionIterator c_iter(
@@ -311,7 +311,7 @@ Status BuildTable(
      if (s.ok()) {
        s = blob_file_builder->Finish();
      } else {
-        blob_file_builder->Abandon(s);
+        blob_file_builder->Abandon();
      }
      blob_file_builder.reset();
    }
@@ -380,19 +380,14 @@ Status BuildTable(
    }
  }

-  Status status_for_listener = s;
  if (meta->fd.GetFileSize() == 0) {
    fname = "(nil)";
-    if (s.ok()) {
-      status_for_listener = Status::Aborted("Empty SST file not kept");
-    }
  }
  // Output to event logger and fire events.
  EventHelpers::LogAndNotifyTableFileCreationFinished(
      event_logger, ioptions.listeners, dbname, tboptions.column_family_name,
      fname, job_id, meta->fd, meta->oldest_blob_file_number, tp,
-      tboptions.reason, status_for_listener, file_checksum,
-      file_checksum_func_name);
+      tboptions.reason, s, file_checksum, file_checksum_func_name);

  return s;
 }
@@ -60,7 +60,6 @@ extern Status BuildTable(
    SnapshotChecker* snapshot_checker, bool paranoid_file_checks,
    InternalStats* internal_stats, IOStatus* io_status,
    const std::shared_ptr<IOTracer>& io_tracer,
-    BlobFileCreationReason blob_creation_reason,
    EventLogger* event_logger = nullptr, int job_id = 0,
    const Env::IOPriority io_priority = Env::IO_HIGH,
    TableProperties* table_properties = nullptr,
@@ -2751,25 +2751,6 @@ double rocksdb_options_get_blob_gc_age_cutoff(rocksdb_options_t* opt) {
  return opt->rep.blob_garbage_collection_age_cutoff;
 }

-void rocksdb_options_set_blob_gc_force_threshold(rocksdb_options_t* opt,
-                                                 double val) {
-  opt->rep.blob_garbage_collection_force_threshold = val;
-}
-
-double rocksdb_options_get_blob_gc_force_threshold(rocksdb_options_t* opt) {
-  return opt->rep.blob_garbage_collection_force_threshold;
-}
-
-void rocksdb_options_set_blob_compaction_readahead_size(rocksdb_options_t* opt,
-                                                        uint64_t val) {
-  opt->rep.blob_compaction_readahead_size = val;
-}
-
-uint64_t rocksdb_options_get_blob_compaction_readahead_size(
-    rocksdb_options_t* opt) {
-  return opt->rep.blob_compaction_readahead_size;
-}
-
 void rocksdb_options_set_num_levels(rocksdb_options_t* opt, int n) {
  opt->rep.num_levels = n;
 }
@@ -3048,9 +3029,9 @@ unsigned char rocksdb_options_get_advise_random_on_open(
  return opt->rep.advise_random_on_open;
 }

-void rocksdb_options_set_experimental_mempurge_threshold(rocksdb_options_t* opt,
-                                                         double v) {
-  opt->rep.experimental_mempurge_threshold = v;
+void rocksdb_options_set_experimental_allow_mempurge(rocksdb_options_t* opt,
+                                                     unsigned char v) {
+  opt->rep.experimental_allow_mempurge = v;
 }

 void rocksdb_options_set_access_hint_on_compaction_start(
@@ -3859,8 +3840,7 @@ void rocksdb_filterpolicy_destroy(rocksdb_filterpolicy_t* filter) {
  delete filter;
 }

-rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(
-    double bits_per_key, bool original_format) {
+rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_key, bool original_format) {
  // Make a rocksdb_filterpolicy_t, but override all of its methods so
  // they delegate to a NewBloomFilterPolicy() instead of user
  // supplied C functions.
@@ -3895,17 +3875,16 @@ rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(
  return wrapper;
 }

-rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_full(
-    double bits_per_key) {
+rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_full(int bits_per_key) {
  return rocksdb_filterpolicy_create_bloom_format(bits_per_key, false);
 }

-rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom(double bits_per_key) {
+rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom(int bits_per_key) {
  return rocksdb_filterpolicy_create_bloom_format(bits_per_key, true);
 }

 rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_ribbon_format(
-    double bloom_equivalent_bits_per_key, int bloom_before_level) {
+    int bloom_equivalent_bits_per_key) {
  // Make a rocksdb_filterpolicy_t, but override all of its methods so
  // they delegate to a NewRibbonFilterPolicy() instead of user
  // supplied C functions.
@@ -3932,8 +3911,7 @@ rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_ribbon_format(
    static void DoNothing(void*) {}
  };
  Wrapper* wrapper = new Wrapper;
-  wrapper->rep_ =
-      NewRibbonFilterPolicy(bloom_equivalent_bits_per_key, bloom_before_level);
+  wrapper->rep_ = NewRibbonFilterPolicy(bloom_equivalent_bits_per_key);
  wrapper->state_ = nullptr;
  wrapper->delete_filter_ = nullptr;
  wrapper->destructor_ = &Wrapper::DoNothing;
@@ -3941,15 +3919,9 @@ rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_ribbon_format(
 }

 rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_ribbon(
-    double bloom_equivalent_bits_per_key) {
+    int bloom_equivalent_bits_per_key) {
  return rocksdb_filterpolicy_create_ribbon_format(
-      bloom_equivalent_bits_per_key, /*bloom_before_level = disabled*/ -1);
-}
-
-rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_ribbon_hybrid(
-    double bloom_equivalent_bits_per_key, int bloom_before_level) {
-  return rocksdb_filterpolicy_create_ribbon_format(
-      bloom_equivalent_bits_per_key, bloom_before_level);
+      bloom_equivalent_bits_per_key);
 }

 rocksdb_mergeoperator_t* rocksdb_mergeoperator_create(
@@ -4737,11 +4709,6 @@ int rocksdb_livefiles_count(
  return static_cast<int>(lf->rep.size());
 }

-const char* rocksdb_livefiles_column_family_name(const rocksdb_livefiles_t* lf,
-                                                 int index) {
-  return lf->rep[index].column_family_name.c_str();
-}
-
 const char* rocksdb_livefiles_name(
  const rocksdb_livefiles_t* lf,
  int index) {
@@ -4908,27 +4875,6 @@ void rocksdb_optimistictransaction_options_set_set_snapshot(
  opt->rep.set_snapshot = v;
 }

-char* rocksdb_optimistictransactiondb_property_value(
-    rocksdb_optimistictransactiondb_t* db, const char* propname) {
-  std::string tmp;
-  if (db->rep->GetProperty(Slice(propname), &tmp)) {
-    // We use strdup() since we expect human readable output.
-    return strdup(tmp.c_str());
-  } else {
-    return nullptr;
-  }
-}
-
-int rocksdb_optimistictransactiondb_property_int(
-    rocksdb_optimistictransactiondb_t* db, const char* propname,
-    uint64_t* out_val) {
-  if (db->rep->GetIntProperty(Slice(propname), out_val)) {
-    return 0;
-  } else {
-    return -1;
-  }
-}
-
 rocksdb_column_family_handle_t* rocksdb_transactiondb_create_column_family(
    rocksdb_transactiondb_t* txn_db,
    const rocksdb_options_t* column_family_options,
@@ -4999,27 +4945,6 @@ void rocksdb_transactiondb_release_snapshot(
  delete snapshot;
 }

-char* rocksdb_transactiondb_property_value(rocksdb_transactiondb_t* db,
-                                           const char* propname) {
-  std::string tmp;
-  if (db->rep->GetProperty(Slice(propname), &tmp)) {
-    // We use strdup() since we expect human readable output.
-    return strdup(tmp.c_str());
-  } else {
-    return nullptr;
-  }
-}
-
-int rocksdb_transactiondb_property_int(rocksdb_transactiondb_t* db,
-                                       const char* propname,
-                                       uint64_t* out_val) {
-  if (db->rep->GetIntProperty(Slice(propname), out_val)) {
-    return 0;
-  } else {
-    return -1;
-  }
-}
-
 rocksdb_transaction_t* rocksdb_transaction_begin(
    rocksdb_transactiondb_t* txn_db,
    const rocksdb_writeoptions_t* write_options,
@@ -5422,31 +5347,12 @@ rocksdb_transaction_t* rocksdb_optimistictransaction_begin(
  return old_txn;
 }

-// Write batch into OptimisticTransactionDB
-void rocksdb_optimistictransactiondb_write(
-    rocksdb_optimistictransactiondb_t* otxn_db,
-    const rocksdb_writeoptions_t* options, rocksdb_writebatch_t* batch,
-    char** errptr) {
-  SaveError(errptr, otxn_db->rep->Write(options->rep, &batch->rep));
-}
-
 void rocksdb_optimistictransactiondb_close(
    rocksdb_optimistictransactiondb_t* otxn_db) {
  delete otxn_db->rep;
  delete otxn_db;
 }

-rocksdb_checkpoint_t* rocksdb_optimistictransactiondb_checkpoint_object_create(
-    rocksdb_optimistictransactiondb_t* otxn_db, char** errptr) {
-  Checkpoint* checkpoint;
-  if (SaveError(errptr, Checkpoint::Create(otxn_db->rep, &checkpoint))) {
-    return nullptr;
-  }
-  rocksdb_checkpoint_t* result = new rocksdb_checkpoint_t;
-  result->rep = checkpoint;
-  return result;
-}
-
 void rocksdb_free(void* ptr) { free(ptr); }

 rocksdb_pinnableslice_t* rocksdb_get_pinned(
@@ -1043,25 +1043,21 @@ int main(int argc, char** argv) {
  }

  StartPhase("filter");
-  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
+  for (run = 0; run <= 3; run++) {
+    // First run uses custom filter
+    // Second run uses old block-based bloom filter
+    // Third run uses full bloom filter
    CheckNoError(err);
    rocksdb_filterpolicy_t* policy;
    if (run == 0) {
      policy = rocksdb_filterpolicy_create(NULL, FilterDestroy, FilterCreate,
                                           FilterKeyMatch, NULL, FilterName);
    } else if (run == 1) {
-      policy = rocksdb_filterpolicy_create_bloom(8.0);
+      policy = rocksdb_filterpolicy_create_bloom(8);
    } else if (run == 2) {
-      policy = rocksdb_filterpolicy_create_bloom_full(8.0);
-    } else if (run == 3) {
-      policy = rocksdb_filterpolicy_create_ribbon(8.0);
+      policy = rocksdb_filterpolicy_create_bloom_full(8);
    } else {
-      policy = rocksdb_filterpolicy_create_ribbon_hybrid(8.0, 1);
+      policy = rocksdb_filterpolicy_create_ribbon(8);
    }
    rocksdb_block_based_options_set_filter_policy(table_options, policy);

@@ -1127,7 +1123,7 @@ int main(int argc, char** argv) {
      } else if (run == 1) {
        // Essentially a fingerprint of the block-based Bloom schema
        CheckCondition(hits == 241);
-      } else if (run == 2 || run == 4) {
+      } else if (run == 2) {
        // Essentially a fingerprint of full Bloom schema, format_version=5
        CheckCondition(hits == 188);
      } else {
@@ -1793,15 +1789,8 @@ int main(int argc, char** argv) {
    rocksdb_options_set_enable_blob_gc(o, 1);
    CheckCondition(1 == rocksdb_options_get_enable_blob_gc(o));

-    rocksdb_options_set_blob_gc_age_cutoff(o, 0.5);
-    CheckCondition(0.5 == rocksdb_options_get_blob_gc_age_cutoff(o));
-
-    rocksdb_options_set_blob_gc_force_threshold(o, 0.75);
-    CheckCondition(0.75 == rocksdb_options_get_blob_gc_force_threshold(o));
-
-    rocksdb_options_set_blob_compaction_readahead_size(o, 262144);
-    CheckCondition(262144 ==
-                   rocksdb_options_get_blob_compaction_readahead_size(o));
+    rocksdb_options_set_blob_gc_age_cutoff(o, 0.75);
+    CheckCondition(0.75 == rocksdb_options_get_blob_gc_age_cutoff(o));

    // Create a copy that should be equal to the original.
    rocksdb_options_t* copy;
@@ -29,7 +29,7 @@
 #include "db/version_set.h"
 #include "db/write_controller.h"
 #include "file/sst_file_manager_impl.h"
-#include "logging/logging.h"
+#include "memtable/hash_skiplist_rep.h"
 #include "monitoring/thread_status_util.h"
 #include "options/options_helper.h"
 #include "port/port.h"
@@ -75,6 +75,11 @@ ColumnFamilyHandleImpl::~ColumnFamilyHandleImpl() {
      bool defer_purge =
          db_->immutable_db_options().avoid_unnecessary_blocking_io;
      db_->PurgeObsoleteFiles(job_context, defer_purge);
+      if (defer_purge) {
+        mutex_->Lock();
+        db_->SchedulePurge();
+        mutex_->Unlock();
+      }
    }
    job_context.Clean();
  }
@@ -198,7 +203,7 @@ Status CheckCFPathsSupported(const DBOptions& db_options,
 namespace {
 const uint64_t kDefaultTtl = 0xfffffffffffffffe;
 const uint64_t kDefaultPeriodicCompSecs = 0xfffffffffffffffe;
-}  // namespace
+};  // namespace

 ColumnFamilyOptions SanitizeOptions(const ImmutableDBOptions& db_options,
                                    const ColumnFamilyOptions& src) {
@@ -206,8 +211,7 @@ ColumnFamilyOptions SanitizeOptions(const ImmutableDBOptions& db_options,
  size_t clamp_max = std::conditional<
      sizeof(size_t) == 4, std::integral_constant<size_t, 0xffffffff>,
      std::integral_constant<uint64_t, 64ull << 30>>::type::value;
-  ClipToRange(&result.write_buffer_size, (static_cast<size_t>(64)) << 10,
-              clamp_max);
+  ClipToRange(&result.write_buffer_size, ((size_t)64) << 10, clamp_max);
  // if user sets arena_block_size, we trust user to use this value. Otherwise,
  // calculate a proper value from writer_buffer_size;
  if (result.arena_block_size <= 0) {
@@ -345,18 +349,12 @@ ColumnFamilyOptions SanitizeOptions(const ImmutableDBOptions& db_options,
  }

  if (result.level_compaction_dynamic_level_bytes) {
-    if (result.compaction_style != kCompactionStyleLevel) {
-      ROCKS_LOG_WARN(db_options.info_log.get(),
-                     "level_compaction_dynamic_level_bytes only makes sense"
-                     "for level-based compaction");
-      result.level_compaction_dynamic_level_bytes = false;
-    } else if (result.cf_paths.size() > 1U) {
-      // we don't yet know how to make both of this feature and multiple
-      // DB path work.
-      ROCKS_LOG_WARN(db_options.info_log.get(),
-                     "multiple cf_paths/db_paths and"
-                     "level_compaction_dynamic_level_bytes"
-                     "can't be used together");
+    if (result.compaction_style != kCompactionStyleLevel ||
+        result.cf_paths.size() > 1U) {
+      // 1. level_compaction_dynamic_level_bytes only makes sense for
+      //    level-based compaction.
+      // 2. we don't yet know how to make both of this feature and multiple
+      //    DB path work.
      result.level_compaction_dynamic_level_bytes = false;
    }
  }
@@ -507,7 +505,7 @@ ColumnFamilyData::ColumnFamilyData(
    uint32_t id, const std::string& name, Version* _dummy_versions,
    Cache* _table_cache, WriteBufferManager* write_buffer_manager,
    const ColumnFamilyOptions& cf_options, const ImmutableDBOptions& db_options,
-    const FileOptions* file_options, ColumnFamilySet* column_family_set,
+    const FileOptions& file_options, ColumnFamilySet* column_family_set,
    BlockCacheTracer* const block_cache_tracer,
    const std::shared_ptr<IOTracer>& io_tracer,
    const std::string& db_session_id)
@@ -1051,26 +1049,25 @@ uint64_t ColumnFamilyData::GetTotalSstFilesSize() const {
  return VersionSet::GetTotalSstFilesSize(dummy_versions_);
 }

-uint64_t ColumnFamilyData::GetTotalBlobFileSize() const {
-  return VersionSet::GetTotalBlobFileSize(dummy_versions_);
-}
-
 uint64_t ColumnFamilyData::GetLiveSstFilesSize() const {
  return current_->GetSstFilesSize();
 }

 MemTable* ColumnFamilyData::ConstructNewMemtable(
-    const MutableCFOptions& mutable_cf_options, SequenceNumber earliest_seq) {
+    const MutableCFOptions& mutable_cf_options, SequenceNumber earliest_seq,
+    uint64_t log_number) {
  return new MemTable(internal_comparator_, ioptions_, mutable_cf_options,
-                      write_buffer_manager_, earliest_seq, id_);
+                      write_buffer_manager_, earliest_seq, id_, log_number);
 }

 void ColumnFamilyData::CreateNewMemtable(
-    const MutableCFOptions& mutable_cf_options, SequenceNumber earliest_seq) {
+    const MutableCFOptions& mutable_cf_options, SequenceNumber earliest_seq,
+    uint64_t log_number) {
  if (mem_ != nullptr) {
    delete mem_->Unref();
  }
-  SetMemtable(ConstructNewMemtable(mutable_cf_options, earliest_seq));
+  SetMemtable(
+      ConstructNewMemtable(mutable_cf_options, earliest_seq, log_number));
  mem_->Ref();
 }

@@ -1354,19 +1351,12 @@ Status ColumnFamilyData::ValidateOptions(
    }
  }

-  if (cf_options.enable_blob_garbage_collection) {
-    if (cf_options.blob_garbage_collection_age_cutoff < 0.0 ||
-        cf_options.blob_garbage_collection_age_cutoff > 1.0) {
-      return Status::InvalidArgument(
-          "The age cutoff for blob garbage collection should be in the range "
-          "[0.0, 1.0].");
-    }
-    if (cf_options.blob_garbage_collection_force_threshold < 0.0 ||
-        cf_options.blob_garbage_collection_force_threshold > 1.0) {
-      return Status::InvalidArgument(
-          "The garbage ratio threshold for forcing blob garbage collection "
-          "should be in the range [0.0, 1.0].");
-    }
+  if (cf_options.enable_blob_garbage_collection &&
+      (cf_options.blob_garbage_collection_age_cutoff < 0.0 ||
+       cf_options.blob_garbage_collection_age_cutoff > 1.0)) {
+    return Status::InvalidArgument(
+        "The age cutoff for blob garbage collection should be in the range "
+        "[0.0, 1.0].");
  }

  if (cf_options.compaction_style == kCompactionStyleFIFO &&
@@ -1466,14 +1456,14 @@ ColumnFamilySet::ColumnFamilySet(const std::string& dbname,
                                 const std::shared_ptr<IOTracer>& io_tracer,
                                 const std::string& db_session_id)
    : max_column_family_(0),
-      file_options_(file_options),
      dummy_cfd_(new ColumnFamilyData(
          ColumnFamilyData::kDummyColumnFamilyDataId, "", nullptr, nullptr,
-          nullptr, ColumnFamilyOptions(), *db_options, &file_options_, nullptr,
+          nullptr, ColumnFamilyOptions(), *db_options, file_options, nullptr,
          block_cache_tracer, io_tracer, db_session_id)),
      default_cfd_cache_(nullptr),
      db_name_(dbname),
      db_options_(db_options),
+      file_options_(file_options),
      table_cache_(table_cache),
      write_buffer_manager_(_write_buffer_manager),
      write_controller_(_write_controller),
@@ -1545,7 +1535,7 @@ ColumnFamilyData* ColumnFamilySet::CreateColumnFamily(
  assert(column_families_.find(name) == column_families_.end());
  ColumnFamilyData* new_cfd = new ColumnFamilyData(
      id, name, dummy_versions, table_cache_, write_buffer_manager_, options,
-      *db_options_, &file_options_, this, block_cache_tracer_, io_tracer_,
+      *db_options_, file_options_, this, block_cache_tracer_, io_tracer_,
      db_session_id_);
  column_families_.insert({name, id});
  column_family_data_.insert({id, new_cfd});
@@ -357,7 +357,6 @@ class ColumnFamilyData {
  uint64_t GetNumLiveVersions() const;  // REQUIRE: DB mutex held
  uint64_t GetTotalSstFilesSize() const;  // REQUIRE: DB mutex held
  uint64_t GetLiveSstFilesSize() const;   // REQUIRE: DB mutex held
-  uint64_t GetTotalBlobFileSize() const;  // REQUIRE: DB mutex held
  void SetMemtable(MemTable* new_mem) {
    uint64_t memtable_id = last_memtable_id_.fetch_add(1) + 1;
    new_mem->SetID(memtable_id);
@@ -369,9 +368,10 @@ class ColumnFamilyData {

  // See Memtable constructor for explanation of earliest_seq param.
  MemTable* ConstructNewMemtable(const MutableCFOptions& mutable_cf_options,
-                                 SequenceNumber earliest_seq);
+                                 SequenceNumber earliest_seq,
+                                 uint64_t log_number = 0);
  void CreateNewMemtable(const MutableCFOptions& mutable_cf_options,
-                         SequenceNumber earliest_seq);
+                         SequenceNumber earliest_seq, uint64_t log_number = 0);

  TableCache* table_cache() const { return table_cache_.get(); }
  BlobFileCache* blob_file_cache() const { return blob_file_cache_.get(); }
@@ -527,7 +527,7 @@ class ColumnFamilyData {
                   WriteBufferManager* write_buffer_manager,
                   const ColumnFamilyOptions& options,
                   const ImmutableDBOptions& db_options,
-                   const FileOptions* file_options,
+                   const FileOptions& file_options,
                   ColumnFamilySet* column_family_set,
                   BlockCacheTracer* const block_cache_tracer,
                   const std::shared_ptr<IOTracer>& io_tracer,
@@ -718,8 +718,6 @@ class ColumnFamilySet {
  std::unordered_map<uint32_t, ColumnFamilyData*> column_family_data_;

  uint32_t max_column_family_;
-  const FileOptions file_options_;
-
  ColumnFamilyData* dummy_cfd_;
  // We don't hold the refcount here, since default column family always exists
  // We are also not responsible for cleaning up default_cfd_cache_. This is
@@ -729,6 +727,7 @@ class ColumnFamilySet {

  const std::string db_name_;
  const ImmutableDBOptions* const db_options_;
+  const FileOptions file_options_;
  Cache* table_cache_;
  WriteBufferManager* write_buffer_manager_;
  WriteController* write_controller_;
@@ -554,7 +554,7 @@ class ColumnFamilyTest
 INSTANTIATE_TEST_CASE_P(FormatDef, ColumnFamilyTest,
                        testing::Values(test::kDefaultFormatVersion));
 INSTANTIATE_TEST_CASE_P(FormatLatest, ColumnFamilyTest,
-                        testing::Values(kLatestFormatVersion));
+                        testing::Values(test::kLatestFormatVersion));

 TEST_P(ColumnFamilyTest, DontReuseColumnFamilyID) {
  for (int iter = 0; iter < 3; ++iter) {
@@ -746,8 +746,8 @@ INSTANTIATE_TEST_CASE_P(
                    std::make_tuple(test::kDefaultFormatVersion, false)));
 INSTANTIATE_TEST_CASE_P(
    FormatLatest, FlushEmptyCFTestWithParam,
-    testing::Values(std::make_tuple(kLatestFormatVersion, true),
-                    std::make_tuple(kLatestFormatVersion, false)));
+    testing::Values(std::make_tuple(test::kLatestFormatVersion, true),
+                    std::make_tuple(test::kLatestFormatVersion, false)));

 TEST_P(ColumnFamilyTest, AddDrop) {
  Open();
@@ -2975,8 +2975,7 @@ TEST_P(ColumnFamilyTest, FlushCloseWALFiles) {
  SpecialEnv env(Env::Default());
  db_options_.env = &env;
  db_options_.max_background_flushes = 1;
-  column_family_options_.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(2));
+  column_family_options_.memtable_factory.reset(new SpecialSkipListFactory(2));
  Open();
  CreateColumnFamilies({"one"});
  ASSERT_OK(Put(1, "fodor", "mirko"));
@@ -3021,8 +3020,7 @@ TEST_P(ColumnFamilyTest, IteratorCloseWALFile1) {
  SpecialEnv env(Env::Default());
  db_options_.env = &env;
  db_options_.max_background_flushes = 1;
-  column_family_options_.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(2));
+  column_family_options_.memtable_factory.reset(new SpecialSkipListFactory(2));
  Open();
  CreateColumnFamilies({"one"});
  ASSERT_OK(Put(1, "fodor", "mirko"));
@@ -3073,8 +3071,7 @@ TEST_P(ColumnFamilyTest, IteratorCloseWALFile2) {
  env.SetBackgroundThreads(2, Env::HIGH);
  db_options_.env = &env;
  db_options_.max_background_flushes = 1;
-  column_family_options_.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(2));
+  column_family_options_.memtable_factory.reset(new SpecialSkipListFactory(2));
  Open();
  CreateColumnFamilies({"one"});
  ASSERT_OK(Put(1, "fodor", "mirko"));
@@ -3132,8 +3129,7 @@ TEST_P(ColumnFamilyTest, ForwardIteratorCloseWALFile) {
  env.SetBackgroundThreads(2, Env::HIGH);
  db_options_.env = &env;
  db_options_.max_background_flushes = 1;
-  column_family_options_.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(3));
+  column_family_options_.memtable_factory.reset(new SpecialSkipListFactory(3));
  column_family_options_.level0_file_num_compaction_trigger = 2;
  Open();
  CreateColumnFamilies({"one"});
@@ -3407,32 +3403,16 @@ TEST(ColumnFamilyTest, ValidateBlobGCCutoff) {
                  .IsInvalidArgument());
 }

-TEST(ColumnFamilyTest, ValidateBlobGCForceThreshold) {
-  DBOptions db_options;
-
-  ColumnFamilyOptions cf_options;
-  cf_options.enable_blob_garbage_collection = true;
-
-  cf_options.blob_garbage_collection_force_threshold = -0.5;
-  ASSERT_TRUE(ColumnFamilyData::ValidateOptions(db_options, cf_options)
-                  .IsInvalidArgument());
-
-  cf_options.blob_garbage_collection_force_threshold = 0.0;
-  ASSERT_OK(ColumnFamilyData::ValidateOptions(db_options, cf_options));
-
-  cf_options.blob_garbage_collection_force_threshold = 0.5;
-  ASSERT_OK(ColumnFamilyData::ValidateOptions(db_options, cf_options));
-
-  cf_options.blob_garbage_collection_force_threshold = 1.0;
-  ASSERT_OK(ColumnFamilyData::ValidateOptions(db_options, cf_options));
-
-  cf_options.blob_garbage_collection_force_threshold = 1.5;
-  ASSERT_TRUE(ColumnFamilyData::ValidateOptions(db_options, cf_options)
-                  .IsInvalidArgument());
-}
-
 }  // namespace ROCKSDB_NAMESPACE

+#ifdef ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS
+extern "C" {
+void RegisterCustomObjects(int argc, char** argv);
+}
+#else
+void RegisterCustomObjects(int /*argc*/, char** /*argv*/) {}
+#endif  // !ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS
+
 int main(int argc, char** argv) {
  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
@@ -10,24 +10,22 @@
 #include <string>
 #include <vector>

-#include "db/dbformat.h"
 #include "rocksdb/comparator.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
-#include "util/vector_iterator.h"

 namespace ROCKSDB_NAMESPACE {

 // A vector iterator which does its own bounds checking. This is for testing the
 // optimizations in the clipping iterator where we bypass the bounds checking if
 // the input iterator has already performed it.
-class BoundsCheckingVectorIterator : public VectorIterator {
+class BoundsCheckingVectorIterator : public test::VectorIterator {
 public:
  BoundsCheckingVectorIterator(const std::vector<std::string>& keys,
                               const std::vector<std::string>& values,
                               const Slice* start, const Slice* end,
                               const Comparator* cmp)
-      : VectorIterator(keys, values, cmp), start_(start), end_(end), cmp_(cmp) {
+      : VectorIterator(keys, values), start_(start), end_(end), cmp_(cmp) {
    assert(cmp_);
  }

@@ -107,7 +105,7 @@ TEST_P(ClippingIteratorTest, Clip) {
      use_bounds_checking_vec_it
          ? new BoundsCheckingVectorIterator(input_keys, input_values, &start,
                                             &end, BytewiseComparator())
-          : new VectorIterator(input_keys, input_values, BytewiseComparator()));
+          : new test::VectorIterator(input_keys, input_values));

  ClippingIterator clip(input.get(), &start, &end, BytewiseComparator());

@@ -211,9 +211,9 @@ Compaction::Compaction(
    std::vector<CompactionInputFiles> _inputs, int _output_level,
    uint64_t _target_file_size, uint64_t _max_compaction_bytes,
    uint32_t _output_path_id, CompressionType _compression,
-    CompressionOptions _compression_opts, Temperature _output_temperature,
-    uint32_t _max_subcompactions, std::vector<FileMetaData*> _grandparents,
-    bool _manual_compaction, double _score, bool _deletion_compaction,
+    CompressionOptions _compression_opts, uint32_t _max_subcompactions,
+    std::vector<FileMetaData*> _grandparents, bool _manual_compaction,
+    double _score, bool _deletion_compaction,
    CompactionReason _compaction_reason)
    : input_vstorage_(vstorage),
      start_level_(_inputs[0].level),
@@ -229,7 +229,6 @@ Compaction::Compaction(
      output_path_id_(_output_path_id),
      output_compression_(_compression),
      output_compression_opts_(_compression_opts),
-      output_temperature_(_output_temperature),
      deletion_compaction_(_deletion_compaction),
      inputs_(PopulateWithAtomicBoundaries(vstorage, std::move(_inputs))),
      grandparents_(std::move(_grandparents)),
@@ -309,12 +308,6 @@ bool Compaction::IsTrivialMove() const {
    return false;
  }

-  if (start_level_ == output_level_) {
-    // It doesn't make sense if compaction picker picks files just to trivial
-    // move to the same level.
-    return false;
-  }
-
  // 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) &&
@@ -612,19 +605,10 @@ bool Compaction::DoesInputReferenceBlobFiles() const {
  return false;
 }

-uint64_t Compaction::MinInputFileOldestAncesterTime(
-    const InternalKey* start, const InternalKey* end) const {
+uint64_t Compaction::MinInputFileOldestAncesterTime() const {
  uint64_t min_oldest_ancester_time = port::kMaxUint64;
-  const InternalKeyComparator& icmp =
-      column_family_data()->internal_comparator();
  for (const auto& level_files : inputs_) {
    for (const auto& file : level_files.files) {
-      if (start != nullptr && icmp.Compare(file->largest, *start) < 0) {
-        continue;
-      }
-      if (end != nullptr && icmp.Compare(file->smallest, *end) > 0) {
-        continue;
-      }
      uint64_t oldest_ancester_time = file->TryGetOldestAncesterTime();
      if (oldest_ancester_time != 0) {
        min_oldest_ancester_time =
@@ -76,8 +76,7 @@ class Compaction {
             std::vector<CompactionInputFiles> inputs, int output_level,
             uint64_t target_file_size, uint64_t max_compaction_bytes,
             uint32_t output_path_id, CompressionType compression,
-             CompressionOptions compression_opts,
-             Temperature output_temperature, uint32_t max_subcompactions,
+             CompressionOptions compression_opts, uint32_t max_subcompactions,
             std::vector<FileMetaData*> grandparents,
             bool manual_compaction = false, double score = -1,
             bool deletion_compaction = false,
@@ -300,14 +299,9 @@ class Compaction {

  uint64_t max_compaction_bytes() const { return max_compaction_bytes_; }

-  Temperature output_temperature() const { return output_temperature_; }
-
  uint32_t max_subcompactions() const { return max_subcompactions_; }

-  // start and end are sub compact range. Null if no boundary.
-  // This is used to filter out some input files' ancester's time range.
-  uint64_t MinInputFileOldestAncesterTime(const InternalKey* start,
-                                          const InternalKey* end) const;
+  uint64_t MinInputFileOldestAncesterTime() const;

  // Called by DBImpl::NotifyOnCompactionCompleted to make sure number of
  // compaction begin and compaction completion callbacks match.
@@ -362,7 +356,6 @@ class Compaction {
  const uint32_t output_path_id_;
  CompressionType output_compression_;
  CompressionOptions output_compression_opts_;
-  Temperature output_temperature_;
  // If true, then the compaction can be done by simply deleting input files.
  const bool deletion_compaction_;

@@ -5,12 +5,8 @@

 #pragma once

-#include <cstdint>
-
 #include "rocksdb/rocksdb_namespace.h"

-namespace ROCKSDB_NAMESPACE {
-
 struct CompactionIterationStats {
  // Compaction statistics

@@ -42,8 +38,4 @@ struct CompactionIterationStats {
  // Blob related statistics
  uint64_t num_blobs_read = 0;
  uint64_t total_blob_bytes_read = 0;
-  uint64_t num_blobs_relocated = 0;
-  uint64_t total_blob_bytes_relocated = 0;
 };
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -8,17 +8,30 @@
 #include <iterator>
 #include <limits>

-#include "db/blob/blob_fetcher.h"
 #include "db/blob/blob_file_builder.h"
 #include "db/blob/blob_index.h"
-#include "db/blob/prefetch_buffer_collection.h"
 #include "db/snapshot_checker.h"
-#include "logging/logging.h"
 #include "port/likely.h"
 #include "rocksdb/listener.h"
 #include "table/internal_iterator.h"
 #include "test_util/sync_point.h"

+#define DEFINITELY_IN_SNAPSHOT(seq, snapshot)                       \
+  ((seq) <= (snapshot) &&                                           \
+   (snapshot_checker_ == nullptr ||                                 \
+    LIKELY(snapshot_checker_->CheckInSnapshot((seq), (snapshot)) == \
+           SnapshotCheckerResult::kInSnapshot)))
+
+#define DEFINITELY_NOT_IN_SNAPSHOT(seq, snapshot)                     \
+  ((seq) > (snapshot) ||                                              \
+   (snapshot_checker_ != nullptr &&                                   \
+    UNLIKELY(snapshot_checker_->CheckInSnapshot((seq), (snapshot)) == \
+             SnapshotCheckerResult::kNotInSnapshot)))
+
+#define IN_EARLIEST_SNAPSHOT(seq) \
+  ((seq) <= earliest_snapshot_ && \
+   (snapshot_checker_ == nullptr || LIKELY(IsInEarliestSnapshot(seq))))
+
 namespace ROCKSDB_NAMESPACE {
 CompactionIterator::CompactionIterator(
    InternalIterator* input, const Comparator* cmp, MergeHelper* merge_helper,
@@ -90,9 +103,6 @@ CompactionIterator::CompactionIterator(
      merge_out_iter_(merge_helper_),
      blob_garbage_collection_cutoff_file_number_(
          ComputeBlobGarbageCollectionCutoffFileNumber(compaction_.get())),
-      blob_fetcher_(CreateBlobFetcherIfNeeded(compaction_.get())),
-      prefetch_buffers_(
-          CreatePrefetchBufferCollectionIfNeeded(compaction_.get())),
      current_key_committed_(false),
      cmp_with_history_ts_low_(0),
      level_(compaction_ == nullptr ? 0 : compaction_->level()) {
@@ -230,13 +240,6 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
          compaction_filter_skip_until_.rep());
      if (CompactionFilter::Decision::kUndetermined == filter &&
          !compaction_filter_->IsStackedBlobDbInternalCompactionFilter()) {
-        if (compaction_ == nullptr) {
-          status_ =
-              Status::Corruption("Unexpected blob index outside of compaction");
-          valid_ = false;
-          return false;
-        }
-
        // For integrated BlobDB impl, CompactionIterator reads blob value.
        // For Stacked BlobDB impl, the corresponding CompactionFilter's
        // FilterV2 method should read the blob value.
@@ -247,19 +250,23 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
          valid_ = false;
          return false;
        }
-
-        FilePrefetchBuffer* prefetch_buffer =
-            prefetch_buffers_ ? prefetch_buffers_->GetOrCreatePrefetchBuffer(
-                                    blob_index.file_number())
-                              : nullptr;
+        if (blob_index.HasTTL() || blob_index.IsInlined()) {
+          status_ = Status::Corruption("Unexpected TTL/inlined blob index");
+          valid_ = false;
+          return false;
+        }
+        if (compaction_ == nullptr) {
+          status_ =
+              Status::Corruption("Unexpected blob index outside of compaction");
+          valid_ = false;
+          return false;
+        }
+        const Version* const version = compaction_->input_version();
+        assert(version);

        uint64_t bytes_read = 0;
-
-        assert(blob_fetcher_);
-
-        s = blob_fetcher_->FetchBlob(ikey_.user_key, blob_index,
-                                     prefetch_buffer, &blob_value_,
-                                     &bytes_read);
+        s = version->GetBlob(ReadOptions(), ikey_.user_key, blob_index,
+                             &blob_value_, &bytes_read);
        if (!s.ok()) {
          status_ = s;
          valid_ = false;
@@ -415,12 +422,6 @@ void CompactionIterator::NextFromInput() {
      // Copy key for output
      key_ = current_key_.SetInternalKey(key_, &ikey_);

-      int prev_cmp_with_ts_low =
-          !full_history_ts_low_ ? 0
-          : curr_ts_.empty()
-              ? 0
-              : cmp_->CompareTimestamp(curr_ts_, *full_history_ts_low_);
-
      // If timestamp_size_ > 0, then copy from ikey_ to curr_ts_ for the use
      // in next iteration to compare with the timestamp of next key.
      UpdateTimestampAndCompareWithFullHistoryLow();
@@ -430,16 +431,14 @@ void CompactionIterator::NextFromInput() {
      // (2) timestamp is disabled, OR
      // (3) all history will be preserved, OR
      // (4) user key (excluding timestamp) is different from previous key, OR
-      // (5) timestamp is NO older than *full_history_ts_low_, OR
-      // (6) timestamp is the largest one older than full_history_ts_low_,
+      // (5) timestamp is NO older than *full_history_ts_low_
      // then current_user_key_ must be treated as a different user key.
      // This means, if a user key (excluding ts) is the same as the previous
      // user key, and its ts is older than *full_history_ts_low_, then we
      // consider this key for GC, e.g. it may be dropped if certain conditions
      // match.
      if (!has_current_user_key_ || !timestamp_size_ || !full_history_ts_low_ ||
-          !user_key_equal_without_ts || cmp_with_history_ts_low_ >= 0 ||
-          prev_cmp_with_ts_low >= 0) {
+          !user_key_equal_without_ts || cmp_with_history_ts_low_ >= 0) {
        // Initialize for future comparison for rule (A) and etc.
        current_user_key_sequence_ = kMaxSequenceNumber;
        current_user_key_snapshot_ = 0;
@@ -449,8 +448,6 @@ void CompactionIterator::NextFromInput() {

      has_outputted_key_ = false;

-      last_key_seq_zeroed_ = false;
-
      current_key_committed_ = KeyCommitted(ikey_.sequence);

      // Apply the compaction filter to the first committed version of the user
@@ -514,11 +511,11 @@ void CompactionIterator::NextFromInput() {
                        "Unexpected key type %d for compaction output",
                        ikey_.type);
      }
-      assert(current_user_key_snapshot_ >= last_snapshot);
-      if (current_user_key_snapshot_ < last_snapshot) {
+      assert(current_user_key_snapshot_ == last_snapshot);
+      if (current_user_key_snapshot_ != last_snapshot) {
        ROCKS_LOG_FATAL(info_log_,
                        "current_user_key_snapshot_ (%" PRIu64
-                        ") < last_snapshot (%" PRIu64 ")",
+                        ") != last_snapshot (%" PRIu64 ")",
                        current_user_key_snapshot_, last_snapshot);
      }

@@ -538,25 +535,6 @@ void CompactionIterator::NextFromInput() {
      // 2) We've already returned a record in this snapshot -OR-
      //    there are no earlier earliest_write_conflict_snapshot.
      //
-      // A note about 2) above:
-      // we try to determine whether there is any earlier write conflict
-      // checking snapshot by calling DefinitelyInSnapshot() with seq and
-      // earliest_write_conflict_snapshot as arguments. For write-prepared
-      // and write-unprepared transactions, if earliest_write_conflict_snapshot
-      // is evicted from WritePreparedTxnDB::commit_cache, then
-      // DefinitelyInSnapshot(seq, earliest_write_conflict_snapshot) returns
-      // false, even if the seq is actually visible within
-      // earliest_write_conflict_snapshot. Consequently, CompactionIterator
-      // may try to zero out its sequence number, thus hitting assertion error
-      // in debug mode or cause incorrect DBIter return result.
-      // We observe that earliest_write_conflict_snapshot >= earliest_snapshot,
-      // and the seq zeroing logic depends on
-      // DefinitelyInSnapshot(seq, earliest_snapshot). Therefore, if we cannot
-      // determine whether seq is **definitely** in
-      // earliest_write_conflict_snapshot, then we can additionally check if
-      // seq is definitely in earliest_snapshot. If the latter holds, then the
-      // former holds too.
-      //
      // Rule 1 is needed for SingleDelete correctness.  Rule 2 is needed to
      // allow Transactions to do write-conflict checking (if we compacted away
      // all keys, then we wouldn't know that a write happened in this
@@ -581,21 +559,9 @@ void CompactionIterator::NextFromInput() {
      // we can choose how to handle such a combinations of operations.  We will
      // try to compact out as much as we can in these cases.
      // We will report counts on these anomalous cases.
-      //
-      // Note: If timestamp is enabled, then record will be eligible for
-      // deletion, only if, along with above conditions (Rule 1 and Rule 2)
-      // full_history_ts_low_ is specified and timestamp for that key is less
-      // than *full_history_ts_low_. If it's not eligible for deletion, then we
-      // will output the SingleDelete. For Optimization 3 also, if
-      // full_history_ts_low_ is specified and timestamp for the key is less
-      // than *full_history_ts_low_ then only optimization will be applied.

      // The easiest way to process a SingleDelete during iteration is to peek
      // ahead at the next key.
-      const bool is_timestamp_eligible_for_gc =
-          (timestamp_size_ == 0 ||
-           (full_history_ts_low_ && cmp_with_history_ts_low_ < 0));
-
      ParsedInternalKey next_ikey;
      AdvanceInputIter();

@@ -604,55 +570,24 @@ void CompactionIterator::NextFromInput() {
      if (input_.Valid() &&
          ParseInternalKey(input_.key(), &next_ikey, allow_data_in_errors_)
              .ok() &&
-          cmp_->EqualWithoutTimestamp(ikey_.user_key, next_ikey.user_key)) {
-#ifndef NDEBUG
-        const Compaction* c =
-            compaction_ ? compaction_->real_compaction() : nullptr;
-#endif
-        TEST_SYNC_POINT_CALLBACK(
-            "CompactionIterator::NextFromInput:SingleDelete:1",
-            const_cast<Compaction*>(c));
-        if (last_key_seq_zeroed_) {
-          ++iter_stats_.num_record_drop_hidden;
-          ++iter_stats_.num_record_drop_obsolete;
-          assert(bottommost_level_);
-          AdvanceInputIter();
-        } else if (prev_snapshot == 0 ||
-                   DefinitelyNotInSnapshot(next_ikey.sequence, prev_snapshot)) {
-          // Check whether the next key belongs to the same snapshot as the
-          // SingleDelete.
-
-          TEST_SYNC_POINT_CALLBACK(
-              "CompactionIterator::NextFromInput:SingleDelete:2", nullptr);
-          if (next_ikey.type == kTypeSingleDeletion ||
-              next_ikey.type == kTypeDeletion) {
-            // We encountered two SingleDeletes for same key in a row. This
-            // could be due to unexpected user input. If write-(un)prepared
-            // transaction is used, this could also be due to releasing an old
-            // snapshot between a Put and its matching SingleDelete.
-            // Furthermore, if write-(un)prepared transaction is rolled back
-            // after prepare, we will write a Delete to cancel a prior Put. If
-            // old snapshot is released between a later Put and its matching
-            // SingleDelete, we will end up with a Delete followed by
-            // SingleDelete.
-            // Skip the first SingleDelete and let the next iteration decide
-            // how to handle the second SingleDelete or Delete.
+          cmp_->Equal(ikey_.user_key, next_ikey.user_key)) {
+        // Check whether the next key belongs to the same snapshot as the
+        // SingleDelete.
+        if (prev_snapshot == 0 ||
+            DEFINITELY_NOT_IN_SNAPSHOT(next_ikey.sequence, prev_snapshot)) {
+          if (next_ikey.type == kTypeSingleDeletion) {
+            // We encountered two SingleDeletes in a row.  This could be due to
+            // unexpected user input.
+            // Skip the first SingleDelete and let the next iteration decide how
+            // to handle the second SingleDelete

            // First SingleDelete has been skipped since we already called
            // input_.Next().
            ++iter_stats_.num_record_drop_obsolete;
            ++iter_stats_.num_single_del_mismatch;
-          } else if (!is_timestamp_eligible_for_gc) {
-            // We cannot drop the SingleDelete as timestamp is enabled, and
-            // timestamp of this key is greater than or equal to
-            // *full_history_ts_low_. We will output the SingleDelete.
-            valid_ = true;
          } else if (has_outputted_key_ ||
-                     DefinitelyInSnapshot(ikey_.sequence,
-                                          earliest_write_conflict_snapshot_) ||
-                     (earliest_snapshot_ < earliest_write_conflict_snapshot_ &&
-                      DefinitelyInSnapshot(ikey_.sequence,
-                                           earliest_snapshot_))) {
+                     DEFINITELY_IN_SNAPSHOT(
+                         ikey_.sequence, earliest_write_conflict_snapshot_)) {
            // Found a matching value, we can drop the single delete and the
            // value.  It is safe to drop both records since we've already
            // outputted a key in this snapshot, or there is no earlier
@@ -685,17 +620,11 @@ void CompactionIterator::NextFromInput() {
            // Set up the Put to be outputted in the next iteration.
            // (Optimization 3).
            clear_and_output_next_key_ = true;
-            TEST_SYNC_POINT_CALLBACK(
-                "CompactionIterator::NextFromInput:KeepSDForWW",
-                /*arg=*/nullptr);
          }
        } else {
          // We hit the next snapshot without hitting a put, so the iterator
          // returns the single delete.
          valid_ = true;
-          TEST_SYNC_POINT_CALLBACK(
-              "CompactionIterator::NextFromInput:SingleDelete:3",
-              const_cast<Compaction*>(c));
        }
      } else {
        // We are at the end of the input, could not parse the next key, or hit
@@ -706,11 +635,9 @@ void CompactionIterator::NextFromInput() {
        // iteration. If the next key is corrupt, we return before the
        // comparison, so the value of has_current_user_key does not matter.
        has_current_user_key_ = false;
-        if (compaction_ != nullptr &&
-            DefinitelyInSnapshot(ikey_.sequence, earliest_snapshot_) &&
+        if (compaction_ != nullptr && IN_EARLIEST_SNAPSHOT(ikey_.sequence) &&
            compaction_->KeyNotExistsBeyondOutputLevel(ikey_.user_key,
-                                                       &level_ptrs_) &&
-            is_timestamp_eligible_for_gc) {
+                                                       &level_ptrs_)) {
          // Key doesn't exist outside of this range.
          // Can compact out this SingleDelete.
          ++iter_stats_.num_record_drop_obsolete;
@@ -718,11 +645,6 @@ void CompactionIterator::NextFromInput() {
          if (!bottommost_level_) {
            ++iter_stats_.num_optimized_del_drop_obsolete;
          }
-        } else if (last_key_seq_zeroed_) {
-          // Skip.
-          ++iter_stats_.num_record_drop_hidden;
-          ++iter_stats_.num_record_drop_obsolete;
-          assert(bottommost_level_);
        } else {
          // Output SingleDelete
          valid_ = true;
@@ -757,7 +679,7 @@ void CompactionIterator::NextFromInput() {
               (ikey_.type == kTypeDeletion ||
                (ikey_.type == kTypeDeletionWithTimestamp &&
                 cmp_with_history_ts_low_ < 0)) &&
-               DefinitelyInSnapshot(ikey_.sequence, earliest_snapshot_) &&
+               IN_EARLIEST_SNAPSHOT(ikey_.sequence) &&
               ikeyNotNeededForIncrementalSnapshot() &&
               compaction_->KeyNotExistsBeyondOutputLevel(ikey_.user_key,
                                                          &level_ptrs_)) {
@@ -800,13 +722,6 @@ void CompactionIterator::NextFromInput() {
                                 ikey_.user_key, &level_ptrs_));
      ParsedInternalKey next_ikey;
      AdvanceInputIter();
-#ifndef NDEBUG
-      const Compaction* c =
-          compaction_ ? compaction_->real_compaction() : nullptr;
-#endif
-      TEST_SYNC_POINT_CALLBACK(
-          "CompactionIterator::NextFromInput:BottommostDelete:1",
-          const_cast<Compaction*>(c));
      // Skip over all versions of this key that happen to occur in the same
      // snapshot range as the delete.
      //
@@ -819,7 +734,7 @@ void CompactionIterator::NextFromInput() {
                  .ok()) &&
             cmp_->EqualWithoutTimestamp(ikey_.user_key, next_ikey.user_key) &&
             (prev_snapshot == 0 ||
-              DefinitelyNotInSnapshot(next_ikey.sequence, prev_snapshot))) {
+              DEFINITELY_NOT_IN_SNAPSHOT(next_ikey.sequence, prev_snapshot))) {
        AdvanceInputIter();
      }
      // If you find you still need to output a row with this key, we need to output the
@@ -839,15 +754,15 @@ void CompactionIterator::NextFromInput() {
      }

      pinned_iters_mgr_.StartPinning();
+      Version* version = compaction_ ? compaction_->input_version() : nullptr;

      // We know the merge type entry is not hidden, otherwise we would
      // have hit (A)
      // We encapsulate the merge related state machine in a different
      // object to minimize change to the existing flow.
-      Status s = merge_helper_->MergeUntil(
-          &input_, range_del_agg_, prev_snapshot, bottommost_level_,
-          allow_data_in_errors_, blob_fetcher_.get(), prefetch_buffers_.get(),
-          &iter_stats_);
+      Status s = merge_helper_->MergeUntil(&input_, range_del_agg_,
+                                           prev_snapshot, bottommost_level_,
+                                           allow_data_in_errors_, version);
      merge_out_iter_.SeekToFirst();

      if (!s.ok() && !s.IsMergeInProgress()) {
@@ -967,23 +882,26 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {
      }
    }

+    if (blob_index.IsInlined() || blob_index.HasTTL()) {
+      status_ = Status::Corruption("Unexpected TTL/inlined blob index");
+      valid_ = false;
+
+      return;
+    }
+
    if (blob_index.file_number() >=
        blob_garbage_collection_cutoff_file_number_) {
      return;
    }

-    FilePrefetchBuffer* prefetch_buffer =
-        prefetch_buffers_ ? prefetch_buffers_->GetOrCreatePrefetchBuffer(
-                                blob_index.file_number())
-                          : nullptr;
+    const Version* const version = compaction_->input_version();
+    assert(version);

    uint64_t bytes_read = 0;

    {
-      assert(blob_fetcher_);
-
-      const Status s = blob_fetcher_->FetchBlob(
-          user_key(), blob_index, prefetch_buffer, &blob_value_, &bytes_read);
+      const Status s = version->GetBlob(ReadOptions(), user_key(), blob_index,
+                                        &blob_value_, &bytes_read);

      if (!s.ok()) {
        status_ = s;
@@ -996,9 +914,6 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {
    ++iter_stats_.num_blobs_read;
    iter_stats_.total_blob_bytes_read += bytes_read;

-    ++iter_stats_.num_blobs_relocated;
-    iter_stats_.total_blob_bytes_relocated += blob_index.size();
-
    value_ = blob_value_;

    if (ExtractLargeValueIfNeededImpl()) {
@@ -1062,22 +977,14 @@ void CompactionIterator::PrepareOutput() {
    if (valid_ && compaction_ != nullptr &&
        !compaction_->allow_ingest_behind() &&
        ikeyNotNeededForIncrementalSnapshot() && bottommost_level_ &&
-        DefinitelyInSnapshot(ikey_.sequence, earliest_snapshot_) &&
-        ikey_.type != kTypeMerge) {
-      assert(ikey_.type != kTypeDeletion);
-      assert(ikey_.type != kTypeSingleDeletion ||
-             (timestamp_size_ || full_history_ts_low_));
-      if (ikey_.type == kTypeDeletion ||
-          (ikey_.type == kTypeSingleDeletion &&
-           (!timestamp_size_ || !full_history_ts_low_))) {
+        IN_EARLIEST_SNAPSHOT(ikey_.sequence) && ikey_.type != kTypeMerge) {
+      assert(ikey_.type != kTypeDeletion && ikey_.type != kTypeSingleDeletion);
+      if (ikey_.type == kTypeDeletion || ikey_.type == kTypeSingleDeletion) {
        ROCKS_LOG_FATAL(info_log_,
                        "Unexpected key type %d for seq-zero optimization",
                        ikey_.type);
      }
      ikey_.sequence = 0;
-      last_key_seq_zeroed_ = true;
-      TEST_SYNC_POINT_CALLBACK("CompactionIterator::PrepareOutput:ZeroingSeq",
-                               &ikey_);
      if (!timestamp_size_) {
        current_key_.UpdateInternalKey(0, ikey_.type);
      } else if (full_history_ts_low_ && cmp_with_history_ts_low_ < 0) {
@@ -1146,6 +1053,41 @@ inline bool CompactionIterator::ikeyNotNeededForIncrementalSnapshot() {
         (ikey_.sequence < preserve_deletes_seqnum_);
 }

+bool CompactionIterator::IsInEarliestSnapshot(SequenceNumber sequence) {
+  assert(snapshot_checker_ != nullptr);
+  bool pre_condition = (earliest_snapshot_ == kMaxSequenceNumber ||
+                        (earliest_snapshot_iter_ != snapshots_->end() &&
+                         *earliest_snapshot_iter_ == earliest_snapshot_));
+  assert(pre_condition);
+  if (!pre_condition) {
+    ROCKS_LOG_FATAL(info_log_,
+                    "Pre-Condition is not hold in IsInEarliestSnapshot");
+  }
+  auto in_snapshot =
+      snapshot_checker_->CheckInSnapshot(sequence, earliest_snapshot_);
+  while (UNLIKELY(in_snapshot == SnapshotCheckerResult::kSnapshotReleased)) {
+    // Avoid the the current earliest_snapshot_ being return as
+    // earliest visible snapshot for the next value. So if a value's sequence
+    // is zero-ed out by PrepareOutput(), the next value will be compact out.
+    released_snapshots_.insert(earliest_snapshot_);
+    earliest_snapshot_iter_++;
+
+    if (earliest_snapshot_iter_ == snapshots_->end()) {
+      earliest_snapshot_ = kMaxSequenceNumber;
+    } else {
+      earliest_snapshot_ = *earliest_snapshot_iter_;
+    }
+    in_snapshot =
+        snapshot_checker_->CheckInSnapshot(sequence, earliest_snapshot_);
+  }
+  assert(in_snapshot != SnapshotCheckerResult::kSnapshotReleased);
+  if (in_snapshot == SnapshotCheckerResult::kSnapshotReleased) {
+    ROCKS_LOG_FATAL(info_log_,
+                    "Unexpected released snapshot in IsInEarliestSnapshot");
+  }
+  return in_snapshot == SnapshotCheckerResult::kInSnapshot;
+}
+
 uint64_t CompactionIterator::ComputeBlobGarbageCollectionCutoffFileNumber(
    const CompactionProxy* compaction) {
  if (!compaction) {
@@ -1156,7 +1098,7 @@ uint64_t CompactionIterator::ComputeBlobGarbageCollectionCutoffFileNumber(
    return 0;
  }

-  const Version* const version = compaction->input_version();
+  Version* const version = compaction->input_version();
  assert(version);

  const VersionStorageInfo* const storage_info = version->storage_info();
@@ -1172,42 +1114,4 @@ uint64_t CompactionIterator::ComputeBlobGarbageCollectionCutoffFileNumber(
                                : std::numeric_limits<uint64_t>::max();
 }

-std::unique_ptr<BlobFetcher> CompactionIterator::CreateBlobFetcherIfNeeded(
-    const CompactionProxy* compaction) {
-  if (!compaction) {
-    return nullptr;
-  }
-
-  const Version* const version = compaction->input_version();
-  if (!version) {
-    return nullptr;
-  }
-
-  return std::unique_ptr<BlobFetcher>(new BlobFetcher(version, ReadOptions()));
-}
-
-std::unique_ptr<PrefetchBufferCollection>
-CompactionIterator::CreatePrefetchBufferCollectionIfNeeded(
-    const CompactionProxy* compaction) {
-  if (!compaction) {
-    return nullptr;
-  }
-
-  if (!compaction->input_version()) {
-    return nullptr;
-  }
-
-  if (compaction->allow_mmap_reads()) {
-    return nullptr;
-  }
-
-  const uint64_t readahead_size = compaction->blob_compaction_readahead_size();
-  if (!readahead_size) {
-    return nullptr;
-  }
-
-  return std::unique_ptr<PrefetchBufferCollection>(
-      new PrefetchBufferCollection(readahead_size));
-}
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -23,8 +23,6 @@
 namespace ROCKSDB_NAMESPACE {

 class BlobFileBuilder;
-class BlobFetcher;
-class PrefetchBufferCollection;

 // A wrapper of internal iterator whose purpose is to count how
 // many entries there are in the iterator.
@@ -94,19 +92,13 @@ class CompactionIterator {

    virtual bool preserve_deletes() const = 0;

-    virtual bool allow_mmap_reads() const = 0;
-
    virtual bool enable_blob_garbage_collection() const = 0;

    virtual double blob_garbage_collection_age_cutoff() const = 0;

-    virtual uint64_t blob_compaction_readahead_size() const = 0;
-
-    virtual const Version* input_version() const = 0;
+    virtual Version* input_version() const = 0;

    virtual bool DoesInputReferenceBlobFiles() const = 0;
-
-    virtual const Compaction* real_compaction() const = 0;
  };

  class RealCompaction : public CompactionProxy {
@@ -143,10 +135,6 @@ class CompactionIterator {
      return compaction_->immutable_options()->preserve_deletes;
    }

-    bool allow_mmap_reads() const override {
-      return compaction_->immutable_options()->allow_mmap_reads;
-    }
-
    bool enable_blob_garbage_collection() const override {
      return compaction_->mutable_cf_options()->enable_blob_garbage_collection;
    }
@@ -156,11 +144,7 @@ class CompactionIterator {
          ->blob_garbage_collection_age_cutoff;
    }

-    uint64_t blob_compaction_readahead_size() const override {
-      return compaction_->mutable_cf_options()->blob_compaction_readahead_size;
-    }
-
-    const Version* input_version() const override {
+    Version* input_version() const override {
      return compaction_->input_version();
    }

@@ -168,8 +152,6 @@ class CompactionIterator {
      return compaction_->DoesInputReferenceBlobFiles();
    }

-    const Compaction* real_compaction() const override { return compaction_; }
-
   private:
    const Compaction* compaction_;
  };
@@ -285,9 +267,7 @@ class CompactionIterator {
               SnapshotCheckerResult::kInSnapshot;
  }

-  bool DefinitelyInSnapshot(SequenceNumber seq, SequenceNumber snapshot);
-
-  bool DefinitelyNotInSnapshot(SequenceNumber seq, SequenceNumber snapshot);
+  bool IsInEarliestSnapshot(SequenceNumber sequence);

  // Extract user-defined timestamp from user key if possible and compare it
  // with *full_history_ts_low_ if applicable.
@@ -305,10 +285,6 @@ class CompactionIterator {

  static uint64_t ComputeBlobGarbageCollectionCutoffFileNumber(
      const CompactionProxy* compaction);
-  static std::unique_ptr<BlobFetcher> CreateBlobFetcherIfNeeded(
-      const CompactionProxy* compaction);
-  static std::unique_ptr<PrefetchBufferCollection>
-  CreatePrefetchBufferCollectionIfNeeded(const CompactionProxy* compaction);

  SequenceIterWrapper input_;
  const Comparator* cmp_;
@@ -397,9 +373,6 @@ class CompactionIterator {

  uint64_t blob_garbage_collection_cutoff_file_number_;

-  std::unique_ptr<BlobFetcher> blob_fetcher_;
-  std::unique_ptr<PrefetchBufferCollection> prefetch_buffers_;
-
  std::string blob_index_;
  PinnableSlice blob_value_;
  std::string compaction_filter_value_;
@@ -422,10 +395,6 @@ class CompactionIterator {

  const int level_;

-  // True if the previous internal key (same user key)'s sequence number has
-  // just been zeroed out during bottommost compaction.
-  bool last_key_seq_zeroed_{false};
-
  void AdvanceInputIter() { input_.Next(); }

  void SkipUntil(const Slice& skip_until) { input_.Seek(skip_until); }
@@ -443,21 +412,4 @@ class CompactionIterator {
            manual_compaction_canceled_->load(std::memory_order_relaxed));
  }
 };
-
-inline bool CompactionIterator::DefinitelyInSnapshot(SequenceNumber seq,
-                                                     SequenceNumber snapshot) {
-  return ((seq) <= (snapshot) &&
-          (snapshot_checker_ == nullptr ||
-           LIKELY(snapshot_checker_->CheckInSnapshot((seq), (snapshot)) ==
-                  SnapshotCheckerResult::kInSnapshot)));
-}
-
-inline bool CompactionIterator::DefinitelyNotInSnapshot(
-    SequenceNumber seq, SequenceNumber snapshot) {
-  return ((seq) > (snapshot) ||
-          (snapshot_checker_ != nullptr &&
-           UNLIKELY(snapshot_checker_->CheckInSnapshot((seq), (snapshot)) ==
-                    SnapshotCheckerResult::kNotInSnapshot)));
-}
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -3,17 +3,15 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include "db/compaction/compaction_iterator.h"

 #include <string>
 #include <vector>

-#include "db/dbformat.h"
+#include "db/compaction/compaction_iterator.h"
 #include "port/port.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/string_util.h"
-#include "util/vector_iterator.h"
 #include "utilities/merge_operators.h"

 namespace ROCKSDB_NAMESPACE {
@@ -88,7 +86,7 @@ class FilterAllKeysCompactionFilter : public CompactionFilter {
  const char* Name() const override { return "AllKeysCompactionFilter"; }
 };

-class LoggingForwardVectorIterator : public VectorIterator {
+class LoggingForwardVectorIterator : public InternalIterator {
 public:
  struct Action {
    enum class Type {
@@ -110,19 +108,22 @@ class LoggingForwardVectorIterator : public VectorIterator {

  LoggingForwardVectorIterator(const std::vector<std::string>& keys,
                               const std::vector<std::string>& values)
-      : VectorIterator(keys, values) {
-    current_ = keys_.size();
+      : keys_(keys), values_(values), current_(keys.size()) {
+    assert(keys_.size() == values_.size());
  }

+  bool Valid() const override { return current_ < keys_.size(); }
+
  void SeekToFirst() override {
    log.emplace_back(Action::Type::SEEK_TO_FIRST);
-    VectorIterator::SeekToFirst();
+    current_ = 0;
  }
  void SeekToLast() override { assert(false); }

  void Seek(const Slice& target) override {
    log.emplace_back(Action::Type::SEEK, target.ToString());
-    VectorIterator::Seek(target);
+    current_ = std::lower_bound(keys_.begin(), keys_.end(), target.ToString()) -
+               keys_.begin();
  }

  void SeekForPrev(const Slice& /*target*/) override { assert(false); }
@@ -130,20 +131,27 @@ class LoggingForwardVectorIterator : public VectorIterator {
  void Next() override {
    assert(Valid());
    log.emplace_back(Action::Type::NEXT);
-    VectorIterator::Next();
+    current_++;
  }
  void Prev() override { assert(false); }

  Slice key() const override {
    assert(Valid());
-    return VectorIterator::key();
+    return Slice(keys_[current_]);
  }
  Slice value() const override {
    assert(Valid());
-    return VectorIterator::value();
+    return Slice(values_[current_]);
  }

+  Status status() const override { return Status::OK(); }
+
  std::vector<Action> log;
+
+ private:
+  std::vector<std::string> keys_;
+  std::vector<std::string> values_;
+  size_t current_;
 };

 class FakeCompaction : public CompactionIterator::CompactionProxy {
@@ -168,20 +176,14 @@ class FakeCompaction : public CompactionIterator::CompactionProxy {

  bool preserve_deletes() const override { return false; }

-  bool allow_mmap_reads() const override { return false; }
-
  bool enable_blob_garbage_collection() const override { return false; }

  double blob_garbage_collection_age_cutoff() const override { return 0.0; }

-  uint64_t blob_compaction_readahead_size() const override { return 0; }
-
-  const Version* input_version() const override { return nullptr; }
+  Version* input_version() const override { return nullptr; }

  bool DoesInputReferenceBlobFiles() const override { return false; }

-  const Compaction* real_compaction() const override { return nullptr; }
-
  bool key_not_exists_beyond_output_level = false;

  bool is_bottommost_level = false;
@@ -240,7 +242,7 @@ class CompactionIteratorTest : public testing::TestWithParam<bool> {
      bool key_not_exists_beyond_output_level = false,
      const std::string* full_history_ts_low = nullptr) {
    std::unique_ptr<InternalIterator> unfragmented_range_del_iter(
-        new VectorIterator(range_del_ks, range_del_vs, &icmp_));
+        new test::VectorIterator(range_del_ks, range_del_vs));
    auto tombstone_list = std::make_shared<FragmentedRangeTombstoneList>(
        std::move(unfragmented_range_del_iter), icmp_);
    std::unique_ptr<FragmentedRangeTombstoneIterator> range_del_iter(
@@ -1175,10 +1177,9 @@ TEST_P(CompactionIteratorTsGcTest, NewHidesOldSameSnapshot) {
    std::string full_history_ts_low;
    // Keys whose timestamps larger than or equal to 102 will be preserved.
    PutFixed64(&full_history_ts_low, 102);
-    const std::vector<std::string> expected_keys = {
-        input_keys[0], input_keys[1], input_keys[2]};
-    const std::vector<std::string> expected_values = {"", input_values[1],
-                                                      input_values[2]};
+    const std::vector<std::string> expected_keys = {input_keys[0],
+                                                    input_keys[1]};
+    const std::vector<std::string> expected_values = {"", "a2"};
    RunTest(input_keys, input_values, expected_keys, expected_values,
            /*last_committed_seq=*/kMaxSequenceNumber,
            /*merge_operator=*/nullptr, /*compaction_filter=*/nullptr,
@@ -1255,101 +1256,6 @@ TEST_P(CompactionIteratorTsGcTest, RewriteTs) {
  }
 }

-TEST_P(CompactionIteratorTsGcTest, SingleDeleteNoKeyEligibleForGC) {
-  constexpr char user_key[][2] = {{'a', '\0'}, {'b', '\0'}};
-  const std::vector<std::string> input_keys = {
-      test::KeyStr(/*ts=*/104, user_key[0], /*seq=*/4, kTypeSingleDeletion),
-      test::KeyStr(/*ts=*/103, user_key[0], /*seq=*/3, kTypeValue),
-      test::KeyStr(/*ts=*/102, user_key[1], /*seq=*/2, kTypeValue)};
-  const std::vector<std::string> input_values = {"", "a3", "b2"};
-  std::string full_history_ts_low;
-  // All keys' timestamps are newer than or equal to 102, thus none of them
-  // will be eligible for GC.
-  PutFixed64(&full_history_ts_low, 102);
-  const std::vector<std::string>& expected_keys = input_keys;
-  const std::vector<std::string>& expected_values = input_values;
-  const std::vector<std::pair<bool, bool>> params = {
-      {false, false}, {false, true}, {true, true}};
-  for (const std::pair<bool, bool>& param : params) {
-    const bool bottommost_level = param.first;
-    const bool key_not_exists_beyond_output_level = param.second;
-    RunTest(input_keys, input_values, expected_keys, expected_values,
-            /*last_committed_seq=*/kMaxSequenceNumber,
-            /*merge_operator=*/nullptr, /*compaction_filter=*/nullptr,
-            bottommost_level,
-            /*earliest_write_conflict_snapshot=*/kMaxSequenceNumber,
-            key_not_exists_beyond_output_level, &full_history_ts_low);
-  }
-}
-
-TEST_P(CompactionIteratorTsGcTest, SingleDeleteDropTombstones) {
-  constexpr char user_key[] = "a";
-  const std::vector<std::string> input_keys = {
-      test::KeyStr(/*ts=*/103, user_key, /*seq=*/4, kTypeSingleDeletion),
-      test::KeyStr(/*ts=*/102, user_key, /*seq=*/3, kTypeValue),
-      test::KeyStr(/*ts=*/101, user_key, /*seq=*/2, kTypeSingleDeletion),
-      test::KeyStr(/*ts=*/100, user_key, /*seq=*/1, kTypeValue)};
-  const std::vector<std::string> input_values = {"", "a2", "", "a0"};
-  const std::vector<std::string> expected_keys = {input_keys[0], input_keys[1]};
-  const std::vector<std::string> expected_values = {"", "a2"};
-
-  // Take a snapshot at seq 2.
-  AddSnapshot(2);
-  {
-    const std::vector<std::pair<bool, bool>> params = {
-        {false, false}, {false, true}, {true, true}};
-    for (const std::pair<bool, bool>& param : params) {
-      const bool bottommost_level = param.first;
-      const bool key_not_exists_beyond_output_level = param.second;
-      std::string full_history_ts_low;
-      PutFixed64(&full_history_ts_low, 102);
-      RunTest(input_keys, input_values, expected_keys, expected_values,
-              /*last_committed_seq=*/kMaxSequenceNumber,
-              /*merge_operator=*/nullptr, /*compaction_filter=*/nullptr,
-              bottommost_level,
-              /*earliest_write_conflict_snapshot=*/kMaxSequenceNumber,
-              key_not_exists_beyond_output_level, &full_history_ts_low);
-    }
-  }
-}
-
-TEST_P(CompactionIteratorTsGcTest, SingleDeleteAllKeysOlderThanThreshold) {
-  constexpr char user_key[][2] = {{'a', '\0'}, {'b', '\0'}};
-  const std::vector<std::string> input_keys = {
-      test::KeyStr(/*ts=*/103, user_key[0], /*seq=*/4, kTypeSingleDeletion),
-      test::KeyStr(/*ts=*/102, user_key[0], /*seq=*/3, kTypeValue),
-      test::KeyStr(/*ts=*/104, user_key[1], /*seq=*/5, kTypeValue)};
-  const std::vector<std::string> input_values = {"", "a2", "b5"};
-  std::string full_history_ts_low;
-  PutFixed64(&full_history_ts_low, std::numeric_limits<uint64_t>::max());
-  {
-    // With a snapshot at seq 3, both the deletion marker and the key at 3 must
-    // be preserved.
-    AddSnapshot(3);
-    const std::vector<std::string> expected_keys = {
-        input_keys[0], input_keys[1], input_keys[2]};
-    const std::vector<std::string> expected_values = {"", "a2", "b5"};
-    RunTest(input_keys, input_values, expected_keys, expected_values,
-            /*last_committed_seq=*/kMaxSequenceNumber,
-            /*merge_operator=*/nullptr, /*compaction_filter=*/nullptr,
-            /*bottommost_level=*/false,
-            /*earliest_write_conflict_snapshot=*/kMaxSequenceNumber,
-            /*key_not_exists_beyond_output_level=*/false, &full_history_ts_low);
-    ClearSnapshots();
-  }
-  {
-    // No snapshot.
-    const std::vector<std::string> expected_keys = {input_keys[2]};
-    const std::vector<std::string> expected_values = {"b5"};
-    RunTest(input_keys, input_values, expected_keys, expected_values,
-            /*last_committed_seq=*/kMaxSequenceNumber,
-            /*merge_operator=*/nullptr, /*compaction_filter=*/nullptr,
-            /*bottommost_level=*/false,
-            /*earliest_write_conflict_snapshot=*/kMaxSequenceNumber,
-            /*key_not_exists_beyond_output_level=*/false, &full_history_ts_low);
-  }
-}
-
 INSTANTIATE_TEST_CASE_P(CompactionIteratorTsGcTestInstance,
                        CompactionIteratorTsGcTest,
                        testing::Values(true, false));
@@ -107,10 +107,6 @@ const char* GetCompactionReasonString(CompactionReason compaction_reason) {
      return "ExternalSstIngestion";
    case CompactionReason::kPeriodicCompaction:
      return "PeriodicCompaction";
-    case CompactionReason::kChangeTemperature:
-      return "ChangeTemperature";
-    case CompactionReason::kForcedBlobGC:
-      return "ForcedBlobGC";
    case CompactionReason::kNumOfReasons:
      // fall through
    default:
@@ -170,13 +166,6 @@ struct CompactionJob::SubcompactionState {
    }
  }

-  // Some identified files with old oldest ancester time and the range should be
-  // isolated out so that the output file(s) in that range can be merged down
-  // for TTL and clear the timestamps for the range.
-  std::vector<FileMetaData*> files_to_cut_for_ttl;
-  int cur_files_to_cut_for_ttl = -1;
-  int next_files_to_cut_for_ttl = 0;
-
  uint64_t current_output_file_size = 0;

  // State during the subcompaction
@@ -219,8 +208,6 @@ struct CompactionJob::SubcompactionState {
    return Status::OK();
  }

-  void FillFilesToCutForTtl();
-
  // Returns true iff we should stop building the current output
  // before processing "internal_key".
  bool ShouldStopBefore(const Slice& internal_key, uint64_t curr_file_size) {
@@ -228,7 +215,6 @@ struct CompactionJob::SubcompactionState {
        &compaction->column_family_data()->internal_comparator();
    const std::vector<FileMetaData*>& grandparents = compaction->grandparents();

-    bool grandparant_file_switched = false;
    // Scan to find earliest grandparent file that contains key.
    while (grandparent_index < grandparents.size() &&
           icmp->Compare(internal_key,
@@ -236,7 +222,6 @@ struct CompactionJob::SubcompactionState {
               0) {
      if (seen_key) {
        overlapped_bytes += grandparents[grandparent_index]->fd.GetFileSize();
-        grandparant_file_switched = true;
      }
      assert(grandparent_index + 1 >= grandparents.size() ||
             icmp->Compare(
@@ -246,47 +231,13 @@ struct CompactionJob::SubcompactionState {
    }
    seen_key = true;

-    if (grandparant_file_switched && overlapped_bytes + curr_file_size >
-                                         compaction->max_compaction_bytes()) {
+    if (overlapped_bytes + curr_file_size >
+        compaction->max_compaction_bytes()) {
      // Too much overlap for current output; start new output
      overlapped_bytes = 0;
      return true;
    }

-    if (!files_to_cut_for_ttl.empty()) {
-      if (cur_files_to_cut_for_ttl != -1) {
-        // Previous key is inside the range of a file
-        if (icmp->Compare(internal_key,
-                          files_to_cut_for_ttl[cur_files_to_cut_for_ttl]
-                              ->largest.Encode()) > 0) {
-          next_files_to_cut_for_ttl = cur_files_to_cut_for_ttl + 1;
-          cur_files_to_cut_for_ttl = -1;
-          return true;
-        }
-      } else {
-        // Look for the key position
-        while (next_files_to_cut_for_ttl <
-               static_cast<int>(files_to_cut_for_ttl.size())) {
-          if (icmp->Compare(internal_key,
-                            files_to_cut_for_ttl[next_files_to_cut_for_ttl]
-                                ->smallest.Encode()) >= 0) {
-            if (icmp->Compare(internal_key,
-                              files_to_cut_for_ttl[next_files_to_cut_for_ttl]
-                                  ->largest.Encode()) <= 0) {
-              // With in the current file
-              cur_files_to_cut_for_ttl = next_files_to_cut_for_ttl;
-              return true;
-            }
-            // Beyond the current file
-            next_files_to_cut_for_ttl++;
-          } else {
-            // Still fall into the gap
-            break;
-          }
-        }
-      }
-    }
-
    return false;
  }

@@ -299,46 +250,6 @@ struct CompactionJob::SubcompactionState {
  }
 };

-void CompactionJob::SubcompactionState::FillFilesToCutForTtl() {
-  if (compaction->immutable_options()->compaction_style !=
-          CompactionStyle::kCompactionStyleLevel ||
-      compaction->immutable_options()->compaction_pri !=
-          CompactionPri::kMinOverlappingRatio ||
-      compaction->mutable_cf_options()->ttl == 0 ||
-      compaction->num_input_levels() < 2 || compaction->bottommost_level()) {
-    return;
-  }
-
-  // We define new file with oldest ancestor time to be younger than 1/4 TTL,
-  // and an old one to be older than 1/2 TTL time.
-  int64_t temp_current_time;
-  auto get_time_status = compaction->immutable_options()->clock->GetCurrentTime(
-      &temp_current_time);
-  if (!get_time_status.ok()) {
-    return;
-  }
-  uint64_t current_time = static_cast<uint64_t>(temp_current_time);
-  if (current_time < compaction->mutable_cf_options()->ttl) {
-    return;
-  }
-  uint64_t old_age_thres =
-      current_time - compaction->mutable_cf_options()->ttl / 2;
-
-  const std::vector<FileMetaData*>& olevel =
-      *(compaction->inputs(compaction->num_input_levels() - 1));
-  for (FileMetaData* file : olevel) {
-    // Worth filtering out by start and end?
-    uint64_t oldest_ancester_time = file->TryGetOldestAncesterTime();
-    // We put old files if they are not too small to prevent a flood
-    // of small files.
-    if (oldest_ancester_time < old_age_thres &&
-        file->fd.GetFileSize() >
-            compaction->mutable_cf_options()->target_file_size_base / 2) {
-      files_to_cut_for_ttl.push_back(file);
-    }
-  }
-}
-
 // Maintains state for the entire compaction
 struct CompactionJob::CompactionState {
  Compaction* const compaction;
@@ -763,16 +674,12 @@ Status CompactionJob::Run() {
    constexpr IODebugContext* dbg = nullptr;

    if (output_directory_) {
-      io_s = output_directory_->FsyncWithDirOptions(
-          IOOptions(), dbg,
-          DirFsyncOptions(DirFsyncOptions::FsyncReason::kNewFileSynced));
+      io_s = output_directory_->Fsync(IOOptions(), dbg);
    }

    if (io_s.ok() && wrote_new_blob_files && blob_output_directory_ &&
        blob_output_directory_ != output_directory_) {
-      io_s = blob_output_directory_->FsyncWithDirOptions(
-          IOOptions(), dbg,
-          DirFsyncOptions(DirFsyncOptions::FsyncReason::kNewFileSynced));
+      io_s = blob_output_directory_->Fsync(IOOptions(), dbg);
    }
  }
  if (io_status_.ok()) {
@@ -972,7 +879,7 @@ Status CompactionJob::Install(const MutableCFOptions& mutable_cf_options) {

  UpdateCompactionJobStats(stats);

-  auto stream = event_logger_->LogToBuffer(log_buffer_, 8192);
+  auto stream = event_logger_->LogToBuffer(log_buffer_);
  stream << "job" << job_id_ << "event"
         << "compaction_finished"
         << "compaction_time_micros" << stats.micros
@@ -1023,8 +930,7 @@ Status CompactionJob::Install(const MutableCFOptions& mutable_cf_options) {
 }

 #ifndef ROCKSDB_LITE
-CompactionServiceJobStatus
-CompactionJob::ProcessKeyValueCompactionWithCompactionService(
+void CompactionJob::ProcessKeyValueCompactionWithCompactionService(
    SubcompactionState* sub_compact) {
  assert(sub_compact);
  assert(sub_compact->compaction);
@@ -1061,7 +967,7 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(
  Status s = compaction_input.Write(&compaction_input_binary);
  if (!s.ok()) {
    sub_compact->status = s;
-    return CompactionServiceJobStatus::kFailure;
+    return;
  }

  std::ostringstream input_files_oss;
@@ -1076,77 +982,39 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(
      "[%s] [JOB %d] Starting remote compaction (output level: %d): %s",
      compaction_input.column_family.name.c_str(), job_id_,
      compaction_input.output_level, input_files_oss.str().c_str());
-  CompactionServiceJobInfo info(dbname_, db_id_, db_session_id_,
-                                GetCompactionId(sub_compact), thread_pri_);
  CompactionServiceJobStatus compaction_status =
-      db_options_.compaction_service->StartV2(info, compaction_input_binary);
-  switch (compaction_status) {
-    case CompactionServiceJobStatus::kSuccess:
-      break;
-    case CompactionServiceJobStatus::kFailure:
-      sub_compact->status = Status::Incomplete(
-          "CompactionService failed to start compaction job.");
-      ROCKS_LOG_WARN(db_options_.info_log,
-                     "[%s] [JOB %d] Remote compaction failed to start.",
-                     compaction_input.column_family.name.c_str(), job_id_);
-      return compaction_status;
-    case CompactionServiceJobStatus::kUseLocal:
-      ROCKS_LOG_INFO(
-          db_options_.info_log,
-          "[%s] [JOB %d] Remote compaction fallback to local by API Start.",
-          compaction_input.column_family.name.c_str(), job_id_);
-      return compaction_status;
-    default:
-      assert(false);  // unknown status
-      break;
+      db_options_.compaction_service->Start(compaction_input_binary,
+                                            GetCompactionId(sub_compact));
+  if (compaction_status != CompactionServiceJobStatus::kSuccess) {
+    sub_compact->status =
+        Status::Incomplete("CompactionService failed to start compaction job.");
+    return;
  }

-  ROCKS_LOG_INFO(db_options_.info_log,
-                 "[%s] [JOB %d] Waiting for remote compaction...",
-                 compaction_input.column_family.name.c_str(), job_id_);
  std::string compaction_result_binary;
-  compaction_status = db_options_.compaction_service->WaitForCompleteV2(
-      info, &compaction_result_binary);
-
-  if (compaction_status == CompactionServiceJobStatus::kUseLocal) {
-    ROCKS_LOG_INFO(db_options_.info_log,
-                   "[%s] [JOB %d] Remote compaction fallback to local by API "
-                   "WaitForComplete.",
-                   compaction_input.column_family.name.c_str(), job_id_);
-    return compaction_status;
-  }
+  compaction_status = db_options_.compaction_service->WaitForComplete(
+      GetCompactionId(sub_compact), &compaction_result_binary);

  CompactionServiceResult compaction_result;
  s = CompactionServiceResult::Read(compaction_result_binary,
                                    &compaction_result);
-
-  if (compaction_status == CompactionServiceJobStatus::kFailure) {
-    if (s.ok()) {
-      if (compaction_result.status.ok()) {
-        sub_compact->status = Status::Incomplete(
-            "CompactionService failed to run the compaction job (even though "
-            "the internal status is okay).");
-      } else {
-        // set the current sub compaction status with the status returned from
-        // remote
-        sub_compact->status = compaction_result.status;
-      }
-    } else {
-      sub_compact->status = Status::Incomplete(
-          "CompactionService failed to run the compaction job (and no valid "
-          "result is returned).");
-      compaction_result.status.PermitUncheckedError();
-    }
+  if (compaction_status != CompactionServiceJobStatus::kSuccess) {
+    sub_compact->status =
+        s.ok() ? compaction_result.status
+               : Status::Incomplete(
+                     "CompactionService failed to run compaction job.");
+    compaction_result.status.PermitUncheckedError();
    ROCKS_LOG_WARN(db_options_.info_log,
-                   "[%s] [JOB %d] Remote compaction failed.",
-                   compaction_input.column_family.name.c_str(), job_id_);
-    return compaction_status;
+                   "[%s] [JOB %d] Remote compaction failed, status: %s",
+                   compaction_input.column_family.name.c_str(), job_id_,
+                   s.ToString().c_str());
+    return;
  }

  if (!s.ok()) {
    sub_compact->status = s;
    compaction_result.status.PermitUncheckedError();
-    return CompactionServiceJobStatus::kFailure;
+    return;
  }
  sub_compact->status = compaction_result.status;

@@ -1166,7 +1034,7 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(

  if (!s.ok()) {
    sub_compact->status = s;
-    return CompactionServiceJobStatus::kFailure;
+    return;
  }

  for (const auto& file : compaction_result.output_files) {
@@ -1177,7 +1045,7 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(
    s = fs_->RenameFile(src_file, tgt_file, IOOptions(), nullptr);
    if (!s.ok()) {
      sub_compact->status = s;
-      return CompactionServiceJobStatus::kFailure;
+      return;
    }

    FileMetaData meta;
@@ -1185,7 +1053,7 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(
    s = fs_->GetFileSize(tgt_file, IOOptions(), &file_size, nullptr);
    if (!s.ok()) {
      sub_compact->status = s;
-      return CompactionServiceJobStatus::kFailure;
+      return;
    }
    meta.fd = FileDescriptor(file_num, compaction->output_path_id(), file_size,
                             file.smallest_seqno, file.largest_seqno);
@@ -1204,10 +1072,8 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(
  sub_compact->num_output_records = compaction_result.num_output_records;
  sub_compact->approx_size = compaction_input.approx_size;  // is this used?
  sub_compact->total_bytes = compaction_result.total_bytes;
-  RecordTick(stats_, REMOTE_COMPACT_READ_BYTES, compaction_result.bytes_read);
-  RecordTick(stats_, REMOTE_COMPACT_WRITE_BYTES,
-             compaction_result.bytes_written);
-  return CompactionServiceJobStatus::kSuccess;
+  IOSTATS_ADD(bytes_written, compaction_result.bytes_written);
+  IOSTATS_ADD(bytes_read, compaction_result.bytes_read);
 }
 #endif  // !ROCKSDB_LITE

@@ -1217,14 +1083,7 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {

 #ifndef ROCKSDB_LITE
  if (db_options_.compaction_service) {
-    CompactionServiceJobStatus comp_status =
-        ProcessKeyValueCompactionWithCompactionService(sub_compact);
-    if (comp_status == CompactionServiceJobStatus::kSuccess ||
-        comp_status == CompactionServiceJobStatus::kFailure) {
-      return;
-    }
-    // fallback to local compaction
-    assert(comp_status == CompactionServiceJobStatus::kUseLocal);
+    return ProcessKeyValueCompactionWithCompactionService(sub_compact);
  }
 #endif  // !ROCKSDB_LITE

@@ -1348,13 +1207,13 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {

  std::unique_ptr<BlobFileBuilder> blob_file_builder(
      mutable_cf_options->enable_blob_files
-          ? new BlobFileBuilder(
-                versions_, fs_.get(),
-                sub_compact->compaction->immutable_options(),
-                mutable_cf_options, &file_options_, job_id_, cfd->GetID(),
-                cfd->GetName(), Env::IOPriority::IO_LOW, write_hint_,
-                io_tracer_, blob_callback_, BlobFileCreationReason::kCompaction,
-                &blob_file_paths, &sub_compact->blob_file_additions)
+          ? new BlobFileBuilder(versions_, fs_.get(),
+                                sub_compact->compaction->immutable_options(),
+                                mutable_cf_options, &file_options_, job_id_,
+                                cfd->GetID(), cfd->GetName(),
+                                Env::IOPriority::IO_LOW, write_hint_,
+                                io_tracer_, blob_callback_, &blob_file_paths,
+                                &sub_compact->blob_file_additions)
          : nullptr);

  TEST_SYNC_POINT("CompactionJob::Run():Inprogress");
@@ -1378,7 +1237,6 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {
  auto c_iter = sub_compact->c_iter.get();
  c_iter->SeekToFirst();
  if (c_iter->Valid() && sub_compact->compaction->output_level() != 0) {
-    sub_compact->FillFilesToCutForTtl();
    // ShouldStopBefore() maintains state based on keys processed so far. The
    // compaction loop always calls it on the "next" key, thus won't tell it the
    // first key. So we do that here.
@@ -1509,16 +1367,6 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {

  RecordTick(stats_, FILTER_OPERATION_TOTAL_TIME,
             c_iter_stats.total_filter_time);
-
-  if (c_iter_stats.num_blobs_relocated > 0) {
-    RecordTick(stats_, BLOB_DB_GC_NUM_KEYS_RELOCATED,
-               c_iter_stats.num_blobs_relocated);
-  }
-  if (c_iter_stats.total_blob_bytes_relocated > 0) {
-    RecordTick(stats_, BLOB_DB_GC_BYTES_RELOCATED,
-               c_iter_stats.total_blob_bytes_relocated);
-  }
-
  RecordDroppedKeys(c_iter_stats, &sub_compact->compaction_job_stats);
  RecordCompactionIOStats();

@@ -1566,7 +1414,7 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {
    if (status.ok()) {
      status = blob_file_builder->Finish();
    } else {
-      blob_file_builder->Abandon(status);
+      blob_file_builder->Abandon();
    }
    blob_file_builder.reset();
  }
@@ -1827,6 +1675,7 @@ Status CompactionJob::FinishCompactionOutputFile(
      meta->UpdateBoundariesForRange(smallest_candidate, largest_candidate,
                                     tombstone.seq_,
                                     cfd->internal_comparator());
+
      // The smallest key in a file is used for range tombstone truncation, so
      // it cannot have a seqnum of 0 (unless the smallest data key in a file
      // has a seqnum of 0). Otherwise, the truncated tombstone may expose
@@ -1850,23 +1699,6 @@ Status CompactionJob::FinishCompactionOutputFile(
  if (s.ok()) {
    meta->fd.file_size = current_bytes;
    meta->marked_for_compaction = sub_compact->builder->NeedCompact();
-    // With accurate smallest and largest key, we can get a slightly more
-    // accurate oldest ancester time.
-    // This makes oldest ancester time in manifest more accurate than in
-    // table properties. Not sure how to resolve it.
-    if (meta->smallest.size() > 0 && meta->largest.size() > 0) {
-      uint64_t refined_oldest_ancester_time;
-      Slice new_smallest = meta->smallest.user_key();
-      Slice new_largest = meta->largest.user_key();
-      if (!new_largest.empty() && !new_smallest.empty()) {
-        refined_oldest_ancester_time =
-            sub_compact->compaction->MinInputFileOldestAncesterTime(
-                &(meta->smallest), &(meta->largest));
-        if (refined_oldest_ancester_time != port::kMaxUint64) {
-          meta->oldest_ancester_time = refined_oldest_ancester_time;
-        }
-      }
-    }
  }
  sub_compact->current_output()->finished = true;
  sub_compact->total_bytes += current_bytes;
@@ -2095,12 +1927,11 @@ Status CompactionJob::OpenCompactionOutputFile(

  // Pass temperature of botommost files to FileSystem.
  FileOptions fo_copy = file_options_;
-  Temperature temperature = sub_compact->compaction->output_temperature();
-  if (temperature == Temperature::kUnknown && bottommost_level_) {
-    temperature =
+  Temperature temperature = Temperature::kUnknown;
+  if (bottommost_level_) {
+    fo_copy.temperature = temperature =
        sub_compact->compaction->mutable_cf_options()->bottommost_temperature;
  }
-  fo_copy.temperature = temperature;

  Status s;
  IOStatus io_s = NewWritableFile(fs_.get(), fname, &writable_file, fo_copy);
@@ -2137,17 +1968,8 @@ Status CompactionJob::OpenCompactionOutputFile(
                   get_time_status.ToString().c_str());
  }
  uint64_t current_time = static_cast<uint64_t>(temp_current_time);
-  InternalKey tmp_start, tmp_end;
-  if (sub_compact->start != nullptr) {
-    tmp_start.SetMinPossibleForUserKey(*(sub_compact->start));
-  }
-  if (sub_compact->end != nullptr) {
-    tmp_end.SetMinPossibleForUserKey(*(sub_compact->end));
-  }
  uint64_t oldest_ancester_time =
-      sub_compact->compaction->MinInputFileOldestAncesterTime(
-          (sub_compact->start != nullptr) ? &tmp_start : nullptr,
-          (sub_compact->end != nullptr) ? &tmp_end : nullptr);
+      sub_compact->compaction->MinInputFileOldestAncesterTime();
  if (oldest_ancester_time == port::kMaxUint64) {
    oldest_ancester_time = current_time;
  }
@@ -2366,12 +2188,6 @@ std::string CompactionServiceCompactionJob::GetTableFileName(
  return MakeTableFileName(output_path_, file_number);
 }

-void CompactionServiceCompactionJob::RecordCompactionIOStats() {
-  compaction_result_->bytes_read += IOSTATS(bytes_read);
-  compaction_result_->bytes_written += IOSTATS(bytes_written);
-  CompactionJob::RecordCompactionIOStats();
-}
-
 CompactionServiceCompactionJob::CompactionServiceCompactionJob(
    int job_id, Compaction* compaction, const ImmutableDBOptions& db_options,
    const MutableDBOptions& mutable_db_options, const FileOptions& file_options,
@@ -2446,8 +2262,7 @@ Status CompactionServiceCompactionJob::Run() {
    constexpr IODebugContext* dbg = nullptr;

    if (output_directory_) {
-      io_s = output_directory_->FsyncWithDirOptions(IOOptions(), dbg,
-                                                    DirFsyncOptions());
+      io_s = output_directory_->Fsync(IOOptions(), dbg);
    }
  }
  if (io_status_.ok()) {
@@ -2463,6 +2278,9 @@ Status CompactionServiceCompactionJob::Run() {
  // Finish up all book-keeping to unify the subcompaction results
  AggregateStatistics();
  UpdateCompactionStats();
+
+  compaction_result_->bytes_written = IOSTATS(bytes_written);
+  compaction_result_->bytes_read = IOSTATS(bytes_read);
  RecordCompactionIOStats();

  LogFlush(db_options_.info_log);
@@ -20,6 +20,7 @@
 #include "db/blob/blob_file_completion_callback.h"
 #include "db/column_family.h"
 #include "db/compaction/compaction_iterator.h"
+#include "db/dbformat.h"
 #include "db/flush_scheduler.h"
 #include "db/internal_stats.h"
 #include "db/job_context.h"
@@ -116,7 +117,7 @@ class CompactionJob {
  void AggregateStatistics();
  void UpdateCompactionStats();
  void LogCompaction();
-  virtual void RecordCompactionIOStats();
+  void RecordCompactionIOStats();
  void CleanupCompaction();

  // Call compaction filter. Then iterate through input and compact the
@@ -145,7 +146,7 @@ class CompactionJob {
  // consecutive groups such that each group has a similar size.
  void GenSubcompactionBoundaries();

-  CompactionServiceJobStatus ProcessKeyValueCompactionWithCompactionService(
+  void ProcessKeyValueCompactionWithCompactionService(
      SubcompactionState* sub_compact);

  // update the thread status for starting a compaction.
@@ -303,10 +304,10 @@ struct CompactionServiceResult {
  std::string output_path;

  // some statistics about the compaction
-  uint64_t num_output_records = 0;
-  uint64_t total_bytes = 0;
-  uint64_t bytes_read = 0;
-  uint64_t bytes_written = 0;
+  uint64_t num_output_records;
+  uint64_t total_bytes;
+  uint64_t bytes_read;
+  uint64_t bytes_written;
  CompactionJobStats stats;

  // serialization interface to read and write the object
@@ -346,9 +347,6 @@ class CompactionServiceCompactionJob : private CompactionJob {

  IOStatus io_status() const { return CompactionJob::io_status(); }

- protected:
-  void RecordCompactionIOStats() override;
-
 private:
  // Get table file name in output_path
  std::string GetTableFileName(uint64_t file_number) override;
@@ -24,6 +24,7 @@
 #include "db/write_batch_internal.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
+#include "memtable/hash_linklist_rep.h"
 #include "monitoring/statistics.h"
 #include "monitoring/thread_status_util.h"
 #include "port/stack_trace.h"
@@ -268,10 +269,10 @@ class CompactionJobStatsTest : public testing::Test,
    if (cf == 0) {
      // default cfd
      EXPECT_TRUE(db_->GetProperty(
-          "rocksdb.num-files-at-level" + ToString(level), &property));
+          "rocksdb.num-files-at-level" + NumberToString(level), &property));
    } else {
      EXPECT_TRUE(db_->GetProperty(
-          handles_[cf], "rocksdb.num-files-at-level" + ToString(level),
+          handles_[cf], "rocksdb.num-files-at-level" + NumberToString(level),
          &property));
    }
    return atoi(property.c_str());
@@ -21,7 +21,6 @@
 #include "db/version_set.h"
 #include "file/writable_file_writer.h"
 #include "rocksdb/cache.h"
-#include "rocksdb/convenience.h"
 #include "rocksdb/db.h"
 #include "rocksdb/file_system.h"
 #include "rocksdb/options.h"
@@ -74,7 +73,9 @@ class CompactionJobTestBase : public testing::Test {
 protected:
  CompactionJobTestBase(std::string dbname, const Comparator* ucmp,
                        std::function<std::string(uint64_t)> encode_u64_ts)
-      : dbname_(std::move(dbname)),
+      : env_(Env::Default()),
+        fs_(env_->GetFileSystem()),
+        dbname_(std::move(dbname)),
        ucmp_(ucmp),
        db_options_(),
        mutable_cf_options_(cf_options_),
@@ -90,13 +91,7 @@ class CompactionJobTestBase : public testing::Test {
        preserve_deletes_seqnum_(0),
        mock_table_factory_(new mock::MockTableFactory()),
        error_handler_(nullptr, db_options_, &mutex_),
-        encode_u64_ts_(std::move(encode_u64_ts)) {
-    Env* base_env = Env::Default();
-    EXPECT_OK(
-        test::CreateEnvFromSystem(ConfigOptions(), &base_env, &env_guard_));
-    env_ = base_env;
-    fs_ = env_->GetFileSystem();
-  }
+        encode_u64_ts_(std::move(encode_u64_ts)) {}

  void SetUp() override {
    EXPECT_OK(env_->CreateDirIfMissing(dbname_));
@@ -203,11 +198,9 @@ class CompactionJobTestBase : public testing::Test {

    VersionEdit edit;
    edit.AddFile(level, file_number, 0, 10, smallest_key, largest_key,
-                 smallest_seqno, largest_seqno, false, Temperature::kUnknown,
-                 oldest_blob_file_number, kUnknownOldestAncesterTime,
-                 kUnknownFileCreationTime, kUnknownFileChecksum,
-                 kUnknownFileChecksumFuncName, kDisableUserTimestamp,
-                 kDisableUserTimestamp);
+                 smallest_seqno, largest_seqno, false, oldest_blob_file_number,
+                 kUnknownOldestAncesterTime, kUnknownFileCreationTime,
+                 kUnknownFileChecksum, kUnknownFileChecksumFuncName);

    mutex_.Lock();
    EXPECT_OK(
@@ -341,8 +334,8 @@ class CompactionJobTestBase : public testing::Test {
        cfd->current()->storage_info(), *cfd->ioptions(),
        *cfd->GetLatestMutableCFOptions(), mutable_db_options_,
        compaction_input_files, output_level, 1024 * 1024, 10 * 1024 * 1024, 0,
-        kNoCompression, cfd->GetLatestMutableCFOptions()->compression_opts,
-        Temperature::kUnknown, 0, {}, true);
+        kNoCompression, cfd->GetLatestMutableCFOptions()->compression_opts, 0,
+        {}, true);
    compaction.SetInputVersion(cfd->current());

    LogBuffer log_buffer(InfoLogLevel::INFO_LEVEL, db_options_.info_log.get());
@@ -393,7 +386,6 @@ class CompactionJobTestBase : public testing::Test {
    }
  }

-  std::shared_ptr<Env> env_guard_;
  Env* env_;
  std::shared_ptr<FileSystem> fs_;
  std::string dbname_;
@@ -1128,9 +1120,7 @@ TEST_F(CompactionJobTest, InputSerialization) {
    input.snapshots.emplace_back(rnd64.Uniform(UINT64_MAX));
  }
  while (!rnd.OneIn(10)) {
-    input.input_files.emplace_back(rnd.RandomString(
-        rnd.Uniform(kStrMaxLen - 1) +
-        1));  // input file name should have at least one character
+    input.input_files.emplace_back(rnd.RandomString(rnd.Uniform(kStrMaxLen)));
  }
  input.output_level = 4;
  input.has_begin = rnd.OneIn(2);
@@ -1301,16 +1291,13 @@ TEST_F(CompactionJobTimestampTest, GCDisabled) {
  auto file1 =
      mock::MakeMockFile({{KeyStr("a", 10, ValueType::kTypeValue, 100), "a10"},
                          {KeyStr("a", 9, ValueType::kTypeValue, 99), "a9"},
-                          {KeyStr("b", 8, ValueType::kTypeValue, 98), "b8"},
-                          {KeyStr("d", 7, ValueType::kTypeValue, 97), "d7"}});
-
+                          {KeyStr("b", 8, ValueType::kTypeValue, 98), "b8"}});
  AddMockFile(file1);

  auto file2 = mock::MakeMockFile(
-      {{KeyStr("b", 6, ValueType::kTypeDeletionWithTimestamp, 96), ""},
-       {KeyStr("c", 5, ValueType::kTypeDeletionWithTimestamp, 95), ""},
-       {KeyStr("c", 4, ValueType::kTypeValue, 94), "c5"},
-       {KeyStr("d", 3, ValueType::kTypeSingleDeletion, 93), ""}});
+      {{KeyStr("b", 7, ValueType::kTypeDeletionWithTimestamp, 97), ""},
+       {KeyStr("c", 6, ValueType::kTypeDeletionWithTimestamp, 96), ""},
+       {KeyStr("c", 5, ValueType::kTypeValue, 95), "c5"}});
  AddMockFile(file2);

  SetLastSequence(10);
@@ -1319,11 +1306,9 @@ TEST_F(CompactionJobTimestampTest, GCDisabled) {
      {{KeyStr("a", 10, ValueType::kTypeValue, 100), "a10"},
       {KeyStr("a", 9, ValueType::kTypeValue, 99), "a9"},
       {KeyStr("b", 8, ValueType::kTypeValue, 98), "b8"},
-       {KeyStr("b", 6, ValueType::kTypeDeletionWithTimestamp, 96), ""},
-       {KeyStr("c", 5, ValueType::kTypeDeletionWithTimestamp, 95), ""},
-       {KeyStr("c", 4, ValueType::kTypeValue, 94), "c5"},
-       {KeyStr("d", 7, ValueType::kTypeValue, 97), "d7"},
-       {KeyStr("d", 3, ValueType::kTypeSingleDeletion, 93), ""}});
+       {KeyStr("b", 7, ValueType::kTypeDeletionWithTimestamp, 97), ""},
+       {KeyStr("c", 6, ValueType::kTypeDeletionWithTimestamp, 96), ""},
+       {KeyStr("c", 5, ValueType::kTypeValue, 95), "c5"}});
  const auto& files = cfd_->current()->storage_info()->LevelFiles(0);
  RunCompaction({files}, expected_results);
 }
@@ -1361,21 +1346,19 @@ TEST_F(CompactionJobTimestampTest, AllKeysExpired) {

  auto file1 = mock::MakeMockFile(
      {{KeyStr("a", 5, ValueType::kTypeDeletionWithTimestamp, 100), ""},
-       {KeyStr("b", 6, ValueType::kTypeSingleDeletion, 99), ""},
-       {KeyStr("c", 7, ValueType::kTypeValue, 98), "c7"}});
+       {KeyStr("b", 6, ValueType::kTypeValue, 99), "b6"}});
  AddMockFile(file1);

  auto file2 = mock::MakeMockFile(
-      {{KeyStr("a", 4, ValueType::kTypeValue, 97), "a4"},
-       {KeyStr("b", 3, ValueType::kTypeValue, 96), "b3"},
-       {KeyStr("c", 2, ValueType::kTypeDeletionWithTimestamp, 95), ""},
-       {KeyStr("c", 1, ValueType::kTypeValue, 94), "c1"}});
+      {{KeyStr("a", 4, ValueType::kTypeValue, 98), "a4"},
+       {KeyStr("b", 3, ValueType::kTypeDeletionWithTimestamp, 97), ""},
+       {KeyStr("b", 2, ValueType::kTypeValue, 96), "b2"}});
  AddMockFile(file2);

-  SetLastSequence(7);
+  SetLastSequence(6);

  auto expected_results =
-      mock::MakeMockFile({{KeyStr("c", 0, ValueType::kTypeValue, 0), "c7"}});
+      mock::MakeMockFile({{KeyStr("b", 0, ValueType::kTypeValue, 0), "b6"}});
  const auto& files = cfd_->current()->storage_info()->LevelFiles(0);

  full_history_ts_low_ = encode_u64_ts_(std::numeric_limits<uint64_t>::max());
@@ -1400,7 +1383,6 @@ TEST_F(CompactionJobTimestampTest, SomeKeysExpired) {

  auto expected_results =
      mock::MakeMockFile({{KeyStr("a", 5, ValueType::kTypeValue, 50), "a5"},
-                          {KeyStr("a", 0, ValueType::kTypeValue, 0), "a3"},
                          {KeyStr("b", 6, ValueType::kTypeValue, 49), "b6"}});
  const auto& files = cfd_->current()->storage_info()->LevelFiles(0);

@@ -1412,7 +1394,6 @@ TEST_F(CompactionJobTimestampTest, SomeKeysExpired) {

 int main(int argc, char** argv) {
  ::testing::InitGoogleTest(&argc, argv);
-  RegisterCustomObjects(argc, argv);
  return RUN_ALL_TESTS();
 }

@@ -15,11 +15,9 @@
 #include <string>
 #include <utility>
 #include <vector>
-
 #include "db/column_family.h"
 #include "file/filename.h"
 #include "logging/log_buffer.h"
-#include "logging/logging.h"
 #include "monitoring/statistics.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
@@ -360,7 +358,7 @@ Compaction* CompactionPicker::CompactFiles(
      output_level, compact_options.output_file_size_limit,
      mutable_cf_options.max_compaction_bytes, output_path_id, compression_type,
      GetCompressionOptions(mutable_cf_options, vstorage, output_level),
-      Temperature::kUnknown, compact_options.max_subcompactions,
+      compact_options.max_subcompactions,
      /* grandparents */ {}, true);
  RegisterCompaction(c);
  return c;
@@ -554,14 +552,10 @@ void CompactionPicker::GetGrandparents(
  InternalKey start, limit;
  GetRange(inputs, output_level_inputs, &start, &limit);
  // Compute the set of grandparent files that overlap this compaction
-  // (parent == level+1; grandparent == level+2 or the first
-  // level after that has overlapping files)
-  for (int level = output_level_inputs.level + 1; level < NumberLevels();
-       level++) {
-    vstorage->GetOverlappingInputs(level, &start, &limit, grandparents);
-    if (!grandparents->empty()) {
-      break;
-    }
+  // (parent == level+1; grandparent == level+2)
+  if (output_level_inputs.level + 1 < NumberLevels()) {
+    vstorage->GetOverlappingInputs(output_level_inputs.level + 1, &start,
+                                   &limit, grandparents);
  }
 }

@@ -640,8 +634,7 @@ Compaction* CompactionPicker::CompactRange(
        GetCompressionType(ioptions_, vstorage, mutable_cf_options,
                           output_level, 1),
        GetCompressionOptions(mutable_cf_options, vstorage, output_level),
-        Temperature::kUnknown, compact_range_options.max_subcompactions,
-        /* grandparents */ {},
+        compact_range_options.max_subcompactions, /* grandparents */ {},
        /* is manual */ true);
    RegisterCompaction(c);
    vstorage->ComputeCompactionScore(ioptions_, mutable_cf_options);
@@ -819,8 +812,7 @@ Compaction* CompactionPicker::CompactRange(
      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),
+      compact_range_options.max_subcompactions, std::move(grandparents),
      /* is manual compaction */ true);

  TEST_SYNC_POINT_CALLBACK("CompactionPicker::CompactRange:Return", compaction);
@@ -13,10 +13,8 @@
 #include <cinttypes>
 #include <string>
 #include <vector>
-
 #include "db/column_family.h"
 #include "logging/log_buffer.h"
-#include "logging/logging.h"
 #include "util/string_util.h"

 namespace ROCKSDB_NAMESPACE {
@@ -113,7 +111,7 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
  Compaction* c = new Compaction(
      vstorage, ioptions_, mutable_cf_options, mutable_db_options,
      std::move(inputs), 0, 0, 0, 0, kNoCompression,
-      mutable_cf_options.compression_opts, Temperature::kUnknown,
+      mutable_cf_options.compression_opts,
      /* max_subcompactions */ 0, {}, /* is manual */ false,
      vstorage->CompactionScore(0),
      /* is deletion compaction */ true, CompactionReason::kFIFOTtl);
@@ -156,8 +154,7 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
            {comp_inputs}, 0, 16 * 1024 * 1024 /* output file size limit */,
            0 /* max compaction bytes, not applicable */,
            0 /* output path ID */, mutable_cf_options.compression,
-            mutable_cf_options.compression_opts, Temperature::kUnknown,
-            0 /* max_subcompactions */, {},
+            mutable_cf_options.compression_opts, 0 /* max_subcompactions */, {},
            /* is manual */ false, vstorage->CompactionScore(0),
            /* is deletion compaction */ false,
            CompactionReason::kFIFOReduceNumFiles);
@@ -206,119 +203,13 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
  Compaction* c = new Compaction(
      vstorage, ioptions_, mutable_cf_options, mutable_db_options,
      std::move(inputs), 0, 0, 0, 0, kNoCompression,
-      mutable_cf_options.compression_opts, Temperature::kUnknown,
+      mutable_cf_options.compression_opts,
      /* max_subcompactions */ 0, {}, /* is manual */ false,
      vstorage->CompactionScore(0),
      /* is deletion compaction */ true, CompactionReason::kFIFOMaxSize);
  return c;
 }

-Compaction* FIFOCompactionPicker::PickCompactionToWarm(
-    const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
-    const MutableDBOptions& mutable_db_options, VersionStorageInfo* vstorage,
-    LogBuffer* log_buffer) {
-  if (mutable_cf_options.compaction_options_fifo.age_for_warm == 0) {
-    return nullptr;
-  }
-
-  const int kLevel0 = 0;
-  const std::vector<FileMetaData*>& level_files = vstorage->LevelFiles(kLevel0);
-
-  int64_t _current_time;
-  auto status = ioptions_.clock->GetCurrentTime(&_current_time);
-  if (!status.ok()) {
-    ROCKS_LOG_BUFFER(log_buffer,
-                     "[%s] FIFO compaction: Couldn't get current time: %s. "
-                     "Not doing compactions based on warm threshold. ",
-                     cf_name.c_str(), status.ToString().c_str());
-    return nullptr;
-  }
-  const uint64_t current_time = static_cast<uint64_t>(_current_time);
-
-  if (!level0_compactions_in_progress_.empty()) {
-    ROCKS_LOG_BUFFER(
-        log_buffer,
-        "[%s] FIFO compaction: Already executing compaction. Parallel "
-        "compactions are not supported",
-        cf_name.c_str());
-    return nullptr;
-  }
-
-  std::vector<CompactionInputFiles> inputs;
-  inputs.emplace_back();
-  inputs[0].level = 0;
-
-  // avoid underflow
-  if (current_time > mutable_cf_options.compaction_options_fifo.age_for_warm) {
-    uint64_t create_time_threshold =
-        current_time - mutable_cf_options.compaction_options_fifo.age_for_warm;
-    uint64_t compaction_size = 0;
-    // We will ideally identify a file qualifying for warm tier by knowing
-    // the timestamp for the youngest entry in the file. However, right now
-    // we don't have the information. We infer it by looking at timestamp
-    // of the next file's (which is just younger) oldest entry's timestamp.
-    FileMetaData* prev_file = nullptr;
-    for (auto ritr = level_files.rbegin(); ritr != level_files.rend(); ++ritr) {
-      FileMetaData* f = *ritr;
-      assert(f);
-      if (f->being_compacted) {
-        // Right now this probably won't happen as we never try to schedule
-        // two compactions in parallel, so here we just simply don't schedule
-        // anything.
-        return nullptr;
-      }
-      uint64_t oldest_ancester_time = f->TryGetOldestAncesterTime();
-      if (oldest_ancester_time == kUnknownOldestAncesterTime) {
-        // Older files might not have enough information. It is possible to
-        // handle these files by looking at newer files, but maintaining the
-        // logic isn't worth it.
-        break;
-      }
-      if (oldest_ancester_time > create_time_threshold) {
-        // The previous file (which has slightly older data) doesn't qualify
-        // for warm tier.
-        break;
-      }
-      if (prev_file != nullptr) {
-        compaction_size += prev_file->fd.GetFileSize();
-        if (compaction_size > mutable_cf_options.max_compaction_bytes) {
-          break;
-        }
-        inputs[0].files.push_back(prev_file);
-        ROCKS_LOG_BUFFER(log_buffer,
-                         "[%s] FIFO compaction: picking file %" PRIu64
-                         " with next file's oldest time %" PRIu64 " for warm",
-                         cf_name.c_str(), prev_file->fd.GetNumber(),
-                         oldest_ancester_time);
-      }
-      if (f->temperature == Temperature::kUnknown ||
-          f->temperature == Temperature::kHot) {
-        prev_file = f;
-      } else if (!inputs[0].files.empty()) {
-        // A warm file newer than files picked.
-        break;
-      } else {
-        assert(prev_file == nullptr);
-      }
-    }
-  }
-
-  if (inputs[0].files.empty()) {
-    return nullptr;
-  }
-
-  Compaction* c = new Compaction(
-      vstorage, ioptions_, mutable_cf_options, mutable_db_options,
-      std::move(inputs), 0, 0 /* output file size limit */,
-      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,
-      vstorage->CompactionScore(0),
-      /* is deletion compaction */ false, CompactionReason::kChangeTemperature);
-  return c;
-}
-
 Compaction* FIFOCompactionPicker::PickCompaction(
    const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
    const MutableDBOptions& mutable_db_options, VersionStorageInfo* vstorage,
@@ -334,10 +225,6 @@ Compaction* FIFOCompactionPicker::PickCompaction(
    c = PickSizeCompaction(cf_name, mutable_cf_options, mutable_db_options,
                           vstorage, log_buffer);
  }
-  if (c == nullptr) {
-    c = PickCompactionToWarm(cf_name, mutable_cf_options, mutable_db_options,
-                             vstorage, log_buffer);
-  }
  RegisterCompaction(c);
  return c;
 }
@@ -52,12 +52,6 @@ class FIFOCompactionPicker : public CompactionPicker {
                                 const MutableDBOptions& mutable_db_options,
                                 VersionStorageInfo* version,
                                 LogBuffer* log_buffer);
-
-  Compaction* PickCompactionToWarm(const std::string& cf_name,
-                                   const MutableCFOptions& mutable_cf_options,
-                                   const MutableDBOptions& mutable_db_options,
-                                   VersionStorageInfo* version,
-                                   LogBuffer* log_buffer);
 };
 }  // namespace ROCKSDB_NAMESPACE
 #endif  // !ROCKSDB_LITE
@@ -31,9 +31,6 @@ bool LevelCompactionPicker::NeedsCompaction(
  if (!vstorage->FilesMarkedForCompaction().empty()) {
    return true;
  }
-  if (!vstorage->FilesMarkedForForcedBlobGC().empty()) {
-    return true;
-  }
  for (int i = 0; i <= vstorage->MaxInputLevel(); i++) {
    if (vstorage->CompactionScore(i) >= 1) {
      return true;
@@ -251,13 +248,6 @@ void LevelCompactionBuilder::SetupInitialFiles() {
    compaction_reason_ = CompactionReason::kPeriodicCompaction;
    return;
  }
-
-  // Forced blob garbage collection
-  PickFileToCompact(vstorage_->FilesMarkedForForcedBlobGC(), false);
-  if (!start_level_inputs_.empty()) {
-    compaction_reason_ = CompactionReason::kForcedBlobGC;
-    return;
-  }
 }

 bool LevelCompactionBuilder::SetupOtherL0FilesIfNeeded() {
@@ -346,7 +336,6 @@ Compaction* LevelCompactionBuilder::GetCompaction() {
      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_,
      start_level_score_, false /* deletion_compaction */, compaction_reason_);

@@ -395,7 +384,7 @@ uint32_t LevelCompactionBuilder::GetPathId(
          if (ioptions.level_compaction_dynamic_level_bytes) {
            // Currently, level_compaction_dynamic_level_bytes is ignored when
            // multiple db paths are specified. https://github.com/facebook/
-            // rocksdb/blob/main/db/column_family.cc.
+            // rocksdb/blob/master/db/column_family.cc.
            // Still, adding this check to avoid accidentally using
            // max_bytes_for_level_multiplier_additional
            level_size = static_cast<uint64_t>(
@@ -3,15 +3,15 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

+
 #include <limits>
 #include <string>
 #include <utility>
-
 #include "db/compaction/compaction.h"
 #include "db/compaction/compaction_picker_fifo.h"
 #include "db/compaction/compaction_picker_level.h"
 #include "db/compaction/compaction_picker_universal.h"
-#include "db/compaction/file_pri.h"
+
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/string_util.h"
@@ -98,9 +98,7 @@ class CompactionPickerTest : public testing::Test {
  void Add(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,
-           Temperature temperature = Temperature::kUnknown,
-           uint64_t oldest_ancestor_time = kUnknownOldestAncesterTime) {
+           size_t compensated_file_size = 0, bool marked_for_compact = false) {
    VersionStorageInfo* vstorage;
    if (temp_vstorage_) {
      vstorage = temp_vstorage_.get();
@@ -112,13 +110,11 @@ class CompactionPickerTest : public testing::Test {
        file_number, path_id, file_size,
        InternalKey(smallest, smallest_seq, kTypeValue),
        InternalKey(largest, largest_seq, kTypeValue), smallest_seq,
-        largest_seq, marked_for_compact, temperature, kInvalidBlobFileNumber,
+        largest_seq, marked_for_compact, kInvalidBlobFileNumber,
        kUnknownOldestAncesterTime, kUnknownFileCreationTime,
-        kUnknownFileChecksum, kUnknownFileChecksumFuncName,
-        kDisableUserTimestamp, kDisableUserTimestamp);
+        kUnknownFileChecksum, kUnknownFileChecksumFuncName);
    f->compensated_file_size =
        (compensated_file_size != 0) ? compensated_file_size : file_size;
-    f->oldest_ancester_time = oldest_ancestor_time;
    vstorage->AddFile(level, f);
    files_.emplace_back(f);
    file_map_.insert({file_number, {f, level}});
@@ -149,7 +145,7 @@ class CompactionPickerTest : public testing::Test {
      vstorage_ = std::move(temp_vstorage_);
    }
    vstorage_->CalculateBaseBytes(ioptions_, mutable_cf_options_);
-    vstorage_->UpdateFilesByCompactionPri(ioptions_, mutable_cf_options_);
+    vstorage_->UpdateFilesByCompactionPri(ioptions_.compaction_pri);
    vstorage_->UpdateNumNonEmptyLevels();
    vstorage_->GenerateFileIndexer();
    vstorage_->GenerateLevelFilesBrief();
@@ -733,221 +729,6 @@ TEST_F(CompactionPickerTest, UniversalPeriodicCompaction6) {
  ASSERT_EQ(4, compaction->output_level());
 }

-TEST_F(CompactionPickerTest, UniversalIncrementalSpace1) {
-  const uint64_t kFileSize = 100000;
-
-  mutable_cf_options_.max_compaction_bytes = 555555;
-  mutable_cf_options_.compaction_options_universal.incremental = true;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 30;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(5, kCompactionStyleUniversal);
-
-  Add(0, 1U, "150", "200", kFileSize, 0, 500, 550);
-  Add(2, 2U, "010", "080", kFileSize, 0, 200, 251);
-  Add(3, 5U, "310", "380", kFileSize, 0, 200, 251);
-  Add(3, 6U, "410", "880", kFileSize, 0, 200, 251);
-  Add(3, 7U, "910", "980", 1, 0, 200, 251);
-  Add(4, 10U, "201", "250", kFileSize, 0, 101, 150);
-  Add(4, 11U, "301", "350", kFileSize, 0, 101, 150);
-  Add(4, 12U, "401", "450", kFileSize, 0, 101, 150);
-  Add(4, 13U, "501", "750", kFileSize, 0, 101, 150);
-  Add(4, 14U, "801", "850", kFileSize, 0, 101, 150);
-  Add(4, 15U, "901", "950", kFileSize, 0, 101, 150);
-  //  Add(4, 15U, "960", "970", kFileSize, 0, 101, 150);
-
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-  ASSERT_TRUE(compaction);
-  ASSERT_EQ(4, compaction->output_level());
-  ASSERT_EQ(3, compaction->start_level());
-  ASSERT_EQ(2U, compaction->num_input_files(0));
-  ASSERT_EQ(5U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(6U, compaction->input(0, 1)->fd.GetNumber());
-  // ASSERT_EQ(4U, compaction->num_input_files(1));
-  ASSERT_EQ(11U, compaction->input(1, 0)->fd.GetNumber());
-  ASSERT_EQ(12U, compaction->input(1, 1)->fd.GetNumber());
-  ASSERT_EQ(13U, compaction->input(1, 2)->fd.GetNumber());
-  ASSERT_EQ(14U, compaction->input(1, 3)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, UniversalIncrementalSpace2) {
-  const uint64_t kFileSize = 100000;
-
-  mutable_cf_options_.max_compaction_bytes = 400000;
-  mutable_cf_options_.compaction_options_universal.incremental = true;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 30;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(5, kCompactionStyleUniversal);
-
-  Add(0, 1U, "150", "200", kFileSize, 0, 500, 550);
-  Add(1, 2U, "010", "080", kFileSize, 0, 200, 251);
-  Add(2, 5U, "310", "380", kFileSize, 0, 200, 251);
-  Add(2, 6U, "410", "880", kFileSize, 0, 200, 251);
-  Add(2, 7U, "910", "980", kFileSize, 0, 200, 251);
-  Add(4, 10U, "201", "250", kFileSize, 0, 101, 150);
-  Add(4, 11U, "301", "350", kFileSize, 0, 101, 150);
-  Add(4, 12U, "401", "450", kFileSize, 0, 101, 150);
-  Add(4, 13U, "501", "750", kFileSize, 0, 101, 150);
-  Add(4, 14U, "801", "850", kFileSize, 0, 101, 150);
-  Add(4, 15U, "901", "950", kFileSize, 0, 101, 150);
-
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-  ASSERT_TRUE(compaction);
-  ASSERT_EQ(4, compaction->output_level());
-  ASSERT_EQ(2, compaction->start_level());
-  ASSERT_EQ(1U, compaction->num_input_files(0));
-  ASSERT_EQ(7U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(1U, compaction->num_input_files(1));
-  ASSERT_EQ(15U, compaction->input(1, 0)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, UniversalIncrementalSpace3) {
-  // Test bottom level files falling between gaps between two upper level
-  // files
-  const uint64_t kFileSize = 100000;
-
-  mutable_cf_options_.max_compaction_bytes = 300000;
-  mutable_cf_options_.compaction_options_universal.incremental = true;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 30;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(5, kCompactionStyleUniversal);
-
-  Add(0, 1U, "150", "200", kFileSize, 0, 500, 550);
-  Add(2, 2U, "010", "080", kFileSize, 0, 200, 251);
-  Add(3, 5U, "000", "180", kFileSize, 0, 200, 251);
-  Add(3, 6U, "181", "190", kFileSize, 0, 200, 251);
-  Add(3, 7U, "710", "810", kFileSize, 0, 200, 251);
-  Add(3, 8U, "820", "830", kFileSize, 0, 200, 251);
-  Add(3, 9U, "900", "991", kFileSize, 0, 200, 251);
-  Add(4, 10U, "201", "250", kFileSize, 0, 101, 150);
-  Add(4, 11U, "301", "350", kFileSize, 0, 101, 150);
-  Add(4, 12U, "401", "450", kFileSize, 0, 101, 150);
-  Add(4, 13U, "501", "750", kFileSize, 0, 101, 150);
-  Add(4, 14U, "801", "850", kFileSize, 0, 101, 150);
-  Add(4, 15U, "901", "950", kFileSize, 0, 101, 150);
-
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-  ASSERT_TRUE(compaction);
-  ASSERT_EQ(4, compaction->output_level());
-  ASSERT_EQ(2, compaction->start_level());
-  ASSERT_EQ(1U, compaction->num_input_files(0));
-  ASSERT_EQ(2U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(2U, compaction->num_input_files(1));
-  ASSERT_EQ(5U, compaction->input(1, 0)->fd.GetNumber());
-  ASSERT_EQ(6U, compaction->input(1, 1)->fd.GetNumber());
-  ASSERT_EQ(0, compaction->num_input_files(2));
-}
-
-TEST_F(CompactionPickerTest, UniversalIncrementalSpace4) {
-  // Test compaction candidates always cover many files.
-  const uint64_t kFileSize = 100000;
-
-  mutable_cf_options_.max_compaction_bytes = 3200000;
-  mutable_cf_options_.compaction_options_universal.incremental = true;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 30;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(5, kCompactionStyleUniversal);
-
-  Add(0, 1U, "150", "200", kFileSize, 0, 500, 550);
-  Add(2, 2U, "010", "080", kFileSize, 0, 200, 251);
-
-  // Generate files like following:
-  // L3: (1101, 1180) (1201, 1280) ... (7901, 7908)
-  // L4: (1130, 1150) (1160, 1210) (1230, 1250) (1260 1310) ... (7960, 8010)
-  for (int i = 11; i < 79; i++) {
-    Add(3, 100 + i * 3, ToString(i * 100).c_str(),
-        ToString(i * 100 + 80).c_str(), kFileSize, 0, 200, 251);
-    // Add a tie breaker
-    if (i == 66) {
-      Add(3, 10000U, "6690", "6699", kFileSize, 0, 200, 251);
-    }
-
-    Add(4, 100 + i * 3 + 1, ToString(i * 100 + 30).c_str(),
-        ToString(i * 100 + 50).c_str(), kFileSize, 0, 200, 251);
-    Add(4, 100 + i * 3 + 2, ToString(i * 100 + 60).c_str(),
-        ToString(i * 100 + 110).c_str(), kFileSize, 0, 200, 251);
-  }
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-  ASSERT_TRUE(compaction);
-  ASSERT_EQ(4, compaction->output_level());
-  ASSERT_EQ(3, compaction->start_level());
-  ASSERT_EQ(6U, compaction->num_input_files(0));
-  ASSERT_EQ(100 + 62U * 3, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(10000U, compaction->input(0, 5)->fd.GetNumber());
-  ASSERT_EQ(11, compaction->num_input_files(1));
-}
-
-TEST_F(CompactionPickerTest, UniversalIncrementalSpace5) {
-  // Test compaction candidates always cover many files with some single
-  // files larger than size threshold.
-  const uint64_t kFileSize = 100000;
-
-  mutable_cf_options_.max_compaction_bytes = 3200000;
-  mutable_cf_options_.compaction_options_universal.incremental = true;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 30;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(5, kCompactionStyleUniversal);
-
-  Add(0, 1U, "150", "200", kFileSize, 0, 500, 550);
-  Add(2, 2U, "010", "080", kFileSize, 0, 200, 251);
-
-  // Generate files like following:
-  // L3: (1101, 1180) (1201, 1280) ... (7901, 7908)
-  // L4: (1130, 1150) (1160, 1210) (1230, 1250) (1260 1310) ... (7960, 8010)
-  for (int i = 11; i < 70; i++) {
-    Add(3, 100 + i * 3, ToString(i * 100).c_str(),
-        ToString(i * 100 + 80).c_str(),
-        i % 10 == 9 ? kFileSize * 100 : kFileSize, 0, 200, 251);
-
-    Add(4, 100 + i * 3 + 1, ToString(i * 100 + 30).c_str(),
-        ToString(i * 100 + 50).c_str(), kFileSize, 0, 200, 251);
-    Add(4, 100 + i * 3 + 2, ToString(i * 100 + 60).c_str(),
-        ToString(i * 100 + 110).c_str(), kFileSize, 0, 200, 251);
-  }
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-  ASSERT_TRUE(compaction);
-  ASSERT_EQ(4, compaction->output_level());
-  ASSERT_EQ(3, compaction->start_level());
-  ASSERT_EQ(6U, compaction->num_input_files(0));
-  ASSERT_EQ(100 + 14 * 3, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(100 + 19 * 3, compaction->input(0, 5)->fd.GetNumber());
-  ASSERT_EQ(13, compaction->num_input_files(1));
-}
-
 TEST_F(CompactionPickerTest, NeedsCompactionFIFO) {
  NewVersionStorage(1, kCompactionStyleFIFO);
  const int kFileCount =
@@ -976,245 +757,6 @@ TEST_F(CompactionPickerTest, NeedsCompactionFIFO) {
              vstorage_->CompactionScore(0) >= 1);
  }
 }
-
-TEST_F(CompactionPickerTest, FIFOToWarm1) {
-  NewVersionStorage(1, kCompactionStyleFIFO);
-  const uint64_t kFileSize = 100000;
-  const uint64_t kMaxSize = kFileSize * 100000;
-  uint64_t kWarmThreshold = 2000;
-
-  fifo_options_.max_table_files_size = kMaxSize;
-  fifo_options_.age_for_warm = kWarmThreshold;
-  mutable_cf_options_.compaction_options_fifo = fifo_options_;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_compaction_bytes = kFileSize * 100;
-  FIFOCompactionPicker fifo_compaction_picker(ioptions_, &icmp_);
-
-  int64_t current_time = 0;
-  ASSERT_OK(Env::Default()->GetCurrentTime(&current_time));
-  uint64_t threshold_time =
-      static_cast<uint64_t>(current_time) - kWarmThreshold;
-  Add(0, 6U, "240", "290", 2 * kFileSize, 0, 2900, 3000, 0, true,
-      Temperature::kUnknown, static_cast<uint64_t>(current_time) - 100);
-  Add(0, 5U, "240", "290", 2 * kFileSize, 0, 2700, 2800, 0, true,
-      Temperature::kUnknown, threshold_time + 100);
-  Add(0, 4U, "260", "300", 1 * kFileSize, 0, 2500, 2600, 0, true,
-      Temperature::kUnknown, threshold_time - 2000);
-  Add(0, 3U, "200", "300", 4 * kFileSize, 0, 2300, 2400, 0, true,
-      Temperature::kUnknown, threshold_time - 3000);
-  UpdateVersionStorageInfo();
-
-  ASSERT_EQ(fifo_compaction_picker.NeedsCompaction(vstorage_.get()), true);
-  std::unique_ptr<Compaction> compaction(fifo_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(1U, compaction->num_input_files(0));
-  ASSERT_EQ(3U, compaction->input(0, 0)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, FIFOToWarm2) {
-  NewVersionStorage(1, kCompactionStyleFIFO);
-  const uint64_t kFileSize = 100000;
-  const uint64_t kMaxSize = kFileSize * 100000;
-  uint64_t kWarmThreshold = 2000;
-
-  fifo_options_.max_table_files_size = kMaxSize;
-  fifo_options_.age_for_warm = kWarmThreshold;
-  mutable_cf_options_.compaction_options_fifo = fifo_options_;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_compaction_bytes = kFileSize * 100;
-  FIFOCompactionPicker fifo_compaction_picker(ioptions_, &icmp_);
-
-  int64_t current_time = 0;
-  ASSERT_OK(Env::Default()->GetCurrentTime(&current_time));
-  uint64_t threshold_time =
-      static_cast<uint64_t>(current_time) - kWarmThreshold;
-  Add(0, 6U, "240", "290", 2 * kFileSize, 0, 2900, 3000, 0, true,
-      Temperature::kUnknown, static_cast<uint64_t>(current_time) - 100);
-  Add(0, 5U, "240", "290", 2 * kFileSize, 0, 2700, 2800, 0, true,
-      Temperature::kUnknown, threshold_time + 100);
-  Add(0, 4U, "260", "300", 1 * kFileSize, 0, 2500, 2600, 0, true,
-      Temperature::kUnknown, threshold_time - 2000);
-  Add(0, 3U, "200", "300", 4 * kFileSize, 0, 2300, 2400, 0, true,
-      Temperature::kUnknown, threshold_time - 3000);
-  Add(0, 2U, "200", "300", 4 * kFileSize, 0, 2100, 2200, 0, true,
-      Temperature::kUnknown, threshold_time - 4000);
-  UpdateVersionStorageInfo();
-
-  ASSERT_EQ(fifo_compaction_picker.NeedsCompaction(vstorage_.get()), true);
-  std::unique_ptr<Compaction> compaction(fifo_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(2U, compaction->num_input_files(0));
-  ASSERT_EQ(2U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(3U, compaction->input(0, 1)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, FIFOToWarmMaxSize) {
-  NewVersionStorage(1, kCompactionStyleFIFO);
-  const uint64_t kFileSize = 100000;
-  const uint64_t kMaxSize = kFileSize * 100000;
-  uint64_t kWarmThreshold = 2000;
-
-  fifo_options_.max_table_files_size = kMaxSize;
-  fifo_options_.age_for_warm = kWarmThreshold;
-  mutable_cf_options_.compaction_options_fifo = fifo_options_;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_compaction_bytes = kFileSize * 9;
-  FIFOCompactionPicker fifo_compaction_picker(ioptions_, &icmp_);
-
-  int64_t current_time = 0;
-  ASSERT_OK(Env::Default()->GetCurrentTime(&current_time));
-  uint64_t threshold_time =
-      static_cast<uint64_t>(current_time) - kWarmThreshold;
-  Add(0, 6U, "240", "290", 2 * kFileSize, 0, 2900, 3000, 0, true,
-      Temperature::kUnknown, static_cast<uint64_t>(current_time) - 100);
-  Add(0, 5U, "240", "290", 2 * kFileSize, 0, 2700, 2800, 0, true,
-      Temperature::kUnknown, threshold_time + 100);
-  Add(0, 4U, "260", "300", 1 * kFileSize, 0, 2500, 2600, 0, true,
-      Temperature::kUnknown, threshold_time - 2000);
-  Add(0, 3U, "200", "300", 4 * kFileSize, 0, 2300, 2400, 0, true,
-      Temperature::kUnknown, threshold_time - 3000);
-  Add(0, 2U, "200", "300", 4 * kFileSize, 0, 2100, 2200, 0, true,
-      Temperature::kUnknown, threshold_time - 4000);
-  Add(0, 1U, "200", "300", 4 * kFileSize, 0, 2000, 2100, 0, true,
-      Temperature::kUnknown, threshold_time - 5000);
-  UpdateVersionStorageInfo();
-
-  ASSERT_EQ(fifo_compaction_picker.NeedsCompaction(vstorage_.get()), true);
-  std::unique_ptr<Compaction> compaction(fifo_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(2U, compaction->num_input_files(0));
-  ASSERT_EQ(1U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(2U, compaction->input(0, 1)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, FIFOToWarmWithExistingWarm) {
-  NewVersionStorage(1, kCompactionStyleFIFO);
-  const uint64_t kFileSize = 100000;
-  const uint64_t kMaxSize = kFileSize * 100000;
-  uint64_t kWarmThreshold = 2000;
-
-  fifo_options_.max_table_files_size = kMaxSize;
-  fifo_options_.age_for_warm = kWarmThreshold;
-  mutable_cf_options_.compaction_options_fifo = fifo_options_;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_compaction_bytes = kFileSize * 100;
-  FIFOCompactionPicker fifo_compaction_picker(ioptions_, &icmp_);
-
-  int64_t current_time = 0;
-  ASSERT_OK(Env::Default()->GetCurrentTime(&current_time));
-  uint64_t threshold_time =
-      static_cast<uint64_t>(current_time) - kWarmThreshold;
-  Add(0, 6U, "240", "290", 2 * kFileSize, 0, 2900, 3000, 0, true,
-      Temperature::kUnknown, static_cast<uint64_t>(current_time) - 100);
-  Add(0, 5U, "240", "290", 2 * kFileSize, 0, 2700, 2800, 0, true,
-      Temperature::kUnknown, threshold_time + 100);
-  Add(0, 4U, "260", "300", 1 * kFileSize, 0, 2500, 2600, 0, true,
-      Temperature::kUnknown, threshold_time - 2000);
-  Add(0, 3U, "200", "300", 4 * kFileSize, 0, 2300, 2400, 0, true,
-      Temperature::kUnknown, threshold_time - 3000);
-  Add(0, 2U, "200", "300", 4 * kFileSize, 0, 2100, 2200, 0, true,
-      Temperature::kUnknown, threshold_time - 4000);
-  Add(0, 1U, "200", "300", 4 * kFileSize, 0, 2000, 2100, 0, true,
-      Temperature::kWarm, threshold_time - 5000);
-  UpdateVersionStorageInfo();
-
-  ASSERT_EQ(fifo_compaction_picker.NeedsCompaction(vstorage_.get()), true);
-  std::unique_ptr<Compaction> compaction(fifo_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(2U, compaction->num_input_files(0));
-  ASSERT_EQ(2U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(3U, compaction->input(0, 1)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, FIFOToWarmWithOngoing) {
-  NewVersionStorage(1, kCompactionStyleFIFO);
-  const uint64_t kFileSize = 100000;
-  const uint64_t kMaxSize = kFileSize * 100000;
-  uint64_t kWarmThreshold = 2000;
-
-  fifo_options_.max_table_files_size = kMaxSize;
-  fifo_options_.age_for_warm = kWarmThreshold;
-  mutable_cf_options_.compaction_options_fifo = fifo_options_;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_compaction_bytes = kFileSize * 100;
-  FIFOCompactionPicker fifo_compaction_picker(ioptions_, &icmp_);
-
-  int64_t current_time = 0;
-  ASSERT_OK(Env::Default()->GetCurrentTime(&current_time));
-  uint64_t threshold_time =
-      static_cast<uint64_t>(current_time) - kWarmThreshold;
-  Add(0, 6U, "240", "290", 2 * kFileSize, 0, 2900, 3000, 0, true,
-      Temperature::kUnknown, static_cast<uint64_t>(current_time) - 100);
-  Add(0, 5U, "240", "290", 2 * kFileSize, 0, 2700, 2800, 0, true,
-      Temperature::kUnknown, threshold_time + 100);
-  Add(0, 4U, "260", "300", 1 * kFileSize, 0, 2500, 2600, 0, true,
-      Temperature::kUnknown, threshold_time - 2000);
-  Add(0, 3U, "200", "300", 4 * kFileSize, 0, 2300, 2400, 0, true,
-      Temperature::kUnknown, threshold_time - 3000);
-  Add(0, 2U, "200", "300", 4 * kFileSize, 0, 2100, 2200, 0, true,
-      Temperature::kUnknown, threshold_time - 4000);
-  Add(0, 1U, "200", "300", 4 * kFileSize, 0, 2000, 2100, 0, true,
-      Temperature::kWarm, threshold_time - 5000);
-  file_map_[2].first->being_compacted = true;
-  UpdateVersionStorageInfo();
-
-  ASSERT_EQ(fifo_compaction_picker.NeedsCompaction(vstorage_.get()), true);
-  std::unique_ptr<Compaction> compaction(fifo_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  // Stop if a file is being compacted
-  ASSERT_TRUE(compaction.get() == nullptr);
-}
-
-TEST_F(CompactionPickerTest, FIFOToWarmWithHotBetweenWarms) {
-  NewVersionStorage(1, kCompactionStyleFIFO);
-  const uint64_t kFileSize = 100000;
-  const uint64_t kMaxSize = kFileSize * 100000;
-  uint64_t kWarmThreshold = 2000;
-
-  fifo_options_.max_table_files_size = kMaxSize;
-  fifo_options_.age_for_warm = kWarmThreshold;
-  mutable_cf_options_.compaction_options_fifo = fifo_options_;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
-  mutable_cf_options_.max_compaction_bytes = kFileSize * 100;
-  FIFOCompactionPicker fifo_compaction_picker(ioptions_, &icmp_);
-
-  int64_t current_time = 0;
-  ASSERT_OK(Env::Default()->GetCurrentTime(&current_time));
-  uint64_t threshold_time =
-      static_cast<uint64_t>(current_time) - kWarmThreshold;
-  Add(0, 6U, "240", "290", 2 * kFileSize, 0, 2900, 3000, 0, true,
-      Temperature::kUnknown, static_cast<uint64_t>(current_time) - 100);
-  Add(0, 5U, "240", "290", 2 * kFileSize, 0, 2700, 2800, 0, true,
-      Temperature::kUnknown, threshold_time + 100);
-  Add(0, 4U, "260", "300", 1 * kFileSize, 0, 2500, 2600, 0, true,
-      Temperature::kUnknown, threshold_time - 2000);
-  Add(0, 3U, "200", "300", 4 * kFileSize, 0, 2300, 2400, 0, true,
-      Temperature::kWarm, threshold_time - 3000);
-  Add(0, 2U, "200", "300", 4 * kFileSize, 0, 2100, 2200, 0, true,
-      Temperature::kUnknown, threshold_time - 4000);
-  Add(0, 1U, "200", "300", 4 * kFileSize, 0, 2000, 2100, 0, true,
-      Temperature::kWarm, threshold_time - 5000);
-  UpdateVersionStorageInfo();
-
-  ASSERT_EQ(fifo_compaction_picker.NeedsCompaction(vstorage_.get()), true);
-  std::unique_ptr<Compaction> compaction(fifo_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  // Stop if a file is being compacted
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(1U, compaction->num_input_files(0));
-  ASSERT_EQ(2U, compaction->input(0, 0)->fd.GetNumber());
-}
-
 #endif  // ROCKSDB_LITE

 TEST_F(CompactionPickerTest, CompactionPriMinOverlapping1) {
@@ -1673,66 +1215,6 @@ TEST_F(CompactionPickerTest, OverlappingUserKeys11) {
  ASSERT_EQ(7U, compaction->input(1, 0)->fd.GetNumber());
 }

-TEST_F(CompactionPickerTest, FileTtlBooster) {
-  // Set TTL to 2048
-  // TTL boosting for all levels starts at 1024,
-  // Whole TTL range is 2048 * 31 / 32 - 1024 = 1984 - 1024 = 960.
-  // From second last level (L5), range starts at
-  // 1024 + 480, 1024 + 240, 1024 + 120 (which is L3).
-  // Boosting step 124 / 16 = 7.75 -> 7
-  //
-  const uint64_t kCurrentTime = 1000000;
-  FileMetaData meta;
-
-  {
-    FileTtlBooster booster(kCurrentTime, 2048, 7, 3);
-
-    // Not triggering if the file is younger than ttl/2
-    meta.oldest_ancester_time = kCurrentTime - 1023;
-    ASSERT_EQ(1, booster.GetBoostScore(&meta));
-    meta.oldest_ancester_time = kCurrentTime - 1024;
-    ASSERT_EQ(1, booster.GetBoostScore(&meta));
-    meta.oldest_ancester_time = kCurrentTime + 10;
-    ASSERT_EQ(1, booster.GetBoostScore(&meta));
-
-    // Within one boosting step
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 120 + 6);
-    ASSERT_EQ(1, booster.GetBoostScore(&meta));
-
-    // One boosting step
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 120 + 7);
-    ASSERT_EQ(2, booster.GetBoostScore(&meta));
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 120 + 8);
-    ASSERT_EQ(2, booster.GetBoostScore(&meta));
-
-    // Multiple boosting steps
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 120 + 30);
-    ASSERT_EQ(5, booster.GetBoostScore(&meta));
-
-    // Very high boosting steps
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 120 + 700);
-    ASSERT_EQ(101, booster.GetBoostScore(&meta));
-  }
-  {
-    // Test second last level
-    FileTtlBooster booster(kCurrentTime, 2048, 7, 5);
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 480);
-    ASSERT_EQ(1, booster.GetBoostScore(&meta));
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 480 + 60);
-    ASSERT_EQ(3, booster.GetBoostScore(&meta));
-  }
-  {
-    // Test last level
-    FileTtlBooster booster(kCurrentTime, 2048, 7, 6);
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 480);
-    ASSERT_EQ(1, booster.GetBoostScore(&meta));
-    meta.oldest_ancester_time = kCurrentTime - (1024 + 480 + 60);
-    ASSERT_EQ(1, booster.GetBoostScore(&meta));
-    meta.oldest_ancester_time = kCurrentTime - 3000;
-    ASSERT_EQ(1, booster.GetBoostScore(&meta));
-  }
-}
-
 TEST_F(CompactionPickerTest, NotScheduleL1IfL0WithHigherPri1) {
  NewVersionStorage(6, kCompactionStyleLevel);
  mutable_cf_options_.level0_file_num_compaction_trigger = 2;
@@ -15,11 +15,9 @@
 #include <queue>
 #include <string>
 #include <utility>
-
 #include "db/column_family.h"
 #include "file/filename.h"
 #include "logging/log_buffer.h"
-#include "logging/logging.h"
 #include "monitoring/statistics.h"
 #include "test_util/sync_point.h"
 #include "util/random.h"
@@ -89,14 +87,6 @@ class UniversalCompactionBuilder {
  // Pick Universal compaction to limit space amplification.
  Compaction* PickCompactionToReduceSizeAmp();

-  // Try to pick incremental compaction to reduce space amplification.
-  // It will return null if it cannot find a fanout within the threshold.
-  // Fanout is defined as
-  //    total size of files to compact at output level
-  //  --------------------------------------------------
-  //    total size of files to compact at other levels
-  Compaction* PickIncrementalForReduceSizeAmp(double fanout_threshold);
-
  Compaction* PickDeleteTriggeredCompaction();

  // Form a compaction from the sorted run indicated by start_index to the
@@ -112,14 +102,12 @@ class UniversalCompactionBuilder {
  // because some files are being compacted.
  Compaction* PickPeriodicCompaction();

-  // Used in universal compaction when the allow_trivial_move
+  // Used in universal compaction when the enabled_trivial_move
  // option is set. Checks whether there are any overlapping files
  // in the input. Returns true if the input files are non
  // overlapping.
  bool IsInputFilesNonOverlapping(Compaction* c);

-  uint64_t GetMaxOverlappingBytes() const;
-
  const ImmutableOptions& ioptions_;
  const InternalKeyComparator* icmp_;
  double score_;
@@ -169,9 +157,9 @@ struct SmallestKeyHeapComparator {
  const Comparator* ucmp_;
 };

-using SmallestKeyHeap =
-    std::priority_queue<InputFileInfo, std::vector<InputFileInfo>,
-                        SmallestKeyHeapComparator>;
+typedef std::priority_queue<InputFileInfo, std::vector<InputFileInfo>,
+                            SmallestKeyHeapComparator>
+    SmallestKeyHeap;

 // This function creates the heap that is used to find if the files are
 // overlapping during universal compaction when the allow_trivial_move
@@ -498,11 +486,8 @@ Compaction* UniversalCompactionBuilder::PickCompaction() {
  }
 #endif
  // update statistics
-  size_t num_files = 0;
-  for (auto& each_level : *c->inputs()) {
-    num_files += each_level.files.size();
-  }
-  RecordInHistogram(ioptions_.stats, NUM_FILES_IN_SINGLE_COMPACTION, num_files);
+  RecordInHistogram(ioptions_.stats, NUM_FILES_IN_SINGLE_COMPACTION,
+                    c->inputs(0)->size());

  picker_->RegisterCompaction(c);
  vstorage_->ComputeCompactionScore(ioptions_, mutable_cf_options_);
@@ -727,19 +712,6 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSortedRuns(
                     cf_name_.c_str(), file_num_buf);
  }

-  std::vector<FileMetaData*> grandparents;
-  // Include grandparents for potential file cutting in incremental
-  // mode. It is for aligning file cutting boundaries across levels,
-  // so that subsequent compactions can pick files with aligned
-  // buffer.
-  // Single files are only picked up in incremental mode, so that
-  // there is no need for full range.
-  if (mutable_cf_options_.compaction_options_universal.incremental &&
-      first_index_after < sorted_runs_.size() &&
-      sorted_runs_[first_index_after].level > 1) {
-    grandparents = vstorage_->LevelFiles(sorted_runs_[first_index_after].level);
-  }
-
  CompactionReason compaction_reason;
  if (max_number_of_files_to_compact == UINT_MAX) {
    compaction_reason = CompactionReason::kUniversalSizeRatio;
@@ -751,14 +723,13 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSortedRuns(
      std::move(inputs), output_level,
      MaxFileSizeForLevel(mutable_cf_options_, output_level,
                          kCompactionStyleUniversal),
-      GetMaxOverlappingBytes(), path_id,
+      LLONG_MAX, 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);
+      /* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false,
+      score_, false /* deletion_compaction */, compaction_reason);
 }

 // Look at overall size amplification. If size amplification
@@ -814,8 +785,6 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSizeAmp() {
  for (size_t loop = start_index; loop + 1 < sorted_runs_.size(); loop++) {
    sr = &sorted_runs_[loop];
    if (sr->being_compacted) {
-      // TODO with incremental compaction is supported, we might want to
-      // schedule some incremental compactions in parallel if needed.
      char file_num_buf[kFormatFileNumberBufSize];
      sr->Dump(file_num_buf, sizeof(file_num_buf), true);
      ROCKS_LOG_BUFFER(
@@ -849,250 +818,16 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSizeAmp() {
        " earliest-file-size %" PRIu64,
        cf_name_.c_str(), candidate_size, earliest_file_size);
  }
-  // Since incremental compaction can't include more than second last
-  // level, it can introduce penalty, compared to full compaction. We
-  // hard code the pentalty to be 80%. If we end up with a compaction
-  // fanout higher than 80% of full level compactions, we fall back
-  // to full level compaction.
-  // The 80% threshold is arbitrary and can be adjusted or made
-  // configurable in the future.
-  // This also prevent the case when compaction falls behind and we
-  // need to compact more levels for compactions to catch up.
-  if (mutable_cf_options_.compaction_options_universal.incremental) {
-    double fanout_threshold = static_cast<double>(earliest_file_size) /
-                              static_cast<double>(candidate_size) * 1.8;
-    Compaction* picked = PickIncrementalForReduceSizeAmp(fanout_threshold);
-    if (picked != nullptr) {
-      // As the feature is still incremental, picking incremental compaction
-      // might fail and we will fall bck to compacting full level.
-      return picked;
-    }
-  }
  return PickCompactionToOldest(start_index,
                                CompactionReason::kUniversalSizeAmplification);
 }

-Compaction* UniversalCompactionBuilder::PickIncrementalForReduceSizeAmp(
-    double fanout_threshold) {
-  // Try find all potential compactions with total size just over
-  // options.max_compaction_size / 2, and take the one with the lowest
-  // fanout (defined in declaration of the function).
-  // This is done by having a sliding window of the files at the second
-  // lowest level, and keep expanding while finding overlapping in the
-  // last level. Once total size exceeds the size threshold, calculate
-  // the fanout value. And then shrinking from the small side of the
-  // window. Keep doing it until the end.
-  // Finally, we try to include upper level files if they fall into
-  // the range.
-  //
-  // Note that it is a similar problem as leveled compaction's
-  // kMinOverlappingRatio priority, but instead of picking single files
-  // we expand to a target compaction size. The reason is that in
-  // leveled compaction, actual fanout value tends to high, e.g. 10, so
-  // even with single file in down merging level, the extra size
-  // compacted in boundary files is at a lower ratio. But here users
-  // often have size of second last level size to be 1/4, 1/3 or even
-  // 1/2 of the bottommost level, so picking single file in second most
-  // level will cause significant waste, which is not desirable.
-  //
-  // This algorithm has lots of room to improve to pick more efficient
-  // compactions.
-  assert(sorted_runs_.size() >= 2);
-  int second_last_level = sorted_runs_[sorted_runs_.size() - 2].level;
-  if (second_last_level == 0) {
-    // Can't split Level 0.
-    return nullptr;
-  }
-  int output_level = sorted_runs_.back().level;
-  const std::vector<FileMetaData*>& bottom_files =
-      vstorage_->LevelFiles(output_level);
-  const std::vector<FileMetaData*>& files =
-      vstorage_->LevelFiles(second_last_level);
-  assert(!bottom_files.empty());
-  assert(!files.empty());
-
-  //  std::unordered_map<uint64_t, uint64_t> file_to_order;
-
-  int picked_start_idx = 0;
-  int picked_end_idx = 0;
-  double picked_fanout = fanout_threshold;
-
-  // Use half target compaction bytes as anchor to stop growing second most
-  // level files, and reserve growing space for more overlapping bottom level,
-  // clean cut, files from other levels, etc.
-  uint64_t comp_thres_size = mutable_cf_options_.max_compaction_bytes / 2;
-  int start_idx = 0;
-  int bottom_end_idx = 0;
-  int bottom_start_idx = 0;
-  uint64_t non_bottom_size = 0;
-  uint64_t bottom_size = 0;
-  bool end_bottom_size_counted = false;
-  for (int end_idx = 0; end_idx < static_cast<int>(files.size()); end_idx++) {
-    FileMetaData* end_file = files[end_idx];
-
-    // Include bottom most level files smaller than the current second
-    // last level file.
-    int num_skipped = 0;
-    while (bottom_end_idx < static_cast<int>(bottom_files.size()) &&
-           icmp_->Compare(bottom_files[bottom_end_idx]->largest,
-                          end_file->smallest) < 0) {
-      if (!end_bottom_size_counted) {
-        bottom_size += bottom_files[bottom_end_idx]->fd.file_size;
-      }
-      bottom_end_idx++;
-      end_bottom_size_counted = false;
-      num_skipped++;
-    }
-
-    if (num_skipped > 1) {
-      // At least a file in the bottom most level falls into the file gap. No
-      // reason to include the file. We cut the range and start a new sliding
-      // window.
-      start_idx = end_idx;
-    }
-
-    if (start_idx == end_idx) {
-      // new sliding window.
-      non_bottom_size = 0;
-      bottom_size = 0;
-      bottom_start_idx = bottom_end_idx;
-      end_bottom_size_counted = false;
-    }
-
-    non_bottom_size += end_file->fd.file_size;
-
-    // Include all overlapping files in bottom level.
-    while (bottom_end_idx < static_cast<int>(bottom_files.size()) &&
-           icmp_->Compare(bottom_files[bottom_end_idx]->smallest,
-                          end_file->largest) < 0) {
-      if (!end_bottom_size_counted) {
-        bottom_size += bottom_files[bottom_end_idx]->fd.file_size;
-        end_bottom_size_counted = true;
-      }
-      if (icmp_->Compare(bottom_files[bottom_end_idx]->largest,
-                         end_file->largest) > 0) {
-        // next level file cross large boundary of current file.
-        break;
-      }
-      bottom_end_idx++;
-      end_bottom_size_counted = false;
-    }
-
-    if ((non_bottom_size + bottom_size > comp_thres_size ||
-         end_idx == static_cast<int>(files.size()) - 1) &&
-        non_bottom_size > 0) {  // Do we alow 0 size file at all?
-      // If it is a better compaction, remember it in picked* variables.
-      double fanout = static_cast<double>(bottom_size) /
-                      static_cast<double>(non_bottom_size);
-      if (fanout < picked_fanout) {
-        picked_start_idx = start_idx;
-        picked_end_idx = end_idx;
-        picked_fanout = fanout;
-      }
-      // Shrink from the start end to under comp_thres_size
-      while (non_bottom_size + bottom_size > comp_thres_size &&
-             start_idx <= end_idx) {
-        non_bottom_size -= files[start_idx]->fd.file_size;
-        start_idx++;
-        if (start_idx < static_cast<int>(files.size())) {
-          while (bottom_start_idx <= bottom_end_idx &&
-                 icmp_->Compare(bottom_files[bottom_start_idx]->largest,
-                                files[start_idx]->smallest) < 0) {
-            bottom_size -= bottom_files[bottom_start_idx]->fd.file_size;
-            bottom_start_idx++;
-          }
-        }
-      }
-    }
-  }
-
-  if (picked_fanout >= fanout_threshold) {
-    assert(picked_fanout == fanout_threshold);
-    return nullptr;
-  }
-
-  std::vector<CompactionInputFiles> inputs;
-  CompactionInputFiles bottom_level_inputs;
-  CompactionInputFiles second_last_level_inputs;
-  second_last_level_inputs.level = second_last_level;
-  bottom_level_inputs.level = output_level;
-  for (int i = picked_start_idx; i <= picked_end_idx; i++) {
-    if (files[i]->being_compacted) {
-      return nullptr;
-    }
-    second_last_level_inputs.files.push_back(files[i]);
-  }
-  assert(!second_last_level_inputs.empty());
-  if (!picker_->ExpandInputsToCleanCut(cf_name_, vstorage_,
-                                       &second_last_level_inputs,
-                                       /*next_smallest=*/nullptr)) {
-    return nullptr;
-  }
-  // We might be able to avoid this binary search if we save and expand
-  // from bottom_start_idx and bottom_end_idx, but for now, we use
-  // SetupOtherInputs() for simplicity.
-  int parent_index = -1;  // Create and use bottom_start_idx?
-  if (!picker_->SetupOtherInputs(cf_name_, mutable_cf_options_, vstorage_,
-                                 &second_last_level_inputs,
-                                 &bottom_level_inputs, &parent_index,
-                                 /*base_index=*/-1)) {
-    return nullptr;
-  }
-
-  // Try to include files in upper levels if they fall into the range.
-  // Since we need to go from lower level up and this is in the reverse
-  // order, compared to level order, we first write to an reversed
-  // data structure and finally copy them to compaction inputs.
-  InternalKey smallest, largest;
-  picker_->GetRange(second_last_level_inputs, &smallest, &largest);
-  std::vector<CompactionInputFiles> inputs_reverse;
-  for (auto it = ++(++sorted_runs_.rbegin()); it != sorted_runs_.rend(); it++) {
-    SortedRun& sr = *it;
-    if (sr.level == 0) {
-      break;
-    }
-    std::vector<FileMetaData*> level_inputs;
-    vstorage_->GetCleanInputsWithinInterval(sr.level, &smallest, &largest,
-                                            &level_inputs);
-    if (!level_inputs.empty()) {
-      inputs_reverse.push_back({});
-      inputs_reverse.back().level = sr.level;
-      inputs_reverse.back().files = level_inputs;
-      picker_->GetRange(inputs_reverse.back(), &smallest, &largest);
-    }
-  }
-  for (auto it = inputs_reverse.rbegin(); it != inputs_reverse.rend(); it++) {
-    inputs.push_back(*it);
-  }
-
-  inputs.push_back(second_last_level_inputs);
-  inputs.push_back(bottom_level_inputs);
-
-  // TODO support multi paths?
-  uint32_t path_id = 0;
-  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_,
-                         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,
-      score_, false /* deletion_compaction */,
-      CompactionReason::kUniversalSizeAmplification);
-}
-
 // Pick files marked for compaction. Typically, files are marked by
 // CompactOnDeleteCollector due to the presence of tombstones.
 Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
  CompactionInputFiles start_level_inputs;
  int output_level;
  std::vector<CompactionInputFiles> inputs;
-  std::vector<FileMetaData*> grandparents;

  if (vstorage_->num_levels() == 1) {
    // This is single level universal. Since we're basically trying to reclaim
@@ -1199,9 +934,6 @@ Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
      if (picker_->FilesRangeOverlapWithCompaction(inputs, output_level)) {
        return nullptr;
      }
-
-      picker_->GetGrandparents(vstorage_, start_level_inputs,
-                               output_level_inputs, &grandparents);
    } else {
      inputs.push_back(start_level_inputs);
    }
@@ -1219,13 +951,12 @@ Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
      std::move(inputs), output_level,
      MaxFileSizeForLevel(mutable_cf_options_, output_level,
                          kCompactionStyleUniversal),
-      /* max_grandparent_overlap_bytes */ GetMaxOverlappingBytes(), path_id,
+      /* max_grandparent_overlap_bytes */ LLONG_MAX, path_id,
      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, score_,
-      false /* deletion_compaction */,
+      /* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false,
+      score_, false /* deletion_compaction */,
      CompactionReason::kFilesMarkedForCompaction);
 }

@@ -1293,12 +1024,11 @@ Compaction* UniversalCompactionBuilder::PickCompactionToOldest(
      std::move(inputs), output_level,
      MaxFileSizeForLevel(mutable_cf_options_, output_level,
                          kCompactionStyleUniversal),
-      GetMaxOverlappingBytes(), path_id,
+      LLONG_MAX, path_id,
      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,
      score_, false /* deletion_compaction */, compaction_reason);
 }
@@ -1368,17 +1098,6 @@ Compaction* UniversalCompactionBuilder::PickPeriodicCompaction() {

  return c;
 }
-
-uint64_t UniversalCompactionBuilder::GetMaxOverlappingBytes() const {
-  if (!mutable_cf_options_.compaction_options_universal.incremental) {
-    return port::kMaxUint64;
-  } else {
-    // Try to align cutting boundary with files at the next level if the
-    // file isn't end up with 1/2 of target size, or it would overlap
-    // with two full size files at the next level.
-    return mutable_cf_options_.target_file_size_base / 2 * 3;
-  }
-}
 }  // namespace ROCKSDB_NAMESPACE

 #endif  // !ROCKSDB_LITE
@@ -10,54 +10,13 @@

 namespace ROCKSDB_NAMESPACE {

-class TestCompactionServiceBase {
+class MyTestCompactionService : public CompactionService {
 public:
-  virtual int GetCompactionNum() = 0;
+  MyTestCompactionService(const std::string& db_path, Options& options,
+                          std::shared_ptr<Statistics> statistics = nullptr)
+      : db_path_(db_path), options_(options), statistics_(statistics) {}

-  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"; }
+  static const char* kClassName() { return "MyTestCompactionService"; }

  const char* Name() const override { return kClassName(); }

@@ -66,9 +25,7 @@ class MyTestCompactionServiceLegacy : public CompactionService,
    InstrumentedMutexLock l(&mutex_);
    jobs_.emplace(job_id, compaction_service_input);
    CompactionServiceJobStatus s = CompactionServiceJobStatus::kSuccess;
-    if (is_override_start_status) {
-      return override_start_status;
-    }
+    TEST_SYNC_POINT_CALLBACK("MyTestCompactionService::Start::End", &s);
    return s;
  }

@@ -85,10 +42,6 @@ class MyTestCompactionServiceLegacy : public CompactionService,
      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 =
@@ -106,9 +59,8 @@ class MyTestCompactionServiceLegacy : public CompactionService,
    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;
-    }
+    TEST_SYNC_POINT_CALLBACK("MyTestCompactionService::WaitForComplete::End",
+                             compaction_service_result);
    compaction_num_.fetch_add(1);
    if (s.ok()) {
      return CompactionServiceJobStatus::kSuccess;
@@ -117,7 +69,7 @@ class MyTestCompactionServiceLegacy : public CompactionService,
    }
  }

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

 private:
  InstrumentedMutex mutex_;
@@ -128,144 +80,12 @@ class MyTestCompactionServiceLegacy : public CompactionService,
  std::shared_ptr<Statistics> statistics_;
 };

-class MyTestCompactionService : public CompactionService,
-                                public TestCompactionServiceBase {
- public:
-  MyTestCompactionService(std::string db_path, Options& options,
-                          std::shared_ptr<Statistics>& statistics)
-      : db_path_(std::move(db_path)),
-        options_(options),
-        statistics_(statistics),
-        start_info_("na", "na", "na", 0, Env::TOTAL),
-        wait_info_("na", "na", "na", 0, Env::TOTAL) {}
-
-  static const char* kClassName() { return "MyTestCompactionService"; }
-
-  const char* Name() const override { return kClassName(); }
-
-  CompactionServiceJobStatus StartV2(
-      const CompactionServiceJobInfo& info,
-      const std::string& compaction_service_input) override {
-    InstrumentedMutexLock l(&mutex_);
-    start_info_ = info;
-    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;
-    }
-    return s;
-  }
-
-  CompactionServiceJobStatus WaitForCompleteV2(
-      const CompactionServiceJobInfo& info,
-      std::string* compaction_service_result) override {
-    std::string compaction_input;
-    assert(info.db_name == db_path_);
-    {
-      InstrumentedMutexLock l(&mutex_);
-      wait_info_ = info;
-      auto i = jobs_.find(info.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(info.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(); }
-
-  CompactionServiceJobInfo GetCompactionInfoForStart() { return start_info_; }
-  CompactionServiceJobInfo GetCompactionInfoForWait() { return wait_info_; }
-
- 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_;
-  CompactionServiceJobInfo start_info_;
-  CompactionServiceJobInfo wait_info_;
-};
-
-// This is only for listing test classes
-enum TestCompactionServiceType {
-  MyTestCompactionServiceType,
-  MyTestCompactionServiceLegacyType,
-};
-
-class CompactionServiceTest
-    : public DBTestBase,
-      public testing::WithParamInterface<TestCompactionServiceType> {
+class CompactionServiceTest : public DBTestBase {
 public:
  explicit CompactionServiceTest()
      : DBTestBase("compaction_service_test", true) {}

 protected:
-  void ReopenWithCompactionService(Options* options) {
-    options->env = env_;
-    primary_statistics_ = CreateDBStatistics();
-    options->statistics = primary_statistics_;
-    compactor_statistics_ = CreateDBStatistics();
-    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);
-  }
-
-  Statistics* GetCompactorStatistics() { return compactor_statistics_.get(); }
-
-  Statistics* GetPrimaryStatistics() { return primary_statistics_.get(); }
-
-  TestCompactionServiceBase* GetCompactionService() {
-    CompactionService* cs = compaction_service_.get();
-    return dynamic_cast<TestCompactionServiceBase*>(cs);
-  }
-
  void GenerateTestData() {
    // Generate 20 files @ L2
    for (int i = 0; i < 20; i++) {
@@ -299,19 +119,17 @@ class CompactionServiceTest
      }
    }
  }
-
- private:
-  std::shared_ptr<Statistics> compactor_statistics_;
-  std::shared_ptr<Statistics> primary_statistics_;
-  std::shared_ptr<CompactionService> compaction_service_;
 };

-TEST_P(CompactionServiceTest, BasicCompactions) {
+TEST_F(CompactionServiceTest, BasicCompactions) {
  Options options = CurrentOptions();
-  ReopenWithCompactionService(&options);
+  options.env = env_;
+  options.statistics = CreateDBStatistics();
+  std::shared_ptr<Statistics> compactor_statistics = CreateDBStatistics();
+  options.compaction_service = std::make_shared<MyTestCompactionService>(
+      dbname_, options, compactor_statistics);

-  Statistics* primary_statistics = GetPrimaryStatistics();
-  Statistics* compactor_statistics = GetCompactorStatistics();
+  DestroyAndReopen(options);

  for (int i = 0; i < 20; i++) {
    for (int j = 0; j < 10; j++) {
@@ -339,32 +157,21 @@ TEST_P(CompactionServiceTest, BasicCompactions) {
      ASSERT_EQ(result, "value_new" + ToString(i));
    }
  }
-  auto my_cs = GetCompactionService();
+  auto my_cs =
+      dynamic_cast<MyTestCompactionService*>(options.compaction_service.get());
  ASSERT_GE(my_cs->GetCompactionNum(), 1);

-  // make sure the compaction statistics is only recorded on the remote side
-  ASSERT_GE(compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES), 1);
-  ASSERT_GE(compactor_statistics->getTickerCount(COMPACT_READ_BYTES), 1);
-  ASSERT_EQ(primary_statistics->getTickerCount(COMPACT_WRITE_BYTES), 0);
-  // even with remote compaction, primary host still needs to read SST files to
-  // `verify_table()`.
-  ASSERT_GE(primary_statistics->getTickerCount(COMPACT_READ_BYTES), 1);
-  // all the compaction write happens on the remote side
-  ASSERT_EQ(primary_statistics->getTickerCount(REMOTE_COMPACT_WRITE_BYTES),
-            compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES));
-  ASSERT_GE(primary_statistics->getTickerCount(REMOTE_COMPACT_READ_BYTES), 1);
-  ASSERT_GT(primary_statistics->getTickerCount(COMPACT_READ_BYTES),
-            primary_statistics->getTickerCount(REMOTE_COMPACT_READ_BYTES));
-  // compactor is already the remote side, which doesn't have remote
-  ASSERT_EQ(compactor_statistics->getTickerCount(REMOTE_COMPACT_READ_BYTES), 0);
-  ASSERT_EQ(compactor_statistics->getTickerCount(REMOTE_COMPACT_WRITE_BYTES),
+  // make sure the compaction statistics is only recorded on remote side
+  ASSERT_GE(
+      compactor_statistics->getTickerCount(COMPACTION_KEY_DROP_NEWER_ENTRY), 1);
+  ASSERT_EQ(options.statistics->getTickerCount(COMPACTION_KEY_DROP_NEWER_ENTRY),
            0);

  // Test failed compaction
  SyncPoint::GetInstance()->SetCallBack(
      "DBImplSecondary::CompactWithoutInstallation::End", [&](void* status) {
        // override job status
-        auto s = static_cast<Status*>(status);
+        Status* s = static_cast<Status*>(status);
        *s = Status::Aborted("MyTestCompactionService failed to compact!");
      });
  SyncPoint::GetInstance()->EnableProcessing();
@@ -393,13 +200,17 @@ TEST_P(CompactionServiceTest, BasicCompactions) {
  ASSERT_TRUE(s.IsAborted());
 }

-TEST_P(CompactionServiceTest, ManualCompaction) {
+TEST_F(CompactionServiceTest, ManualCompaction) {
  Options options = CurrentOptions();
+  options.env = env_;
  options.disable_auto_compactions = true;
-  ReopenWithCompactionService(&options);
+  options.compaction_service =
+      std::make_shared<MyTestCompactionService>(dbname_, options);
+  DestroyAndReopen(options);
  GenerateTestData();

-  auto my_cs = GetCompactionService();
+  auto my_cs =
+      dynamic_cast<MyTestCompactionService*>(options.compaction_service.get());

  std::string start_str = Key(15);
  std::string end_str = Key(45);
@@ -430,15 +241,22 @@ TEST_P(CompactionServiceTest, ManualCompaction) {
  VerifyTestData();
 }

-TEST_P(CompactionServiceTest, FailedToStart) {
+TEST_F(CompactionServiceTest, FailedToStart) {
  Options options = CurrentOptions();
+  options.env = env_;
  options.disable_auto_compactions = true;
-  ReopenWithCompactionService(&options);
-
+  options.compaction_service =
+      std::make_shared<MyTestCompactionService>(dbname_, options);
+  DestroyAndReopen(options);
  GenerateTestData();

-  auto my_cs = GetCompactionService();
-  my_cs->OverrideStartStatus(CompactionServiceJobStatus::kFailure);
+  SyncPoint::GetInstance()->SetCallBack(
+      "MyTestCompactionService::Start::End", [&](void* status) {
+        // override job status
+        auto s = static_cast<CompactionServiceJobStatus*>(status);
+        *s = CompactionServiceJobStatus::kFailure;
+      });
+  SyncPoint::GetInstance()->EnableProcessing();

  std::string start_str = Key(15);
  std::string end_str = Key(45);
@@ -448,15 +266,22 @@ TEST_P(CompactionServiceTest, FailedToStart) {
  ASSERT_TRUE(s.IsIncomplete());
 }

-TEST_P(CompactionServiceTest, InvalidResult) {
+TEST_F(CompactionServiceTest, InvalidResult) {
  Options options = CurrentOptions();
+  options.env = env_;
  options.disable_auto_compactions = true;
-  ReopenWithCompactionService(&options);
-
+  options.compaction_service =
+      std::make_shared<MyTestCompactionService>(dbname_, options);
+  DestroyAndReopen(options);
  GenerateTestData();

-  auto my_cs = GetCompactionService();
-  my_cs->OverrideWaitResult("Invalid Str");
+  SyncPoint::GetInstance()->SetCallBack(
+      "MyTestCompactionService::WaitForComplete::End", [&](void* result) {
+        // override job status
+        auto result_str = static_cast<std::string*>(result);
+        *result_str = "Invalid Str";
+      });
+  SyncPoint::GetInstance()->EnableProcessing();

  std::string start_str = Key(15);
  std::string end_str = Key(45);
@@ -466,17 +291,21 @@ TEST_P(CompactionServiceTest, InvalidResult) {
  ASSERT_FALSE(s.ok());
 }

-TEST_P(CompactionServiceTest, SubCompaction) {
+TEST_F(CompactionServiceTest, SubCompaction) {
  Options options = CurrentOptions();
+  options.env = env_;
  options.max_subcompactions = 10;
  options.target_file_size_base = 1 << 10;  // 1KB
  options.disable_auto_compactions = true;
-  ReopenWithCompactionService(&options);
+  options.compaction_service =
+      std::make_shared<MyTestCompactionService>(dbname_, options);

+  DestroyAndReopen(options);
  GenerateTestData();
  VerifyTestData();

-  auto my_cs = GetCompactionService();
+  auto my_cs =
+      dynamic_cast<MyTestCompactionService*>(options.compaction_service.get());
  int compaction_num_before = my_cs->GetCompactionNum();

  auto cro = CompactRangeOptions();
@@ -505,12 +334,15 @@ class PartialDeleteCompactionFilter : public CompactionFilter {
  const char* Name() const override { return "PartialDeleteCompactionFilter"; }
 };

-TEST_P(CompactionServiceTest, CompactionFilter) {
+TEST_F(CompactionServiceTest, CompactionFilter) {
  Options options = CurrentOptions();
-  std::unique_ptr<CompactionFilter> delete_comp_filter(
-      new PartialDeleteCompactionFilter());
-  options.compaction_filter = delete_comp_filter.get();
-  ReopenWithCompactionService(&options);
+  options.env = env_;
+  auto delete_comp_filter = PartialDeleteCompactionFilter();
+  options.compaction_filter = &delete_comp_filter;
+  options.compaction_service =
+      std::make_shared<MyTestCompactionService>(dbname_, options);
+
+  DestroyAndReopen(options);

  for (int i = 0; i < 20; i++) {
    for (int j = 0; j < 10; j++) {
@@ -542,13 +374,18 @@ TEST_P(CompactionServiceTest, CompactionFilter) {
      ASSERT_EQ(result, "value_new" + ToString(i));
    }
  }
-  auto my_cs = GetCompactionService();
+  auto my_cs =
+      dynamic_cast<MyTestCompactionService*>(options.compaction_service.get());
  ASSERT_GE(my_cs->GetCompactionNum(), 1);
 }

-TEST_P(CompactionServiceTest, Snapshot) {
+TEST_F(CompactionServiceTest, Snapshot) {
  Options options = CurrentOptions();
-  ReopenWithCompactionService(&options);
+  options.env = env_;
+  options.compaction_service =
+      std::make_shared<MyTestCompactionService>(dbname_, options);
+
+  DestroyAndReopen(options);

  ASSERT_OK(Put(Key(1), "value1"));
  ASSERT_OK(Put(Key(2), "value1"));
@@ -560,18 +397,23 @@ TEST_P(CompactionServiceTest, Snapshot) {
  ASSERT_OK(Flush());

  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
-  auto my_cs = GetCompactionService();
+  auto my_cs =
+      dynamic_cast<MyTestCompactionService*>(options.compaction_service.get());
  ASSERT_GE(my_cs->GetCompactionNum(), 1);
  ASSERT_EQ("value1", Get(Key(1), s1));
  ASSERT_EQ("value2", Get(Key(1)));
  db_->ReleaseSnapshot(s1);
 }

-TEST_P(CompactionServiceTest, ConcurrentCompaction) {
+TEST_F(CompactionServiceTest, ConcurrentCompaction) {
  Options options = CurrentOptions();
  options.level0_file_num_compaction_trigger = 100;
+  options.env = env_;
+  options.compaction_service =
+      std::make_shared<MyTestCompactionService>(dbname_, options);
  options.max_background_jobs = 20;
-  ReopenWithCompactionService(&options);
+
+  DestroyAndReopen(options);
  GenerateTestData();

  ColumnFamilyMetaData meta;
@@ -599,213 +441,22 @@ TEST_P(CompactionServiceTest, ConcurrentCompaction) {
      ASSERT_EQ(result, "value_new" + ToString(i));
    }
  }
-  auto my_cs = GetCompactionService();
+  auto my_cs =
+      dynamic_cast<MyTestCompactionService*>(options.compaction_service.get());
  ASSERT_EQ(my_cs->GetCompactionNum(), 10);
  ASSERT_EQ(FilesPerLevel(), "0,0,10");
 }

-TEST_P(CompactionServiceTest, CompactionInfo) {
-  // only test compaction info for new compaction service interface
-  if (GetParam() != MyTestCompactionServiceType) {
-    return;
-  }
-
-  Options options = CurrentOptions();
-  ReopenWithCompactionService(&options);
-
-  for (int i = 0; i < 20; 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());
-  }
-
-  for (int i = 0; i < 10; i++) {
-    for (int j = 0; j < 10; j++) {
-      int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
-    }
-    ASSERT_OK(Flush());
-  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-  auto my_cs =
-      static_cast_with_check<MyTestCompactionService>(GetCompactionService());
-  uint64_t comp_num = my_cs->GetCompactionNum();
-  ASSERT_GE(comp_num, 1);
-
-  CompactionServiceJobInfo info = my_cs->GetCompactionInfoForStart();
-  ASSERT_EQ(dbname_, info.db_name);
-  std::string db_id, db_session_id;
-  ASSERT_OK(db_->GetDbIdentity(db_id));
-  ASSERT_EQ(db_id, info.db_id);
-  ASSERT_OK(db_->GetDbSessionId(db_session_id));
-  ASSERT_EQ(db_session_id, info.db_session_id);
-  ASSERT_EQ(Env::LOW, info.priority);
-  info = my_cs->GetCompactionInfoForWait();
-  ASSERT_EQ(dbname_, info.db_name);
-  ASSERT_EQ(db_id, info.db_id);
-  ASSERT_EQ(db_session_id, info.db_session_id);
-  ASSERT_EQ(Env::LOW, info.priority);
-
-  // Test priority USER
-  ColumnFamilyMetaData meta;
-  db_->GetColumnFamilyMetaData(&meta);
-  SstFileMetaData file = meta.levels[1].files[0];
-  ASSERT_OK(db_->CompactFiles(CompactionOptions(),
-                              {file.db_path + "/" + file.name}, 2));
-  info = my_cs->GetCompactionInfoForStart();
-  ASSERT_EQ(Env::USER, info.priority);
-  info = my_cs->GetCompactionInfoForWait();
-  ASSERT_EQ(Env::USER, info.priority);
-
-  // Test priority BOTTOM
-  env_->SetBackgroundThreads(1, Env::BOTTOM);
-  options.num_levels = 2;
-  ReopenWithCompactionService(&options);
-  my_cs =
-      static_cast_with_check<MyTestCompactionService>(GetCompactionService());
-
-  for (int i = 0; i < 20; 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());
-  }
-
-  for (int i = 0; i < 4; i++) {
-    for (int j = 0; j < 10; j++) {
-      int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
-    }
-    ASSERT_OK(Flush());
-  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-  info = my_cs->GetCompactionInfoForStart();
-  ASSERT_EQ(Env::BOTTOM, info.priority);
-  info = my_cs->GetCompactionInfoForWait();
-  ASSERT_EQ(Env::BOTTOM, info.priority);
-}
-
-TEST_P(CompactionServiceTest, FallbackLocalAuto) {
-  Options options = CurrentOptions();
-  ReopenWithCompactionService(&options);
-
-  auto my_cs = GetCompactionService();
-  Statistics* compactor_statistics = GetCompactorStatistics();
-  Statistics* primary_statistics = GetPrimaryStatistics();
-  uint64_t compactor_write_bytes =
-      compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES);
-  uint64_t primary_write_bytes =
-      primary_statistics->getTickerCount(COMPACT_WRITE_BYTES);
-
-  my_cs->OverrideStartStatus(CompactionServiceJobStatus::kUseLocal);
-
-  for (int i = 0; i < 20; 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());
-  }
-
-  for (int i = 0; i < 10; i++) {
-    for (int j = 0; j < 10; j++) {
-      int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
-    }
-    ASSERT_OK(Flush());
-  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-
-  // verify result
-  for (int i = 0; i < 200; i++) {
-    auto result = Get(Key(i));
-    if (i % 2) {
-      ASSERT_EQ(result, "value" + ToString(i));
-    } else {
-      ASSERT_EQ(result, "value_new" + ToString(i));
-    }
-  }
-
-  ASSERT_EQ(my_cs->GetCompactionNum(), 0);
-
-  // make sure the compaction statistics is only recorded on the local side
-  ASSERT_EQ(compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES),
-            compactor_write_bytes);
-  ASSERT_GT(primary_statistics->getTickerCount(COMPACT_WRITE_BYTES),
-            primary_write_bytes);
-  ASSERT_EQ(primary_statistics->getTickerCount(REMOTE_COMPACT_READ_BYTES), 0);
-  ASSERT_EQ(primary_statistics->getTickerCount(REMOTE_COMPACT_WRITE_BYTES), 0);
-}
-
-TEST_P(CompactionServiceTest, FallbackLocalManual) {
-  Options options = CurrentOptions();
-  options.disable_auto_compactions = true;
-  ReopenWithCompactionService(&options);
-
-  GenerateTestData();
-  VerifyTestData();
-
-  auto my_cs = GetCompactionService();
-  Statistics* compactor_statistics = GetCompactorStatistics();
-  Statistics* primary_statistics = GetPrimaryStatistics();
-  uint64_t compactor_write_bytes =
-      compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES);
-  uint64_t primary_write_bytes =
-      primary_statistics->getTickerCount(COMPACT_WRITE_BYTES);
-
-  // re-enable remote compaction
-  my_cs->ResetOverride();
-  std::string start_str = Key(15);
-  std::string end_str = Key(45);
-  Slice start(start_str);
-  Slice end(end_str);
-  uint64_t comp_num = my_cs->GetCompactionNum();
-
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), &start, &end));
-  ASSERT_GE(my_cs->GetCompactionNum(), comp_num + 1);
-  // make sure the compaction statistics is only recorded on the remote side
-  ASSERT_GT(compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES),
-            compactor_write_bytes);
-  ASSERT_EQ(primary_statistics->getTickerCount(REMOTE_COMPACT_WRITE_BYTES),
-            compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES));
-  ASSERT_EQ(primary_statistics->getTickerCount(COMPACT_WRITE_BYTES),
-            primary_write_bytes);
-
-  // return run local again with API WaitForComplete
-  my_cs->OverrideWaitStatus(CompactionServiceJobStatus::kUseLocal);
-  start_str = Key(120);
-  start = start_str;
-  comp_num = my_cs->GetCompactionNum();
-  compactor_write_bytes =
-      compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES);
-  primary_write_bytes = primary_statistics->getTickerCount(COMPACT_WRITE_BYTES);
-
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), &start, nullptr));
-  ASSERT_EQ(my_cs->GetCompactionNum(),
-            comp_num);  // no remote compaction is run
-  // make sure the compaction statistics is only recorded on the local side
-  ASSERT_EQ(compactor_statistics->getTickerCount(COMPACT_WRITE_BYTES),
-            compactor_write_bytes);
-  ASSERT_GT(primary_statistics->getTickerCount(COMPACT_WRITE_BYTES),
-            primary_write_bytes);
-  ASSERT_EQ(primary_statistics->getTickerCount(REMOTE_COMPACT_WRITE_BYTES),
-            compactor_write_bytes);
-
-  // verify result after 2 manual compactions
-  VerifyTestData();
-}
-
-INSTANTIATE_TEST_CASE_P(
-    CompactionServiceTest, CompactionServiceTest,
-    ::testing::Values(
-        TestCompactionServiceType::MyTestCompactionServiceType,
-        TestCompactionServiceType::MyTestCompactionServiceLegacyType));
-
 }  // namespace ROCKSDB_NAMESPACE

+#ifdef ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS
+extern "C" {
+void RegisterCustomObjects(int argc, char** argv);
+}
+#else
+void RegisterCustomObjects(int /*argc*/, char** /*argv*/) {}
+#endif  // !ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS
+
 int main(int argc, char** argv) {
  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
@@ -1,92 +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 <algorithm>
-
-#include "db/version_edit.h"
-
-namespace ROCKSDB_NAMESPACE {
-// We boost files that are closer to TTL limit. This boosting could be
-// through FileMetaData.compensated_file_size but this compensated size
-// is widely used as something similar to file size so dramatically boost
-// the value might cause unintended consequences.
-//
-// This boosting algorithm can go very fancy, but here we use a simple
-// formula which can satisify:
-// (1) Different levels are triggered slightly differently to avoid
-//     too many cascading cases
-// (2) Files in the same level get boosting more when TTL gets closer.
-//
-// Don't do any boosting before TTL has past by half. This is to make
-// sure lower write amp for most of the case. And all levels should be
-// fully boosted when total TTL compaction threshold triggers.
-// Differientiate boosting ranges of each level by 1/2. This will make
-// range for each level exponentially increasing. We could do it by
-// having them to be equal, or go even fancier. We can adjust it after
-// we observe the behavior in production.
-// The threshold starting boosting:
-// +------------------------------------------------------------------ +
-// ^                            ^   ^     ^       ^                 ^
-// Age 0                        ... |     |    second last level    thresold
-//                                  |     |
-//                                  |  third last level
-//                                  |
-//                            forth last level
-//
-// We arbitrarily set with 0 when a file is aged boost_age_start and
-// grow linearly. The ratio is arbitrarily set so that when the next level
-// starts to boost, the previous level's boosting amount is 16.
-class FileTtlBooster {
- public:
-  FileTtlBooster(uint64_t current_time, uint64_t ttl, int num_non_empty_levels,
-                 int level)
-      : current_time_(current_time) {
-    if (ttl == 0 || level == 0 || level >= num_non_empty_levels - 1) {
-      enabled_ = false;
-      boost_age_start_ = 0;
-      boost_step_ = 1;
-    } else {
-      enabled_ = true;
-      uint64_t all_boost_start_age = ttl / 2;
-      uint64_t all_boost_age_range = (ttl / 32) * 31 - all_boost_start_age;
-      uint64_t boost_age_range =
-          all_boost_age_range >> (num_non_empty_levels - level - 1);
-      boost_age_start_ = all_boost_start_age + boost_age_range;
-      const uint64_t kBoostRatio = 16;
-      // prevent 0 value to avoid divide 0 error.
-      boost_step_ = std::max(boost_age_range / kBoostRatio, uint64_t{1});
-    }
-  }
-
-  uint64_t GetBoostScore(FileMetaData* f) {
-    if (!enabled_) {
-      return 1;
-    }
-    uint64_t oldest_ancester_time = f->TryGetOldestAncesterTime();
-    if (oldest_ancester_time >= current_time_) {
-      return 1;
-    }
-    uint64_t age = current_time_ - oldest_ancester_time;
-    if (age > boost_age_start_) {
-      // Use integer just for convenience.
-      // We could make all file_to_order double if we want.
-      // Technically this can overflow if users override timing and
-      // give a very high current time. Ignore the case for simplicity.
-      // Boosting is addition to current value, so +1. This will effectively
-      // make boosting to kick in after the first boost_step_ is reached.
-      return (age - boost_age_start_) / boost_step_ + 1;
-    }
-    return 1;
-  }
-
- private:
-  bool enabled_;
-  uint64_t current_time_;
-  uint64_t boost_age_start_;
-  uint64_t boost_step_;
-};
-}  // namespace ROCKSDB_NAMESPACE
@@ -8,24 +8,7 @@

 #include <algorithm>

-#include "rocksdb/utilities/customizable_util.h"
-#include "rocksdb/utilities/object_registry.h"
-#include "rocksdb/utilities/options_type.h"
-
 namespace ROCKSDB_NAMESPACE {
-static std::unordered_map<std::string, OptionTypeInfo>
-    sst_fixed_prefix_type_info = {
-#ifndef ROCKSDB_LITE
-        {"length",
-         {0, OptionType::kSizeT, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-#endif  // ROCKSDB_LITE
-};
-
-SstPartitionerFixedPrefixFactory::SstPartitionerFixedPrefixFactory(size_t len)
-    : len_(len) {
-  RegisterOptions("Length", &len_, &sst_fixed_prefix_type_info);
-}

 PartitionerResult SstPartitionerFixedPrefix::ShouldPartition(
    const PartitionerRequest& request) {
@@ -58,33 +41,4 @@ std::shared_ptr<SstPartitionerFactory> NewSstPartitionerFixedPrefixFactory(
  return std::make_shared<SstPartitionerFixedPrefixFactory>(prefix_len);
 }

-#ifndef ROCKSDB_LITE
-namespace {
-static int RegisterSstPartitionerFactories(ObjectLibrary& library,
-                                           const std::string& /*arg*/) {
-  library.Register<SstPartitionerFactory>(
-      SstPartitionerFixedPrefixFactory::kClassName(),
-      [](const std::string& /*uri*/,
-         std::unique_ptr<SstPartitionerFactory>* guard,
-         std::string* /* errmsg */) {
-        guard->reset(new SstPartitionerFixedPrefixFactory(0));
-        return guard->get();
-      });
-  return 1;
-}
-}  // namespace
-#endif  // ROCKSDB_LITE
-
-Status SstPartitionerFactory::CreateFromString(
-    const ConfigOptions& options, const std::string& value,
-    std::shared_ptr<SstPartitionerFactory>* result) {
-#ifndef ROCKSDB_LITE
-  static std::once_flag once;
-  std::call_once(once, [&]() {
-    RegisterSstPartitionerFactories(*(ObjectLibrary::Default().get()), "");
-  });
-#endif  // ROCKSDB_LITE
-  return LoadSharedObject<SstPartitionerFactory>(options, value, nullptr,
-                                                 result);
-}
 }  // namespace ROCKSDB_NAMESPACE
@@ -317,7 +317,7 @@ class ComparatorDBTest
 INSTANTIATE_TEST_CASE_P(FormatDef, ComparatorDBTest,
                        testing::Values(test::kDefaultFormatVersion));
 INSTANTIATE_TEST_CASE_P(FormatLatest, ComparatorDBTest,
-                        testing::Values(kLatestFormatVersion));
+                        testing::Values(test::kLatestFormatVersion));

 TEST_P(ComparatorDBTest, Bytewise) {
  for (int rand_seed = 301; rand_seed < 306; rand_seed++) {
@@ -544,9 +544,9 @@ TEST_F(CorruptionTest, RangeDeletionCorrupted) {
      fs->GetFileSize(filename, file_opts.io_options, &file_size, nullptr));

  BlockHandle range_del_handle;
-  ASSERT_OK(FindMetaBlockInFile(
+  ASSERT_OK(FindMetaBlock(
      file_reader.get(), file_size, kBlockBasedTableMagicNumber,
-      ImmutableOptions(options_), kRangeDelBlockName, &range_del_handle));
+      ImmutableOptions(options_), kRangeDelBlock, &range_del_handle));

  ASSERT_OK(TryReopen());
  ASSERT_OK(test::CorruptFile(env_, filename,
@@ -890,6 +890,14 @@ TEST_F(CorruptionTest, VerifyWholeTableChecksum) {

 }  // namespace ROCKSDB_NAMESPACE

+#ifdef ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS
+extern "C" {
+void RegisterCustomObjects(int argc, char** argv);
+}
+#else
+void RegisterCustomObjects(int /*argc*/, char** /*argv*/) {}
+#endif  // !ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS
+
 int main(int argc, char** argv) {
  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
@@ -6,7 +6,6 @@
 #ifndef ROCKSDB_LITE

 #include "db/db_impl/db_impl.h"
-#include "db/db_test_util.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "table/cuckoo/cuckoo_table_factory.h"
@@ -95,8 +94,8 @@ class CuckooTableDBTest : public testing::Test {

  int NumTableFilesAtLevel(int level) {
    std::string property;
-    EXPECT_TRUE(db_->GetProperty("rocksdb.num-files-at-level" + ToString(level),
-                                 &property));
+    EXPECT_TRUE(db_->GetProperty(
+        "rocksdb.num-files-at-level" + NumberToString(level), &property));
    return atoi(property.c_str());
  }

@@ -134,7 +133,6 @@ TEST_F(CuckooTableDBTest, Flush) {

  TablePropertiesCollection ptc;
  ASSERT_OK(reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
-  VerifySstUniqueIds(ptc);
  ASSERT_EQ(1U, ptc.size());
  ASSERT_EQ(3U, ptc.begin()->second->num_entries);
  ASSERT_EQ("1", FilesPerLevel());
@@ -151,7 +149,6 @@ TEST_F(CuckooTableDBTest, Flush) {
  ASSERT_OK(dbfull()->TEST_FlushMemTable());

  ASSERT_OK(reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
-  VerifySstUniqueIds(ptc);
  ASSERT_EQ(2U, ptc.size());
  auto row = ptc.begin();
  ASSERT_EQ(3U, row->second->num_entries);
@@ -169,7 +166,6 @@ TEST_F(CuckooTableDBTest, Flush) {
  ASSERT_OK(Delete("key4"));
  ASSERT_OK(dbfull()->TEST_FlushMemTable());
  ASSERT_OK(reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
-  VerifySstUniqueIds(ptc);
  ASSERT_EQ(3U, ptc.size());
  row = ptc.begin();
  ASSERT_EQ(3U, row->second->num_entries);
@@ -194,7 +190,6 @@ TEST_F(CuckooTableDBTest, FlushWithDuplicateKeys) {

  TablePropertiesCollection ptc;
  ASSERT_OK(reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
-  VerifySstUniqueIds(ptc);
  ASSERT_EQ(1U, ptc.size());
  ASSERT_EQ(2U, ptc.begin()->second->num_entries);
  ASSERT_EQ("1", FilesPerLevel());
@@ -8,14 +8,13 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #include <cstring>
+#include <regex>

 #include "db/db_test_util.h"
-#include "options/options_helper.h"
 #include "port/stack_trace.h"
 #include "rocksdb/flush_block_policy.h"
 #include "rocksdb/merge_operator.h"
 #include "rocksdb/perf_context.h"
-#include "rocksdb/table.h"
 #include "rocksdb/utilities/debug.h"
 #include "table/block_based/block_based_table_reader.h"
 #include "table/block_based/block_builder.h"
@@ -32,7 +31,7 @@ namespace ROCKSDB_NAMESPACE {

 class DBBasicTest : public DBTestBase {
 public:
-  DBBasicTest() : DBTestBase("db_basic_test", /*env_do_fsync=*/false) {}
+  DBBasicTest() : DBTestBase("/db_basic_test", /*env_do_fsync=*/false) {}
 };

 TEST_F(DBBasicTest, OpenWhenOpen) {
@@ -70,10 +69,11 @@ TEST_F(DBBasicTest, UniqueSession) {
  ASSERT_EQ(sid2, sid4);

  // Expected compact format for session ids (see notes in implementation)
-  TestRegex expected("[0-9A-Z]{20}");
-  EXPECT_MATCHES_REGEX(sid1, expected);
-  EXPECT_MATCHES_REGEX(sid2, expected);
-  EXPECT_MATCHES_REGEX(sid3, expected);
+  std::regex expected("[0-9A-Z]{20}");
+  const std::string match("match");
+  EXPECT_EQ(match, std::regex_replace(sid1, expected, match));
+  EXPECT_EQ(match, std::regex_replace(sid2, expected, match));
+  EXPECT_EQ(match, std::regex_replace(sid3, expected, match));

 #ifndef ROCKSDB_LITE
  Close();
@@ -973,24 +973,16 @@ TEST_F(DBBasicTest, MultiGetEmpty) {
  } while (ChangeCompactOptions());
 }

-class DBBlockChecksumTest : public DBBasicTest,
-                            public testing::WithParamInterface<uint32_t> {};
-
-INSTANTIATE_TEST_CASE_P(FormatVersions, DBBlockChecksumTest,
-                        testing::ValuesIn(test::kFooterFormatVersionsToTest));
-
-TEST_P(DBBlockChecksumTest, BlockChecksumTest) {
+TEST_F(DBBasicTest, ChecksumTest) {
  BlockBasedTableOptions table_options;
-  table_options.format_version = GetParam();
  Options options = CurrentOptions();
+  // change when new checksum type added
+  int max_checksum = static_cast<int>(kxxHash64);
  const int kNumPerFile = 2;

-  const auto algs = GetSupportedChecksums();
-  const int algs_size = static_cast<int>(algs.size());
-
  // generate one table with each type of checksum
-  for (int i = 0; i < algs_size; ++i) {
-    table_options.checksum = algs[i];
+  for (int i = 0; i <= max_checksum; ++i) {
+    table_options.checksum = static_cast<ChecksumType>(i);
    options.table_factory.reset(NewBlockBasedTableFactory(table_options));
    Reopen(options);
    for (int j = 0; j < kNumPerFile; ++j) {
@@ -1000,20 +992,15 @@ TEST_P(DBBlockChecksumTest, BlockChecksumTest) {
  }

  // with each valid checksum type setting...
-  for (int i = 0; i < algs_size; ++i) {
-    table_options.checksum = algs[i];
+  for (int i = 0; i <= max_checksum; ++i) {
+    table_options.checksum = static_cast<ChecksumType>(i);
    options.table_factory.reset(NewBlockBasedTableFactory(table_options));
    Reopen(options);
    // verify every type of checksum (should be regardless of that setting)
-    for (int j = 0; j < algs_size * kNumPerFile; ++j) {
+    for (int j = 0; j < (max_checksum + 1) * kNumPerFile; ++j) {
      ASSERT_EQ(Key(j), Get(Key(j)));
    }
  }
-
-  // Now test invalid checksum type
-  table_options.checksum = static_cast<ChecksumType>(123);
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  ASSERT_TRUE(TryReopen(options).IsInvalidArgument());
 }

 // On Windows you can have either memory mapped file or a file
@@ -1145,15 +1132,9 @@ TEST_F(DBBasicTest, DBCloseFlushError) {
  ASSERT_OK(Put("key3", "value3"));
  fault_injection_env->SetFilesystemActive(false);
  Status s = dbfull()->Close();
-  ASSERT_NE(s, Status::OK());
-  // retry should return the same error
-  s = dbfull()->Close();
-  ASSERT_NE(s, Status::OK());
  fault_injection_env->SetFilesystemActive(true);
-  // retry close() is no-op even the system is back. Could be improved if
-  // Close() is retry-able: #9029
-  s = dbfull()->Close();
  ASSERT_NE(s, Status::OK());
+
  Destroy(options);
 }

@@ -2565,7 +2546,7 @@ TEST_F(DBBasicTest, DisableTrackWal) {
  ASSERT_OK(dbfull()->TEST_SwitchMemtable());
  ASSERT_OK(db_->SyncWAL());
  // Some WALs are tracked.
-  ASSERT_FALSE(dbfull()->GetVersionSet()->GetWalSet().GetWals().empty());
+  ASSERT_FALSE(dbfull()->TEST_GetVersionSet()->GetWalSet().GetWals().empty());
  Close();

  // Disable WAL tracking.
@@ -2573,14 +2554,14 @@ TEST_F(DBBasicTest, DisableTrackWal) {
  options.create_if_missing = false;
  ASSERT_OK(TryReopen(options));
  // Previously tracked WALs are cleared.
-  ASSERT_TRUE(dbfull()->GetVersionSet()->GetWalSet().GetWals().empty());
+  ASSERT_TRUE(dbfull()->TEST_GetVersionSet()->GetWalSet().GetWals().empty());
  Close();

  // Re-enable WAL tracking again.
  options.track_and_verify_wals_in_manifest = true;
  options.create_if_missing = false;
  ASSERT_OK(TryReopen(options));
-  ASSERT_TRUE(dbfull()->GetVersionSet()->GetWalSet().GetWals().empty());
+  ASSERT_TRUE(dbfull()->TEST_GetVersionSet()->GetWalSet().GetWals().empty());
  Close();
 }
 #endif  // !ROCKSDB_LITE
@@ -2612,27 +2593,12 @@ TEST_F(DBBasicTest, ManifestChecksumMismatch) {
  ASSERT_TRUE(s.IsCorruption());
 }

-TEST_F(DBBasicTest, ConcurrentlyCloseDB) {
-  Options options = CurrentOptions();
-  DestroyAndReopen(options);
-  std::vector<std::thread> workers;
-  for (int i = 0; i < 10; i++) {
-    workers.push_back(std::thread([&]() {
-      auto s = db_->Close();
-      ASSERT_OK(s);
-    }));
-  }
-  for (auto& w : workers) {
-    w.join();
-  }
-}
-
 #ifndef ROCKSDB_LITE
 class DBBasicTestTrackWal : public DBTestBase,
                            public testing::WithParamInterface<bool> {
 public:
  DBBasicTestTrackWal()
-      : DBTestBase("db_basic_test_track_wal", /*env_do_fsync=*/false) {}
+      : DBTestBase("/db_basic_test_track_wal", /*env_do_fsync=*/false) {}

  int CountWalFiles() {
    VectorLogPtr log_files;
@@ -2790,11 +2756,6 @@ class DBBasicTestMultiGet : public DBTestBase {
        EXPECT_OK(dbfull()->Flush(FlushOptions(), handles_[cf]));
      }
    }
-    // Clear compressed cache, which is always pre-populated
-    if (compressed_cache_) {
-      compressed_cache_->SetCapacity(0);
-      compressed_cache_->SetCapacity(1048576);
-    }
  }

  bool CheckValue(int i, const std::string& value) {
@@ -3271,11 +3232,13 @@ INSTANTIATE_TEST_CASE_P(ParallelIO, DBBasicTestWithParallelIO,
 // Forward declaration
 class DeadlineFS;

-class DeadlineRandomAccessFile : public FSRandomAccessFileOwnerWrapper {
+class DeadlineRandomAccessFile : public FSRandomAccessFileWrapper {
 public:
  DeadlineRandomAccessFile(DeadlineFS& fs,
                           std::unique_ptr<FSRandomAccessFile>& file)
-      : FSRandomAccessFileOwnerWrapper(std::move(file)), fs_(fs) {}
+      : FSRandomAccessFileWrapper(file.get()),
+        fs_(fs),
+        file_(std::move(file)) {}

  IOStatus Read(uint64_t offset, size_t len, const IOOptions& opts,
                Slice* result, char* scratch,
@@ -3304,9 +3267,6 @@ class DeadlineFS : public FileSystemWrapper {
        ignore_deadline_(false),
        error_on_delay_(error_on_delay) {}

-  static const char* kClassName() { return "DeadlineFileSystem"; }
-  const char* Name() const override { return kClassName(); }
-
  IOStatus NewRandomAccessFile(const std::string& fname,
                               const FileOptions& opts,
                               std::unique_ptr<FSRandomAccessFile>* result,
@@ -3868,6 +3828,14 @@ INSTANTIATE_TEST_CASE_P(DBBasicTestDeadline, DBBasicTestDeadline,
                                          std::make_tuple(true, true)));
 }  // namespace ROCKSDB_NAMESPACE

+#ifdef ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS
+extern "C" {
+void RegisterCustomObjects(int argc, char** argv);
+}
+#else
+void RegisterCustomObjects(int /*argc*/, char** /*argv*/) {}
+#endif  // !ROCKSDB_UNITTESTS_WITH_CUSTOM_OBJECTS_FROM_STATIC_LIBS
+
 int main(int argc, char** argv) {
  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
@@ -7,7 +7,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 #include <cstdlib>
-#include <functional>
 #include <memory>

 #include "cache/cache_entry_roles.h"
@@ -15,13 +14,9 @@
 #include "db/column_family.h"
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
-#include "rocksdb/persistent_cache.h"
-#include "rocksdb/statistics.h"
 #include "rocksdb/table.h"
 #include "util/compression.h"
-#include "util/defer.h"
 #include "util/random.h"
-#include "utilities/fault_injection_fs.h"

 namespace ROCKSDB_NAMESPACE {

@@ -44,7 +39,7 @@ class DBBlockCacheTest : public DBTestBase {
  const size_t kValueSize = 100;

  DBBlockCacheTest()
-      : DBTestBase("db_block_cache_test", /*env_do_fsync=*/true) {}
+      : DBTestBase("/db_block_cache_test", /*env_do_fsync=*/true) {}

  BlockBasedTableOptions GetTableOptions() {
    BlockBasedTableOptions table_options;
@@ -337,143 +332,6 @@ TEST_F(DBBlockCacheTest, TestWithCompressedBlockCache) {
  CheckCacheCounters(options, 1, 0, 1, 0);
  CheckCompressedCacheCounters(options, 0, 1, 0, 0);
 }
-
-namespace {
-class PersistentCacheFromCache : public PersistentCache {
- public:
-  PersistentCacheFromCache(std::shared_ptr<Cache> cache, bool read_only)
-      : cache_(cache), read_only_(read_only) {}
-
-  Status Insert(const Slice& key, const char* data,
-                const size_t size) override {
-    if (read_only_) {
-      return Status::NotSupported();
-    }
-    std::unique_ptr<char[]> copy{new char[size]};
-    std::copy_n(data, size, copy.get());
-    Status s = cache_->Insert(
-        key, copy.get(), size,
-        GetCacheEntryDeleterForRole<char[], CacheEntryRole::kMisc>());
-    if (s.ok()) {
-      copy.release();
-    }
-    return s;
-  }
-
-  Status Lookup(const Slice& key, std::unique_ptr<char[]>* data,
-                size_t* size) override {
-    auto handle = cache_->Lookup(key);
-    if (handle) {
-      char* ptr = static_cast<char*>(cache_->Value(handle));
-      *size = cache_->GetCharge(handle);
-      data->reset(new char[*size]);
-      std::copy_n(ptr, *size, data->get());
-      cache_->Release(handle);
-      return Status::OK();
-    } else {
-      return Status::NotFound();
-    }
-  }
-
-  bool IsCompressed() override { return false; }
-
-  StatsType Stats() override { return StatsType(); }
-
-  std::string GetPrintableOptions() const override { return ""; }
-
-  uint64_t NewId() override { return cache_->NewId(); }
-
- private:
-  std::shared_ptr<Cache> cache_;
-  bool read_only_;
-};
-
-class ReadOnlyCacheWrapper : public CacheWrapper {
-  using CacheWrapper::CacheWrapper;
-
-  using Cache::Insert;
-  Status Insert(const Slice& /*key*/, void* /*value*/, size_t /*charge*/,
-                void (*)(const Slice& key, void* value) /*deleter*/,
-                Handle** /*handle*/, Priority /*priority*/) override {
-    return Status::NotSupported();
-  }
-};
-
-}  // namespace
-
-TEST_F(DBBlockCacheTest, TestWithSameCompressed) {
-  auto table_options = GetTableOptions();
-  auto options = GetOptions(table_options);
-  InitTable(options);
-
-  std::shared_ptr<Cache> rw_cache{NewLRUCache(1000000)};
-  std::shared_ptr<PersistentCacheFromCache> rw_pcache{
-      new PersistentCacheFromCache(rw_cache, /*read_only*/ false)};
-  // Exercise some obscure behavior with read-only wrappers
-  std::shared_ptr<Cache> ro_cache{new ReadOnlyCacheWrapper(rw_cache)};
-  std::shared_ptr<PersistentCacheFromCache> ro_pcache{
-      new PersistentCacheFromCache(rw_cache, /*read_only*/ true)};
-
-  // Simple same pointer
-  table_options.block_cache = rw_cache;
-  table_options.block_cache_compressed = rw_cache;
-  table_options.persistent_cache.reset();
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  ASSERT_EQ(TryReopen(options).ToString(),
-            "Invalid argument: block_cache same as block_cache_compressed not "
-            "currently supported, and would be bad for performance anyway");
-
-  // Other cases
-  table_options.block_cache = ro_cache;
-  table_options.block_cache_compressed = rw_cache;
-  table_options.persistent_cache.reset();
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  ASSERT_EQ(TryReopen(options).ToString(),
-            "Invalid argument: block_cache and block_cache_compressed share "
-            "the same key space, which is not supported");
-
-  table_options.block_cache = rw_cache;
-  table_options.block_cache_compressed = ro_cache;
-  table_options.persistent_cache.reset();
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  ASSERT_EQ(TryReopen(options).ToString(),
-            "Invalid argument: block_cache_compressed and block_cache share "
-            "the same key space, which is not supported");
-
-  table_options.block_cache = ro_cache;
-  table_options.block_cache_compressed.reset();
-  table_options.persistent_cache = rw_pcache;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  ASSERT_EQ(TryReopen(options).ToString(),
-            "Invalid argument: block_cache and persistent_cache share the same "
-            "key space, which is not supported");
-
-  table_options.block_cache = rw_cache;
-  table_options.block_cache_compressed.reset();
-  table_options.persistent_cache = ro_pcache;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  ASSERT_EQ(TryReopen(options).ToString(),
-            "Invalid argument: persistent_cache and block_cache share the same "
-            "key space, which is not supported");
-
-  table_options.block_cache.reset();
-  table_options.no_block_cache = true;
-  table_options.block_cache_compressed = ro_cache;
-  table_options.persistent_cache = rw_pcache;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  ASSERT_EQ(TryReopen(options).ToString(),
-            "Invalid argument: block_cache_compressed and persistent_cache "
-            "share the same key space, which is not supported");
-
-  table_options.block_cache.reset();
-  table_options.no_block_cache = true;
-  table_options.block_cache_compressed = rw_cache;
-  table_options.persistent_cache = ro_pcache;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  ASSERT_EQ(TryReopen(options).ToString(),
-            "Invalid argument: persistent_cache and block_cache_compressed "
-            "share the same key space, which is not supported");
-}
 #endif  // SNAPPY

 #ifndef ROCKSDB_LITE
@@ -639,161 +497,11 @@ TEST_F(DBBlockCacheTest, WarmCacheWithDataBlocksDuringFlush) {
    ASSERT_OK(Put(ToString(i), value));
    ASSERT_OK(Flush());
    ASSERT_EQ(i, options.statistics->getTickerCount(BLOCK_CACHE_DATA_ADD));
+
    ASSERT_EQ(value, Get(ToString(i)));
    ASSERT_EQ(0, options.statistics->getTickerCount(BLOCK_CACHE_DATA_MISS));
    ASSERT_EQ(i, options.statistics->getTickerCount(BLOCK_CACHE_DATA_HIT));
  }
-  // Verify compaction not counted
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), /*begin=*/nullptr,
-                              /*end=*/nullptr));
-  EXPECT_EQ(kNumBlocks,
-            options.statistics->getTickerCount(BLOCK_CACHE_DATA_ADD));
-}
-
-// This test cache data, index and filter blocks during flush.
-class DBBlockCacheTest1 : public DBTestBase,
-                          public ::testing::WithParamInterface<uint32_t> {
- public:
-  const size_t kNumBlocks = 10;
-  const size_t kValueSize = 100;
-  DBBlockCacheTest1() : DBTestBase("db_block_cache_test1", true) {}
-};
-
-INSTANTIATE_TEST_CASE_P(DBBlockCacheTest1, DBBlockCacheTest1,
-                        ::testing::Values(1, 2, 3));
-
-TEST_P(DBBlockCacheTest1, WarmCacheWithBlocksDuringFlush) {
-  Options options = CurrentOptions();
-  options.create_if_missing = true;
-  options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
-
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = NewLRUCache(1 << 25, 0, false);
-
-  uint32_t filter_type = GetParam();
-  switch (filter_type) {
-    case 1:  // partition_filter
-      table_options.partition_filters = true;
-      table_options.index_type =
-          BlockBasedTableOptions::IndexType::kTwoLevelIndexSearch;
-      table_options.filter_policy.reset(NewBloomFilterPolicy(10, false));
-      break;
-    case 2:  // block-based filter
-      table_options.filter_policy.reset(NewBloomFilterPolicy(10, true));
-      break;
-    case 3:  // full filter
-      table_options.filter_policy.reset(NewBloomFilterPolicy(10, false));
-      break;
-    default:
-      assert(false);
-  }
-
-  table_options.cache_index_and_filter_blocks = true;
-  table_options.prepopulate_block_cache =
-      BlockBasedTableOptions::PrepopulateBlockCache::kFlushOnly;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  DestroyAndReopen(options);
-
-  std::string value(kValueSize, 'a');
-  for (size_t i = 1; i <= kNumBlocks; i++) {
-    ASSERT_OK(Put(ToString(i), value));
-    ASSERT_OK(Flush());
-    ASSERT_EQ(i, options.statistics->getTickerCount(BLOCK_CACHE_DATA_ADD));
-    if (filter_type == 1) {
-      ASSERT_EQ(2 * i,
-                options.statistics->getTickerCount(BLOCK_CACHE_INDEX_ADD));
-      ASSERT_EQ(2 * i,
-                options.statistics->getTickerCount(BLOCK_CACHE_FILTER_ADD));
-    } else {
-      ASSERT_EQ(i, options.statistics->getTickerCount(BLOCK_CACHE_INDEX_ADD));
-      ASSERT_EQ(i, options.statistics->getTickerCount(BLOCK_CACHE_FILTER_ADD));
-    }
-    ASSERT_EQ(value, Get(ToString(i)));
-
-    ASSERT_EQ(0, options.statistics->getTickerCount(BLOCK_CACHE_DATA_MISS));
-    ASSERT_EQ(i, options.statistics->getTickerCount(BLOCK_CACHE_DATA_HIT));
-
-    ASSERT_EQ(0, options.statistics->getTickerCount(BLOCK_CACHE_INDEX_MISS));
-    ASSERT_EQ(i * 3, options.statistics->getTickerCount(BLOCK_CACHE_INDEX_HIT));
-    if (filter_type == 1) {
-      ASSERT_EQ(i * 3,
-                options.statistics->getTickerCount(BLOCK_CACHE_FILTER_HIT));
-    } else {
-      ASSERT_EQ(i * 2,
-                options.statistics->getTickerCount(BLOCK_CACHE_FILTER_HIT));
-    }
-    ASSERT_EQ(0, options.statistics->getTickerCount(BLOCK_CACHE_FILTER_MISS));
-  }
-
-  // Verify compaction not counted
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), /*begin=*/nullptr,
-                              /*end=*/nullptr));
-  EXPECT_EQ(kNumBlocks,
-            options.statistics->getTickerCount(BLOCK_CACHE_DATA_ADD));
-  // Index and filter blocks are automatically warmed when the new table file
-  // is automatically opened at the end of compaction. This is not easily
-  // disabled so results in the new index and filter blocks being warmed.
-  if (filter_type == 1) {
-    EXPECT_EQ(2 * (1 + kNumBlocks),
-              options.statistics->getTickerCount(BLOCK_CACHE_INDEX_ADD));
-    EXPECT_EQ(2 * (1 + kNumBlocks),
-              options.statistics->getTickerCount(BLOCK_CACHE_FILTER_ADD));
-  } else {
-    EXPECT_EQ(1 + kNumBlocks,
-              options.statistics->getTickerCount(BLOCK_CACHE_INDEX_ADD));
-    EXPECT_EQ(1 + kNumBlocks,
-              options.statistics->getTickerCount(BLOCK_CACHE_FILTER_ADD));
-  }
-}
-
-TEST_F(DBBlockCacheTest, DynamicallyWarmCacheDuringFlush) {
-  Options options = CurrentOptions();
-  options.create_if_missing = true;
-  options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
-
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = NewLRUCache(1 << 25, 0, false);
-  table_options.cache_index_and_filter_blocks = false;
-  table_options.prepopulate_block_cache =
-      BlockBasedTableOptions::PrepopulateBlockCache::kFlushOnly;
-
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  DestroyAndReopen(options);
-
-  std::string value(kValueSize, 'a');
-
-  for (size_t i = 1; i <= 5; i++) {
-    ASSERT_OK(Put(ToString(i), value));
-    ASSERT_OK(Flush());
-    ASSERT_EQ(1,
-              options.statistics->getAndResetTickerCount(BLOCK_CACHE_DATA_ADD));
-
-    ASSERT_EQ(value, Get(ToString(i)));
-    ASSERT_EQ(0,
-              options.statistics->getAndResetTickerCount(BLOCK_CACHE_DATA_ADD));
-    ASSERT_EQ(
-        0, options.statistics->getAndResetTickerCount(BLOCK_CACHE_DATA_MISS));
-    ASSERT_EQ(1,
-              options.statistics->getAndResetTickerCount(BLOCK_CACHE_DATA_HIT));
-  }
-
-  ASSERT_OK(dbfull()->SetOptions(
-      {{"block_based_table_factory", "{prepopulate_block_cache=kDisable;}"}}));
-
-  for (size_t i = 6; i <= kNumBlocks; i++) {
-    ASSERT_OK(Put(ToString(i), value));
-    ASSERT_OK(Flush());
-    ASSERT_EQ(0,
-              options.statistics->getAndResetTickerCount(BLOCK_CACHE_DATA_ADD));
-
-    ASSERT_EQ(value, Get(ToString(i)));
-    ASSERT_EQ(1,
-              options.statistics->getAndResetTickerCount(BLOCK_CACHE_DATA_ADD));
-    ASSERT_EQ(
-        1, options.statistics->getAndResetTickerCount(BLOCK_CACHE_DATA_MISS));
-    ASSERT_EQ(0,
-              options.statistics->getAndResetTickerCount(BLOCK_CACHE_DATA_HIT));
-  }
 }
 #endif

@@ -1504,227 +1212,13 @@ TEST_F(DBBlockCacheTest, CacheEntryRoleStats) {

 #endif  // ROCKSDB_LITE

-class DBBlockCacheKeyTest
-    : public DBTestBase,
-      public testing::WithParamInterface<std::tuple<bool, bool>> {
- public:
-  DBBlockCacheKeyTest()
-      : DBTestBase("db_block_cache_test", /*env_do_fsync=*/false) {}
-
-  void SetUp() override {
-    use_compressed_cache_ = std::get<0>(GetParam());
-    exclude_file_numbers_ = std::get<1>(GetParam());
-  }
-
-  bool use_compressed_cache_;
-  bool exclude_file_numbers_;
-};
-
-// Disable LinkFile so that we can physically copy a DB using Checkpoint.
-// Disable file GetUniqueId to enable stable cache keys.
-class StableCacheKeyTestFS : public FaultInjectionTestFS {
- public:
-  explicit StableCacheKeyTestFS(const std::shared_ptr<FileSystem>& base)
-      : FaultInjectionTestFS(base) {
-    SetFailGetUniqueId(true);
-  }
-
-  virtual ~StableCacheKeyTestFS() override {}
-
-  IOStatus LinkFile(const std::string&, const std::string&, const IOOptions&,
-                    IODebugContext*) override {
-    return IOStatus::NotSupported("Disabled");
-  }
-};
-
-TEST_P(DBBlockCacheKeyTest, StableCacheKeys) {
-  std::shared_ptr<StableCacheKeyTestFS> test_fs{
-      new StableCacheKeyTestFS(env_->GetFileSystem())};
-  std::unique_ptr<CompositeEnvWrapper> test_env{
-      new CompositeEnvWrapper(env_, test_fs)};
-
-  Options options = CurrentOptions();
-  options.create_if_missing = true;
-  options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
-  options.env = test_env.get();
-
-  BlockBasedTableOptions table_options;
-
-  int key_count = 0;
-  uint64_t expected_stat = 0;
-
-  std::function<void()> verify_stats;
-  if (use_compressed_cache_) {
-    if (!Snappy_Supported()) {
-      ROCKSDB_GTEST_SKIP("Compressed cache test requires snappy support");
-      return;
-    }
-    options.compression = CompressionType::kSnappyCompression;
-    table_options.no_block_cache = true;
-    table_options.block_cache_compressed = NewLRUCache(1 << 25, 0, false);
-    verify_stats = [&options, &expected_stat] {
-      // One for ordinary SST file and one for external SST file
-      ASSERT_EQ(expected_stat,
-                options.statistics->getTickerCount(BLOCK_CACHE_COMPRESSED_ADD));
-    };
-  } else {
-    table_options.cache_index_and_filter_blocks = true;
-    table_options.block_cache = NewLRUCache(1 << 25, 0, false);
-    verify_stats = [&options, &expected_stat] {
-      ASSERT_EQ(expected_stat,
-                options.statistics->getTickerCount(BLOCK_CACHE_DATA_ADD));
-      ASSERT_EQ(expected_stat,
-                options.statistics->getTickerCount(BLOCK_CACHE_INDEX_ADD));
-      ASSERT_EQ(expected_stat,
-                options.statistics->getTickerCount(BLOCK_CACHE_FILTER_ADD));
-    };
-  }
-
-  table_options.filter_policy.reset(NewBloomFilterPolicy(10, false));
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  CreateAndReopenWithCF({"koko"}, options);
-
-  if (exclude_file_numbers_) {
-    // Simulate something like old behavior without file numbers in properties.
-    // This is a "control" side of the test that also ensures safely degraded
-    // behavior on old files.
-    ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-        "BlockBasedTableBuilder::BlockBasedTableBuilder:PreSetupBaseCacheKey",
-        [&](void* arg) {
-          TableProperties* props = reinterpret_cast<TableProperties*>(arg);
-          props->orig_file_number = 0;
-        });
-    ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-  }
-
-  std::function<void()> perform_gets = [&key_count, &expected_stat, this]() {
-    if (exclude_file_numbers_) {
-      // No cache key reuse should happen, because we can't rely on current
-      // file number being stable
-      expected_stat += key_count;
-    } else {
-      // Cache keys should be stable
-      expected_stat = key_count;
-    }
-    for (int i = 0; i < key_count; ++i) {
-      ASSERT_EQ(Get(1, Key(i)), "abc");
-    }
-  };
-
-  // Ordinary SST files with same session id
-  const std::string something_compressible(500U, 'x');
-  for (int i = 0; i < 2; ++i) {
-    ASSERT_OK(Put(1, Key(key_count), "abc"));
-    ASSERT_OK(Put(1, Key(key_count) + "a", something_compressible));
-    ASSERT_OK(Flush(1));
-    ++key_count;
-  }
-
-#ifndef ROCKSDB_LITE
-  // Save an export of those ordinary SST files for later
-  std::string export_files_dir = dbname_ + "/exported";
-  ExportImportFilesMetaData* metadata_ptr_ = nullptr;
-  Checkpoint* checkpoint;
-  ASSERT_OK(Checkpoint::Create(db_, &checkpoint));
-  ASSERT_OK(checkpoint->ExportColumnFamily(handles_[1], export_files_dir,
-                                           &metadata_ptr_));
-  ASSERT_NE(metadata_ptr_, nullptr);
-  delete checkpoint;
-  checkpoint = nullptr;
-
-  // External SST files with same session id
-  SstFileWriter sst_file_writer(EnvOptions(), options);
-  std::vector<std::string> external;
-  for (int i = 0; i < 2; ++i) {
-    std::string f = dbname_ + "/external" + ToString(i) + ".sst";
-    external.push_back(f);
-    ASSERT_OK(sst_file_writer.Open(f));
-    ASSERT_OK(sst_file_writer.Put(Key(key_count), "abc"));
-    ASSERT_OK(
-        sst_file_writer.Put(Key(key_count) + "a", something_compressible));
-    ++key_count;
-    ExternalSstFileInfo external_info;
-    ASSERT_OK(sst_file_writer.Finish(&external_info));
-    IngestExternalFileOptions ingest_opts;
-    ASSERT_OK(db_->IngestExternalFile(handles_[1], {f}, ingest_opts));
-  }
-
-  if (exclude_file_numbers_) {
-    // FIXME(peterd): figure out where these extra ADDs are coming from
-    options.statistics->recordTick(BLOCK_CACHE_COMPRESSED_ADD,
-                                   uint64_t{0} - uint64_t{2});
-  }
-#endif
-
-  perform_gets();
-  verify_stats();
-
-  // Make sure we can cache hit after re-open
-  ReopenWithColumnFamilies({"default", "koko"}, options);
-
-  perform_gets();
-  verify_stats();
-
-  // Make sure we can cache hit even on a full copy of the DB. Using
-  // StableCacheKeyTestFS, Checkpoint will resort to full copy not hard link.
-  // (Checkpoint  not available in LITE mode to test this.)
-#ifndef ROCKSDB_LITE
-  auto db_copy_name = dbname_ + "-copy";
-  ASSERT_OK(Checkpoint::Create(db_, &checkpoint));
-  ASSERT_OK(checkpoint->CreateCheckpoint(db_copy_name));
-  delete checkpoint;
-
-  Close();
-  Destroy(options);
-
-  // Switch to the DB copy
-  SaveAndRestore<std::string> save_dbname(&dbname_, db_copy_name);
-  ReopenWithColumnFamilies({"default", "koko"}, options);
-
-  perform_gets();
-  verify_stats();
-
-  // And ensure that re-importing + ingesting the same files into a
-  // different DB uses same cache keys
-  DestroyAndReopen(options);
-
-  ColumnFamilyHandle* cfh = nullptr;
-  ASSERT_OK(db_->CreateColumnFamilyWithImport(ColumnFamilyOptions(), "yoyo",
-                                              ImportColumnFamilyOptions(),
-                                              *metadata_ptr_, &cfh));
-  ASSERT_NE(cfh, nullptr);
-  delete cfh;
-  cfh = nullptr;
-  delete metadata_ptr_;
-  metadata_ptr_ = nullptr;
-
-  DestroyDB(export_files_dir, options);
-
-  ReopenWithColumnFamilies({"default", "yoyo"}, options);
-
-  IngestExternalFileOptions ingest_opts;
-  ASSERT_OK(db_->IngestExternalFile(handles_[1], {external}, ingest_opts));
-
-  perform_gets();
-  verify_stats();
-#endif  // !ROCKSDB_LITE
-
-  Close();
-  Destroy(options);
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
-}
-
-INSTANTIATE_TEST_CASE_P(DBBlockCacheKeyTest, DBBlockCacheKeyTest,
-                        ::testing::Combine(::testing::Bool(),
-                                           ::testing::Bool()));
-
 class DBBlockCachePinningTest
    : public DBTestBase,
      public testing::WithParamInterface<
          std::tuple<bool, PinningTier, PinningTier, PinningTier>> {
 public:
  DBBlockCachePinningTest()
-      : DBTestBase("db_block_cache_test", /*env_do_fsync=*/false) {}
+      : DBTestBase("/db_block_cache_test", /*env_do_fsync=*/false) {}

  void SetUp() override {
    partition_index_and_filters_ = std::get<0>(GetParam());
@@ -10,15 +10,11 @@
 #include <iomanip>
 #include <sstream>

-#include "cache/cache_entry_roles.h"
-#include "cache/cache_reservation_manager.h"
 #include "db/db_test_util.h"
 #include "options/options_helper.h"
 #include "port/stack_trace.h"
-#include "rocksdb/convenience.h"
 #include "rocksdb/perf_context.h"
 #include "table/block_based/filter_policy_internal.h"
-#include "test_util/testutil.h"
 #include "util/string_util.h"

 namespace ROCKSDB_NAMESPACE {
@@ -32,7 +28,7 @@ using BFP = BloomFilterPolicy;
 class DBBloomFilterTest : public DBTestBase {
 public:
  DBBloomFilterTest()
-      : DBTestBase("db_bloom_filter_test", /*env_do_fsync=*/true) {}
+      : DBTestBase("/db_bloom_filter_test", /*env_do_fsync=*/true) {}
 };

 class DBBloomFilterTestWithParam : public DBTestBase,
@@ -46,7 +42,7 @@ class DBBloomFilterTestWithParam : public DBTestBase,

 public:
  DBBloomFilterTestWithParam()
-      : DBTestBase("db_bloom_filter_tests", /*env_do_fsync=*/true) {}
+      : DBTestBase("/db_bloom_filter_tests", /*env_do_fsync=*/true) {}

  ~DBBloomFilterTestWithParam() override {}

@@ -551,9 +547,10 @@ INSTANTIATE_TEST_CASE_P(
 INSTANTIATE_TEST_CASE_P(
    FormatLatest, DBBloomFilterTestWithParam,
    ::testing::Values(
-        std::make_tuple(BFP::kDeprecatedBlock, false, kLatestFormatVersion),
-        std::make_tuple(BFP::kAutoBloom, true, kLatestFormatVersion),
-        std::make_tuple(BFP::kAutoBloom, false, kLatestFormatVersion)));
+        std::make_tuple(BFP::kDeprecatedBlock, false,
+                        test::kLatestFormatVersion),
+        std::make_tuple(BFP::kAutoBloom, true, test::kLatestFormatVersion),
+        std::make_tuple(BFP::kAutoBloom, false, test::kLatestFormatVersion)));
 #endif  // !defined(ROCKSDB_VALGRIND_RUN) || defined(ROCKSDB_FULL_VALGRIND_RUN)

 TEST_F(DBBloomFilterTest, BloomFilterRate) {
@@ -669,439 +666,6 @@ TEST_F(DBBloomFilterTest, BloomFilterReverseCompatibility) {
  }
 }

-/*
- * A cache wrapper that tracks peaks and increments of filter
- * construction cache reservation.
- *        p0
- *       / \   p1
- *      /   \  /\
- *     /     \/  \
- *  a /       b   \
- * peaks = {p0, p1}
- * increments = {p1-a, p2-b}
- */
-class FilterConstructResPeakTrackingCache : public CacheWrapper {
- public:
-  explicit FilterConstructResPeakTrackingCache(std::shared_ptr<Cache> target)
-      : CacheWrapper(std::move(target)),
-        cur_cache_res_(0),
-        cache_res_peak_(0),
-        cache_res_increment_(0),
-        last_peak_tracked_(false),
-        cache_res_increments_sum_(0) {}
-
-  using Cache::Insert;
-  Status Insert(const Slice& key, void* value, size_t charge,
-                void (*deleter)(const Slice& key, void* value),
-                Handle** handle = nullptr,
-                Priority priority = Priority::LOW) override {
-    Status s = target_->Insert(key, value, charge, deleter, handle, priority);
-    if (deleter == kNoopDeleterForFilterConstruction) {
-      if (last_peak_tracked_) {
-        cache_res_peak_ = 0;
-        cache_res_increment_ = 0;
-        last_peak_tracked_ = false;
-      }
-      cur_cache_res_ += charge;
-      cache_res_peak_ = std::max(cache_res_peak_, cur_cache_res_);
-      cache_res_increment_ += charge;
-    }
-    return s;
-  }
-
-  using Cache::Release;
-  bool Release(Handle* handle, bool force_erase = false) override {
-    auto deleter = GetDeleter(handle);
-    if (deleter == kNoopDeleterForFilterConstruction) {
-      if (!last_peak_tracked_) {
-        cache_res_peaks_.push_back(cache_res_peak_);
-        cache_res_increments_sum_ += cache_res_increment_;
-        last_peak_tracked_ = true;
-      }
-      cur_cache_res_ -= GetCharge(handle);
-    }
-    bool is_successful = target_->Release(handle, force_erase);
-    return is_successful;
-  }
-
-  std::deque<std::size_t> GetReservedCachePeaks() { return cache_res_peaks_; }
-
-  std::size_t GetReservedCacheIncrementSum() {
-    return cache_res_increments_sum_;
-  }
-
- private:
-  static const Cache::DeleterFn kNoopDeleterForFilterConstruction;
-
-  std::size_t cur_cache_res_;
-  std::size_t cache_res_peak_;
-  std::size_t cache_res_increment_;
-  bool last_peak_tracked_;
-  std::deque<std::size_t> cache_res_peaks_;
-  std::size_t cache_res_increments_sum_;
-};
-
-const Cache::DeleterFn
-    FilterConstructResPeakTrackingCache::kNoopDeleterForFilterConstruction =
-        CacheReservationManager::TEST_GetNoopDeleterForRole<
-            CacheEntryRole::kFilterConstruction>();
-
-// To align with the type of hash entry being reserved in implementation.
-using FilterConstructionReserveMemoryHash = uint64_t;
-
-class DBFilterConstructionReserveMemoryTestWithParam
-    : public DBTestBase,
-      public testing::WithParamInterface<
-          std::tuple<bool, BloomFilterPolicy::Mode, bool>> {
- public:
-  DBFilterConstructionReserveMemoryTestWithParam()
-      : DBTestBase("db_bloom_filter_tests",
-                   /*env_do_fsync=*/true),
-        num_key_(0),
-        reserve_table_builder_memory_(std::get<0>(GetParam())),
-        policy_(std::get<1>(GetParam())),
-        partition_filters_(std::get<2>(GetParam())) {
-    if (!reserve_table_builder_memory_ ||
-        policy_ == BloomFilterPolicy::Mode::kDeprecatedBlock ||
-        policy_ == BloomFilterPolicy::Mode::kLegacyBloom) {
-      // For these cases, we only interested in whether filter construction
-      // cache resevation happens instead of its accuracy. Therefore we don't
-      // need many keys.
-      num_key_ = 5;
-    } else if (partition_filters_) {
-      // For PartitionFilter case, since we set
-      // table_options.metadata_block_size big enough such that each partition
-      // trigger at least 1 dummy entry reservation each for hash entries and
-      // final filter, we need a large number of keys to ensure we have at least
-      // two partitions.
-      num_key_ = 18 * CacheReservationManager::GetDummyEntrySize() /
-                 sizeof(FilterConstructionReserveMemoryHash);
-    } else if (policy_ == BloomFilterPolicy::Mode::kFastLocalBloom) {
-      // For Bloom Filter + FullFilter case, since we design the num_key_ to
-      // make hash entry cache reservation be a multiple of dummy entries, the
-      // correct behavior of charging final filter on top of it will trigger at
-      // least another dummy entry insertion. Therefore we can assert that
-      // behavior and we don't need a large number of keys to verify we
-      // indeed charge the final filter for cache reservation, even though final
-      // filter is a lot smaller than hash entries.
-      num_key_ = 1 * CacheReservationManager::GetDummyEntrySize() /
-                 sizeof(FilterConstructionReserveMemoryHash);
-    } else {
-      // For Ribbon Filter + FullFilter case, we need a large enough number of
-      // keys so that charging final filter after releasing the hash entries
-      // reservation will trigger at least another dummy entry (or equivalently
-      // to saying, causing another peak in cache reservation) as banding
-      // reservation might not be a multiple of dummy entry.
-      num_key_ = 12 * CacheReservationManager::GetDummyEntrySize() /
-                 sizeof(FilterConstructionReserveMemoryHash);
-    }
-  }
-
-  BlockBasedTableOptions GetBlockBasedTableOptions() {
-    BlockBasedTableOptions table_options;
-
-    // We set cache capacity big enough to prevent cache full for convenience in
-    // calculation.
-    constexpr std::size_t kCacheCapacity = 100 * 1024 * 1024;
-
-    table_options.reserve_table_builder_memory = reserve_table_builder_memory_;
-    table_options.filter_policy.reset(new BloomFilterPolicy(10, policy_));
-    table_options.partition_filters = partition_filters_;
-    if (table_options.partition_filters) {
-      table_options.index_type =
-          BlockBasedTableOptions::IndexType::kTwoLevelIndexSearch;
-      // We set table_options.metadata_block_size big enough so that each
-      // partition trigger at least 1 dummy entry insertion each for hash
-      // entries and final filter.
-      table_options.metadata_block_size = 409000;
-    }
-
-    LRUCacheOptions lo;
-    lo.capacity = kCacheCapacity;
-    lo.num_shard_bits = 0;  // 2^0 shard
-    lo.strict_capacity_limit = true;
-    cache_ = std::make_shared<FilterConstructResPeakTrackingCache>(
-        (NewLRUCache(lo)));
-    table_options.block_cache = cache_;
-
-    return table_options;
-  }
-
-  std::size_t GetNumKey() { return num_key_; }
-
-  bool ReserveTableBuilderMemory() { return reserve_table_builder_memory_; }
-
-  BloomFilterPolicy::Mode GetFilterPolicy() { return policy_; }
-
-  bool PartitionFilters() { return partition_filters_; }
-
-  std::shared_ptr<FilterConstructResPeakTrackingCache>
-  GetFilterConstructResPeakTrackingCache() {
-    return cache_;
-  }
-
- private:
-  std::size_t num_key_;
-  bool reserve_table_builder_memory_;
-  BloomFilterPolicy::Mode policy_;
-  bool partition_filters_;
-  std::shared_ptr<FilterConstructResPeakTrackingCache> cache_;
-};
-
-INSTANTIATE_TEST_CASE_P(
-    BlockBasedTableOptions, DBFilterConstructionReserveMemoryTestWithParam,
-    ::testing::Values(
-        std::make_tuple(false, BloomFilterPolicy::Mode::kFastLocalBloom, false),
-        std::make_tuple(true, BloomFilterPolicy::Mode::kFastLocalBloom, false),
-        std::make_tuple(true, BloomFilterPolicy::Mode::kFastLocalBloom, true),
-        std::make_tuple(true, BloomFilterPolicy::Mode::kStandard128Ribbon,
-                        false),
-        std::make_tuple(true, BloomFilterPolicy::Mode::kStandard128Ribbon,
-                        true),
-        std::make_tuple(true, BloomFilterPolicy::Mode::kDeprecatedBlock, false),
-        std::make_tuple(true, BloomFilterPolicy::Mode::kLegacyBloom, false)));
-
-// TODO: Speed up this test.
-// The current test inserts many keys (on the scale of dummy entry size)
-// in order to make small memory user (e.g, final filter, partitioned hash
-// entries/filter/banding) , which is proportional to the number of
-// keys, big enough so that its cache reservation triggers dummy entry insertion
-// and becomes observable in the test.
-//
-// However, inserting that many keys slows down this test and leaves future
-// developers an opportunity to speed it up.
-//
-// Possible approaches & challenges:
-// 1. Use sync point during cache reservation of filter construction
-//
-// Benefit: It does not rely on triggering dummy entry insertion
-// but the sync point to verify small memory user is charged correctly.
-//
-// Challenge: this approach is intrusive.
-//
-// 2. Make dummy entry size configurable and set it small in the test
-//
-// Benefit: It increases the precision of cache reservation and therefore
-// small memory usage can still trigger insertion of dummy entry.
-//
-// Challenge: change CacheReservationManager related APIs and a hack
-// might be needed to control the size of dummmy entry of
-// CacheReservationManager used in filter construction for testing
-// since CacheReservationManager is not exposed at the high level.
-//
-TEST_P(DBFilterConstructionReserveMemoryTestWithParam, ReserveMemory) {
-  Options options = CurrentOptions();
-  // We set write_buffer_size big enough so that in the case where there is
-  // filter construction cache reservation, flush won't be triggered before we
-  // manually trigger it for clean testing
-  options.write_buffer_size = 640 << 20;
-  options.table_factory.reset(
-      NewBlockBasedTableFactory(GetBlockBasedTableOptions()));
-  std::shared_ptr<FilterConstructResPeakTrackingCache> cache =
-      GetFilterConstructResPeakTrackingCache();
-  options.create_if_missing = true;
-  // Disable auto compaction to prevent its unexpected side effect
-  // to the number of keys per partition designed by us in the test
-  options.disable_auto_compactions = true;
-  DestroyAndReopen(options);
-  int num_key = static_cast<int>(GetNumKey());
-  for (int i = 0; i < num_key; i++) {
-    ASSERT_OK(Put(Key(i), Key(i)));
-  }
-
-  ASSERT_EQ(cache->GetReservedCacheIncrementSum(), 0)
-      << "Flush was triggered too early in the test case with filter "
-         "construction cache reservation - please make sure no flush triggered "
-         "during the key insertions above";
-
-  ASSERT_OK(Flush());
-
-  bool reserve_table_builder_memory = ReserveTableBuilderMemory();
-  BloomFilterPolicy::Mode policy = GetFilterPolicy();
-  bool partition_filters = PartitionFilters();
-
-  std::deque<std::size_t> filter_construction_cache_res_peaks =
-      cache->GetReservedCachePeaks();
-  std::size_t filter_construction_cache_res_increments_sum =
-      cache->GetReservedCacheIncrementSum();
-
-  if (!reserve_table_builder_memory) {
-    EXPECT_EQ(filter_construction_cache_res_peaks.size(), 0);
-    return;
-  }
-
-  if (policy == BloomFilterPolicy::Mode::kDeprecatedBlock ||
-      policy == BloomFilterPolicy::Mode::kLegacyBloom) {
-    EXPECT_EQ(filter_construction_cache_res_peaks.size(), 0)
-        << "There shouldn't be filter construction cache reservation as this "
-           "feature does not support BloomFilterPolicy::Mode::kDeprecatedBlock "
-           "nor BloomFilterPolicy::Mode::kLegacyBloom";
-    return;
-  }
-
-  const std::size_t kDummyEntrySize =
-      CacheReservationManager::GetDummyEntrySize();
-
-  const std::size_t predicted_hash_entries_cache_res =
-      num_key * sizeof(FilterConstructionReserveMemoryHash);
-  ASSERT_EQ(predicted_hash_entries_cache_res % kDummyEntrySize, 0)
-      << "It's by this test's design that predicted_hash_entries_cache_res is "
-         "a multipe of dummy entry";
-
-  const std::size_t predicted_hash_entries_cache_res_dummy_entry_num =
-      predicted_hash_entries_cache_res / kDummyEntrySize;
-  const std::size_t predicted_final_filter_cache_res =
-      static_cast<std::size_t>(std::ceil(
-          1.0 * predicted_hash_entries_cache_res_dummy_entry_num / 6 *
-          (policy == BloomFilterPolicy::Mode::kStandard128Ribbon ? 0.7 : 1))) *
-      kDummyEntrySize;
-  const std::size_t predicted_banding_cache_res =
-      static_cast<std::size_t>(
-          std::ceil(predicted_hash_entries_cache_res_dummy_entry_num * 2.5)) *
-      kDummyEntrySize;
-
-  if (policy == BloomFilterPolicy::Mode::kFastLocalBloom) {
-    /* BloomFilterPolicy::Mode::kFastLocalBloom + FullFilter
-     *        p0
-     *       /  \
-     *    b /    \
-     *     /      \
-     *    /        \
-     *  0/          \
-     *  hash entries = b - 0, final filter = p0 - b
-     *  p0 = hash entries + final filter
-     *
-     *  The test is designed in a way such that the reservation for b is a
-     *  multiple of dummy entries so that reservation for (p0 - b)
-     *  will trigger at least another dummy entry insertion.
-     *
-     * BloomFilterPolicy::Mode::kFastLocalBloom + PartitionedFilter
-     *                   p1
-     *                  /  \
-     *        p0     b'/    \
-     *       /  \     /      \
-     *    b /    \   /        \
-     *     /      \ /          \
-     *    /        a            \
-     *  0/                       \
-     *  partitioned hash entries1 = b - 0, partitioned hash entries1 = b' - a
-     *  parittioned final filter1 = p0 - b, parittioned final filter2 = p1 - b'
-     *
-     *  (increment p0 - 0) + (increment p1 - a)
-     *  = partitioned hash entries1 + partitioned hash entries2
-     *  + parittioned final filter1 + parittioned final filter2
-     *  = hash entries + final filter
-     *
-     */
-    if (!partition_filters) {
-      EXPECT_EQ(filter_construction_cache_res_peaks.size(), 1)
-          << "Filter construction cache reservation should have only 1 peak in "
-             "case: BloomFilterPolicy::Mode::kFastLocalBloom + FullFilter";
-      std::size_t filter_construction_cache_res_peak =
-          filter_construction_cache_res_peaks[0];
-      EXPECT_GT(filter_construction_cache_res_peak,
-                predicted_hash_entries_cache_res)
-          << "The testing number of hash entries is designed to make hash "
-             "entries cache reservation be multiples of dummy entries"
-             " so the correct behavior of charging final filter on top of it"
-             " should've triggered at least another dummy entry insertion";
-
-      std::size_t predicted_filter_construction_cache_res_peak =
-          predicted_hash_entries_cache_res + predicted_final_filter_cache_res;
-      EXPECT_GE(filter_construction_cache_res_peak,
-                predicted_filter_construction_cache_res_peak * 0.9);
-      EXPECT_LE(filter_construction_cache_res_peak,
-                predicted_filter_construction_cache_res_peak * 1.1);
-      return;
-    } else {
-      EXPECT_GE(filter_construction_cache_res_peaks.size(), 2)
-          << "Filter construction cache reservation should have multiple peaks "
-             "in case: BloomFilterPolicy::Mode::kFastLocalBloom + "
-             "PartitionedFilter";
-      std::size_t predicted_filter_construction_cache_res_increments_sum =
-          predicted_hash_entries_cache_res + predicted_final_filter_cache_res;
-      EXPECT_GE(filter_construction_cache_res_increments_sum,
-                predicted_filter_construction_cache_res_increments_sum * 0.9);
-      EXPECT_LE(filter_construction_cache_res_increments_sum,
-                predicted_filter_construction_cache_res_increments_sum * 1.1);
-      return;
-    }
-  }
-
-  if (policy == BloomFilterPolicy::Mode::kStandard128Ribbon) {
-    /* BloomFilterPolicy::Mode::kStandard128Ribbon + FullFilter
-     *        p0
-     *       /  \  p1
-     *      /    \/\
-     *   b /     b' \
-     *    /          \
-     *  0/            \
-     *  hash entries = b - 0, banding = p0 - b, final filter = p1 - b'
-     *  p0 = hash entries + banding
-     *
-     *  The test is designed in a way such that the reservation for (p1 - b')
-     *  will trigger at least another dummy entry insertion
-     *  (or equivelantly to saying, creating another peak).
-     *
-     *  BloomFilterPolicy::Mode::kStandard128Ribbon + PartitionedFilter
-     *                     p3
-     *        p0           /\  p4
-     *       /  \ p1      /  \ /\
-     *      /    \/\  b''/    a' \
-     *   b /     b' \   /         \
-     *    /          \ /           \
-     *  0/            a             \
-     *  partitioned hash entries1 = b - 0, partitioned hash entries2 = b'' - a
-     *  partitioned banding1 = p0 - b, partitioned banding2 = p3 - b''
-     *  parittioned final filter1 = p1 - b',parittioned final filter2 = p4 - a'
-     *
-     *  (increment p0 - 0) + (increment p1 - b')
-     *  + (increment p3 - a) + (increment p4 - a')
-     *  = partitioned hash entries1 + partitioned hash entries2
-     *  + parittioned banding1 + parittioned banding2
-     *  + parittioned final filter1 + parittioned final filter2
-     *  = hash entries + banding + final filter
-     */
-    if (!partition_filters) {
-      ASSERT_GE(std::floor(1.0 * predicted_final_filter_cache_res /
-                           CacheReservationManager::GetDummyEntrySize()),
-                1)
-          << "Final filter cache reservation too small for this test - please "
-             "increase the number of keys";
-      EXPECT_EQ(filter_construction_cache_res_peaks.size(), 2)
-          << "Filter construction cache reservation should have 2 peaks in "
-             "case: BloomFilterPolicy::Mode::kStandard128Ribbon + FullFilter. "
-             "The second peak is resulted from charging the final filter after "
-             "decreasing the hash entry reservation since the testing final "
-             "filter reservation is designed to be at least 1 dummy entry size";
-
-      std::size_t filter_construction_cache_res_peak =
-          filter_construction_cache_res_peaks[0];
-      std::size_t predicted_filter_construction_cache_res_peak =
-          predicted_hash_entries_cache_res + predicted_banding_cache_res;
-      EXPECT_GE(filter_construction_cache_res_peak,
-                predicted_filter_construction_cache_res_peak * 0.9);
-      EXPECT_LE(filter_construction_cache_res_peak,
-                predicted_filter_construction_cache_res_peak * 1.1);
-      return;
-    } else {
-      EXPECT_GE(filter_construction_cache_res_peaks.size(), 3)
-          << "Filter construction cache reservation should have more than 3 "
-             "peaks "
-             "in case: BloomFilterPolicy::Mode::kStandard128Ribbon + "
-             "PartitionedFilter";
-      std::size_t predicted_filter_construction_cache_res_increments_sum =
-          predicted_hash_entries_cache_res + predicted_banding_cache_res +
-          predicted_final_filter_cache_res;
-      EXPECT_GE(filter_construction_cache_res_increments_sum,
-                predicted_filter_construction_cache_res_increments_sum * 0.9);
-      EXPECT_LE(filter_construction_cache_res_increments_sum,
-                predicted_filter_construction_cache_res_increments_sum * 1.1);
-      return;
-    }
-  }
-}
-
 namespace {
 // A wrapped bloom over block-based FilterPolicy
 class TestingWrappedBlockBasedFilterPolicy : public FilterPolicy {
@@ -1502,63 +1066,6 @@ TEST_F(DBBloomFilterTest, MemtableWholeKeyBloomFilter) {
  ASSERT_EQ(1, get_perf_context()->bloom_memtable_hit_count);
 }

-TEST_F(DBBloomFilterTest, MemtableWholeKeyBloomFilterMultiGet) {
-  Options options = CurrentOptions();
-  options.memtable_prefix_bloom_size_ratio = 0.015;
-  options.memtable_whole_key_filtering = true;
-  Reopen(options);
-  std::string key1("AA");
-  std::string key2("BB");
-  std::string key3("CC");
-  std::string key4("DD");
-  std::string key_not("EE");
-  std::string value1("Value1");
-  std::string value2("Value2");
-  std::string value3("Value3");
-  std::string value4("Value4");
-
-  ASSERT_OK(Put(key1, value1, WriteOptions()));
-  ASSERT_OK(Put(key2, value2, WriteOptions()));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put(key3, value3, WriteOptions()));
-  const Snapshot* snapshot = db_->GetSnapshot();
-  ASSERT_OK(Put(key4, value4, WriteOptions()));
-
-  // Delete key2 and key3
-  ASSERT_OK(
-      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), "BA", "CZ"));
-
-  // Read without snapshot
-  auto results = MultiGet({key_not, key1, key2, key3, key4});
-  ASSERT_EQ(results[0], "NOT_FOUND");
-  ASSERT_EQ(results[1], value1);
-  ASSERT_EQ(results[2], "NOT_FOUND");
-  ASSERT_EQ(results[3], "NOT_FOUND");
-  ASSERT_EQ(results[4], value4);
-
-  // Also check Get
-  ASSERT_EQ(Get(key1), value1);
-  ASSERT_EQ(Get(key2), "NOT_FOUND");
-  ASSERT_EQ(Get(key3), "NOT_FOUND");
-  ASSERT_EQ(Get(key4), value4);
-
-  // Read with snapshot
-  results = MultiGet({key_not, key1, key2, key3, key4}, snapshot);
-  ASSERT_EQ(results[0], "NOT_FOUND");
-  ASSERT_EQ(results[1], value1);
-  ASSERT_EQ(results[2], value2);
-  ASSERT_EQ(results[3], value3);
-  ASSERT_EQ(results[4], "NOT_FOUND");
-
-  // Also check Get
-  ASSERT_EQ(Get(key1, snapshot), value1);
-  ASSERT_EQ(Get(key2, snapshot), value2);
-  ASSERT_EQ(Get(key3, snapshot), value3);
-  ASSERT_EQ(Get(key4, snapshot), "NOT_FOUND");
-
-  db_->ReleaseSnapshot(snapshot);
-}
-
 TEST_F(DBBloomFilterTest, MemtablePrefixBloomOutOfDomain) {
  constexpr size_t kPrefixSize = 8;
  const std::string kKey = "key";
@@ -1587,7 +1094,7 @@ class DBBloomFilterTestVaryPrefixAndFormatVer

 public:
  DBBloomFilterTestVaryPrefixAndFormatVer()
-      : DBTestBase("db_bloom_filter_tests", /*env_do_fsync=*/true) {}
+      : DBTestBase("/db_bloom_filter_tests", /*env_do_fsync=*/true) {}

  ~DBBloomFilterTestVaryPrefixAndFormatVer() override {}

@@ -2312,8 +1819,8 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterUpperBound) {
      ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_PREFIX_USEFUL), 0);
    }
    ASSERT_OK(dbfull()->SetOptions({{"prefix_extractor", "fixed:5"}}));
-    ASSERT_EQ(dbfull()->GetOptions().prefix_extractor->AsString(),
-              "rocksdb.FixedPrefix.5");
+    ASSERT_EQ(0, strcmp(dbfull()->GetOptions().prefix_extractor->Name(),
+                        "rocksdb.FixedPrefix.5"));
    {
      // BF changed, [abcdxx00, abce) is a valid bound, will trigger BF read
      Slice upper_bound("abce");
@@ -2432,8 +1939,8 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterMultipleSST) {
    ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_PREFIX_CHECKED), 1);

    ASSERT_OK(dbfull()->SetOptions({{"prefix_extractor", "capped:3"}}));
-    ASSERT_EQ(dbfull()->GetOptions().prefix_extractor->AsString(),
-              "rocksdb.CappedPrefix.3");
+    ASSERT_EQ(0, strcmp(dbfull()->GetOptions().prefix_extractor->Name(),
+                        "rocksdb.CappedPrefix.3"));
    read_options.iterate_upper_bound = &upper_bound;
    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
    ASSERT_EQ(CountIter(iter, "foo"), 2);
@@ -2466,8 +1973,8 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterMultipleSST) {
    }

    ASSERT_OK(dbfull()->SetOptions({{"prefix_extractor", "fixed:2"}}));
-    ASSERT_EQ(dbfull()->GetOptions().prefix_extractor->AsString(),
-              "rocksdb.FixedPrefix.2");
+    ASSERT_EQ(0, strcmp(dbfull()->GetOptions().prefix_extractor->Name(),
+                        "rocksdb.FixedPrefix.2"));
    // third SST with fixed:2 BF
    ASSERT_OK(Put("foo6", "bar6"));
    ASSERT_OK(Put("foo7", "bar7"));
@@ -2514,8 +2021,8 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterMultipleSST) {
      ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_PREFIX_USEFUL), 3);
    }
    ASSERT_OK(dbfull()->SetOptions({{"prefix_extractor", "capped:3"}}));
-    ASSERT_EQ(dbfull()->GetOptions().prefix_extractor->AsString(),
-              "rocksdb.CappedPrefix.3");
+    ASSERT_EQ(0, strcmp(dbfull()->GetOptions().prefix_extractor->Name(),
+                        "rocksdb.CappedPrefix.3"));
    {
      std::unique_ptr<Iterator> iter_all(db_->NewIterator(read_options));
      ASSERT_EQ(CountIter(iter_all, "foo"), 6);
@@ -2555,8 +2062,9 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterNewColumnFamily) {
    // create a new CF and set prefix_extractor dynamically
    options.prefix_extractor.reset(NewCappedPrefixTransform(3));
    CreateColumnFamilies({"ramen_dojo_" + std::to_string(iteration)}, options);
-    ASSERT_EQ(dbfull()->GetOptions(handles_[2]).prefix_extractor->AsString(),
-              "rocksdb.CappedPrefix.3");
+    ASSERT_EQ(0,
+              strcmp(dbfull()->GetOptions(handles_[2]).prefix_extractor->Name(),
+                     "rocksdb.CappedPrefix.3"));
    ASSERT_OK(Put(2, "foo3", "bar3"));
    ASSERT_OK(Put(2, "foo4", "bar4"));
    ASSERT_OK(Put(2, "foo5", "bar5"));
@@ -2572,8 +2080,9 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterNewColumnFamily) {
    }
    ASSERT_OK(
        dbfull()->SetOptions(handles_[2], {{"prefix_extractor", "fixed:2"}}));
-    ASSERT_EQ(dbfull()->GetOptions(handles_[2]).prefix_extractor->AsString(),
-              "rocksdb.FixedPrefix.2");
+    ASSERT_EQ(0,
+              strcmp(dbfull()->GetOptions(handles_[2]).prefix_extractor->Name(),
+                     "rocksdb.FixedPrefix.2"));
    {
      std::unique_ptr<Iterator> iter(
          db_->NewIterator(read_options, handles_[2]));
@@ -2638,8 +2147,8 @@ TEST_F(DBBloomFilterTest, DynamicBloomFilterOptions) {
    ASSERT_EQ(TestGetTickerCount(options, BLOOM_FILTER_PREFIX_USEFUL), 0);

    ASSERT_OK(dbfull()->SetOptions({{"prefix_extractor", "capped:3"}}));
-    ASSERT_EQ(dbfull()->GetOptions().prefix_extractor->AsString(),
-              "rocksdb.CappedPrefix.3");
+    ASSERT_EQ(0, strcmp(dbfull()->GetOptions().prefix_extractor->Name(),
+                        "rocksdb.CappedPrefix.3"));
    {
      std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
      // "fp*" should be skipped
@@ -2662,8 +2171,7 @@ TEST_F(DBBloomFilterTest, SeekForPrevWithPartitionedFilters) {
  Options options = CurrentOptions();
  constexpr size_t kNumKeys = 10000;
  static_assert(kNumKeys <= 10000, "kNumKeys have to be <= 10000");
-  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(kNumKeys + 10));
+  options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeys + 10));
  options.create_if_missing = true;
  constexpr size_t kPrefixLength = 4;
  options.prefix_extractor.reset(NewFixedPrefixTransform(kPrefixLength));
@@ -22,7 +22,7 @@ static std::string NEW_VALUE = "NewValue";
 class DBTestCompactionFilter : public DBTestBase {
 public:
  DBTestCompactionFilter()
-      : DBTestBase("db_compaction_filter_test", /*env_do_fsync=*/true) {}
+      : DBTestBase("/db_compaction_filter_test", /*env_do_fsync=*/true) {}
 };

 // Param variant of DBTestBase::ChangeCompactOptions
@@ -19,7 +19,6 @@
 #include "rocksdb/sst_file_writer.h"
 #include "rocksdb/utilities/convenience.h"
 #include "test_util/sync_point.h"
-#include "test_util/testutil.h"
 #include "util/concurrent_task_limiter_impl.h"
 #include "util/random.h"
 #include "utilities/fault_injection_env.h"
@@ -33,7 +32,7 @@ namespace ROCKSDB_NAMESPACE {
 class DBCompactionTest : public DBTestBase {
 public:
  DBCompactionTest()
-      : DBTestBase("db_compaction_test", /*env_do_fsync=*/true) {}
+      : DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) {}
 };

 class DBCompactionTestWithParam
@@ -41,7 +40,7 @@ class DBCompactionTestWithParam
      public testing::WithParamInterface<std::tuple<uint32_t, bool>> {
 public:
  DBCompactionTestWithParam()
-      : DBTestBase("db_compaction_test", /*env_do_fsync=*/true) {
+      : DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) {
    max_subcompactions_ = std::get<0>(GetParam());
    exclusive_manual_compaction_ = std::get<1>(GetParam());
  }
@@ -59,7 +58,7 @@ class DBCompactionTestWithBottommostParam
      public testing::WithParamInterface<BottommostLevelCompaction> {
 public:
  DBCompactionTestWithBottommostParam()
-      : DBTestBase("db_compaction_test", /*env_do_fsync=*/true) {
+      : DBTestBase("/db_compaction_test", /*env_do_fsync=*/true) {
    bottommost_level_compaction_ = GetParam();
  }

@@ -806,8 +805,7 @@ TEST_P(DBCompactionTestWithParam, CompactionTrigger) {
  options.num_levels = 3;
  options.level0_file_num_compaction_trigger = 3;
  options.max_subcompactions = max_subcompactions_;
-  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(kNumKeysPerFile));
+  options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile));
  CreateAndReopenWithCF({"pikachu"}, options);

  Random rnd(301);
@@ -854,8 +852,7 @@ TEST_F(DBCompactionTest, BGCompactionsAllowed) {
  options.level0_slowdown_writes_trigger = 20;
  options.soft_pending_compaction_bytes_limit = 1 << 30;  // Infinitely large
  options.max_background_compactions = 3;
-  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(kNumKeysPerFile));
+  options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile));

  // Block all threads in thread pool.
  const size_t kTotalTasks = 4;
@@ -2097,7 +2094,7 @@ TEST_P(DBCompactionTestWithParam, LevelCompactionThirdPath) {
  options.db_paths.emplace_back(dbname_ + "_2", 4 * 1024 * 1024);
  options.db_paths.emplace_back(dbname_ + "_3", 1024 * 1024 * 1024);
  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
+      new SpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
  options.compaction_style = kCompactionStyleLevel;
  options.write_buffer_size = 110 << 10;  // 110KB
  options.arena_block_size = 4 << 10;
@@ -2206,7 +2203,7 @@ TEST_P(DBCompactionTestWithParam, LevelCompactionPathUse) {
  options.db_paths.emplace_back(dbname_ + "_2", 4 * 1024 * 1024);
  options.db_paths.emplace_back(dbname_ + "_3", 1024 * 1024 * 1024);
  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
+      new SpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
  options.compaction_style = kCompactionStyleLevel;
  options.write_buffer_size = 110 << 10;  // 110KB
  options.arena_block_size = 4 << 10;
@@ -2316,7 +2313,7 @@ TEST_P(DBCompactionTestWithParam, LevelCompactionCFPathUse) {
  options.db_paths.emplace_back(dbname_ + "_2", 4 * 1024 * 1024);
  options.db_paths.emplace_back(dbname_ + "_3", 1024 * 1024 * 1024);
  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
+    new SpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
  options.compaction_style = kCompactionStyleLevel;
  options.write_buffer_size = 110 << 10;  // 110KB
  options.arena_block_size = 4 << 10;
@@ -2335,7 +2332,7 @@ TEST_P(DBCompactionTestWithParam, LevelCompactionCFPathUse) {
  option_vector.emplace_back(DBOptions(options), cf_opt1);
  CreateColumnFamilies({"one"},option_vector[1]);

-  // Configure CF2 specific paths.
+  // Configura CF2 specific paths.
  cf_opt2.cf_paths.emplace_back(dbname_ + "cf2", 500 * 1024);
  cf_opt2.cf_paths.emplace_back(dbname_ + "cf2_2", 4 * 1024 * 1024);
  cf_opt2.cf_paths.emplace_back(dbname_ + "cf2_3", 1024 * 1024 * 1024);
@@ -2390,16 +2387,13 @@ TEST_P(DBCompactionTestWithParam, LevelCompactionCFPathUse) {
  // Check that default column family uses db_paths.
  // And Column family "one" uses cf_paths.

-  // The compaction in level0 outputs the sst files in level1.
-  // The first path cannot hold level1's data(400KB+400KB > 500KB),
-  // so every compaction move a sst file to second path. Please
-  // refer to LevelCompactionBuilder::GetPathId.
+  // First three 110KB files are not going to second path.
+  // After that, (100K, 200K)
  for (int num = 0; num < 3; num++) {
    generate_file();
  }
-  check_sstfilecount(0, 1);
-  check_sstfilecount(1, 2);

+  // Another 110KB triggers a compaction to 400K file to fill up first path
  generate_file();
  check_sstfilecount(1, 3);

@@ -3015,7 +3009,7 @@ TEST_P(DBCompactionTestWithParam, CompressLevelCompaction) {
  }
  Options options = CurrentOptions();
  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
+      new SpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
  options.compaction_style = kCompactionStyleLevel;
  options.write_buffer_size = 110 << 10;  // 110KB
  options.arena_block_size = 4 << 10;
@@ -4302,67 +4296,6 @@ TEST_F(DBCompactionTest, LevelPeriodicAndTtlCompaction) {
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
 }

-TEST_F(DBCompactionTest, LevelTtlBooster) {
-  const int kNumKeysPerFile = 32;
-  const int kNumLevelFiles = 3;
-  const int kValueSize = 1000;
-
-  Options options = CurrentOptions();
-  options.ttl = 10 * 60 * 60;                           // 10 hours
-  options.periodic_compaction_seconds = 480 * 60 * 60;  // very long
-  options.level0_file_num_compaction_trigger = 2;
-  options.max_bytes_for_level_base = 5 * uint64_t{kNumKeysPerFile * kValueSize};
-  options.max_open_files = -1;  // needed for both periodic and ttl compactions
-  options.compaction_pri = CompactionPri::kMinOverlappingRatio;
-  env_->SetMockSleep();
-  options.env = env_;
-
-  // NOTE: Presumed unnecessary and removed: resetting mock time in env
-
-  DestroyAndReopen(options);
-
-  Random rnd(301);
-  for (int i = 0; i < kNumLevelFiles; ++i) {
-    for (int j = 0; j < kNumKeysPerFile; ++j) {
-      ASSERT_OK(
-          Put(Key(i * kNumKeysPerFile + j), rnd.RandomString(kValueSize)));
-    }
-    ASSERT_OK(Flush());
-  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-
-  MoveFilesToLevel(2);
-
-  ASSERT_EQ("0,0,3", FilesPerLevel());
-
-  // Create some files for L1
-  for (int i = 0; i < 2; i++) {
-    for (int j = 0; j < kNumKeysPerFile; ++j) {
-      ASSERT_OK(Put(Key(2 * j + i), rnd.RandomString(kValueSize)));
-    }
-    ASSERT_OK(Flush());
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
-  }
-
-  ASSERT_EQ("0,1,3", FilesPerLevel());
-
-  // Make the new L0 files qualify TTL boosting and generate one more to trigger
-  // L1 -> L2 compaction. Old files will be picked even if their priority is
-  // lower without boosting.
-  env_->MockSleepForSeconds(8 * 60 * 60);
-  for (int i = 0; i < 2; i++) {
-    for (int j = 0; j < kNumKeysPerFile; ++j) {
-      ASSERT_OK(Put(Key(kNumKeysPerFile * 2 + 2 * j + i),
-                    rnd.RandomString(kValueSize * 2)));
-    }
-    ASSERT_OK(Flush());
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
-  }
-  ASSERT_EQ("0,1,2", FilesPerLevel());
-
-  ASSERT_GT(SizeAtLevel(1), kNumKeysPerFile * 4 * kValueSize);
-}
-
 TEST_F(DBCompactionTest, LevelPeriodicCompactionWithCompactionFilters) {
  class TestCompactionFilter : public CompactionFilter {
    const char* Name() const override { return "TestCompactionFilter"; }
@@ -4879,8 +4812,7 @@ TEST_F(DBCompactionTest, CompactionLimiter) {
  options.level0_slowdown_writes_trigger = 64;
  options.level0_stop_writes_trigger = 64;
  options.max_background_jobs = kMaxBackgroundThreads; // Enough threads
-  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(kNumKeysPerFile));
+  options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile));
  options.max_write_buffer_number = 10; // Enough memtables
  DestroyAndReopen(options);

@@ -5040,7 +4972,7 @@ TEST_P(DBCompactionDirectIOTest, DirectIO) {
  options.create_if_missing = true;
  options.disable_auto_compactions = true;
  options.use_direct_io_for_flush_and_compaction = GetParam();
-  options.env = MockEnv::Create(Env::Default());
+  options.env = new MockEnv(Env::Default());
  Reopen(options);
  bool readahead = false;
  SyncPoint::GetInstance()->SetCallBack(
@@ -5073,7 +5005,7 @@ class CompactionPriTest : public DBTestBase,
                          public testing::WithParamInterface<uint32_t> {
 public:
  CompactionPriTest()
-      : DBTestBase("compaction_pri_test", /*env_do_fsync=*/true) {
+      : DBTestBase("/compaction_pri_test", /*env_do_fsync=*/true) {
    compaction_pri_ = GetParam();
  }

@@ -5316,7 +5248,6 @@ TEST_F(DBCompactionTest, ManualCompactionMax) {
  generate_sst_func();
  uint64_t total_size = (l1_avg_size * 10) + (l2_avg_size * 100);
  opts.max_compaction_bytes = total_size / num_split;
-  opts.target_file_size_base = total_size / num_split;
  Reopen(opts);
  num_compactions.store(0);
  ASSERT_OK(db_->CompactRange(cro, nullptr, nullptr));
@@ -5324,7 +5255,6 @@ TEST_F(DBCompactionTest, ManualCompactionMax) {

  // very small max_compaction_bytes, it should still move forward
  opts.max_compaction_bytes = l1_avg_size / 2;
-  opts.target_file_size_base = l1_avg_size / 2;
  DestroyAndReopen(opts);
  generate_sst_func();
  num_compactions.store(0);
@@ -5338,8 +5268,7 @@ TEST_F(DBCompactionTest, ManualCompactionMax) {
  generate_sst_func();
  total_size = (l1_avg_size * 10) + (l2_avg_size * 100);
  Status s = db_->SetOptions(
-      {{"max_compaction_bytes", std::to_string(total_size / num_split)},
-       {"target_file_size_base", std::to_string(total_size / num_split)}});
+      {{"max_compaction_bytes", std::to_string(total_size / num_split)}});
  ASSERT_OK(s);

  num_compactions.store(0);
@@ -5406,8 +5335,7 @@ TEST_P(DBCompactionTestWithParam, FixFileIngestionCompactionDeadlock) {
  options.level0_file_num_compaction_trigger =
      options.level0_stop_writes_trigger;
  options.max_subcompactions = max_subcompactions_;
-  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(kNumKeysPerFile));
+  options.memtable_factory.reset(new SpecialSkipListFactory(kNumKeysPerFile));
  DestroyAndReopen(options);
  Random rnd(301);

@@ -5933,7 +5861,7 @@ TEST_F(DBCompactionTest, ChangeLevelCompactRangeConflictsWithManual) {
  // `Status::Incomplete`.
  Options options = CurrentOptions();
  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
+      new SpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
  options.level0_file_num_compaction_trigger = 2;
  options.num_levels = 3;
  Reopen(options);
@@ -6021,7 +5949,7 @@ TEST_F(DBCompactionTest, ChangeLevelErrorPathTest) {
  // succeeds
  Options options = CurrentOptions();
  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
+      new SpecialSkipListFactory(KNumKeysByGenerateNewFile - 1));
  options.level0_file_num_compaction_trigger = 2;
  options.num_levels = 3;
  Reopen(options);
@@ -6127,7 +6055,7 @@ TEST_F(DBCompactionTest, CompactionWithBlob) {
  ASSERT_EQ(Get(first_key), third_value);
  ASSERT_EQ(Get(second_key), third_value);

-  VersionSet* const versions = dbfull()->GetVersionSet();
+  VersionSet* const versions = dbfull()->TEST_GetVersionSet();
  assert(versions);

  ColumnFamilyData* const cfd = versions->GetColumnFamilySet()->GetDefault();
@@ -6230,7 +6158,7 @@ TEST_P(DBCompactionTestBlobError, CompactionError) {
  SyncPoint::GetInstance()->DisableProcessing();
  SyncPoint::GetInstance()->ClearAllCallBacks();

-  VersionSet* const versions = dbfull()->GetVersionSet();
+  VersionSet* const versions = dbfull()->TEST_GetVersionSet();
  assert(versions);

  ColumnFamilyData* const cfd = versions->GetColumnFamilySet()->GetDefault();
@@ -6352,7 +6280,7 @@ TEST_P(DBCompactionTestBlobGC, CompactionWithBlobGC) {
    ASSERT_EQ(new_blob_files[i - cutoff_index], original_blob_files[i]);
  }

-  VersionSet* const versions = dbfull()->GetVersionSet();
+  VersionSet* const versions = dbfull()->TEST_GetVersionSet();
  assert(versions);
  assert(versions->GetColumnFamilySet());

@@ -6818,247 +6746,6 @@ TEST_F(DBCompactionTest, CompactionWithChecksumHandoffManifest2) {
  Destroy(options);
 }

-TEST_F(DBCompactionTest, FIFOWarm) {
-  Options options = CurrentOptions();
-  options.compaction_style = kCompactionStyleFIFO;
-  options.num_levels = 1;
-  options.max_open_files = -1;
-  options.level0_file_num_compaction_trigger = 2;
-  options.create_if_missing = true;
-  CompactionOptionsFIFO fifo_options;
-  fifo_options.age_for_warm = 1000;
-  fifo_options.max_table_files_size = 100000000;
-  options.compaction_options_fifo = fifo_options;
-  env_->SetMockSleep();
-  Reopen(options);
-
-  int total_warm = 0;
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "NewWritableFile::FileOptions.temperature", [&](void* arg) {
-        Temperature temperature = *(static_cast<Temperature*>(arg));
-        if (temperature == Temperature::kWarm) {
-          total_warm++;
-        }
-      });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-
-  // The file system does not support checksum handoff. The check
-  // will be ignored.
-  ASSERT_OK(Put(Key(0), "value1"));
-  env_->MockSleepForSeconds(800);
-  ASSERT_OK(Put(Key(2), "value2"));
-  ASSERT_OK(Flush());
-
-  ASSERT_OK(Put(Key(0), "value1"));
-  env_->MockSleepForSeconds(800);
-  ASSERT_OK(Put(Key(2), "value2"));
-  ASSERT_OK(Flush());
-
-  ASSERT_OK(Put(Key(0), "value1"));
-  env_->MockSleepForSeconds(800);
-  ASSERT_OK(Put(Key(2), "value2"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-
-  ASSERT_OK(Put(Key(0), "value1"));
-  env_->MockSleepForSeconds(800);
-  ASSERT_OK(Put(Key(2), "value2"));
-  ASSERT_OK(Flush());
-
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
-
-  ColumnFamilyMetaData metadata;
-  db_->GetColumnFamilyMetaData(&metadata);
-  ASSERT_EQ(4, metadata.file_count);
-  ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[0].temperature);
-  ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[1].temperature);
-  ASSERT_EQ(Temperature::kWarm, metadata.levels[0].files[2].temperature);
-  ASSERT_EQ(Temperature::kWarm, metadata.levels[0].files[3].temperature);
-  ASSERT_EQ(2, total_warm);
-
-  Destroy(options);
-}
-
-TEST_F(DBCompactionTest,
-       DisableManualCompactionDoesNotWaitForDrainingAutomaticCompaction) {
-  // When `CompactRangeOptions::exclusive_manual_compaction == true`, we wait
-  // for automatic compactions to drain before starting the manual compaction.
-  // This test verifies `DisableManualCompaction()` can cancel such a compaction
-  // without waiting for the drain to complete.
-  const int kNumL0Files = 4;
-
-  // Enforces manual compaction enters wait loop due to pending automatic
-  // compaction.
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
-      {{"DBImpl::BGWorkCompaction", "DBImpl::RunManualCompaction:NotScheduled"},
-       {"DBImpl::RunManualCompaction:WaitScheduled",
-        "BackgroundCallCompaction:0"}});
-  // The automatic compaction will cancel the waiting manual compaction.
-  // Completing this implies the cancellation did not wait on automatic
-  // compactions to finish.
-  bool callback_completed = false;
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "BackgroundCallCompaction:0", [&](void* /*arg*/) {
-        db_->DisableManualCompaction();
-        callback_completed = true;
-      });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-
-  Options options = CurrentOptions();
-  options.level0_file_num_compaction_trigger = kNumL0Files;
-  Reopen(options);
-
-  for (int i = 0; i < kNumL0Files; ++i) {
-    ASSERT_OK(Put(Key(1), "value1"));
-    ASSERT_OK(Put(Key(2), "value2"));
-    ASSERT_OK(Flush());
-  }
-
-  CompactRangeOptions cro;
-  cro.exclusive_manual_compaction = true;
-  ASSERT_TRUE(db_->CompactRange(cro, nullptr, nullptr).IsIncomplete());
-
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-  ASSERT_TRUE(callback_completed);
-}
-
-TEST_F(DBCompactionTest, ChangeLevelConflictsWithManual) {
-  Options options = CurrentOptions();
-  options.num_levels = 3;
-  Reopen(options);
-
-  // Setup an LSM with L2 populated.
-  Random rnd(301);
-  ASSERT_OK(Put(Key(0), rnd.RandomString(990)));
-  ASSERT_OK(Put(Key(1), rnd.RandomString(990)));
-  {
-    CompactRangeOptions cro;
-    cro.change_level = true;
-    cro.target_level = 2;
-    ASSERT_OK(dbfull()->CompactRange(cro, nullptr, nullptr));
-  }
-  ASSERT_EQ("0,0,1", FilesPerLevel(0));
-
-  // The background thread will refit L2->L1 while the foreground thread will
-  // attempt to run a compaction on new data. The following dependencies
-  // ensure the background manual compaction's refitting phase disables manual
-  // compaction immediately before the foreground manual compaction can register
-  // itself. Manual compaction is kept disabled until the foreground manual
-  // checks for the failure once.
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency({
-      // Only do Put()s for foreground CompactRange() once the background
-      // CompactRange() has reached the refitting phase.
-      {
-          "DBImpl::CompactRange:BeforeRefit:1",
-          "DBCompactionTest::ChangeLevelConflictsWithManual:"
-          "PreForegroundCompactRange",
-      },
-      // Right before we register the manual compaction, proceed with
-      // the refitting phase so manual compactions are disabled. Stay in
-      // the refitting phase with manual compactions disabled until it is
-      // noticed.
-      {
-          "DBImpl::RunManualCompaction:0",
-          "DBImpl::CompactRange:BeforeRefit:2",
-      },
-      {
-          "DBImpl::CompactRange:PreRefitLevel",
-          "DBImpl::RunManualCompaction:1",
-      },
-      {
-          "DBImpl::RunManualCompaction:PausedAtStart",
-          "DBImpl::CompactRange:PostRefitLevel",
-      },
-      // If compaction somehow were scheduled, let's let it run after reenabling
-      // manual compactions. This dependency is not expected to be hit but is
-      // here for speculatively coercing future bugs.
-      {
-          "DBImpl::CompactRange:PostRefitLevel:ManualCompactionEnabled",
-          "BackgroundCallCompaction:0",
-      },
-  });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-
-  ROCKSDB_NAMESPACE::port::Thread refit_level_thread([&] {
-    CompactRangeOptions cro;
-    cro.change_level = true;
-    cro.target_level = 1;
-    ASSERT_OK(dbfull()->CompactRange(cro, nullptr, nullptr));
-  });
-
-  TEST_SYNC_POINT(
-      "DBCompactionTest::ChangeLevelConflictsWithManual:"
-      "PreForegroundCompactRange");
-  ASSERT_OK(Put(Key(0), rnd.RandomString(990)));
-  ASSERT_OK(Put(Key(1), rnd.RandomString(990)));
-  ASSERT_TRUE(dbfull()
-                  ->CompactRange(CompactRangeOptions(), nullptr, nullptr)
-                  .IsIncomplete());
-
-  refit_level_thread.join();
-}
-
-TEST_F(DBCompactionTest, BottomPriCompactionCountsTowardConcurrencyLimit) {
-  // Flushes several files to trigger compaction while lock is released during
-  // a bottom-pri compaction. Verifies it does not get scheduled to thread pool
-  // because per-DB limit for compaction parallelism is one (default).
-  const int kNumL0Files = 4;
-  const int kNumLevels = 3;
-
-  env_->SetBackgroundThreads(1, Env::Priority::BOTTOM);
-
-  Options options = CurrentOptions();
-  options.level0_file_num_compaction_trigger = kNumL0Files;
-  options.num_levels = kNumLevels;
-  DestroyAndReopen(options);
-
-  // Setup last level to be non-empty since it's a bit unclear whether
-  // compaction to an empty level would be considered "bottommost".
-  ASSERT_OK(Put(Key(0), "val"));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(kNumLevels - 1);
-
-  SyncPoint::GetInstance()->LoadDependency(
-      {{"DBImpl::BGWorkBottomCompaction",
-        "DBCompactionTest::BottomPriCompactionCountsTowardConcurrencyLimit:"
-        "PreTriggerCompaction"},
-       {"DBCompactionTest::BottomPriCompactionCountsTowardConcurrencyLimit:"
-        "PostTriggerCompaction",
-        "BackgroundCallCompaction:0"}});
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  port::Thread compact_range_thread([&] {
-    CompactRangeOptions cro;
-    cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-    cro.exclusive_manual_compaction = false;
-    ASSERT_OK(dbfull()->CompactRange(cro, nullptr, nullptr));
-  });
-
-  // Sleep in the low-pri thread so any newly scheduled compaction will be
-  // queued. Otherwise it might finish before we check its existence.
-  test::SleepingBackgroundTask sleeping_task_low;
-  env_->Schedule(&test::SleepingBackgroundTask::DoSleepTask, &sleeping_task_low,
-                 Env::Priority::LOW);
-
-  TEST_SYNC_POINT(
-      "DBCompactionTest::BottomPriCompactionCountsTowardConcurrencyLimit:"
-      "PreTriggerCompaction");
-  for (int i = 0; i < kNumL0Files; ++i) {
-    ASSERT_OK(Put(Key(0), "val"));
-    ASSERT_OK(Flush());
-  }
-  ASSERT_EQ(0u, env_->GetThreadPoolQueueLen(Env::Priority::LOW));
-  TEST_SYNC_POINT(
-      "DBCompactionTest::BottomPriCompactionCountsTowardConcurrencyLimit:"
-      "PostTriggerCompaction");
-
-  sleeping_task_low.WakeUp();
-  sleeping_task_low.WaitUntilDone();
-  compact_range_thread.join();
-}
-
 #endif  // !defined(ROCKSDB_LITE)

 }  // namespace ROCKSDB_NAMESPACE
@@ -13,16 +13,16 @@
 #if !defined(ROCKSDB_LITE)

 #include "db/db_test_util.h"
+#include "env/mock_env.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
-#include "rocksdb/env.h"
 #include "util/random.h"

 namespace ROCKSDB_NAMESPACE {
 class DBTestDynamicLevel : public DBTestBase {
 public:
  DBTestDynamicLevel()
-      : DBTestBase("db_dynamic_level_test", /*env_do_fsync=*/true) {}
+      : DBTestBase("/db_dynamic_level_test", /*env_do_fsync=*/true) {}
 };

 TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase) {
@@ -30,7 +30,7 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase) {
    return;
  }
  // Use InMemoryEnv, or it would be too slow.
-  std::unique_ptr<Env> env(NewMemEnv(env_));
+  std::unique_ptr<Env> env(new MockEnv(env_));

  const int kNKeys = 1000;
  int keys[kNKeys];
@@ -17,7 +17,7 @@ namespace ROCKSDB_NAMESPACE {
 class DBEncryptionTest : public DBTestBase {
 public:
  DBEncryptionTest()
-      : DBTestBase("db_encryption_test", /*env_do_fsync=*/true) {}
+      : DBTestBase("/db_encryption_test", /*env_do_fsync=*/true) {}
  Env* GetTargetEnv() {
    if (encrypted_env_ != nullptr) {
      return (static_cast<EnvWrapper*>(encrypted_env_))->target();
@@ -6,67 +6,23 @@

 #ifndef ROCKSDB_LITE

+#include <stdint.h>
 #include <algorithm>
-#include <cstdint>
-#include <memory>
+#include <cinttypes>
 #include <string>
-#include <vector>
-
 #include "db/db_impl/db_impl.h"
 #include "db/job_context.h"
 #include "db/version_set.h"
 #include "file/file_util.h"
 #include "file/filename.h"
-#include "logging/logging.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
-#include "rocksdb/metadata.h"
-#include "rocksdb/types.h"
 #include "test_util/sync_point.h"
-#include "util/file_checksum_helper.h"
 #include "util/mutexlock.h"

 namespace ROCKSDB_NAMESPACE {

-Status DBImpl::FlushForGetLiveFiles() {
-  mutex_.AssertHeld();
-
-  // flush all dirty data to disk.
-  Status status;
-  if (immutable_db_options_.atomic_flush) {
-    autovector<ColumnFamilyData*> cfds;
-    SelectColumnFamiliesForAtomicFlush(&cfds);
-    mutex_.Unlock();
-    status =
-        AtomicFlushMemTables(cfds, FlushOptions(), FlushReason::kGetLiveFiles);
-    if (status.IsColumnFamilyDropped()) {
-      status = Status::OK();
-    }
-    mutex_.Lock();
-  } else {
-    for (auto cfd : *versions_->GetColumnFamilySet()) {
-      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()) {
-        status = Status::OK();
-      }
-    }
-  }
-  versions_->GetColumnFamilySet()->FreeDeadColumnFamilies();
-  return status;
-}
-
 Status DBImpl::GetLiveFiles(std::vector<std::string>& ret,
                            uint64_t* manifest_file_size,
                            bool flush_memtable) {
@@ -75,7 +31,39 @@ Status DBImpl::GetLiveFiles(std::vector<std::string>& ret,
  mutex_.Lock();

  if (flush_memtable) {
-    Status status = FlushForGetLiveFiles();
+    // flush all dirty data to disk.
+    Status status;
+    if (immutable_db_options_.atomic_flush) {
+      autovector<ColumnFamilyData*> cfds;
+      SelectColumnFamiliesForAtomicFlush(&cfds);
+      mutex_.Unlock();
+      status = AtomicFlushMemTables(cfds, FlushOptions(),
+                                    FlushReason::kGetLiveFiles);
+      if (status.IsColumnFamilyDropped()) {
+        status = Status::OK();
+      }
+      mutex_.Lock();
+    } else {
+      for (auto cfd : *versions_->GetColumnFamilySet()) {
+        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()) {
+          status = Status::OK();
+        }
+      }
+    }
+    versions_->GetColumnFamilySet()->FreeDeadColumnFamilies();
+
    if (!status.ok()) {
      mutex_.Unlock();
      ROCKS_LOG_ERROR(immutable_db_options_.info_log, "Cannot Flush data %s\n",
@@ -127,33 +115,19 @@ Status DBImpl::GetLiveFiles(std::vector<std::string>& ret,
 }

 Status DBImpl::GetSortedWalFiles(VectorLogPtr& files) {
-  // If caller disabled deletions, this function should return files that are
-  // guaranteed not to be deleted until deletions are re-enabled. We need to
-  // wait for pending purges to finish since WalManager doesn't know which
-  // files are going to be purged. Additional purges won't be scheduled as
-  // long as deletions are disabled (so the below loop must terminate).
-  // Also note that we disable deletions anyway to avoid the case where a
-  // file is deleted in the middle of the scan, causing IO error.
-  Status deletions_disabled = DisableFileDeletions();
  {
+    // If caller disabled deletions, this function should return files that are
+    // guaranteed not to be deleted until deletions are re-enabled. We need to
+    // wait for pending purges to finish since WalManager doesn't know which
+    // files are going to be purged. Additional purges won't be scheduled as
+    // long as deletions are disabled (so the below loop must terminate).
    InstrumentedMutexLock l(&mutex_);
-    while (pending_purge_obsolete_files_ > 0 || bg_purge_scheduled_ > 0) {
+    while (disable_delete_obsolete_files_ > 0 &&
+           (pending_purge_obsolete_files_ > 0 || bg_purge_scheduled_ > 0)) {
      bg_cv_.Wait();
    }
  }
-
-  Status s = wal_manager_.GetSortedWalFiles(files);
-
-  // DisableFileDeletions / EnableFileDeletions not supported in read-only DB
-  if (deletions_disabled.ok()) {
-    Status s2 = EnableFileDeletions(/*force*/ false);
-    assert(s2.ok());
-    s2.PermitUncheckedError();
-  } else {
-    assert(deletions_disabled.IsNotSupported());
-  }
-
-  return s;
+  return wal_manager_.GetSortedWalFiles(files);
 }

 Status DBImpl::GetCurrentWalFile(std::unique_ptr<LogFile>* current_log_file) {
@@ -165,245 +139,6 @@ Status DBImpl::GetCurrentWalFile(std::unique_ptr<LogFile>* current_log_file) {

  return wal_manager_.GetLiveWalFile(current_logfile_number, current_log_file);
 }
-
-Status DBImpl::GetLiveFilesStorageInfo(
-    const LiveFilesStorageInfoOptions& opts,
-    std::vector<LiveFileStorageInfo>* files) {
-  // To avoid returning partial results, only move to ouput on success
-  assert(files);
-  files->clear();
-  std::vector<LiveFileStorageInfo> results;
-
-  // NOTE: This implementation was largely migrated from Checkpoint.
-
-  Status s;
-  VectorLogPtr live_wal_files;
-  bool flush_memtable = true;
-  if (!immutable_db_options_.allow_2pc) {
-    if (opts.wal_size_for_flush == port::kMaxUint64) {
-      flush_memtable = false;
-    } else if (opts.wal_size_for_flush > 0) {
-      // If out standing log files are small, we skip the flush.
-      s = GetSortedWalFiles(live_wal_files);
-
-      if (!s.ok()) {
-        return s;
-      }
-
-      // Don't flush column families if total log size is smaller than
-      // log_size_for_flush. We copy the log files instead.
-      // We may be able to cover 2PC case too.
-      uint64_t total_wal_size = 0;
-      for (auto& wal : live_wal_files) {
-        total_wal_size += wal->SizeFileBytes();
-      }
-      if (total_wal_size < opts.wal_size_for_flush) {
-        flush_memtable = false;
-      }
-      live_wal_files.clear();
-    }
-  }
-
-  // This is a modified version of GetLiveFiles, to get access to more
-  // metadata.
-  mutex_.Lock();
-  if (flush_memtable) {
-    Status status = FlushForGetLiveFiles();
-    if (!status.ok()) {
-      mutex_.Unlock();
-      ROCKS_LOG_ERROR(immutable_db_options_.info_log, "Cannot Flush data %s\n",
-                      status.ToString().c_str());
-      return status;
-    }
-  }
-
-  // Make a set of all of the live table and blob files
-  for (auto cfd : *versions_->GetColumnFamilySet()) {
-    if (cfd->IsDropped()) {
-      continue;
-    }
-    VersionStorageInfo& vsi = *cfd->current()->storage_info();
-    auto& cf_paths = cfd->ioptions()->cf_paths;
-
-    auto GetDir = [&](size_t path_id) {
-      // Matching TableFileName() behavior
-      if (path_id >= cf_paths.size()) {
-        assert(false);
-        return cf_paths.back().path;
-      } else {
-        return cf_paths[path_id].path;
-      }
-    };
-
-    for (int level = 0; level < vsi.num_levels(); ++level) {
-      const auto& level_files = vsi.LevelFiles(level);
-      for (const auto& meta : level_files) {
-        assert(meta);
-
-        results.emplace_back();
-        LiveFileStorageInfo& info = results.back();
-
-        info.relative_filename = MakeTableFileName(meta->fd.GetNumber());
-        info.directory = GetDir(meta->fd.GetPathId());
-        info.file_number = meta->fd.GetNumber();
-        info.file_type = kTableFile;
-        info.size = meta->fd.GetFileSize();
-        if (opts.include_checksum_info) {
-          info.file_checksum_func_name = meta->file_checksum_func_name;
-          info.file_checksum = meta->file_checksum;
-          if (info.file_checksum_func_name.empty()) {
-            info.file_checksum_func_name = kUnknownFileChecksumFuncName;
-            info.file_checksum = kUnknownFileChecksum;
-          }
-        }
-        info.temperature = meta->temperature;
-      }
-    }
-    const auto& blob_files = vsi.GetBlobFiles();
-    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 = GetName();  // TODO?: support db_paths/cf_paths
-      info.file_number = meta->GetBlobFileNumber();
-      info.file_type = kBlobFile;
-      info.size = meta->GetBlobFileSize();
-      if (opts.include_checksum_info) {
-        info.file_checksum_func_name = meta->GetChecksumMethod();
-        info.file_checksum = meta->GetChecksumValue();
-        if (info.file_checksum_func_name.empty()) {
-          info.file_checksum_func_name = kUnknownFileChecksumFuncName;
-          info.file_checksum = kUnknownFileChecksum;
-        }
-      }
-      // TODO?: info.temperature
-    }
-  }
-
-  // Capture some final info before releasing mutex
-  const uint64_t manifest_number = versions_->manifest_file_number();
-  const uint64_t manifest_size = versions_->manifest_file_size();
-  const uint64_t options_number = versions_->options_file_number();
-  const uint64_t options_size = versions_->options_file_size_;
-  const uint64_t min_log_num = MinLogNumberToKeep();
-
-  mutex_.Unlock();
-
-  std::string manifest_fname = DescriptorFileName(manifest_number);
-  {  // MANIFEST
-    results.emplace_back();
-    LiveFileStorageInfo& info = results.back();
-
-    info.relative_filename = manifest_fname;
-    info.directory = GetName();
-    info.file_number = manifest_number;
-    info.file_type = kDescriptorFile;
-    info.size = manifest_size;
-    info.trim_to_size = true;
-    if (opts.include_checksum_info) {
-      info.file_checksum_func_name = kUnknownFileChecksumFuncName;
-      info.file_checksum = kUnknownFileChecksum;
-    }
-  }
-
-  {  // CURRENT
-    results.emplace_back();
-    LiveFileStorageInfo& info = results.back();
-
-    info.relative_filename = kCurrentFileName;
-    info.directory = GetName();
-    info.file_type = kCurrentFile;
-    // CURRENT could be replaced so we have to record the contents we want
-    // for it
-    info.replacement_contents = manifest_fname + "\n";
-    info.size = manifest_fname.size() + 1;
-    if (opts.include_checksum_info) {
-      info.file_checksum_func_name = kUnknownFileChecksumFuncName;
-      info.file_checksum = kUnknownFileChecksum;
-    }
-  }
-
-  // The OPTIONS file number is zero in read-write mode when OPTIONS file
-  // writing failed and the DB was configured with
-  // `fail_if_options_file_error == false`. In read-only mode the OPTIONS file
-  // number is zero when no OPTIONS file exist at all. In those cases we do not
-  // record any OPTIONS file in the live file list.
-  if (options_number != 0) {
-    results.emplace_back();
-    LiveFileStorageInfo& info = results.back();
-
-    info.relative_filename = OptionsFileName(options_number);
-    info.directory = GetName();
-    info.file_number = options_number;
-    info.file_type = kOptionsFile;
-    info.size = options_size;
-    if (opts.include_checksum_info) {
-      info.file_checksum_func_name = kUnknownFileChecksumFuncName;
-      info.file_checksum = kUnknownFileChecksum;
-    }
-  }
-
-  // Some legacy testing stuff  TODO: carefully clean up obsolete parts
-  TEST_SYNC_POINT("CheckpointImpl::CreateCheckpoint:FlushDone");
-
-  TEST_SYNC_POINT("CheckpointImpl::CreateCheckpoint:SavedLiveFiles1");
-  TEST_SYNC_POINT("CheckpointImpl::CreateCheckpoint:SavedLiveFiles2");
-
-  if (s.ok()) {
-    s = FlushWAL(false /* sync */);
-  }
-
-  TEST_SYNC_POINT("CheckpointImpl::CreateCustomCheckpoint:AfterGetLive1");
-  TEST_SYNC_POINT("CheckpointImpl::CreateCustomCheckpoint:AfterGetLive2");
-
-  // if we have more than one column family, we need to also get WAL files
-  if (s.ok()) {
-    s = GetSortedWalFiles(live_wal_files);
-  }
-  if (!s.ok()) {
-    return s;
-  }
-
-  size_t wal_size = live_wal_files.size();
-
-  ROCKS_LOG_INFO(immutable_db_options_.info_log,
-                 "Number of log files %" ROCKSDB_PRIszt, live_wal_files.size());
-
-  // Link WAL files. Copy exact size of last one because it is the only one
-  // that has changes after the last flush.
-  auto wal_dir = immutable_db_options_.GetWalDir();
-  for (size_t i = 0; s.ok() && i < wal_size; ++i) {
-    if ((live_wal_files[i]->Type() == kAliveLogFile) &&
-        (!flush_memtable || live_wal_files[i]->LogNumber() >= min_log_num)) {
-      results.emplace_back();
-      LiveFileStorageInfo& info = results.back();
-      auto f = live_wal_files[i]->PathName();
-      assert(!f.empty() && f[0] == '/');
-      info.relative_filename = f.substr(1);
-      info.directory = wal_dir;
-      info.file_number = live_wal_files[i]->LogNumber();
-      info.file_type = kWalFile;
-      info.size = live_wal_files[i]->SizeFileBytes();
-      // Only last should need to be trimmed
-      info.trim_to_size = (i + 1 == wal_size);
-      if (opts.include_checksum_info) {
-        info.file_checksum_func_name = kUnknownFileChecksumFuncName;
-        info.file_checksum = kUnknownFileChecksum;
-      }
-    }
-  }
-
-  if (s.ok()) {
-    // Only move output on success
-    *files = std::move(results);
-  }
-  return s;
-}
-
 }  // namespace ROCKSDB_NAMESPACE

 #endif  // ROCKSDB_LITE
@@ -8,7 +8,6 @@
 // found in the LICENSE file. See the AUTHORS file for names of contributors.

 #include <atomic>
-#include <limits>

 #include "db/db_impl/db_impl.h"
 #include "db/db_test_util.h"
@@ -18,7 +17,6 @@
 #include "port/stack_trace.h"
 #include "rocksdb/utilities/transaction_db.h"
 #include "test_util/sync_point.h"
-#include "test_util/testutil.h"
 #include "util/cast_util.h"
 #include "util/mutexlock.h"
 #include "utilities/fault_injection_env.h"
@@ -32,7 +30,7 @@ static std::string NEW_VALUE = "NewValue";

 class DBFlushTest : public DBTestBase {
 public:
-  DBFlushTest() : DBTestBase("db_flush_test", /*env_do_fsync=*/true) {}
+  DBFlushTest() : DBTestBase("/db_flush_test", /*env_do_fsync=*/true) {}
 };

 class DBFlushDirectIOTest : public DBFlushTest,
@@ -140,7 +138,7 @@ TEST_F(DBFlushTest, FlushInLowPriThreadPool) {
  // scheduled in the low-pri (compaction) thread pool.
  Options options = CurrentOptions();
  options.level0_file_num_compaction_trigger = 4;
-  options.memtable_factory.reset(test::NewSpecialSkipListFactory(1));
+  options.memtable_factory.reset(new SpecialSkipListFactory(1));
  Reopen(options);
  env_->SetBackgroundThreads(0, Env::HIGH);

@@ -664,87 +662,6 @@ TEST_F(DBFlushTest, StatisticsGarbageRangeDeletes) {
  Close();
 }

-#ifndef ROCKSDB_LITE
-// This simple Listener can only handle one flush at a time.
-class TestFlushListener : public EventListener {
- public:
-  TestFlushListener(Env* env, DBFlushTest* test)
-      : slowdown_count(0), stop_count(0), db_closed(), env_(env), test_(test) {
-    db_closed = false;
-  }
-
-  ~TestFlushListener() override {
-    prev_fc_info_.status.PermitUncheckedError();  // Ignore the status
-  }
-  void OnTableFileCreated(const TableFileCreationInfo& info) override {
-    // remember the info for later checking the FlushJobInfo.
-    prev_fc_info_ = info;
-    ASSERT_GT(info.db_name.size(), 0U);
-    ASSERT_GT(info.cf_name.size(), 0U);
-    ASSERT_GT(info.file_path.size(), 0U);
-    ASSERT_GT(info.job_id, 0);
-    ASSERT_GT(info.table_properties.data_size, 0U);
-    ASSERT_GT(info.table_properties.raw_key_size, 0U);
-    ASSERT_GT(info.table_properties.raw_value_size, 0U);
-    ASSERT_GT(info.table_properties.num_data_blocks, 0U);
-    ASSERT_GT(info.table_properties.num_entries, 0U);
-    ASSERT_EQ(info.file_checksum, kUnknownFileChecksum);
-    ASSERT_EQ(info.file_checksum_func_name, kUnknownFileChecksumFuncName);
-  }
-
-  void OnFlushCompleted(DB* db, const FlushJobInfo& info) override {
-    flushed_dbs_.push_back(db);
-    flushed_column_family_names_.push_back(info.cf_name);
-    if (info.triggered_writes_slowdown) {
-      slowdown_count++;
-    }
-    if (info.triggered_writes_stop) {
-      stop_count++;
-    }
-    // verify whether the previously created file matches the flushed file.
-    ASSERT_EQ(prev_fc_info_.db_name, db->GetName());
-    ASSERT_EQ(prev_fc_info_.cf_name, info.cf_name);
-    ASSERT_EQ(prev_fc_info_.job_id, info.job_id);
-    ASSERT_EQ(prev_fc_info_.file_path, info.file_path);
-    ASSERT_EQ(TableFileNameToNumber(info.file_path), info.file_number);
-
-    // Note: the following chunk relies on the notification pertaining to the
-    // database pointed to by DBTestBase::db_, and is thus bypassed when
-    // that assumption does not hold (see the test case MultiDBMultiListeners
-    // below).
-    ASSERT_TRUE(test_);
-    if (db == test_->db_) {
-      std::vector<std::vector<FileMetaData>> files_by_level;
-      test_->dbfull()->TEST_GetFilesMetaData(db->DefaultColumnFamily(),
-                                             &files_by_level);
-
-      ASSERT_FALSE(files_by_level.empty());
-      auto it = std::find_if(files_by_level[0].begin(), files_by_level[0].end(),
-                             [&](const FileMetaData& meta) {
-                               return meta.fd.GetNumber() == info.file_number;
-                             });
-      ASSERT_NE(it, files_by_level[0].end());
-      ASSERT_EQ(info.oldest_blob_file_number, it->oldest_blob_file_number);
-    }
-
-    ASSERT_EQ(db->GetEnv()->GetThreadID(), info.thread_id);
-    ASSERT_GT(info.thread_id, 0U);
-  }
-
-  std::vector<std::string> flushed_column_family_names_;
-  std::vector<DB*> flushed_dbs_;
-  int slowdown_count;
-  int stop_count;
-  bool db_closing;
-  std::atomic_bool db_closed;
-  TableFileCreationInfo prev_fc_info_;
-
- protected:
-  Env* env_;
-  DBFlushTest* test_;
-};
-#endif  // !ROCKSDB_LITE
-
 TEST_F(DBFlushTest, MemPurgeBasic) {
  Options options = CurrentOptions();

@@ -777,14 +694,10 @@ TEST_F(DBFlushTest, MemPurgeBasic) {
  // Enforce size of a single MemTable to 64MB (64MB = 67108864 bytes).
  options.write_buffer_size = 1 << 20;
  // Activate the MemPurge prototype.
-  options.experimental_mempurge_threshold = 1.0;
-#ifndef ROCKSDB_LITE
-  TestFlushListener* listener = new TestFlushListener(options.env, this);
-  options.listeners.emplace_back(listener);
-#endif  // !ROCKSDB_LITE
+  options.experimental_allow_mempurge = true;
  ASSERT_OK(TryReopen(options));
-  std::atomic<uint32_t> mempurge_count{0};
-  std::atomic<uint32_t> sst_count{0};
+  uint32_t mempurge_count = 0;
+  uint32_t sst_count = 0;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::FlushJob:MemPurgeSuccessful",
      [&](void* /*arg*/) { mempurge_count++; });
@@ -859,8 +772,10 @@ TEST_F(DBFlushTest, MemPurgeBasic) {
  // Check that there was no SST files created during flush.
  const uint32_t EXPECTED_SST_COUNT = 0;

-  EXPECT_GE(mempurge_count.exchange(0), EXPECTED_MIN_MEMPURGE_COUNT);
-  EXPECT_EQ(sst_count.exchange(0), EXPECTED_SST_COUNT);
+  EXPECT_GE(mempurge_count, EXPECTED_MIN_MEMPURGE_COUNT);
+  EXPECT_EQ(sst_count, EXPECTED_SST_COUNT);
+
+  const uint32_t mempurge_count_record = mempurge_count;

  // Insertion of of K-V pairs, no overwrites.
  for (size_t i = 0; i < NUM_REPEAT; i++) {
@@ -891,9 +806,9 @@ TEST_F(DBFlushTest, MemPurgeBasic) {
  }

  // Assert that at least one flush to storage has been performed
-  EXPECT_GT(sst_count.exchange(0), EXPECTED_SST_COUNT);
+  ASSERT_GT(sst_count, EXPECTED_SST_COUNT);
  // (which will consequently increase the number of mempurges recorded too).
-  EXPECT_GE(mempurge_count.exchange(0), EXPECTED_MIN_MEMPURGE_COUNT);
+  ASSERT_EQ(mempurge_count, mempurge_count_record);

  // Assert that there is no data corruption, even with
  // a flush to storage.
@@ -922,19 +837,15 @@ TEST_F(DBFlushTest, MemPurgeDeleteAndDeleteRange) {
  options.compression = kNoCompression;
  options.inplace_update_support = false;
  options.allow_concurrent_memtable_write = true;
-#ifndef ROCKSDB_LITE
-  TestFlushListener* listener = new TestFlushListener(options.env, this);
-  options.listeners.emplace_back(listener);
-#endif  // !ROCKSDB_LITE
+
  // Enforce size of a single MemTable to 64MB (64MB = 67108864 bytes).
  options.write_buffer_size = 1 << 20;
  // Activate the MemPurge prototype.
-  options.experimental_mempurge_threshold = 1.0;
-
+  options.experimental_allow_mempurge = true;
  ASSERT_OK(TryReopen(options));

-  std::atomic<uint32_t> mempurge_count{0};
-  std::atomic<uint32_t> sst_count{0};
+  uint32_t mempurge_count = 0;
+  uint32_t sst_count = 0;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::FlushJob:MemPurgeSuccessful",
      [&](void* /*arg*/) { mempurge_count++; });
@@ -1022,8 +933,8 @@ TEST_F(DBFlushTest, MemPurgeDeleteAndDeleteRange) {
  // Check that there was no SST files created during flush.
  const uint32_t EXPECTED_SST_COUNT = 0;

-  EXPECT_GE(mempurge_count.exchange(0), EXPECTED_MIN_MEMPURGE_COUNT);
-  EXPECT_EQ(sst_count.exchange(0), EXPECTED_SST_COUNT);
+  EXPECT_GE(mempurge_count, EXPECTED_MIN_MEMPURGE_COUNT);
+  EXPECT_EQ(sst_count, EXPECTED_SST_COUNT);

  // Additional test for the iterator+memPurge.
  ASSERT_OK(Put(KEY2, p_v2));
@@ -1123,10 +1034,7 @@ TEST_F(DBFlushTest, MemPurgeAndCompactionFilter) {
  options.compression = kNoCompression;
  options.inplace_update_support = false;
  options.allow_concurrent_memtable_write = true;
-#ifndef ROCKSDB_LITE
-  TestFlushListener* listener = new TestFlushListener(options.env, this);
-  options.listeners.emplace_back(listener);
-#endif  // !ROCKSDB_LITE
+
  // Create a ConditionalUpdate compaction filter
  // that will update all the values of the KV pairs
  // where the keys are "lower" than KEY4.
@@ -1136,12 +1044,11 @@ TEST_F(DBFlushTest, MemPurgeAndCompactionFilter) {
  // Enforce size of a single MemTable to 64MB (64MB = 67108864 bytes).
  options.write_buffer_size = 1 << 20;
  // Activate the MemPurge prototype.
-  options.experimental_mempurge_threshold = 1.0;
-
+  options.experimental_allow_mempurge = true;
  ASSERT_OK(TryReopen(options));

-  std::atomic<uint32_t> mempurge_count{0};
-  std::atomic<uint32_t> sst_count{0};
+  uint32_t mempurge_count = 0;
+  uint32_t sst_count = 0;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::FlushJob:MemPurgeSuccessful",
      [&](void* /*arg*/) { mempurge_count++; });
@@ -1187,8 +1094,8 @@ TEST_F(DBFlushTest, MemPurgeAndCompactionFilter) {
  // Check that there was no SST files created during flush.
  const uint32_t EXPECTED_SST_COUNT = 0;

-  EXPECT_GE(mempurge_count.exchange(0), EXPECTED_MIN_MEMPURGE_COUNT);
-  EXPECT_EQ(sst_count.exchange(0), EXPECTED_SST_COUNT);
+  EXPECT_GE(mempurge_count, EXPECTED_MIN_MEMPURGE_COUNT);
+  EXPECT_EQ(sst_count, EXPECTED_SST_COUNT);

  // Verify that the ConditionalUpdateCompactionFilter
  // updated the values of KEY2 and KEY3, and not KEY4 and KEY5.
@@ -1199,7 +1106,7 @@ TEST_F(DBFlushTest, MemPurgeAndCompactionFilter) {
  ASSERT_EQ(Get(KEY5), p_v5);
 }

-TEST_F(DBFlushTest, DISABLED_MemPurgeWALSupport) {
+TEST_F(DBFlushTest, MemPurgeWALSupport) {
  Options options = CurrentOptions();

  options.statistics = CreateDBStatistics();
@@ -1209,11 +1116,10 @@ TEST_F(DBFlushTest, DISABLED_MemPurgeWALSupport) {
  options.inplace_update_support = false;
  options.allow_concurrent_memtable_write = true;

-  // Enforce size of a single MemTable to 128KB.
+  // Enforce size of a single MemTable to 1MB.
  options.write_buffer_size = 128 << 10;
  // Activate the MemPurge prototype.
-  options.experimental_mempurge_threshold = 1.0;
-
+  options.experimental_allow_mempurge = true;
  ASSERT_OK(TryReopen(options));

  const size_t KVSIZE = 10;
@@ -1231,8 +1137,8 @@ TEST_F(DBFlushTest, DISABLED_MemPurgeWALSupport) {
    ASSERT_OK(Put(0, "bar", "v2"));
    ASSERT_OK(Put(1, "bar", "v2"));
    ASSERT_OK(Put(1, "foo", "v3"));
-    std::atomic<uint32_t> mempurge_count{0};
-    std::atomic<uint32_t> sst_count{0};
+    uint32_t mempurge_count = 0;
+    uint32_t sst_count = 0;
    ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
        "DBImpl::FlushJob:MemPurgeSuccessful",
        [&](void* /*arg*/) { mempurge_count++; });
@@ -1252,7 +1158,7 @@ TEST_F(DBFlushTest, DISABLED_MemPurgeWALSupport) {
    // more than would fit in maximum allowed memtables.
    Random rnd(719);
    const size_t NUM_REPEAT = 100;
-    const size_t RAND_KEY_LENGTH = 4096;
+    const size_t RAND_KEY_LENGTH = 8192;
    const size_t RAND_VALUES_LENGTH = 1024;
    std::vector<std::string> values_default(KVSIZE), values_pikachu(KVSIZE);

@@ -1328,11 +1234,8 @@ TEST_F(DBFlushTest, DISABLED_MemPurgeWALSupport) {
    // Check that there was no SST files created during flush.
    const uint32_t EXPECTED_SST_COUNT = 0;

-    EXPECT_GE(mempurge_count.exchange(0), EXPECTED_MIN_MEMPURGE_COUNT);
-    if (options.experimental_mempurge_threshold ==
-        std::numeric_limits<double>::max()) {
-      EXPECT_EQ(sst_count.exchange(0), EXPECTED_SST_COUNT);
-    }
+    EXPECT_GE(mempurge_count, EXPECTED_MIN_MEMPURGE_COUNT);
+    EXPECT_EQ(sst_count, EXPECTED_SST_COUNT);

    ReopenWithColumnFamilies({"default", "pikachu"}, options);
    // Check that there was no data corruption anywhere,
@@ -1357,7 +1260,7 @@ TEST_F(DBFlushTest, DISABLED_MemPurgeWALSupport) {
      ASSERT_OK(Put(1, RNDKEY, RNDVALUE));
    }
    // ASsert than there was at least one flush to storage.
-    EXPECT_GT(sst_count.exchange(0), EXPECTED_SST_COUNT);
+    EXPECT_GT(sst_count, EXPECTED_SST_COUNT);
    ReopenWithColumnFamilies({"default", "pikachu"}, options);
    ASSERT_EQ("v4", Get(1, "foo"));
    ASSERT_EQ("v2", Get(1, "bar"));
@@ -1379,7 +1282,7 @@ TEST_P(DBFlushDirectIOTest, DirectIO) {
  options.disable_auto_compactions = true;
  options.max_background_flushes = 2;
  options.use_direct_io_for_flush_and_compaction = GetParam();
-  options.env = MockEnv::Create(Env::Default());
+  options.env = new MockEnv(Env::Default());
  SyncPoint::GetInstance()->SetCallBack(
      "BuildTable:create_file", [&](void* arg) {
        bool* use_direct_writes = static_cast<bool*>(arg);
@@ -1532,7 +1435,7 @@ TEST_F(DBFlushTest, FireOnFlushCompletedAfterCommittedResult) {
  std::shared_ptr<TestListener> listener = std::make_shared<TestListener>();

  SyncPoint::GetInstance()->LoadDependency(
-      {{"DBImpl::FlushMemTableToOutputFile:AfterPickMemtables",
+      {{"DBImpl::BackgroundCallFlush:start",
        "DBFlushTest::FireOnFlushCompletedAfterCommittedResult:WaitFirst"},
       {"DBImpl::FlushMemTableToOutputFile:Finish",
        "DBFlushTest::FireOnFlushCompletedAfterCommittedResult:WaitSecond"}});
@@ -1608,7 +1511,7 @@ TEST_F(DBFlushTest, FlushWithBlob) {
  ASSERT_EQ(Get("key1"), short_value);
  ASSERT_EQ(Get("key2"), long_value);

-  VersionSet* const versions = dbfull()->GetVersionSet();
+  VersionSet* const versions = dbfull()->TEST_GetVersionSet();
  assert(versions);

  ColumnFamilyData* const cfd = versions->GetColumnFamilySet()->GetDefault();
@@ -1858,50 +1761,6 @@ TEST_F(DBFlushTest, FlushWithChecksumHandoffManifest2) {
  Destroy(options);
 }

-TEST_F(DBFlushTest, PickRightMemtables) {
-  Options options = CurrentOptions();
-  DestroyAndReopen(options);
-  options.create_if_missing = true;
-
-  const std::string test_cf_name = "test_cf";
-  options.max_write_buffer_number = 128;
-  CreateColumnFamilies({test_cf_name}, options);
-
-  Close();
-
-  ReopenWithColumnFamilies({kDefaultColumnFamilyName, test_cf_name}, options);
-
-  ASSERT_OK(db_->Put(WriteOptions(), "key", "value"));
-
-  ASSERT_OK(db_->Put(WriteOptions(), handles_[1], "key", "value"));
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-  SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::SyncClosedLogs:BeforeReLock", [&](void* /*arg*/) {
-        ASSERT_OK(db_->Put(WriteOptions(), handles_[1], "what", "v"));
-        auto* cfhi =
-            static_cast_with_check<ColumnFamilyHandleImpl>(handles_[1]);
-        assert(cfhi);
-        ASSERT_OK(dbfull()->TEST_SwitchMemtable(cfhi->cfd()));
-      });
-  SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::FlushMemTableToOutputFile:AfterPickMemtables", [&](void* arg) {
-        auto* job = reinterpret_cast<FlushJob*>(arg);
-        assert(job);
-        const auto& mems = job->GetMemTables();
-        assert(mems.size() == 1);
-        assert(mems[0]);
-        ASSERT_EQ(1, mems[0]->GetID());
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  ASSERT_OK(db_->Flush(FlushOptions(), handles_[1]));
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-}
-
 class DBFlushTestBlobError : public DBFlushTest,
                             public testing::WithParamInterface<std::string> {
 public:
@@ -1938,7 +1797,7 @@ TEST_P(DBFlushTestBlobError, FlushError) {
  SyncPoint::GetInstance()->DisableProcessing();
  SyncPoint::GetInstance()->ClearAllCallBacks();

-  VersionSet* const versions = dbfull()->GetVersionSet();
+  VersionSet* const versions = dbfull()->TEST_GetVersionSet();
  assert(versions);

  ColumnFamilyData* const cfd = versions->GetColumnFamilySet()->GetDefault();
@@ -2149,7 +2008,7 @@ TEST_P(DBAtomicFlushTest, PrecomputeMinLogNumberToKeepNon2PC) {
    flush_edits.push_back({});
    auto unflushed_cfh = static_cast<ColumnFamilyHandleImpl*>(handles_[1]);

-    ASSERT_EQ(PrecomputeMinLogNumberToKeepNon2PC(dbfull()->GetVersionSet(),
+    ASSERT_EQ(PrecomputeMinLogNumberToKeepNon2PC(dbfull()->TEST_GetVersionSet(),
                                                 flushed_cfds, flush_edits),
              unflushed_cfh->cfd()->GetLogNumber());
  }
@@ -2174,7 +2033,7 @@ TEST_P(DBAtomicFlushTest, PrecomputeMinLogNumberToKeepNon2PC) {
          std::min(min_log_number_to_keep, cfh->cfd()->GetLogNumber());
    }
    ASSERT_EQ(min_log_number_to_keep, log_num_after_flush);
-    ASSERT_EQ(PrecomputeMinLogNumberToKeepNon2PC(dbfull()->GetVersionSet(),
+    ASSERT_EQ(PrecomputeMinLogNumberToKeepNon2PC(dbfull()->TEST_GetVersionSet(),
                                                 flushed_cfds, flush_edits),
              min_log_number_to_keep);
  }
@@ -2363,7 +2222,7 @@ TEST_P(DBAtomicFlushTest, TriggerFlushAndClose) {
  options.create_if_missing = true;
  options.atomic_flush = atomic_flush;
  options.memtable_factory.reset(
-      test::NewSpecialSkipListFactory(kNumKeysTriggerFlush));
+      new SpecialSkipListFactory(kNumKeysTriggerFlush));
  CreateAndReopenWithCF({"pikachu"}, options);

  for (int i = 0; i != kNumKeysTriggerFlush; ++i) {
@@ -2482,122 +2341,6 @@ TEST_P(DBAtomicFlushTest, RollbackAfterFailToInstallResults) {
  SyncPoint::GetInstance()->ClearAllCallBacks();
 }

-// In atomic flush, concurrent bg flush threads commit to the MANIFEST in
-// serial, in the order of their picked memtables for each column family.
-// Only when a bg flush thread finds out that its memtables are the earliest
-// unflushed ones for all the included column families will this bg flush
-// thread continue to commit to MANIFEST.
-// This unit test uses sync point to coordinate the execution of two bg threads
-// executing the same sequence of functions. The interleaving are as follows.
-// time            bg1                            bg2
-//  |   pick memtables to flush
-//  |   flush memtables cf1_m1, cf2_m1
-//  |   join MANIFEST write queue
-//  |                                     pick memtabls to flush
-//  |                                     flush memtables cf1_(m1+1)
-//  |                                     join MANIFEST write queue
-//  |                                     wait to write MANIFEST
-//  |   write MANIFEST
-//  |   IO error
-//  |                                     detect IO error and stop waiting
-//  V
-TEST_P(DBAtomicFlushTest, BgThreadNoWaitAfterManifestError) {
-  bool atomic_flush = GetParam();
-  if (!atomic_flush) {
-    return;
-  }
-  auto fault_injection_env = std::make_shared<FaultInjectionTestEnv>(env_);
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.atomic_flush = true;
-  options.env = fault_injection_env.get();
-  // Set a larger value than default so that RocksDB can schedule concurrent
-  // background flush threads.
-  options.max_background_jobs = 8;
-  options.max_write_buffer_number = 8;
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  assert(2 == handles_.size());
-
-  WriteOptions write_opts;
-  write_opts.disableWAL = true;
-
-  ASSERT_OK(Put(0, "a", "v_0_a", write_opts));
-  ASSERT_OK(Put(1, "a", "v_1_a", write_opts));
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  SyncPoint::GetInstance()->LoadDependency({
-      {"BgFlushThr2:WaitToCommit", "BgFlushThr1:BeforeWriteManifest"},
-  });
-
-  std::thread::id bg_flush_thr1, bg_flush_thr2;
-  SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCallFlush:start", [&](void*) {
-        if (bg_flush_thr1 == std::thread::id()) {
-          bg_flush_thr1 = std::this_thread::get_id();
-        } else if (bg_flush_thr2 == std::thread::id()) {
-          bg_flush_thr2 = std::this_thread::get_id();
-        }
-      });
-
-  int called = 0;
-  SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::AtomicFlushMemTablesToOutputFiles:WaitToCommit", [&](void* arg) {
-        if (std::this_thread::get_id() == bg_flush_thr2) {
-          const auto* ptr = reinterpret_cast<std::pair<Status, bool>*>(arg);
-          assert(ptr);
-          if (0 == called) {
-            // When bg flush thread 2 reaches here for the first time.
-            ASSERT_OK(ptr->first);
-            ASSERT_TRUE(ptr->second);
-          } else if (1 == called) {
-            // When bg flush thread 2 reaches here for the second time.
-            ASSERT_TRUE(ptr->first.IsIOError());
-            ASSERT_FALSE(ptr->second);
-          }
-          ++called;
-          TEST_SYNC_POINT("BgFlushThr2:WaitToCommit");
-        }
-      });
-
-  SyncPoint::GetInstance()->SetCallBack(
-      "VersionSet::ProcessManifestWrites:BeforeWriteLastVersionEdit:0",
-      [&](void*) {
-        if (std::this_thread::get_id() == bg_flush_thr1) {
-          TEST_SYNC_POINT("BgFlushThr1:BeforeWriteManifest");
-        }
-      });
-
-  SyncPoint::GetInstance()->SetCallBack(
-      "VersionSet::LogAndApply:WriteManifest", [&](void*) {
-        if (std::this_thread::get_id() != bg_flush_thr1) {
-          return;
-        }
-        ASSERT_OK(db_->Put(write_opts, "b", "v_1_b"));
-
-        FlushOptions flush_opts;
-        flush_opts.wait = false;
-        std::vector<ColumnFamilyHandle*> cfhs(1, db_->DefaultColumnFamily());
-        ASSERT_OK(dbfull()->Flush(flush_opts, cfhs));
-      });
-
-  SyncPoint::GetInstance()->SetCallBack(
-      "VersionSet::ProcessManifestWrites:AfterSyncManifest", [&](void* arg) {
-        auto* ptr = reinterpret_cast<IOStatus*>(arg);
-        assert(ptr);
-        *ptr = IOStatus::IOError("Injected failure");
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  ASSERT_TRUE(dbfull()->Flush(FlushOptions(), handles_).IsIOError());
-
-  Close();
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-}
-
 INSTANTIATE_TEST_CASE_P(DBFlushDirectIOTest, DBFlushDirectIOTest,
                        testing::Bool());

@@ -8,7 +8,6 @@

 #include "db/db_impl/db_impl.h"
 #include "db/version_set.h"
-#include "logging/logging.h"
 #include "table/get_context.h"
 #include "util/cast_util.h"
Author	SHA1	Message	Date
anand76	e51db47feb	Fix a race in LRUCacheShard::Promote (#8717 ) Summary: In ```LRUCacheShard::Promote```, a reference is released outside the LRU mutex. Fix the race condition. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8717 Reviewed By: zhichao-cao Differential Revision: D30649206 Pulled By: anand1976 fbshipit-source-id: 09c0af05b2294a7fe2c02876a61b0bad6e3ada61	2021-08-31 18:06:53 -07:00
Lucian Grijincu	c3034fce32	rocksdb: don't call LZ4_loadDictHC with null dictionary Summary: UBSAN revealed a pointer underflow when `LZ4HC_init_internal` is called with a null `start`. Reviewed By: ajkr Differential Revision: D30181874 fbshipit-source-id: ca9bbac1a85c58782871d7f153af733b000cc66c	2021-08-09 16:13:49 -07:00
Andrew Kryczka	2dea3dd258	update HISTORY.md release date	2021-08-09 11:34:36 -07:00
Levi Tamasi	37c4996282	Fix the sorting of KeyContexts for batched MultiGet (#8633 ) Summary: `CompareKeyContext::operator()` on the trunk has a bug: when comparing column family IDs, `lhs` is used for both sides of the comparison. This results in the `KeyContext`s getting sorted solely based on key, which in turn means that keys with the same column family do not necessarily form a single range in the sorted list. This violates an assumption of the batched `MultiGet` logic, leading to the same column family showing up multiple times in the list of `MultiGetColumnFamilyData`. The end result is the code attempting to check out the thread-local `SuperVersion` for the same CF multiple times, causing an assertion violation in debug builds and memory corruption/crash in release builds. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8633 Test Plan: `make check` Reviewed By: riversand963 Differential Revision: D30169182 Pulled By: ltamasi fbshipit-source-id: a47710652df7e95b14b40fb710924c11a8478023	2021-08-09 10:59:11 -07:00
Andrew Kryczka	53da604580	update HISTORY.md and version.h for 6.23.3	2021-08-04 17:27:29 -07:00
Andrew Kryczka	60f5a22cff	Do not attempt to rename non-existent info log (#8622 ) Summary: Previously we attempted to rename "LOG" to "LOG.old.*" without checking its existence first. "LOG" had no reason to exist in a new DB. Errors in renaming a non-existent "LOG" were swallowed via `PermitUncheckedError()` so things worked. However the storage service's error monitoring was detecting all these benign rename failures. So it is better to fix it. Also with this PR we can now distinguish rename failure for other reasons and return them. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8622 Test Plan: new unit test Reviewed By: akankshamahajan15 Differential Revision: D30115189 Pulled By: ajkr fbshipit-source-id: e2f337ffb2bd171be0203172abc8e16e7809b170	2021-08-04 17:26:19 -07:00
Levi Tamasi	2898067de8	Mention PR 8585 in HISTORY.md	2021-08-04 13:47:17 -07:00
Levi Tamasi	238a9c3f68	Bump version number to 6.23.2	2021-08-04 13:07:49 -07:00
Yanqin Jin	2511b42c7e	Fix NotifyOnFlushCompleted() for atomic flush (#8585 ) Summary: PR https://github.com/facebook/rocksdb/issues/5908 added `flush_jobs_info_` to `FlushJob` to make sure `OnFlushCompleted()` is called after committing flush results to MANIFEST. However, `flush_jobs_info_` is not updated in atomic flush, causing `NotifyOnFlushCompleted()` to skip `OnFlushCompleted()`. This PR fixes this, in a similar way to https://github.com/facebook/rocksdb/issues/5908 that handles regular flush. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8585 Test Plan: make check Reviewed By: jay-zhuang Differential Revision: D29913720 Pulled By: riversand963 fbshipit-source-id: 4ff023c98372fa2c93188d4a5c8a4e9ffa0f4dda	2021-08-04 11:24:41 -07:00
Levi Tamasi	1920121cef	Mention PR 8605 in HISTORY.md (#8619 ) Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/8619 Reviewed By: riversand963 Differential Revision: D30081937 Pulled By: ltamasi fbshipit-source-id: 57505957ae2c22d4b194aa28cb3fd261b3b39919	2021-08-04 11:20:31 -07:00
Levi Tamasi	7c393c3fc6	Fix a race in ColumnFamilyData::UnrefAndTryDelete (#8605 ) Summary: The `ColumnFamilyData::UnrefAndTryDelete` code currently on the trunk unlocks the DB mutex before destroying the `ThreadLocalPtr` holding the per-thread `SuperVersion` pointers when the only remaining reference is the back reference from `super_version_`. The idea behind this was to break the circular dependency between `ColumnFamilyData` and `SuperVersion`: when the penultimate reference goes away, `ColumnFamilyData` can clean up the `SuperVersion`, which can in turn clean up `ColumnFamilyData`. (Assuming there is a `SuperVersion` and it is not referenced by anything else.) However, unlocking the mutex throws a wrench in this plan by making it possible for another thread to jump in and take another reference to the `ColumnFamilyData`, keeping the object alive in a zombie `ThreadLocalPtr`-less state. This can cause issues like https://github.com/facebook/rocksdb/issues/8440 , https://github.com/facebook/rocksdb/issues/8382 , and might also explain the `was_last_ref` assertion failures from the `ColumnFamilySet` destructor we sometimes observe during close in our stress tests. Digging through the archives, this unlocking goes way back to 2014 (or earlier). The original rationale was that `SuperVersionUnrefHandle` used to lock the mutex so it can call `SuperVersion::Cleanup`; however, this logic turned out to be deadlock-prone. https://github.com/facebook/rocksdb/pull/3510 fixed the deadlock but left the unlocking in place. https://github.com/facebook/rocksdb/pull/6147 then introduced the circular dependency and associated cleanup logic described above (in order to enable iterators to keep the `ColumnFamilyData` for dropped column families alive), and moved the unlocking-relocking snippet to its present location in `UnrefAndTryDelete`. Finally, https://github.com/facebook/rocksdb/pull/7749 fixed a memory leak but apparently exacerbated the race by (otherwise correctly) switching to `UnrefAndTryDelete` in `SuperVersion::Cleanup`. The patch simply eliminates the unlocking and relocking, which has been unnecessary ever since https://github.com/facebook/rocksdb/issues/3510 made `SuperVersionUnrefHandle` lock-free. This closes the window during which another thread could increase the reference count, and hopefully fixes the issues above. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8605 Test Plan: Ran `make check` and stress tests locally. Reviewed By: pdillinger Differential Revision: D30051035 Pulled By: ltamasi fbshipit-source-id: 8fe559e4b4ad69fc142579f8bc393ef525918528	2021-08-04 11:00:18 -07:00
Jay Zhuang	7513e9011b	Update HISTORY.md and version.h for 6.23.1	2021-07-22 13:46:33 -07:00
Jay Zhuang	bf117c54ef	Fix an race condition during multiple DB opening (#8574 ) Summary: ObjectLibrary is shared between multiple DB instances, the Register() could have race condition. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8574 Test Plan: pass the failed test Reviewed By: ajkr Differential Revision: D29855096 Pulled By: jay-zhuang fbshipit-source-id: 541eed0bd495d2c963d858d81e7eabf1ba16153c	2021-07-22 13:43:40 -07:00