Update options.h

2026-11-06 11:02:36 -05:00 · 2022-05-03 11:18:15 -07:00 · 2022-05-03 11:07:29 -07:00
785 changed files with 21182 additions and 67689 deletions
@@ -2,6 +2,12 @@ version: 2.1

 orbs:
  win: circleci/windows@2.4.0
+  slack: circleci/slack@3.4.2
+
+aliases:
+  - &notify-on-main-failure
+    fail_only: true
+    only_for_branches: main

 commands:
  install-cmake-on-macos:
@@ -51,26 +57,67 @@ commands:

  post-steps:
    steps:
+      - slack/status: *notify-on-main-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
          path: LOG
      - run: # on fail, compress Test Logs for diagnosing the issue
-          name: Compress Test Logs
-          command: tar -cvzf t.tar.gz t
-          when: on_fail
+         name: Compress Test Logs
+         command: tar -cvzf t.tar.gz t
+         when: on_fail
      - store_artifacts: # on fail, store Test Logs for diagnosing the issue
          path: t.tar.gz
          destination: test_logs
          when: on_fail
-      - run: # store core dumps if there's any
+
+  install-clang-10:
+    steps:
+      - run:
+          name: Install Clang 10
          command: |
-            mkdir -p /tmp/core_dumps
-            cp core.* /tmp/core_dumps
-          when: on_fail
-      - store_artifacts:
-          path: /tmp/core_dumps
-          when: on_fail
+            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+            echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
+            echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
+            echo "APT::Acquire::Retries \"10\";" | sudo tee -a /etc/apt/apt.conf.d/80-retries # llvm.org unreliable
+            sudo apt-get update -y && sudo apt-get install -y clang-10
+
+  install-clang-13:
+    steps:
+      - run:
+          name: Install Clang 13
+          command: |
+            echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | sudo tee -a /etc/apt/sources.list
+            echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | sudo tee -a /etc/apt/sources.list
+            echo "APT::Acquire::Retries \"10\";" | sudo tee -a /etc/apt/apt.conf.d/80-retries # llvm.org unreliable
+            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+            sudo apt-get update -y && sudo apt-get install -y clang-13
+
+  install-gflags:
+    steps:
+      - run:
+          name: Install gflags
+          command: |
+            sudo apt-get update -y && sudo apt-get install -y libgflags-dev
+
+  install-benchmark:
+    steps:
+      - run:
+          name: Install ninja build
+          command: sudo apt-get update -y && sudo apt-get install -y ninja-build
+      - run:
+          name: Install benchmark
+          command: |
+            git clone --depth 1 --branch v1.6.1 https://github.com/google/benchmark.git ~/benchmark
+            cd ~/benchmark && mkdir build && cd build
+            cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=0
+            ninja && sudo ninja install
+
+  install-valgrind:
+    steps:
+      - run:
+          name: Install valgrind
+          command: sudo apt-get update -y && sudo apt-get install -y valgrind

  upgrade-cmake:
    steps:
@@ -80,13 +127,6 @@ commands:
            sudo apt remove --purge cmake
            sudo snap install cmake --classic

-  install-gflags:
-    steps:
-      - run:
-          name: Install gflags
-          command: |
-            sudo apt-get update -y && sudo apt-get install -y libgflags-dev
-
  install-gflags-on-macos:
    steps:
      - run:
@@ -94,64 +134,35 @@ commands:
          command: |
            HOMEBREW_NO_AUTO_UPDATE=1 brew install gflags

-  setup-folly:
+  install-gtest-parallel:
    steps:
      - run:
-          name: Checkout folly sources
+          name: Install gtest-parallel
          command: |
-            make checkout_folly
+            git clone --single-branch --branch master --depth 1 https://github.com/google/gtest-parallel.git ~/gtest-parallel
+            echo 'export PATH=$HOME/gtest-parallel:$PATH' >> $BASH_ENV

-  build-folly:
+  install-compression-libs:
    steps:
      - run:
-          name: Build folly and dependencies
+          name: Install compression libs
          command: |
-            make build_folly
+            sudo apt-get update -y && sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev

-  build-for-benchmarks:
-    steps:
-      - pre-steps
-      - run:
-          name: "Linux build for benchmarks"
-          command: #sized for the resource-class rocksdb-benchmark-sys1
-            make V=1 J=8 -j8 release
-
-  perform-benchmarks:
+  install-libprotobuf-mutator:
    steps:
      - run:
-          name: "Test low-variance benchmarks"
-          command: ./tools/benchmark_ci.py --db_dir /tmp/rocksdb-benchmark-datadir --output_dir /tmp/benchmark-results --num_keys 10000000
-          environment:
-            LD_LIBRARY_PATH: /usr/local/lib
-            # How long to run parts of the test(s)
-            DURATION_RO: 400
-            DURATION_RW: 700
-            # Keep threads within physical capacity of server (much lower than default)
-            NUM_THREADS: 1
-            MAX_BACKGROUND_JOBS: 3
-            # Don't run a couple of "optional" initial tests
-            CI_TESTS_ONLY: "true"
-            # Reduce configured size of levels to ensure more levels in the leveled compaction LSM tree
-            WRITE_BUFFER_SIZE_MB: 16
-            TARGET_FILE_SIZE_BASE_MB: 16
-            MAX_BYTES_FOR_LEVEL_BASE_MB: 64
-            # The benchmark host has 32GB memory
-            # The following values are tailored to work with that
-            # Note, tests may not exercise the targeted issues if the memory is increased on new test hosts.
-
-
-  post-benchmarks:
-    steps:
-      - store_artifacts: # store the benchmark output
-          path: /tmp/benchmark-results
-          destination: test_logs
-      - run:
-          name: Send benchmark report to visualisation
+          name: Install libprotobuf-mutator libs
          command: |
-            set +e
-            set +o pipefail
-            ./build_tools/benchmark_log_tool.py --tsvfile /tmp/benchmark-results/report.tsv --esdocument https://search-rocksdb-bench-k2izhptfeap2hjfxteolsgsynm.us-west-2.es.amazonaws.com/bench_test3_rix/_doc
-            true
+            git clone --single-branch --branch master --depth 1 git@github.com:google/libprotobuf-mutator.git ~/libprotobuf-mutator
+            cd ~/libprotobuf-mutator && mkdir build && cd build
+            cmake .. -GNinja -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang++-13 -DCMAKE_BUILD_TYPE=Release -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON
+            ninja && sudo ninja install
+      - run:
+          name: Setup environment variables
+          command: |
+            echo "export PKG_CONFIG_PATH=/usr/local/OFF/:~/libprotobuf-mutator/build/external.protobuf/lib/pkgconfig/" >> $BASH_ENV
+            echo "export PROTOC_BIN=~/libprotobuf-mutator/build/external.protobuf/bin/protoc" >> $BASH_ENV

 executors:
  windows-2xlarge:
@@ -159,21 +170,6 @@ executors:
      image: 'windows-server-2019-vs2019:stable'
      resource_class: windows.2xlarge
      shell: bash.exe
-  linux-docker:
-    docker:
-      # The image configuration is build_tools/ubuntu20_image/Dockerfile
-      # To update and build the image:
-      #  $ cd build_tools/ubuntu20_image
-      #  $ docker build -t zjay437/rocksdb:0.5 .
-      #  $ docker push zjay437/rocksdb:0.5
-      # `zjay437` is the account name for zjay@meta.com which readwrite token is shared internally. To login:
-      #  $ docker login --username zjay437
-      # Or please feel free to change it to your docker hub account for hosting the image, meta employee should already have the account and able to login with SSO.
-      # To avoid impacting the existing CI runs, please bump the version every time creating a new image
-      # to run the CI image environment locally:
-      #  $ docker run --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -it zjay437/rocksdb:0.5 bash
-      # option `--cap-add=SYS_PTRACE --security-opt seccomp=unconfined` is used to enable gdb to attach an existing process
-      - image: zjay437/rocksdb:0.6

 jobs:
  build-macos:
@@ -186,7 +182,7 @@ jobs:
      - increase-max-open-files-on-macos
      - install-gflags-on-macos
      - pre-steps-macos
-      - run: ulimit -S -n `ulimit -H -n` && OPT=-DCIRCLECI make V=1 J=32 -j32 all
+      - run: ulimit -S -n 1048576 && OPT=-DCIRCLECI make V=1 J=32 -j32 all
      - post-steps

  build-macos-cmake:
@@ -205,7 +201,7 @@ jobs:
      - pre-steps-macos
      - run:
          name: "cmake generate project file"
-          command: ulimit -S -n `ulimit -H -n` && mkdir build && cd build && cmake -DWITH_GFLAGS=1 ..
+          command: ulimit -S -n 1048576 && mkdir build && cd build && cmake -DWITH_GFLAGS=1 ..
      - run:
          name: "Build tests"
          command: cd build && make V=1 -j32
@@ -214,308 +210,303 @@ jobs:
          steps:
            - run:
                name: "Run even tests"
-                command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j32 -I 0,,2
+                command: ulimit -S -n 1048576 && cd build && ctest -j32 -I 0,,2
      - when:
          condition:
            not: << parameters.run_even_tests >>
          steps:
            - run:
                name: "Run odd tests"
-                command: ulimit -S -n `ulimit -H -n` && cd build && ctest -j32 -I 1,,2
+                command: ulimit -S -n 1048576 && cd build && ctest -j32 -I 1,,2
      - post-steps

  build-linux:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
+      - install-gflags
      - run: make V=1 J=32 -j32 check
      - post-steps

  build-linux-encrypted_env-no_compression:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
+      - install-gflags
      - run: ENCRYPTED_ENV=1 ROCKSDB_DISABLE_SNAPPY=1 ROCKSDB_DISABLE_ZLIB=1 ROCKSDB_DISABLE_BZIP=1 ROCKSDB_DISABLE_LZ4=1 ROCKSDB_DISABLE_ZSTD=1 make V=1 J=32 -j32 check
      - run: |
-          ./sst_dump --help | grep -E -q 'Supported compression types: kNoCompression$' # Verify no compiled in compression
+          ./sst_dump --help | egrep -q 'Supported compression types: kNoCompression$' # Verify no compiled in compression
      - post-steps

  build-linux-shared_lib-alt_namespace-status_checked:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
+      - install-gflags
      - run: ASSERT_STATUS_CHECKED=1 TEST_UINT128_COMPAT=1 ROCKSDB_MODIFY_NPHASH=1 LIB_MODE=shared OPT="-DROCKSDB_NAMESPACE=alternative_rocksdb_ns" make V=1 -j32 check
      - post-steps

  build-linux-release:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - checkout # check out the code in the project directory
      - run: make V=1 -j32 release
-      - run: ./db_stress --version # ensure with gflags
-      - run: make clean
-      - run: apt-get remove -y libgflags-dev
-      - run: make V=1 -j32 release
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
+      - install-gflags
+      - run: make V=1 -j32 release
+      - run: ./db_stress --version # ensure with gflags
      - post-steps

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

  build-linux-lite:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: large
    steps:
      - pre-steps
+      - install-gflags
      - run: LITE=1 make V=1 J=8 -j8 check
      - post-steps

  build-linux-lite-release:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: large
    steps:
      - checkout # check out the code in the project directory
      - run: LITE=1 make V=1 -j8 release
-      - run: ./db_stress --version # ensure with gflags
-      - run: make clean
-      - run: apt-get remove -y libgflags-dev
-      - run: LITE=1 make V=1 -j8 release
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
+      - install-gflags
+      - run: LITE=1 make V=1 -j8 release
+      - run: ./db_stress --version # ensure with gflags
      - post-steps

  build-linux-clang-no_test_run:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: xlarge
    steps:
      - checkout # check out the code in the project directory
+      - run: sudo apt-get update -y && sudo apt-get install -y clang libgflags-dev libtbb-dev
      - run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 make V=1 -j16 all
      - post-steps

  build-linux-clang10-asan:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - 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 # aligned new doesn't work for reason we haven't figured out
      - post-steps

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

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

  build-linux-valgrind:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
+      - install-gflags
+      - install-valgrind
      - run: PORTABLE=1 make V=1 -j32 valgrind_test
      - post-steps

  build-linux-clang10-clang-analyze:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
+      - install-gflags
+      - install-clang-10
+      - run: sudo apt-get update -y && sudo apt-get install -y clang-tools-10
      - run: CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 CLANG_ANALYZER="/usr/bin/clang++-10" CLANG_SCAN_BUILD=scan-build-10 USE_CLANG=1 make V=1 -j32 analyze # aligned new doesn't work for reason we haven't figured out. For unknown, reason passing "clang++-10" as CLANG_ANALYZER doesn't work, and we need a full path.
      - post-steps
-      - run:
-          name: "compress test report"
-          command: tar -cvzf scan_build_report.tar.gz scan_build_report
-          when: on_fail
-      - store_artifacts:
-          path: scan_build_report.tar.gz
-          destination: scan_build_report
-          when: on_fail
-
-  build-linux-runner:
-    machine: true
-    resource_class: facebook/rocksdb-benchmark-sys1
-    steps:
-      - pre-steps
-      - run:
-          name: "Checked Linux build (Runner)"
-          command: make V=1 J=8 -j8 check
-          environment:
-            LD_LIBRARY_PATH: /usr/local/lib
-      - post-steps

  build-linux-cmake-with-folly:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
-      - setup-folly
-      - build-folly
-      - run: (mkdir build && cd build && cmake -DUSE_FOLLY=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 .. && make V=1 -j20 && ctest -j20)
-      - post-steps
-
-  build-linux-cmake-with-folly-lite-no-test:
-    executor: linux-docker
-    resource_class: 2xlarge
-    steps:
-      - pre-steps
-      - setup-folly
-      - run: (mkdir build && cd build && cmake -DUSE_FOLLY_LITE=1 -DWITH_GFLAGS=1 .. && make V=1 -j20)
+      - install-gflags
+      - upgrade-cmake
+      - run: make checkout_folly
+      - run: (mkdir build && cd build && cmake -DUSE_FOLLY=1 -DWITH_GFLAGS=1 .. && make V=1 -j20 && ctest -j20)
      - post-steps

  build-linux-cmake-with-benchmark:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
-      - run: mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20
+      - install-gflags
+      - install-benchmark
+      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20)
      - post-steps

  build-linux-unity-and-headers:
    docker: # executor type
      - image: gcc:latest
-    environment:
-      EXTRA_CXXFLAGS: -mno-avx512f # Warnings-as-error in avx512fintrin.h, would be used on newer hardware
    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: make V=1 -j8 unity_test
+      - run: TEST_TMPDIR=/dev/shm && make V=1 -j8 unity_test
      - run: make V=1 -j8 -k check-headers # could be moved to a different build
      - post-steps

  build-linux-gcc-7-with-folly:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
-      - setup-folly
-      - build-folly
+      - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-7 g++-7 libgflags-dev
+      - run: make checkout_folly
      - run: USE_FOLLY=1 CC=gcc-7 CXX=g++-7 V=1 make -j32 check
      - post-steps

-  build-linux-gcc-7-with-folly-lite-no-test:
-    executor: linux-docker
-    resource_class: 2xlarge
-    steps:
-      - pre-steps
-      - setup-folly
-      - run: USE_FOLLY_LITE=1 CC=gcc-7 CXX=g++-7 V=1 make -j32 all
-      - post-steps
-
  build-linux-gcc-8-no_test_run:
-    executor: linux-docker
-    resource_class: 2xlarge
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
    steps:
      - pre-steps
-      - run: CC=gcc-8 CXX=g++-8 V=1 make -j32 all
-      - post-steps
-
-  build-linux-cmake-with-folly-coroutines:
-    executor: linux-docker
-    resource_class: 2xlarge
-    environment:
-      CC: gcc-10
-      CXX: g++-10
-    steps:
-      - pre-steps
-      - setup-folly
-      - build-folly
-      - run: (mkdir build && cd build && cmake -DUSE_COROUTINES=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 .. && make V=1 -j20 && ctest -j20)
+      - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-8 g++-8 libgflags-dev
+      - run: CC=gcc-8 CXX=g++-8 V=1 make -j16 all
      - post-steps

  build-linux-gcc-10-cxx20-no_test_run:
-    executor: linux-docker
-    resource_class: 2xlarge
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
    steps:
      - pre-steps
-      - run: CC=gcc-10 CXX=g++-10 V=1 ROCKSDB_CXX_STANDARD=c++20 make -j32 all
+      - run: sudo apt-get update -y && sudo apt-get install gcc-10 g++-10 libgflags-dev
+      - run: CC=gcc-10 CXX=g++-10 V=1 ROCKSDB_CXX_STANDARD=c++20 make -j16 all
      - post-steps

  build-linux-gcc-11-no_test_run:
-    executor: linux-docker
-    resource_class: 2xlarge
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
    steps:
      - pre-steps
-      - run: CC=gcc-11 CXX=g++-11 V=1 make -j32 all microbench
+      - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-11 g++-11 libgflags-dev
+      - install-benchmark
+      - run: CC=gcc-11 CXX=g++-11 V=1 make -j16 all microbench
      - post-steps

  build-linux-clang-13-no_test_run:
-    executor: linux-docker
-    resource_class: 2xlarge
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
    steps:
      - pre-steps
-      - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j32 all microbench
+      - install-clang-13
+      - install-benchmark
+      - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j16 all microbench
      - post-steps

  # Ensure ASAN+UBSAN with folly, and full testsuite with clang 13
  build-linux-clang-13-asan-ubsan-with-folly:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
-      - setup-folly
-      - build-folly
+      - install-clang-13
+      - install-gflags
+      - run: make checkout_folly
      - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 USE_FOLLY=1 COMPILE_WITH_UBSAN=1 COMPILE_WITH_ASAN=1 make -j32 check
      - post-steps

  # This job is only to make sure the microbench tests are able to run, the benchmark result is not meaningful as the CI host is changing.
  build-linux-run-microbench:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
+      - install-benchmark
      - run: DEBUG_LEVEL=0 make -j32 run_microbench
      - post-steps

  build-linux-mini-crashtest:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: large
    steps:
      - pre-steps
-      - run: ulimit -S -n `ulimit -H -n` && make V=1 -j8 CRASH_TEST_EXT_ARGS='--duration=960 --max_key=2500000' blackbox_crash_test_with_atomic_flush
-      - post-steps
-
-  build-linux-crashtest-tiered-storage-bb:
-    executor: linux-docker
-    resource_class: 2xlarge
-    steps:
-      - pre-steps
-      - run:
-          name: "run crashtest"
-          command: ulimit -S -n `ulimit -H -n` && make V=1 -j32 CRASH_TEST_EXT_ARGS=--duration=10800 blackbox_crash_test_with_tiered_storage
-          no_output_timeout: 100m
-      - post-steps
-
-  build-linux-crashtest-tiered-storage-wb:
-    executor: linux-docker
-    resource_class: 2xlarge
-    steps:
-      - pre-steps
-      - run:
-          name: "run crashtest"
-          command: ulimit -S -n `ulimit -H -n` && make V=1 -j32 CRASH_TEST_EXT_ARGS=--duration=10800 whitebox_crash_test_with_tiered_storage
-          no_output_timeout: 100m
+      - install-gflags
+      - install-compression-libs
+      - run: make V=1 -j8 CRASH_TEST_EXT_ARGS=--duration=960 blackbox_crash_test_with_atomic_flush
      - post-steps

  build-windows:
@@ -587,10 +578,14 @@ jobs:
            build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,db_test,db_test2,db_merge_operand_test,bloom_test,c_test,coding_test,crc32c_test,dynamic_bloom_test,env_basic_test,env_test,hash_test,random_test -Concurrency 16

  build-linux-java:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: large
+    environment:
+      JAVA_HOME: /usr/lib/jvm/java-1.8.0-openjdk-amd64
    steps:
      - pre-steps
+      - install-gflags
      - run:
          name: "Set Java Environment"
          command: |
@@ -604,10 +599,14 @@ jobs:
      - post-steps

  build-linux-java-static:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: large
+    environment:
+      JAVA_HOME: /usr/lib/jvm/java-1.8.0-openjdk-amd64
    steps:
      - pre-steps
+      - install-gflags
      - run:
          name: "Set Java Environment"
          command: |
@@ -642,7 +641,6 @@ jobs:
      - run:
          name: "Test RocksDBJava"
          command: make V=1 J=16 -j16 jtest
-          no_output_timeout: 20m
      - post-steps

  build-macos-java-static:
@@ -667,7 +665,6 @@ jobs:
      - run:
          name: "Build RocksDBJava x86 and ARM Static Libraries"
          command: make V=1 J=16 -j16 rocksdbjavastaticosx
-          no_output_timeout: 20m
      - post-steps

  build-macos-java-static-universal:
@@ -692,29 +689,37 @@ jobs:
      - run:
          name: "Build RocksDBJava Universal Binary Static Library"
          command: make V=1 J=16 -j16 rocksdbjavastaticosx_ub
-          no_output_timeout: 20m
      - post-steps

  build-examples:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: large
    steps:
      - pre-steps
+      - install-gflags
      - run:
          name: "Build examples"
          command: |
-            make V=1 -j4 static_lib && cd examples && make V=1 -j4
+            OPT=-DTRAVIS V=1 make -j4 static_lib && cd examples && make -j4
      - post-steps

  build-cmake-mingw:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: large
    steps:
      - pre-steps
-      - run: update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
+      - install-gflags
+      - run: sudo apt-get update -y && sudo apt-get install -y mingw-w64
+      - run: sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
      - run:
          name: "Build cmake-mingw"
          command: |
+            sudo apt-get install snapd && sudo snap install cmake --beta --classic
+            export PATH=/snap/bin:$PATH
+            sudo apt-get install -y openjdk-8-jdk
+            export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
            export PATH=$JAVA_HOME/bin:$PATH
            echo "JAVA_HOME=${JAVA_HOME}"
            which java && java -version
@@ -723,12 +728,14 @@ jobs:
      - post-steps

  build-linux-non-shm:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    environment:
      TEST_TMPDIR: /tmp/rocksdb_test_tmp
    steps:
      - pre-steps
+      - install-gflags
      - run: make V=1 -j32 check
      - post-steps

@@ -786,10 +793,13 @@ jobs:
      - post-steps

  build-format-compatible:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: 2xlarge
    steps:
      - pre-steps
+      - install-gflags
+      - install-compression-libs
      - run:
          name: "test"
          command: |
@@ -800,10 +810,14 @@ jobs:
      - post-steps

  build-fuzzers:
-    executor: linux-docker
+    machine:
+      image: ubuntu-2004:202111-02
    resource_class: large
    steps:
      - pre-steps
+      - install-clang-13
+      - run: sudo apt-get update -y && sudo apt-get install -y cmake ninja-build binutils liblzma-dev libz-dev pkg-config autoconf libtool
+      - install-libprotobuf-mutator
      - run:
          name: "Build rocksdb lib"
          command: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j4 static_lib
@@ -812,97 +826,110 @@ jobs:
          command: cd fuzz && make sst_file_writer_fuzzer db_fuzzer db_map_fuzzer
      - post-steps

-  benchmark-linux: #use a private Circle CI runner (resource_class) to run the job
-    machine: true
-    resource_class: facebook/rocksdb-benchmark-sys1
-    steps:
-      - build-for-benchmarks
-      - perform-benchmarks
-      - post-benchmarks
-
 workflows:
  version: 2
-  jobs-linux-run-tests:
+  build-linux:
    jobs:
      - build-linux
-      - build-linux-cmake-with-folly
-      - build-linux-cmake-with-folly-lite-no-test
-      - build-linux-gcc-7-with-folly
-      - build-linux-gcc-7-with-folly-lite-no-test
-      - build-linux-cmake-with-folly-coroutines
-      - build-linux-cmake-with-benchmark
-      - build-linux-encrypted_env-no_compression
-      - build-linux-lite
-  jobs-linux-run-tests-san:
+  build-linux-cmake:
+    jobs:
+      - build-linux-cmake-with-folly
+      - build-linux-cmake-with-benchmark
+  build-linux-encrypted_env-no_compression:
+    jobs:
+      - build-linux-encrypted_env-no_compression
+  build-linux-shared_lib-alt_namespace-status_checked:
    jobs:
-      - build-linux-clang10-asan
-      - build-linux-clang10-ubsan
-      - build-linux-clang10-mini-tsan
      - build-linux-shared_lib-alt_namespace-status_checked
-  jobs-linux-no-test-run:
+  build-linux-lite:
+    jobs:
+      - build-linux-lite
+  build-linux-release:
    jobs:
      - build-linux-release
+  build-linux-release-rtti:
+    jobs:
      - build-linux-release-rtti
+  build-linux-lite-release:
+    jobs:
      - build-linux-lite-release
-      - build-examples
-      - build-fuzzers
-      - build-linux-clang-no_test_run
-      - build-linux-clang-13-no_test_run
-      - build-linux-gcc-8-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
-  jobs-linux-other-checks:
+  build-linux-clang10-asan:
+    jobs:
+      - build-linux-clang10-asan
+  build-linux-clang10-mini-tsan:
+    jobs:
+      - build-linux-clang10-mini-tsan:
+          start_test: ""
+          end_test: "env_test"
+      - build-linux-clang10-mini-tsan:
+          start_test: "env_test"
+          end_test: ""
+  build-linux-clang10-ubsan:
+    jobs:
+      - build-linux-clang10-ubsan
+  build-linux-clang10-clang-analyze:
    jobs:
      - build-linux-clang10-clang-analyze
+  build-linux-unity-and-headers:
+    jobs:
      - build-linux-unity-and-headers
+  build-linux-mini-crashtest:
+    jobs:
      - build-linux-mini-crashtest
-  jobs-windows:
+  build-windows-vs2019:
    jobs:
      - build-windows:
          name: "build-windows-vs2019"
+  build-windows-vs2019-cxx20:
+    jobs:
      - build-windows:
          name: "build-windows-vs2019-cxx20"
          extra_cmake_opt: -DCMAKE_CXX_STANDARD=20
+  build-windows-vs2017:
+    jobs:
      - build-windows:
          name: "build-windows-vs2017"
          vs_year: "2017"
          cmake_generator: "Visual Studio 15 Win64"
-      - build-cmake-mingw
-  jobs-java:
+  build-java:
    jobs:
      - build-linux-java
      - build-linux-java-static
      - build-macos-java
      - build-macos-java-static
      - build-macos-java-static-universal
-  jobs-macos:
+  build-examples:
+    jobs:
+      - build-examples
+  build-linux-compilers-no_test_run:
+    jobs:
+      - build-linux-clang-no_test_run
+      - build-linux-clang-13-no_test_run
+      - build-linux-gcc-7-with-folly
+      - build-linux-gcc-8-no_test_run
+      - build-linux-gcc-10-cxx20-no_test_run
+      - build-linux-gcc-11-no_test_run
+      - build-linux-arm-cmake-no_test_run
+  build-macos:
    jobs:
      - build-macos
      - build-macos-cmake:
          run_even_tests: true
      - build-macos-cmake:
          run_even_tests: false
-  jobs-linux-arm:
+  build-cmake-mingw:
+    jobs:
+      - build-cmake-mingw
+  build-linux-arm:
    jobs:
      - build-linux-arm
  build-fuzzers:
    jobs:
      - build-fuzzers
-  benchmark-linux:
-    triggers:
-      - schedule:
-          cron: "0 * * * *"
-          filters:
-            branches:
-              only:
-                - main
-    jobs:
-      - benchmark-linux
  nightly:
    triggers:
      - schedule:
-          cron: "0 9 * * *"
+          cron: "0 0 * * *"
          filters:
            branches:
              only:
@@ -1,8 +1,5 @@
 name: Check buck targets and code format
 on: [push, pull_request]
-permissions:
-  contents: read
-
 jobs:
  check:
    name: Check TARGETS file and code format
@@ -36,6 +36,7 @@ manifest_dump
 sst_dump
 blob_dump
 block_cache_trace_analyzer
+db_with_timestamp_basic_test
 tools/block_cache_analyzer/*.pyc
 column_aware_encoding_exp
 util/build_version.cc
@@ -51,12 +52,12 @@ rocksdb_dump
 rocksdb_undump
 db_test2
 trace_analyzer
+trace_analyzer_test
 block_cache_trace_analyzer
 io_tracer_parser
 .DS_Store
 .vs
 .vscode
-.clangd

 java/out
 java/target
@@ -0,0 +1,280 @@
+dist: xenial
+language: cpp
+os:
+  - linux
+arch:
+  - arm64
+  - ppc64le
+  - s390x
+compiler:
+  - clang
+  - gcc
+cache:
+  - ccache
+
+addons:
+  apt:
+    update: true
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libgflags-dev
+      - libbz2-dev
+      - liblz4-dev
+      - libsnappy-dev
+      - liblzma-dev  # xv
+      - libzstd-dev
+      - zlib1g-dev
+
+env:
+  - TEST_GROUP=platform_dependent # 16-18 minutes
+  - TEST_GROUP=1 # 33-35 minutes
+  - TEST_GROUP=2 # 18-20 minutes
+  - TEST_GROUP=3 # 20-22 minutes
+  - TEST_GROUP=4 # 12-14 minutes
+  # Run java tests
+  - JOB_NAME=java_test # 4-11 minutes
+  # Build ROCKSDB_LITE
+  - JOB_NAME=lite_build # 3-4 minutes
+  # Build examples
+  - JOB_NAME=examples # 5-7 minutes
+  - JOB_NAME=cmake # 3-5 minutes
+  - JOB_NAME=cmake-gcc8 # 3-5 minutes
+  - JOB_NAME=cmake-gcc9 # 3-5 minutes
+  - JOB_NAME=cmake-gcc9-c++20 # 3-5 minutes
+  - JOB_NAME=cmake-mingw # 3 minutes
+
+matrix:
+  exclude:
+  - os : linux
+    arch: arm64
+    env: JOB_NAME=cmake-mingw
+  - os: linux
+    arch: ppc64le
+    env: JOB_NAME=cmake-mingw
+  - os: linux
+    arch: s390x
+    env: JOB_NAME=cmake-mingw
+  - os: linux
+    compiler: clang
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: linux
+    arch: arm64
+    env: TEST_GROUP=platform_dependent
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os : linux
+    arch: arm64
+    env: TEST_GROUP=1
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+    env: TEST_GROUP=2
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+    env: TEST_GROUP=3
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+    env: TEST_GROUP=4
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+    env: JOB_NAME=cmake
+  - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/
+    os : linux
+    arch: arm64
+    env: JOB_NAME=java_test
+  - if: type = pull_request AND commit_message !~ /FULL_CI/ AND commit_message !~ /java/
+    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
+    env: JOB_NAME=lite_build
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+    env: JOB_NAME=examples
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+    env: JOB_NAME=cmake-gcc8
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+    env: JOB_NAME=cmake-gcc9
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+    env: JOB_NAME=cmake-gcc9-c++20
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    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
+
+install:
+  -  CC=gcc-7 && CXX=g++-7
+  - if [ "${JOB_NAME}" == cmake-gcc8 ]; then
+      sudo apt-get install -y g++-8 || exit $?;
+      CC=gcc-8 && CXX=g++-8;
+    fi
+  - if [ "${JOB_NAME}" == cmake-gcc9 ] || [ "${JOB_NAME}" == cmake-gcc9-c++20 ]; then
+      sudo apt-get install -y g++-9 || exit $?;
+      CC=gcc-9 && CXX=g++-9;
+    fi
+  - if [ "${JOB_NAME}" == cmake-mingw ]; then
+      sudo apt-get install -y mingw-w64 || exit $?;
+    fi
+  - if [ "${CXX}" == "g++-7" ]; then
+      sudo apt-get install -y g++-7 || exit $?;
+    fi
+  - |
+    if [[ "${JOB_NAME}" == cmake* ]]; then
+      sudo apt-get remove -y cmake cmake-data
+      export CMAKE_DEB="cmake-3.14.5-Linux-$(uname -m).deb"
+      export CMAKE_DEB_URL="https://rocksdb-deps.s3-us-west-2.amazonaws.com/cmake/${CMAKE_DEB}"
+      curl --silent --fail --show-error --location --output "${CMAKE_DEB}" "${CMAKE_DEB_URL}" || exit $?
+      sudo dpkg -i "${CMAKE_DEB}" || exit $?
+      which cmake && cmake --version
+    fi
+  - |
+    if [[ "${JOB_NAME}" == java_test || "${JOB_NAME}" == cmake* ]]; then
+      # Ensure JDK 8
+      sudo apt-get install -y openjdk-8-jdk || exit $?
+      export PATH=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin:$PATH
+      export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+      echo "JAVA_HOME=${JAVA_HOME}"
+      which java && java -version
+      which javac && javac -version
+    fi
+
+before_script:
+  # Increase the maximum number of open file descriptors, since some tests use
+  # more FDs than the default limit.
+  - ulimit -n 8192
+
+script:
+  - date; ${CXX} --version
+  - if [ `command -v ccache` ]; then ccache -C; fi
+  - export MK_PARALLEL=4;
+    if [[ "$TRAVIS_CPU_ARCH" == s390x ]]; then
+      export MK_PARALLEL=1;
+    fi
+  - case $TEST_GROUP in
+    platform_dependent)
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=only make -j$MK_PARALLEL all_but_some_tests check_some
+      ;;
+    1)
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_END=backup_engine_test make -j$MK_PARALLEL check_some
+      ;;
+    2)
+      OPT="-DTRAVIS -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" LIB_MODE=shared V=1 make -j$MK_PARALLEL tools && OPT="-DTRAVIS -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=backup_engine_test ROCKSDBTESTS_END=db_universal_compaction_test make -j$MK_PARALLEL check_some
+      ;;
+    3)
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=db_universal_compaction_test ROCKSDBTESTS_END=table_properties_collector_test make -j$MK_PARALLEL check_some
+      ;;
+    4)
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=table_properties_collector_test make -j$MK_PARALLEL check_some
+      ;;
+    esac
+  - case $JOB_NAME in
+    java_test)
+      OPT=-DTRAVIS LIB_MODE=shared V=1 make rocksdbjava jtest
+      ;;
+    lite_build)
+      OPT='-DTRAVIS -DROCKSDB_LITE' LIB_MODE=shared V=1 make -j$MK_PARALLEL all
+      ;;
+    examples)
+      OPT=-DTRAVIS LIB_MODE=shared V=1 make -j$MK_PARALLEL static_lib && cd examples && make -j$MK_PARALLEL
+      ;;
+    cmake-mingw)
+      sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix;
+      mkdir build && cd build && cmake -DJNI=1 -DWITH_GFLAGS=OFF .. -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_SYSTEM_NAME=Windows && make -j4 rocksdb rocksdbjni
+      ;;
+    cmake*)
+      case $JOB_NAME in
+        *-c++20)
+          OPT=-DCMAKE_CXX_STANDARD=20
+          ;;
+      esac
+
+      mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=0 -DWITH_GFLAGS=0 -DWITH_BENCHMARK_TOOLS=0 -DWITH_TOOLS=0 -DWITH_CORE_TOOLS=1 .. && make -j$MK_PARALLEL && cd  .. && rm -rf build && mkdir build && cd build && cmake -DJNI=1 .. -DCMAKE_BUILD_TYPE=Release $OPT && make -j$MK_PARALLEL rocksdb rocksdbjni
+      ;;
+    esac
+notifications:
+    email:
+      - leveldb@fb.com
@@ -40,8 +40,6 @@ include(GoogleTest)
 get_rocksdb_version(rocksdb_VERSION)
 project(rocksdb
  VERSION ${rocksdb_VERSION}
-  DESCRIPTION "An embeddable persistent key-value store for fast storage"
-  HOMEPAGE_URL https://rocksdb.org/
  LANGUAGES CXX C ASM)

 if(POLICY CMP0042)
@@ -74,7 +72,6 @@ option(WITH_WINDOWS_UTF8_FILENAMES "use UTF8 as characterset for opening files,
 if (WITH_WINDOWS_UTF8_FILENAMES)
  add_definitions(-DROCKSDB_WINDOWS_UTF8_FILENAMES)
 endif()
-option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)

 if ($ENV{CIRCLECI})
  message(STATUS "Build for CircieCI env, a few tests may be disabled")
@@ -90,11 +87,7 @@ include(CMakeDependentOption)
 if(MSVC)
  option(WITH_GFLAGS "build with GFlags" OFF)
  option(WITH_XPRESS "build with windows built in compression" OFF)
-  option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF)
-
-  if(NOT ROCKSDB_SKIP_THIRDPARTY)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc)
-  endif()
+  include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc)
 else()
  if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
    # FreeBSD has jemalloc as default malloc
@@ -195,7 +188,7 @@ else()
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes")
  endif()
  if(MINGW)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format -fno-asynchronous-unwind-tables")
    add_definitions(-D_POSIX_C_SOURCE=1)
  endif()
  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -342,6 +335,9 @@ endif()
 # Reset the required flags
 set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})

+# thread_local is part of C++11 and later (TODO: clean up this define)
+add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
+
 option(WITH_IOSTATS_CONTEXT "Enable IO stats context" ON)
 if (NOT WITH_IOSTATS_CONTEXT)
  add_definitions(-DNIOSTATS_CONTEXT)
@@ -585,61 +581,9 @@ endif()

 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/include)
-
-if(USE_COROUTINES)
-  if(USE_FOLLY OR USE_FOLLY_LITE)
-    message(FATAL_ERROR "Please specify exactly one of USE_COROUTINES,"
-    " USE_FOLLY, and USE_FOLLY_LITE")
-  endif()
-  set(CMAKE_CXX_STANDARD 20)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcoroutines -Wno-maybe-uninitialized")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-redundant-move")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-memory-model")
-  add_compile_definitions(USE_COROUTINES)
-  set(USE_FOLLY 1)
-endif()
-
 if(USE_FOLLY)
-  if(USE_FOLLY_LITE)
-    message(FATAL_ERROR "Please specify one of USE_FOLLY or USE_FOLLY_LITE")
-  endif()
-  if(ROCKSDB_BUILD_SHARED)
-    message(FATAL_ERROR "Cannot build RocksDB shared library with folly")
-  endif()
-  set(ROCKSDB_BUILD_SHARED OFF)
-  set(GFLAGS_SHARED FALSE)
-  find_package(folly)
-  # If cmake could not find the folly-config.cmake file, fall back
-  # to looking in third-party/folly for folly and its dependencies
-  if(NOT FOLLY_LIBRARIES)
-    exec_program(python3 ${PROJECT_SOURCE_DIR}/third-party/folly ARGS
-    build/fbcode_builder/getdeps.py show-inst-dir OUTPUT_VARIABLE
-    FOLLY_INST_PATH)
-    exec_program(ls ARGS -d ${FOLLY_INST_PATH}/../boost* OUTPUT_VARIABLE
-    BOOST_INST_PATH)
-    exec_program(ls ARGS -d ${FOLLY_INST_PATH}/../fmt* OUTPUT_VARIABLE
-    FMT_INST_PATH)
-    exec_program(ls ARGS -d ${FOLLY_INST_PATH}/../gflags* OUTPUT_VARIABLE
-    GFLAGS_INST_PATH)
-    set(Boost_DIR ${BOOST_INST_PATH}/lib/cmake/Boost-1.78.0)
-    if(EXISTS ${FMT_INST_PATH}/lib64)
-      set(fmt_DIR ${FMT_INST_PATH}/lib64/cmake/fmt)
-    else()
-      set(fmt_DIR ${FMT_INST_PATH}/lib/cmake/fmt)
-    endif()
-    set(gflags_DIR ${GFLAGS_INST_PATH}/lib/cmake/gflags)
-
-    exec_program(sed ARGS -i 's/gflags_shared//g'
-    ${FOLLY_INST_PATH}/lib/cmake/folly/folly-targets.cmake)
-
-    include(${FOLLY_INST_PATH}/lib/cmake/folly/folly-config.cmake)
-  endif()
-
-  add_compile_definitions(USE_FOLLY FOLLY_NO_CONFIG HAVE_CXX11_ATOMIC)
-  list(APPEND THIRDPARTY_LIBS Folly::folly)
-  set(FOLLY_LIBS Folly::folly)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+  include_directories(${PROJECT_SOURCE_DIR}/third-party/folly)
+  add_definitions(-DUSE_FOLLY -DFOLLY_NO_CONFIG)
 endif()
 find_package(Threads REQUIRED)

@@ -650,14 +594,11 @@ set(SOURCES
        cache/cache_entry_roles.cc
        cache/cache_key.cc
        cache/cache_reservation_manager.cc
-        cache/charged_cache.cc
        cache/clock_cache.cc
        cache/compressed_secondary_cache.cc
-        cache/fast_lru_cache.cc
        cache/lru_cache.cc
        cache/sharded_cache.cc
        db/arena_wrapped_db_iter.cc
-        db/blob/blob_contents.cc
        db/blob/blob_fetcher.cc
        db/blob/blob_file_addition.cc
        db/blob/blob_file_builder.cc
@@ -669,7 +610,6 @@ set(SOURCES
        db/blob/blob_log_format.cc
        db/blob/blob_log_sequential_reader.cc
        db/blob/blob_log_writer.cc
-        db/blob/blob_source.cc
        db/blob/prefetch_buffer_collection.cc
        db/builder.cc
        db/c.cc
@@ -681,11 +621,7 @@ set(SOURCES
        db/compaction/compaction_picker_fifo.cc
        db/compaction/compaction_picker_level.cc
        db/compaction/compaction_picker_universal.cc
-        db/compaction/compaction_service_job.cc
-        db/compaction/compaction_state.cc
-        db/compaction/compaction_outputs.cc
        db/compaction/sst_partitioner.cc
-        db/compaction/subcompaction_state.cc
        db/convenience.cc
        db/db_filesnapshot.cc
        db/db_impl/compacted_db_impl.cc
@@ -720,11 +656,10 @@ set(SOURCES
        db/merge_helper.cc
        db/merge_operator.cc
        db/output_validator.cc
-        db/periodic_task_scheduler.cc
+        db/periodic_work_scheduler.cc
        db/range_del_aggregator.cc
        db/range_tombstone_fragmenter.cc
        db/repair.cc
-        db/seqno_to_time_mapping.cc
        db/snapshot_impl.cc
        db/table_cache.cc
        db/table_properties_collector.cc
@@ -736,8 +671,6 @@ set(SOURCES
        db/version_set.cc
        db/wal_edit.cc
        db/wal_manager.cc
-        db/wide/wide_column_serialization.cc
-        db/wide/wide_columns.cc
        db/write_batch.cc
        db/write_batch_base.cc
        db/write_controller.cc
@@ -800,6 +733,7 @@ set(SOURCES
        table/adaptive/adaptive_table_factory.cc
        table/block_based/binary_search_index_reader.cc
        table/block_based/block.cc
+        table/block_based/block_based_filter_block.cc
        table/block_based/block_based_table_builder.cc
        table/block_based/block_based_table_factory.cc
        table/block_based/block_based_table_iterator.cc
@@ -862,7 +796,6 @@ set(SOURCES
        trace_replay/trace_record_result.cc
        trace_replay/trace_record.cc
        trace_replay/trace_replay.cc
-        util/async_file_reader.cc
        util/cleanable.cc
        util/coding.cc
        util/compaction_job_stats_impl.cc
@@ -880,7 +813,6 @@ set(SOURCES
        util/slice.cc
        util/file_checksum_helper.cc
        util/status.cc
-        util/stderr_logger.cc
        util/string_util.cc
        util/thread_local.cc
        util/threadpool_imp.cc
@@ -1035,24 +967,19 @@ else()
    env/io_posix.cc)
 endif()

-if(USE_FOLLY_LITE)
+if(USE_FOLLY)
  list(APPEND SOURCES
    third-party/folly/folly/container/detail/F14Table.cpp
-    third-party/folly/folly/detail/Futex.cpp
    third-party/folly/folly/lang/SafeAssert.cpp
    third-party/folly/folly/lang/ToAscii.cpp
-    third-party/folly/folly/ScopeGuard.cpp
-    third-party/folly/folly/synchronization/AtomicNotification.cpp
-    third-party/folly/folly/synchronization/DistributedMutex.cpp
-    third-party/folly/folly/synchronization/ParkingLot.cpp)
-  include_directories(${PROJECT_SOURCE_DIR}/third-party/folly)
-  add_definitions(-DUSE_FOLLY -DFOLLY_NO_CONFIG)
-  list(APPEND THIRDPARTY_LIBS glog)
+    third-party/folly/folly/ScopeGuard.cpp)
 endif()

 set(ROCKSDB_STATIC_LIB rocksdb${ARTIFACT_SUFFIX})
 set(ROCKSDB_SHARED_LIB rocksdb-shared${ARTIFACT_SUFFIX})

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

 if(WIN32)
  set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
@@ -1063,36 +990,31 @@ endif()
 set(ROCKSDB_PLUGIN_EXTERNS "")
 set(ROCKSDB_PLUGIN_BUILTINS "")
 message(STATUS "ROCKSDB PLUGINS TO BUILD ${ROCKSDB_PLUGINS}")
+list(APPEND PLUGINS ${ROCKSDB_PLUGINS})
 foreach(PLUGIN IN LISTS PLUGINS)
-  set(PLUGIN_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/plugin/${PLUGIN}/")
-  message(STATUS "PLUGIN ${PLUGIN} including rocksb plugin ${PLUGIN_ROOT}")
+  set(PLUGIN_ROOT "${CMAKE_SOURCE_DIR}/plugin/${PLUGIN}/")
+  message("including rocksb plugin ${PLUGIN_ROOT}")
  set(PLUGINMKFILE "${PLUGIN_ROOT}${PLUGIN}.mk")
  if (NOT EXISTS ${PLUGINMKFILE})
-    message(FATAL_ERROR "PLUGIN ${PLUGIN} Missing plugin makefile: ${PLUGINMKFILE}")
+    message(FATAL_ERROR "Missing plugin makefile: ${PLUGINMKFILE}")
  endif()
  file(READ ${PLUGINMKFILE} PLUGINMK)
-
  string(REGEX MATCH "SOURCES = ([^\n]*)" FOO ${PLUGINMK})
  set(MK_SOURCES ${CMAKE_MATCH_1})
  separate_arguments(MK_SOURCES)
  foreach(MK_FILE IN LISTS MK_SOURCES)
    list(APPEND SOURCES "${PLUGIN_ROOT}${MK_FILE}")
-    message(STATUS "PLUGIN ${PLUGIN} Appending ${PLUGIN_ROOT}${MK_FILE} to SOURCES")
  endforeach()
-
  string(REGEX MATCH "_FUNC = ([^\n]*)" FOO ${PLUGINMK})
  if (NOT ${CMAKE_MATCH_1} STREQUAL "")
    string(APPEND ROCKSDB_PLUGIN_BUILTINS "{\"${PLUGIN}\", " ${CMAKE_MATCH_1} "},")
    string(APPEND ROCKSDB_PLUGIN_EXTERNS "int " ${CMAKE_MATCH_1} "(ROCKSDB_NAMESPACE::ObjectLibrary&, const std::string&); ")
  endif()
-
  string(REGEX MATCH "_LIBS = ([^\n]*)" FOO ${PLUGINMK})
-  separate_arguments(CMAKE_MATCH_1)
-  foreach(MK_LIB IN LISTS CMAKE_MATCH_1)
-    list(APPEND THIRDPARTY_LIBS "${MK_LIB}")
-  endforeach()
-  message(STATUS "PLUGIN ${PLUGIN} THIRDPARTY_LIBS=${THIRDPARTY_LIBS}")
-
+  if (NOT ${CMAKE_MATCH_1} STREQUAL "")
+    list(APPEND THIRDPARTY_LIBS "${CMAKE_MATCH_1}")
+  endif()
+  message("THIRDPARTY_LIBS=${THIRDPARTY_LIBS}")
  #TODO: We need to set any compile/link-time flags and add any link libraries
 endforeach()

@@ -1198,20 +1120,8 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
    COMPATIBILITY SameMajorVersion
  )

-  configure_file(
-    ${PROJECT_NAME}.pc.in
-    ${PROJECT_NAME}.pc
-    @ONLY
-  )
-
  install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

-  foreach (plugin ${PLUGINS})
-    foreach (header ${${plugin}_HEADERS})
-      install(FILES plugin/${plugin}/${header} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rocksdb/plugin/${plugin})
-    endforeach()
-  endforeach()
-
  install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})

  install(
@@ -1248,13 +1158,6 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
    COMPONENT devel
    DESTINATION ${package_config_destination}
  )
-
-  install(
-    FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
-    COMPONENT devel
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-  )
 endif()

 option(WITH_ALL_TESTS "Build all test, rather than a small subset" ON)
@@ -1285,7 +1188,6 @@ if(WITH_TESTS)
        db/blob/blob_file_garbage_test.cc
        db/blob/blob_file_reader_test.cc
        db/blob/blob_garbage_meter_test.cc
-        db/blob/blob_source_test.cc
        db/blob/db_blob_basic_test.cc
        db/blob/db_blob_compaction_test.cc
        db/blob/db_blob_corruption_test.cc
@@ -1298,11 +1200,9 @@ if(WITH_TESTS)
        db/compaction/compaction_iterator_test.cc
        db/compaction/compaction_picker_test.cc
        db/compaction/compaction_service_test.cc
-        db/compaction/tiered_compaction_test.cc
        db/comparator_db_test.cc
        db/corruption_test.cc
        db/cuckoo_table_db_test.cc
-        db/db_readonly_with_timestamp_test.cc
        db/db_with_timestamp_basic_test.cc
        db/db_block_cache_test.cc
        db/db_bloom_filter_test.cc
@@ -1357,9 +1257,8 @@ if(WITH_TESTS)
        db/merge_test.cc
        db/options_file_test.cc
        db/perf_context_test.cc
-        db/periodic_task_scheduler_test.cc
+        db/periodic_work_scheduler_test.cc
        db/plain_table_db_test.cc
-        db/seqno_time_test.cc
        db/prefix_test.cc
        db/range_del_aggregator_test.cc
        db/range_tombstone_fragmenter_test.cc
@@ -1370,8 +1269,6 @@ if(WITH_TESTS)
        db/version_set_test.cc
        db/wal_manager_test.cc
        db/wal_edit_test.cc
-        db/wide/db_wide_basic_test.cc
-        db/wide/wide_column_serialization_test.cc
        db/write_batch_test.cc
        db/write_callback_test.cc
        db/write_controller_test.cc
@@ -1397,6 +1294,7 @@ if(WITH_TESTS)
        options/customizable_test.cc
        options/options_settable_test.cc
        options/options_test.cc
+        table/block_based/block_based_filter_block_test.cc
        table/block_based/block_based_table_reader_test.cc
        table/block_based/block_test.cc
        table/block_based/data_block_hash_index_test.cc
@@ -1465,7 +1363,6 @@ if(WITH_TESTS)
        utilities/transactions/write_prepared_transaction_test.cc
        utilities/transactions/write_unprepared_transaction_test.cc
        utilities/transactions/lock/range/range_locking_test.cc
-        utilities/transactions/timestamped_snapshot_test.cc
        utilities/ttl/ttl_test.cc
        utilities/util_merge_operators_test.cc
        utilities/write_batch_with_index/write_batch_with_index_test.cc
@@ -1474,7 +1371,6 @@ if(WITH_TESTS)

  set(TESTUTIL_SOURCE
      db/db_test_util.cc
-      db/db_with_timestamp_test_util.cc
      monitoring/thread_status_updater_debug.cc
      table/mock_table.cc
      utilities/agg_merge/test_agg_merge.cc
@@ -1484,7 +1380,7 @@ if(WITH_TESTS)
  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
  set(TESTUTILLIB testutillib${ARTIFACT_SUFFIX})
  add_library(${TESTUTILLIB} STATIC ${TESTUTIL_SOURCE})
-  target_link_libraries(${TESTUTILLIB} ${ROCKSDB_LIB} ${FOLLY_LIBS})
+  target_link_libraries(${TESTUTILLIB} ${ROCKSDB_LIB})
  if(MSVC)
    set_target_properties(${TESTUTILLIB} PROPERTIES COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}/testutillib${ARTIFACT_SUFFIX}.pdb")
  endif()
@@ -1542,46 +1438,32 @@ if(WITH_BENCHMARK_TOOLS)
    cache/cache_bench.cc
    cache/cache_bench_tool.cc)
  target_link_libraries(cache_bench${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB} ${FOLLY_LIBS})
+    ${ROCKSDB_LIB} ${GFLAGS_LIB})

  add_executable(memtablerep_bench${ARTIFACT_SUFFIX}
    memtable/memtablerep_bench.cc)
  target_link_libraries(memtablerep_bench${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB} ${FOLLY_LIBS})
+    ${ROCKSDB_LIB} ${GFLAGS_LIB})

  add_executable(range_del_aggregator_bench${ARTIFACT_SUFFIX}
    db/range_del_aggregator_bench.cc)
  target_link_libraries(range_del_aggregator_bench${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB} ${FOLLY_LIBS})
+    ${ROCKSDB_LIB} ${GFLAGS_LIB})

  add_executable(table_reader_bench${ARTIFACT_SUFFIX}
    table/table_reader_bench.cc)
  target_link_libraries(table_reader_bench${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} testharness ${GFLAGS_LIB} ${FOLLY_LIBS})
+    ${ROCKSDB_LIB} testharness ${GFLAGS_LIB})

  add_executable(filter_bench${ARTIFACT_SUFFIX}
    util/filter_bench.cc)
  target_link_libraries(filter_bench${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB} ${FOLLY_LIBS})
+    ${ROCKSDB_LIB} ${GFLAGS_LIB})

  add_executable(hash_table_bench${ARTIFACT_SUFFIX}
    utilities/persistent_cache/hash_table_bench.cc)
  target_link_libraries(hash_table_bench${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB} ${FOLLY_LIBS})
-endif()
-
-option(WITH_TRACE_TOOLS "build with trace tools" ON)
-if(WITH_TRACE_TOOLS)
-  add_executable(block_cache_trace_analyzer_tool${ARTIFACT_SUFFIX}
-    tools/block_cache_analyzer/block_cache_trace_analyzer_tool.cc)
-  target_link_libraries(block_cache_trace_analyzer_tool${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB} ${FOLLY_LIBS})
-
-  add_executable(trace_analyzer${ARTIFACT_SUFFIX}
-    tools/trace_analyzer.cc)
-  target_link_libraries(trace_analyzer${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB} ${FOLLY_LIBS})
-
+    ${ROCKSDB_LIB} ${GFLAGS_LIB})
 endif()

 if(WITH_CORE_TOOLS OR WITH_TOOLS)
@@ -1,276 +1,19 @@
 # Rocksdb Change Log
-## 7.8.3 (11/29/2022)
-* Revert an internal change in 7.8.0 associated with some memory usage churn.
-
-## 7.8.2 (11/27/2022)
-### Behavior changes
-* Make best-efforts recovery verify SST unique ID before Version construction (#10962)
-* Fix failed memtable flush retry bug that could cause wrongly ordered updates, which would surface to writers as `Status::Corruption` in case of `force_consistency_checks=true` (default). It affects use cases that enable both parallel flush (`max_background_flushes > 1` or `max_background_jobs >= 8`) and non-default memtable count (`max_write_buffer_number > 2`).
-* Tiered Storage: fixed excessive keys written to penultimate level in non-debug builds.
-
-### Bug Fixes
-* Fixed a regression in scan for async_io. During seek, valid buffers were getting cleared causing a regression.
-* Fixed a performance regression in iterator where range tombstones after `iterate_upper_bound` is processed.
-
-## 7.8.1 (11/2/2022)
-### Bug Fixes
-* Fix memory corruption error in scans if async_io is enabled. Memory corruption happened if there is IOError while reading the data leading to empty buffer and other buffer already in progress of async read goes again for reading.
-
-## 7.8.0 (10/22/2022)
-### New Features
-* `DeleteRange()` now supports user-defined timestamp.
-* Provide support for async_io with tailing iterators when ReadOptions.tailing is enabled during scans.
-* Tiered Storage: allow data moving up from the last level to the penultimate level if the input level is penultimate level or above.
-* Added `DB::Properties::kFastBlockCacheEntryStats`, which is similar to `DB::Properties::kBlockCacheEntryStats`, except returns cached (stale) values in more cases to reduce overhead.
-* FIFO compaction now supports migrating from a multi-level DB via DB::Open(). During the migration phase, FIFO compaction picker will:
-* picks the sst file with the smallest starting key in the bottom-most non-empty level.
-* Note that during the migration phase, the file purge order will only be an approximation of "FIFO" as files in lower-level might sometime contain newer keys than files in upper-level.
-* Added an option `ignore_max_compaction_bytes_for_input` to ignore max_compaction_bytes limit when adding files to be compacted from input level. This should help reduce write amplification. The option is enabled by default.
-* Tiered Storage: allow data moving up from the last level even if it's a last level only compaction, as long as the penultimate level is empty.
-* Add a new option IOOptions.do_not_recurse that can be used by underlying file systems to skip recursing through sub directories and list only files in GetChildren API.
-* Add option `preserve_internal_time_seconds` to preserve the time information for the latest data. Which can be used to determine the age of data when `preclude_last_level_data_seconds` is enabled. The time information is attached with SST in table property `rocksdb.seqno.time.map` which can be parsed by tool ldb or sst_dump.
-
-### Bug Fixes
-* Fix a bug in io_uring_prep_cancel in AbortIO API for posix which expects sqe->addr to match with read request submitted and wrong paramter was being passed.
-* Fixed a regression in iterator performance when the entire DB is a single memtable introduced in #10449. The fix is in #10705 and #10716.
-* Fixed an optimistic transaction validation bug caused by DBImpl::GetLatestSequenceForKey() returning non-latest seq for merge (#10724).
-* Fixed a bug in iterator refresh which could segfault for DeleteRange users (#10739).
-* Fixed a bug causing manual flush with `flush_opts.wait=false` to stall when database has stopped all writes (#10001).
-* Fixed a bug in iterator refresh that was not freeing up SuperVersion, which could cause excessive resource pinniung (#10770).
-* Fixed a bug where RocksDB could be doing compaction endlessly when allow_ingest_behind is true and the bottommost level is not filled (#10767).
-* Fixed a memory safety bug in experimental HyperClockCache (#10768)
-* Fixed some cases where `ldb update_manifest` and `ldb unsafe_remove_sst_file` are not usable because they were requiring the DB files to match the existing manifest state (before updating the manifest to match a desired state).
-
-### Performance Improvements
-* Try to align the compaction output file boundaries to the next level ones, which can reduce more than 10% compaction load for the default level compaction. The feature is enabled by default, to disable, set `AdvancedColumnFamilyOptions.level_compaction_dynamic_file_size` to false. As a side effect, it can create SSTs larger than the target_file_size (capped at 2x target_file_size) or smaller files.
-* Improve RoundRobin TTL compaction, which is going to be the same as normal RoundRobin compaction to move the compaction cursor.
-* Fix a small CPU regression caused by a change that UserComparatorWrapper was made Customizable, because Customizable itself has small CPU overhead for initialization.
-* Fixed an iterator performance regression for delete range users when scanning through a consecutive sequence of range tombstones (#10877).
-
-### Behavior Changes
-* Sanitize min_write_buffer_number_to_merge to 1 if atomic flush is enabled to prevent unexpected data loss when WAL is disabled in a multi-column-family setting (#10773).
-
-### Public API changes
-* Make kXXH3 checksum the new default, because it is faster on common hardware, especially with kCRC32c affected by a performance bug in some versions of clang (https://github.com/facebook/rocksdb/issues/9891). DBs written with this new setting can be read by RocksDB 6.27 and newer.
-* Refactor the classes, APIs and data structures for block cache tracing to allow a user provided trace writer to be used. Introduced an abstract BlockCacheTraceWriter class that takes a structured BlockCacheTraceRecord. The BlockCacheTraceWriter implementation can then format and log the record in whatever way it sees fit. The default BlockCacheTraceWriterImpl does file tracing using a user provided TraceWriter. More details in rocksdb/includb/block_cache_trace_writer.h.
-
-## 7.7.0 (09/18/2022)
-### Bug Fixes
-* Fixed a hang when an operation such as `GetLiveFiles` or `CreateNewBackup` is asked to trigger and wait for memtable flush on a read-only DB. Such indirect requests for memtable flush are now ignored on a read-only DB.
-* Fixed bug where `FlushWAL(true /* sync */)` (used by `GetLiveFilesStorageInfo()`, which is used by checkpoint and backup) could cause parallel writes at the tail of a WAL file to never be synced.
-* Fix periodic_task unable to re-register the same task type, which may cause `SetOptions()` fail to update periodical_task time like: `stats_dump_period_sec`, `stats_persist_period_sec`.
-* Fixed a bug in the rocksdb.prefetched.bytes.discarded stat. It was counting the prefetch buffer size, rather than the actual number of bytes discarded from the buffer.
-* Fix bug where the directory containing CURRENT can left unsynced after CURRENT is updated to point to the latest MANIFEST, which leads to risk of unsync data loss of CURRENT.
-* Update rocksdb.multiget.io.batch.size stat in non-async MultiGet as well.
-* Fix a bug in key range overlap checking with concurrent compactions when user-defined timestamp is enabled. User-defined timestamps should be EXCLUDED when checking if two ranges overlap.
-* Fixed a bug where the blob cache prepopulating logic did not consider the secondary cache (see #10603).
-* Fixed the rocksdb.num.sst.read.per.level, rocksdb.num.index.and.filter.blocks.read.per.level and rocksdb.num.level.read.per.multiget stats in the MultiGet coroutines
-
-### Public API changes
-* Add `rocksdb_column_family_handle_get_id`, `rocksdb_column_family_handle_get_name` to get name, id of column family in C API
-* Add a new stat rocksdb.async.prefetch.abort.micros to measure time spent waiting for async prefetch reads to abort
-
-### Java API Changes
-* Add CompactionPriority.RoundRobin.
-* Revert to using the default metadata charge policy when creating an LRU cache via the Java API.
-
-### Behavior Change
-* DBOptions::verify_sst_unique_id_in_manifest is now an on-by-default feature that verifies SST file identity whenever they are opened by a DB, rather than only at DB::Open time.
-* Right now, when the option migration tool (OptionChangeMigration()) migrates to FIFO compaction, it compacts all the data into one single SST file and move to L0. This might create a problem for some users: the giant file may be soon deleted to satisfy max_table_files_size, and might cayse the DB to be almost empty. We change the behavior so that the files are cut to be smaller, but these files might not follow the data insertion order. With the change, after the migration, migrated data might not be dropped by insertion order by FIFO compaction.
-* When a block is firstly found from `CompressedSecondaryCache`, we just insert a dummy block into the primary cache and don’t erase the block from `CompressedSecondaryCache`. A standalone handle is returned to the caller. Only if the block is found again from `CompressedSecondaryCache` before the dummy block is evicted, we erase the block from `CompressedSecondaryCache` and insert it into the primary cache.
-* When a block is firstly evicted from the primary cache to `CompressedSecondaryCache`, we just insert a dummy block in `CompressedSecondaryCache`. Only if it is evicted again before the dummy block is evicted from the cache, it is treated as a hot block and is inserted into `CompressedSecondaryCache`.
-* Improved the estimation of memory used by cached blobs by taking into account the size of the object owning the blob value and also the allocator overhead if `malloc_usable_size` is available (see #10583).
-* Blob values now have their own category in the cache occupancy statistics, as opposed to being lumped into the "Misc" bucket (see #10601).
-* Change the optimize_multiget_for_io experimental ReadOptions flag to default on.
-
-### New Features
-*  RocksDB does internal auto prefetching if it notices 2 sequential reads if readahead_size is not specified. New option `num_file_reads_for_auto_readahead` is added in BlockBasedTableOptions which indicates after how many sequential reads internal auto prefetching should be start (default is 2).
-* Added new perf context counters `block_cache_standalone_handle_count`, `block_cache_real_handle_count`,`compressed_sec_cache_insert_real_count`, `compressed_sec_cache_insert_dummy_count`, `compressed_sec_cache_uncompressed_bytes`, and `compressed_sec_cache_compressed_bytes`.
-* Memory for blobs which are to be inserted into the blob cache is now allocated using the cache's allocator (see #10628 and #10647).
-* HyperClockCache is an experimental, lock-free Cache alternative for block cache that offers much improved CPU efficiency under high parallel load or high contention, with some caveats. As much as 4.5x higher ops/sec vs. LRUCache has been seen in db_bench under high parallel load.
-* `CompressedSecondaryCacheOptions::enable_custom_split_merge` is added for enabling the custom split and merge feature, which split the compressed value into chunks so that they may better fit jemalloc bins.
-
-### Performance Improvements
-* Iterator performance is improved for `DeleteRange()` users. Internally, iterator will skip to the end of a range tombstone when possible, instead of looping through each key and check individually if a key is range deleted.
-* Eliminated some allocations and copies in the blob read path. Also, `PinnableSlice` now only points to the blob value and pins the backing resource (cache entry or buffer) in all cases, instead of containing a copy of the blob value. See #10625 and #10647.
-* In case of scans with async_io enabled, few optimizations have been added to issue more asynchronous requests in parallel in order to avoid synchronous prefetching.
-* `DeleteRange()` users should see improvement in get/iterator performance from mutable memtable (see #10547).
-
-## 7.6.0 (08/19/2022)
-### New Features
-* Added `prepopulate_blob_cache` to ColumnFamilyOptions. If enabled, prepopulate warm/hot blobs which are already in memory into blob cache at the time of flush. On a flush, the blob that is in memory (in memtables) get flushed to the device. If using Direct IO, additional IO is incurred to read this blob back into memory again, which is avoided by enabling this option. This further helps if the workload exhibits high temporal locality, where most of the reads go to recently written data. This also helps in case of the remote file system since it involves network traffic and higher latencies.
-* Support using secondary cache with the blob cache. When creating a blob cache, the user can set a secondary blob cache by configuring `secondary_cache` in LRUCacheOptions.
-* Charge memory usage of blob cache when the backing cache of the blob cache and the block cache are different. If an operation reserving memory for blob cache exceeds the avaible space left in the block cache at some point (i.e, causing a cache full under `LRUCacheOptions::strict_capacity_limit` = true), creation will fail with `Status::MemoryLimit()`. To opt in this feature, enable charging `CacheEntryRole::kBlobCache` in `BlockBasedTableOptions::cache_usage_options`.
-* Improve subcompaction range partition so that it is likely to be more even. More evenly distribution of subcompaction will improve compaction throughput for some workloads. All input files' index blocks to sample some anchor key points from which we pick positions to partition the input range. This would introduce some CPU overhead in compaction preparation phase, if subcompaction is enabled, but it should be a small fraction of the CPU usage of the whole compaction process. This also brings a behavier change: subcompaction number is much more likely to maxed out than before.
-* Add CompactionPri::kRoundRobin, a compaction picking mode that cycles through all the files with a compact cursor in a round-robin manner. This feature is available since 7.5.
-* Provide support for subcompactions for user_defined_timestamp.
-* Added an option `memtable_protection_bytes_per_key` that turns on memtable per key-value checksum protection. Each memtable entry will be suffixed by a checksum that is computed during writes, and verified in reads/compaction. Detected corruption will be logged and with corruption status returned to user.
-* Added a blob-specific cache priority level - bottom level. Blobs are typically lower-value targets for caching than data blocks, since 1) with BlobDB, data blocks containing blob references conceptually form an index structure which has to be consulted before we can read the blob value, and 2) cached blobs represent only a single key-value, while cached data blocks generally contain multiple KVs. The user can specify the new option `low_pri_pool_ratio` in `LRUCacheOptions` to configure the ratio of capacity reserved for low priority cache entries (and therefore the remaining ratio is the space reserved for the bottom level), or configuring the new argument `low_pri_pool_ratio` in `NewLRUCache()` to achieve the same effect.
-
-### Public API changes
-* Removed Customizable support for RateLimiter and removed its CreateFromString() and Type() functions.
-* `CompactRangeOptions::exclusive_manual_compaction` is now false by default. This ensures RocksDB does not introduce artificial parallelism limitations by default.
-* Tiered Storage: change `bottommost_temperture` to `last_level_temperture`. The old option name is kept only for migration, please use the new option. The behavior is changed to apply temperature for the `last_level` SST files only.
-* Added a new experimental ReadOption flag called optimize_multiget_for_io, which when set attempts to reduce MultiGet latency by spawning coroutines for keys in multiple levels.
-
-### Bug Fixes
-* Fix a bug starting in 7.4.0 in which some fsync operations might be skipped in a DB after any DropColumnFamily on that DB, until it is re-opened. This can lead to data loss on power loss. (For custom FileSystem implementations, this could lead to `FSDirectory::Fsync` or `FSDirectory::Close` after the first `FSDirectory::Close`; Also, valgrind could report call to `close()` with `fd=-1`.)
-* Fix a bug where `GenericRateLimiter` could revert the bandwidth set dynamically using `SetBytesPerSecond()` when a user configures a structure enclosing it, e.g., using `GetOptionsFromString()` to configure an `Options` that references an existing `RateLimiter` object.
-* Fix race conditions in `GenericRateLimiter`.
-* Fix a bug in `FIFOCompactionPicker::PickTTLCompaction` where total_size calculating might cause underflow
-* Fix data race bug in hash linked list memtable. With this bug, read request might temporarily miss an old record in the memtable in a race condition to the hash bucket.
-* Fix a bug that `best_efforts_recovery` may fail to open the db with mmap read.
-* Fixed a bug where blobs read during compaction would pollute the cache.
-* Fixed a data race in LRUCache when used with a secondary_cache.
-* Fixed a bug where blobs read by iterators would be inserted into the cache even with the `fill_cache` read option set to false.
-* Fixed the segfault caused by `AllocateData()` in `CompressedSecondaryCache::SplitValueIntoChunks()` and `MergeChunksIntoValueTest`.
-* Fixed a bug in BlobDB where a mix of inlined and blob values could result in an incorrect value being passed to the compaction filter (see #10391).
-* Fixed a memory leak bug in stress tests caused by `FaultInjectionSecondaryCache`.
-
-### Behavior Change
-* Added checksum handshake during the copying of decompressed WAL fragment. This together with #9875, #10037, #10212, #10114 and #10319 provides end-to-end integrity protection for write batch during recovery.
-* To minimize the internal fragmentation caused by the variable size of the compressed blocks in `CompressedSecondaryCache`, the original block is split according to the jemalloc bin size in `Insert()` and then merged back in `Lookup()`.
-* PosixLogger is removed and by default EnvLogger will be used for info logging. The behavior of the two loggers should be very similar when using the default Posix Env.
-* Remove [min|max]_timestamp from VersionEdit for now since they are not tracked in MANIFEST anyway but consume two empty std::string (up to 64 bytes) for each file. Should they be added back in the future, we should store them more compactly.
-* Improve universal tiered storage compaction picker to avoid extra major compaction triggered by size amplification. If `preclude_last_level_data_seconds` is enabled, the size amplification is calculated within non last_level data only which skip the last level and use the penultimate level as the size base.
-* If an error is hit when writing to a file (append, sync, etc), RocksDB is more strict with not issuing more operations to it, except closing the file, with exceptions of some WAL file operations in error recovery path.
-* A `WriteBufferManager` constructed with `allow_stall == false` will no longer trigger write stall implicitly by thrashing until memtable count limit is reached. Instead, a column family can continue accumulating writes while that CF is flushing, which means memory may increase. Users who prefer stalling writes must now explicitly set `allow_stall == true`.
-* Add `CompressedSecondaryCache` into the stress tests.
-* Block cache keys have changed, which will cause any persistent caches to miss between versions.
-
-### Performance Improvements
-* Instead of constructing `FragmentedRangeTombstoneList` during every read operation, it is now constructed once and stored in immutable memtables. This improves speed of querying range tombstones from immutable memtables.
-* When using iterators with the integrated BlobDB implementation, blob cache handles are now released immediately when the iterator's position changes.
-* MultiGet can now do more IO in parallel by reading data blocks from SST files in multiple levels, if the optimize_multiget_for_io ReadOption flag is set.
-
-## 7.5.0 (07/15/2022)
-### New Features
-* Mempurge option flag `experimental_mempurge_threshold` is now a ColumnFamilyOptions and can now be dynamically configured using `SetOptions()`.
-* Support backward iteration when `ReadOptions::iter_start_ts` is set.
-* Provide support for ReadOptions.async_io with direct_io to improve Seek latency by using async IO to parallelize child iterator seek and doing asynchronous prefetching on sequential scans.
-* Added support for blob caching in order to cache frequently used blobs for BlobDB.
-  * User can configure the new ColumnFamilyOptions `blob_cache` to enable/disable blob caching.
-  * Either sharing the backend cache with the block cache or using a completely separate cache is supported.
-  * A new abstraction interface called `BlobSource` for blob read logic gives all users access to blobs, whether they are in the blob cache, secondary cache, or (remote) storage. Blobs can be potentially read both while handling user reads (`Get`, `MultiGet`, or iterator) and during compaction (while dealing with compaction filters, Merges, or garbage collection) but eventually all blob reads go through `Version::GetBlob` or, for MultiGet, `Version::MultiGetBlob` (and then get dispatched to the interface -- `BlobSource`).
-* Add experimental tiered compaction feature `AdvancedColumnFamilyOptions::preclude_last_level_data_seconds`, which makes sure the new data inserted within preclude_last_level_data_seconds won't be placed on cold tier (the feature is not complete).
-
-### Public API changes
-* Add metadata related structs and functions in C API, including
-  * `rocksdb_get_column_family_metadata()` and `rocksdb_get_column_family_metadata_cf()` to obtain `rocksdb_column_family_metadata_t`.
-  * `rocksdb_column_family_metadata_t` and its get functions & destroy function.
-  * `rocksdb_level_metadata_t` and its and its get functions & destroy function.
-  * `rocksdb_file_metadata_t` and its and get functions & destroy functions.
-* Add suggest_compact_range() and suggest_compact_range_cf() to C API.
-* When using block cache strict capacity limit (`LRUCache` with `strict_capacity_limit=true`), DB operations now fail with Status code `kAborted` subcode `kMemoryLimit` (`IsMemoryLimit()`) instead of `kIncomplete` (`IsIncomplete()`) when the capacity limit is reached, because Incomplete can mean other specific things for some operations. In more detail, `Cache::Insert()` now returns the updated Status code and this usually propagates through RocksDB to the user on failure.
-* NewClockCache calls temporarily return an LRUCache (with similar characteristics as the desired ClockCache). This is because ClockCache is being replaced by a new version (the old one had unknown bugs) but this is still under development.
-* Add two functions `int ReserveThreads(int threads_to_be_reserved)` and `int ReleaseThreads(threads_to_be_released)` into `Env` class. In the default implementation, both return 0. Newly added `xxxEnv` class that inherits `Env` should implement these two functions for thread reservation/releasing features.
-* Add `rocksdb_options_get_prepopulate_blob_cache` and `rocksdb_options_set_prepopulate_blob_cache` to C API.
-* Add `prepopulateBlobCache` and `setPrepopulateBlobCache` to Java API.
-
-### Bug Fixes
-* Fix a bug in which backup/checkpoint can include a WAL deleted by RocksDB.
-* Fix a bug where concurrent compactions might cause unnecessary further write stalling. In some cases, this might cause write rate to drop to minimum.
-* Fix a bug in Logger where if dbname and db_log_dir are on different filesystems, dbname creation would fail wrt to db_log_dir path returning an error and fails to open the DB.
-* Fix a CPU and memory efficiency issue introduce by https://github.com/facebook/rocksdb/pull/8336 which made InternalKeyComparator configurable as an unintended side effect.
-
-## Behavior Change
-* In leveled compaction with dynamic levelling, level multiplier is not anymore adjusted due to oversized L0. Instead, compaction score is adjusted by increasing size level target by adding incoming bytes from upper levels. This would deprioritize compactions from upper levels if more data from L0 is coming. This is to fix some unnecessary full stalling due to drastic change of level targets, while not wasting write bandwidth for compaction while writes are overloaded.
-* For track_and_verify_wals_in_manifest, revert to the original behavior before #10087: syncing of live WAL file is not tracked, and we track only the synced sizes of **closed** WALs. (PR #10330).
-* WAL compression now computes/verifies checksum during compression/decompression.
-
-### Performance Improvements
-* Rather than doing total sort against all files in a level, SortFileByOverlappingRatio() to only find the top 50 files based on score. This can improve write throughput for the use cases where data is loaded in increasing key order and there are a lot of files in one LSM-tree, where applying compaction results is the bottleneck.
-* In leveled compaction, L0->L1 trivial move will allow more than one file to be moved in one compaction. This would allow L0 files to be moved down faster when data is loaded in sequential order, making slowdown or stop condition harder to hit. Also seek L0->L1 trivial move when only some files qualify.
-* In leveled compaction, try to trivial move more than one files if possible, up to 4 files or max_compaction_bytes. This is to allow higher write throughput for some use cases where data is loaded in sequential order, where appying compaction results is the bottleneck.
-
-## 7.4.0 (06/19/2022)
-### Bug Fixes
-* Fixed a bug in calculating key-value integrity protection for users of in-place memtable updates. In particular, the affected users would be those who configure `protection_bytes_per_key > 0` on `WriteBatch` or `WriteOptions`, and configure `inplace_callback != nullptr`.
-* Fixed a bug where a snapshot taken during SST file ingestion would be unstable.
-* Fixed a bug for non-TransactionDB with avoid_flush_during_recovery = true and TransactionDB where in case of crash, min_log_number_to_keep may not change on recovery and persisting a new MANIFEST with advanced log_numbers for some column families, results in "column family inconsistency" error on second recovery. As a solution, RocksDB will persist the new MANIFEST after successfully syncing the new WAL. If a future recovery starts from the new MANIFEST, then it means the new WAL is successfully synced. Due to the sentinel empty write batch at the beginning, kPointInTimeRecovery of WAL is guaranteed to go after this point. If future recovery starts from the old MANIFEST, it means the writing the new MANIFEST failed. We won't have the "SST ahead of WAL" error.
-* Fixed a bug where RocksDB DB::Open() may creates and writes to two new MANIFEST files even before recovery succeeds. Now writes to MANIFEST are persisted only after recovery is successful.
-* Fix a race condition in WAL size tracking which is caused by an unsafe iterator access after container is changed.
-* Fix unprotected concurrent accesses to `WritableFileWriter::filesize_` by `DB::SyncWAL()` and `DB::Put()` in two write queue mode.
-* Fix a bug in WAL tracking. Before this PR (#10087), calling `SyncWAL()` on the only WAL file of the db will not log the event in MANIFEST, thus allowing a subsequent `DB::Open` even if the WAL file is missing or corrupted.
-* Fix a bug that could return wrong results with `index_type=kHashSearch` and using `SetOptions` to change the `prefix_extractor`.
-* Fixed a bug in WAL tracking with wal_compression. WAL compression writes a kSetCompressionType record which is not associated with any sequence number. As result, WalManager::GetSortedWalsOfType() will skip these WALs and not return them to caller, e.g. Checkpoint, Backup, causing the operations to fail.
-* Avoid a crash if the IDENTITY file is accidentally truncated to empty. A new DB ID will be written and generated on Open.
-* Fixed a possible corruption for users of `manual_wal_flush` and/or `FlushWAL(true /* sync */)`, together with `track_and_verify_wals_in_manifest == true`. For those users, losing unsynced data (e.g., due to power loss) could make future DB opens fail with a `Status::Corruption` complaining about missing WAL data.
-* Fixed a bug in `WriteBatchInternal::Append()` where WAL termination point in write batch was not considered and the function appends an incorrect number of checksums.
-* Fixed a crash bug introduced in 7.3.0 affecting users of MultiGet with `kDataBlockBinaryAndHash`.
-
-### Public API changes
-* Add new API GetUnixTime in Snapshot class which returns the unix time at which Snapshot is taken.
-* Add transaction `get_pinned` and `multi_get` to C API.
-* Add two-phase commit support to C API.
-* Add `rocksdb_transaction_get_writebatch_wi` and `rocksdb_transaction_rebuild_from_writebatch` to C API.
-* Add `rocksdb_options_get_blob_file_starting_level` and `rocksdb_options_set_blob_file_starting_level` to C API.
-* Add `blobFileStartingLevel` and `setBlobFileStartingLevel` to Java API.
-* Add SingleDelete for DB in C API
-* Add User Defined Timestamp in C API.
-  * `rocksdb_comparator_with_ts_create` to create timestamp aware comparator
-  * Put, Get, Delete, SingleDelete, MultiGet APIs has corresponding timestamp aware APIs with suffix `with_ts`
-  * And Add C API's for Transaction, SstFileWriter, Compaction as mentioned [here](https://github.com/facebook/rocksdb/wiki/User-defined-Timestamp-(Experimental))
-* The contract for implementations of Comparator::IsSameLengthImmediateSuccessor has been updated to work around a design bug in `auto_prefix_mode`.
-* The API documentation for `auto_prefix_mode` now notes some corner cases in which it returns different results than `total_order_seek`, due to design bugs that are not easily fixed. Users using built-in comparators and keys at least the size of a fixed prefix length are not affected.
-* Obsoleted the NUM_DATA_BLOCKS_READ_PER_LEVEL stat and introduced the NUM_LEVEL_READ_PER_MULTIGET and MULTIGET_COROUTINE_COUNT stats
-* Introduced `WriteOptions::protection_bytes_per_key`, which can be used to enable key-value integrity protection for live updates.
-
-### New Features
-* Add FileSystem::ReadAsync API in io_tracing
-* Add blob garbage collection parameters `blob_garbage_collection_policy` and `blob_garbage_collection_age_cutoff` to both force-enable and force-disable GC, as well as selectively override age cutoff when using CompactRange.
-* Add an extra sanity check in `GetSortedWalFiles()` (also used by `GetLiveFilesStorageInfo()`, `BackupEngine`, and `Checkpoint`) to reduce risk of successfully created backup or checkpoint failing to open because of missing WAL file.
-* Add a new column family option `blob_file_starting_level` to enable writing blob files during flushes and compactions starting from the specified LSM tree level.
-* Add support for timestamped snapshots (#9879)
-* Provide support for AbortIO in posix to cancel submitted asynchronous requests using io_uring.
-* Add support for rate-limiting batched `MultiGet()` APIs
-* Added several new tickers, perf context statistics, and DB properties to BlobDB
-  * Added new DB properties "rocksdb.blob-cache-capacity", "rocksdb.blob-cache-usage", "rocksdb.blob-cache-pinned-usage" to show blob cache usage.
-  * Added new perf context statistics `blob_cache_hit_count`, `blob_read_count`, `blob_read_byte`, `blob_read_time`, `blob_checksum_time` and `blob_decompress_time`.
-  * Added new tickers `BLOB_DB_CACHE_MISS`, `BLOB_DB_CACHE_HIT`, `BLOB_DB_CACHE_ADD`, `BLOB_DB_CACHE_ADD_FAILURES`, `BLOB_DB_CACHE_BYTES_READ` and `BLOB_DB_CACHE_BYTES_WRITE`.
-
-### Behavior changes
-* DB::Open(), DB::OpenAsSecondary() will fail if a Logger cannot be created (#9984)
-* DB::Write does not hold global `mutex_` if this db instance does not need to switch wal and mem-table (#7516).
-* Removed support for reading Bloom filters using obsolete block-based filter format. (Support for writing such filters was dropped in 7.0.) For good read performance on old DBs using these filters, a full compaction is required.
-* Per KV checksum in write batch is verified before a write batch is written to WAL to detect any corruption to the write batch (#10114).
-
-### Performance Improvements
-* When compiled with folly (Meta-internal integration; experimental in open source build), improve the locking performance (CPU efficiency) of LRUCache by using folly DistributedMutex in place of standard mutex.
-
-## 7.3.0 (05/20/2022)
+## Unreleased
 ### Bug Fixes
 * Fixed a bug where manual flush would block forever even though flush options had wait=false.
 * Fixed a bug where RocksDB could corrupt DBs with `avoid_flush_during_recovery == true` by removing valid WALs, leading to `Status::Corruption` with message like "SST file is ahead of WALs" when attempting to reopen.
 * Fixed a bug in async_io path where incorrect length of data is read by FilePrefetchBuffer if data is consumed from two populated buffers and request for more data is sent.
 * Fixed a CompactionFilter bug. Compaction filter used to use `Delete` to remove keys, even if the keys should be removed with `SingleDelete`. Mixing `Delete` and `SingleDelete` may cause undefined behavior.
-* Fixed a bug in `WritableFileWriter::WriteDirect` and `WritableFileWriter::WriteDirectWithChecksum`. The rate_limiter_priority specified in ReadOptions was not passed to the RateLimiter when requesting a token.
-* Fixed a bug which might cause process crash when I/O error happens when reading an index block in MultiGet().

 ### New Features
 * DB::GetLiveFilesStorageInfo is ready for production use.
 * Add new stats PREFETCHED_BYTES_DISCARDED which records number of prefetched bytes discarded by RocksDB FilePrefetchBuffer on destruction and POLL_WAIT_MICROS records wait time for FS::Poll API completion.
-* RemoteCompaction supports table_properties_collector_factories override on compaction worker.
-* Start tracking SST unique id in MANIFEST, which will be used to verify with SST properties during DB open to make sure the SST file is not overwritten or misplaced. A db option `verify_sst_unique_id_in_manifest` is introduced to enable/disable the verification, if enabled all SST files will be opened during DB-open to verify the unique id (default is false), so it's recommended to use it with `max_open_files = -1` to pre-open the files.
-* Added the ability to concurrently read data blocks from multiple files in a level in batched MultiGet. This can be enabled by setting the async_io option in ReadOptions. Using this feature requires a FileSystem that supports ReadAsync (PosixFileSystem is not supported yet for this), and for RocksDB to be compiled with folly and c++20.
-* Charge memory usage of file metadata. RocksDB holds one file metadata structure in-memory per on-disk table file. If an operation reserving memory for file metadata exceeds the avaible space left in the block
-cache at some point (i.e, causing a cache full under `LRUCacheOptions::strict_capacity_limit` = true), creation will fail with `Status::MemoryLimit()`. To opt in this feature,  enable charging `CacheEntryRole::kFileMetadata` in `BlockBasedTableOptions::cache_usage_options`.

 ### Public API changes
 * Add rollback_deletion_type_callback to TransactionDBOptions so that write-prepared transactions know whether to issue a Delete or SingleDelete to cancel a previous key written during prior prepare phase. The PR aims to prevent mixing SingleDeletes and Deletes for the same key that can lead to undefined behaviors for write-prepared transactions.
 * EXPERIMENTAL: Add new API AbortIO in file_system to abort the read requests submitted asynchronously.
 * CompactionFilter::Decision has a new value: kRemoveWithSingleDelete. If CompactionFilter returns this decision, then CompactionIterator will use `SingleDelete` to mark a key as removed.
-* Renamed CompactionFilter::Decision::kRemoveWithSingleDelete to kPurge since the latter sounds more general and hides the implementation details of how compaction iterator handles keys.
-* Added ability to specify functions for Prepare and Validate to OptionsTypeInfo.  Added methods to OptionTypeInfo to set the functions via an API.  These methods are intended for RocksDB plugin developers for configuration management.
-* Added a new immutable db options, enforce_single_del_contracts. If set to false (default is true), compaction will NOT fail due to a single delete followed by a delete for the same key. The purpose of this temporay option is to help existing use cases migrate.
-* Introduce `BlockBasedTableOptions::cache_usage_options` and use that to replace `BlockBasedTableOptions::reserve_table_builder_memory` and  `BlockBasedTableOptions::reserve_table_reader_memory`.
-* Changed `GetUniqueIdFromTableProperties` to return a 128-bit unique identifier, which will be the standard size now. The old functionality (192-bit) is available from `GetExtendedUniqueIdFromTableProperties`. Both functions are no longer "experimental" and are ready for production use.
-* In IOOptions, mark `prio` as deprecated for future removal.
-* In `file_system.h`, mark `IOPriority` as deprecated for future removal.
-* Add an option, `CompressionOptions::use_zstd_dict_trainer`, to indicate whether zstd dictionary trainer should be used for generating zstd compression dictionaries. The default value of this option is true for backward compatibility. When this option is set to false, zstd API `ZDICT_finalizeDictionary` is used to generate compression dictionaries.
-* Seek API which positions itself every LevelIterator on the correct data block in the correct SST file which can be parallelized if ReadOptions.async_io option is enabled.
-* Add new stat number_async_seek in PerfContext that indicates number of async calls made by seek to prefetch data.
-* Add support for user-defined timestamps to read only DB.

 ### Bug Fixes
 * RocksDB calls FileSystem::Poll API during FilePrefetchBuffer destruction which impacts performance as it waits for read requets completion which is not needed anymore. Calling FileSystem::AbortIO to abort those requests instead fixes that performance issue.
@@ -278,12 +21,6 @@ cache at some point (i.e, causing a cache full under `LRUCacheOptions::strict_ca

 ### Behavior changes
 * Enforce the existing contract of SingleDelete so that SingleDelete cannot be mixed with Delete because it leads to undefined behavior. Fix a number of unit tests that violate the contract but happen to pass.
-* ldb `--try_load_options` default to true if `--db` is specified and not creating a new DB, the user can still explicitly disable that by `--try_load_options=false` (or explicitly enable that by `--try_load_options`).
-* During Flush write or Compaction write/read, the WriteController is used to determine whether DB writes are stalled or slowed down. The priority (Env::IOPriority) can then be determined accordingly and be passed in IOOptions to the file system.
-
-### Performance Improvements
-* Avoid calling malloc_usable_size() in LRU Cache's mutex.
-* Reduce DB mutex holding time when finding obsolete files to delete. When a file is trivial moved to another level, the internal files will be referenced twice internally and sometimes opened twice too. If a deletion candidate file is not the last reference, we need to destroy the reference and close the file but not deleting the file. Right now we determine it by building a set of all live files. With the improvement, we check the file against all live LSM-tree versions instead.

 ## 7.2.0 (04/15/2022)
 ### Bug Fixes
@@ -6,9 +6,7 @@ This is the list of all known third-party language bindings for RocksDB. If some
    * http://pyrocksdb.readthedocs.org/en/latest/ (unmaintained)
 * Perl - https://metacpan.org/pod/RocksDB
 * Node.js - https://npmjs.org/package/rocksdb
-* Go 
-  * https://github.com/linxGnu/grocksdb
-  * https://github.com/tecbot/gorocksdb (unmaintained)
+* Go - https://github.com/tecbot/gorocksdb
 * Ruby - http://rubygems.org/gems/rocksdb-ruby
 * Haskell - https://hackage.haskell.org/package/rocksdb-haskell
 * PHP - https://github.com/Photonios/rocksdb-php
@@ -8,7 +8,7 @@

 BASH_EXISTS := $(shell which bash)
 SHELL := $(shell which bash)
-include common.mk
+include python.mk

 CLEAN_FILES = # deliberately empty, so we can append below.
 CFLAGS += ${EXTRA_CFLAGS}
@@ -136,19 +136,6 @@ CXXFLAGS += $(PLATFORM_SHARED_CFLAGS) -DROCKSDB_DLL
 CFLAGS +=  $(PLATFORM_SHARED_CFLAGS) -DROCKSDB_DLL
 endif

-GIT_COMMAND ?= git
-ifeq ($(USE_COROUTINES), 1)
-	USE_FOLLY = 1
-	# glog/logging.h requires HAVE_CXX11_ATOMIC
-	OPT += -DUSE_COROUTINES -DHAVE_CXX11_ATOMIC
-	ROCKSDB_CXX_STANDARD = c++2a
-	USE_RTTI = 1
-ifneq ($(USE_CLANG), 1)
-	ROCKSDB_CXX_STANDARD = c++20
-	PLATFORM_CXXFLAGS += -fcoroutines
-endif
-endif
-
 # if we're compiling for release, compile without debug code (-DNDEBUG)
 ifeq ($(DEBUG_LEVEL),0)
 OPT += -DNDEBUG
@@ -190,16 +177,6 @@ ifeq ($(USE_LTO), 1)
 	LDFLAGS += -flto -fuse-linker-plugin
 endif

-# `COERCE_CONTEXT_SWITCH=1` will inject spurious wakeup and
-# random length of sleep or context switch at critical
-# points (e.g, before acquring db mutex) in RocksDB.
-# In this way, it coerces as many excution orders as possible in the hope of
-# exposing the problematic excution order
-COERCE_CONTEXT_SWITCH ?= 0
-ifeq ($(COERCE_CONTEXT_SWITCH), 1)
-OPT += -DCOERCE_CONTEXT_SWITCH
-endif
-
 #-----------------------------------------------
 include src.mk

@@ -249,8 +226,6 @@ dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \
                  export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \
                  export USE_CLANG="$(USE_CLANG)"; \
                  export LIB_MODE="$(LIB_MODE)"; \
-		  export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \
-		  export USE_FOLLY="$(USE_FOLLY)"; \
                  "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
 # this file is generated by the previous line to set build flags and sources
 include make_config.mk
@@ -431,10 +406,6 @@ ifndef DISABLE_JEMALLOC
 			PLATFORM_CXXFLAGS += -DUSE_JEMALLOC
 			PLATFORM_CCFLAGS  += -DUSE_JEMALLOC
 		endif
-		ifeq ($(USE_FOLLY_LITE),1)
-			PLATFORM_CXXFLAGS += -DUSE_JEMALLOC
-			PLATFORM_CCFLAGS  += -DUSE_JEMALLOC
-		endif
 	endif
 	ifdef WITH_JEMALLOC_FLAG
 		PLATFORM_LDFLAGS += -ljemalloc
@@ -468,57 +439,10 @@ endif

 # This provides a Makefile simulation of a Meta-internal folly integration.
 # It is not validated for general use.
-#
-# USE_FOLLY links the build targets with libfolly.a. The latter could be
-# built using 'make build_folly', or built externally and specified in
-# the CXXFLAGS and EXTRA_LDFLAGS env variables. The build_detect_platform
-# script tries to detect if an external folly dependency has been specified.
-# If not, it exports FOLLY_PATH to the path of the installed Folly and
-# dependency libraries.
-#
-# USE_FOLLY_LITE cherry picks source files from Folly to include in the
-# RocksDB library. Its faster and has fewer dependencies on 3rd party
-# libraries, but with limited functionality. For example, coroutine
-# functionality is not available.
 ifeq ($(USE_FOLLY),1)
-ifeq ($(USE_FOLLY_LITE),1)
-$(error Please specify only one of USE_FOLLY and USE_FOLLY_LITE)
-endif
-ifneq ($(strip $(FOLLY_PATH)),)
-	BOOST_PATH = $(shell (ls -d $(FOLLY_PATH)/../boost*))
-	DBL_CONV_PATH = $(shell (ls -d $(FOLLY_PATH)/../double-conversion*))
-	GFLAGS_PATH = $(shell (ls -d $(FOLLY_PATH)/../gflags*))
-	GLOG_PATH = $(shell (ls -d $(FOLLY_PATH)/../glog*))
-	LIBEVENT_PATH = $(shell (ls -d $(FOLLY_PATH)/../libevent*))
-	XZ_PATH = $(shell (ls -d $(FOLLY_PATH)/../xz*))
-	LIBSODIUM_PATH = $(shell (ls -d $(FOLLY_PATH)/../libsodium*))
-	FMT_PATH = $(shell (ls -d $(FOLLY_PATH)/../fmt*))
-
-	# For some reason, glog and fmt libraries are under either lib or lib64
-	GLOG_LIB_PATH = $(shell (ls -d $(GLOG_PATH)/lib*))
-	FMT_LIB_PATH = $(shell (ls -d $(FMT_PATH)/lib*))
-
-	# AIX: pre-defined system headers are surrounded by an extern "C" block
-	ifeq ($(PLATFORM), OS_AIX)
-		PLATFORM_CCFLAGS += -I$(BOOST_PATH)/include -I$(DBL_CONV_PATH)/include -I$(GLOG_PATH)/include -I$(LIBEVENT_PATH)/include -I$(XZ_PATH)/include -I$(LIBSODIUM_PATH)/include -I$(FOLLY_PATH)/include -I$(FMT_PATH)/include
-		PLATFORM_CXXFLAGS += -I$(BOOST_PATH)/include -I$(DBL_CONV_PATH)/include -I$(GLOG_PATH)/include -I$(LIBEVENT_PATH)/include -I$(XZ_PATH)/include -I$(LIBSODIUM_PATH)/include -I$(FOLLY_PATH)/include -I$(FMT_PATH)/include
-	else
-		PLATFORM_CCFLAGS += -isystem $(BOOST_PATH)/include -isystem $(DBL_CONV_PATH)/include -isystem $(GLOG_PATH)/include -isystem $(LIBEVENT_PATH)/include -isystem $(XZ_PATH)/include -isystem $(LIBSODIUM_PATH)/include -isystem $(FOLLY_PATH)/include -isystem $(FMT_PATH)/include
-		PLATFORM_CXXFLAGS += -isystem $(BOOST_PATH)/include -isystem $(DBL_CONV_PATH)/include -isystem $(GLOG_PATH)/include -isystem $(LIBEVENT_PATH)/include -isystem $(XZ_PATH)/include -isystem $(LIBSODIUM_PATH)/include -isystem $(FOLLY_PATH)/include -isystem $(FMT_PATH)/include
+	ifeq (,$(FOLLY_DIR))
+		FOLLY_DIR = ./third-party/folly
 	endif
-
-	# Add -ldl at the end as gcc resolves a symbol in a library by searching only in libraries specified later
-	# in the command line
-	PLATFORM_LDFLAGS += $(FOLLY_PATH)/lib/libfolly.a $(BOOST_PATH)/lib/libboost_context.a $(BOOST_PATH)/lib/libboost_filesystem.a $(BOOST_PATH)/lib/libboost_atomic.a $(BOOST_PATH)/lib/libboost_program_options.a $(BOOST_PATH)/lib/libboost_regex.a $(BOOST_PATH)/lib/libboost_system.a $(BOOST_PATH)/lib/libboost_thread.a $(DBL_CONV_PATH)/lib/libdouble-conversion.a $(FMT_LIB_PATH)/libfmt.a $(GLOG_LIB_PATH)/libglog.so $(GFLAGS_PATH)/lib/libgflags.so.2.2 $(LIBEVENT_PATH)/lib/libevent-2.1.so -ldl
-	PLATFORM_LDFLAGS += -Wl,-rpath=$(GFLAGS_PATH)/lib -Wl,-rpath=$(GLOG_LIB_PATH) -Wl,-rpath=$(LIBEVENT_PATH)/lib -Wl,-rpath=$(LIBSODIUM_PATH)/lib -Wl,-rpath=$(LIBEVENT_PATH)/lib
-endif
-	PLATFORM_CCFLAGS += -DUSE_FOLLY -DFOLLY_NO_CONFIG
-	PLATFORM_CXXFLAGS += -DUSE_FOLLY -DFOLLY_NO_CONFIG
-endif
-
-ifeq ($(USE_FOLLY_LITE),1)
-	# Path to the Folly source code and include files
-	FOLLY_DIR = ./third-party/folly
 	# AIX: pre-defined system headers are surrounded by an extern "C" block
 	ifeq ($(PLATFORM), OS_AIX)
 		PLATFORM_CCFLAGS += -I$(FOLLY_DIR)
@@ -529,8 +453,6 @@ ifeq ($(USE_FOLLY_LITE),1)
 	endif
 	PLATFORM_CCFLAGS += -DUSE_FOLLY -DFOLLY_NO_CONFIG
 	PLATFORM_CXXFLAGS += -DUSE_FOLLY -DFOLLY_NO_CONFIG
-# TODO: fix linking with fbcode compiler config
-	PLATFORM_LDFLAGS += -lglog
 endif

 ifdef TEST_CACHE_LINE_SIZE
@@ -617,7 +539,7 @@ LIB_OBJECTS += $(patsubst %.c, $(OBJ_DIR)/%.o, $(LIB_SOURCES_C))
 LIB_OBJECTS += $(patsubst %.S, $(OBJ_DIR)/%.o, $(LIB_SOURCES_ASM))
 endif

-ifeq ($(USE_FOLLY_LITE),1)
+ifeq ($(USE_FOLLY),1)
  LIB_OBJECTS += $(patsubst %.cpp, $(OBJ_DIR)/%.o, $(FOLLY_SOURCES))
 endif

@@ -658,7 +580,7 @@ ifneq ($(filter check-headers, $(MAKECMDGOALS)),)
 # TODO: add/support JNI headers
 	DEV_HEADER_DIRS := $(sort include/ $(dir $(ALL_SOURCES)))
 # Some headers like in port/ are platform-specific
-	DEV_HEADERS := $(shell $(FIND) $(DEV_HEADER_DIRS) -type f -name '*.h' | grep -E -v 'port/|plugin/|lua/|range_tree/')
+	DEV_HEADERS := $(shell $(FIND) $(DEV_HEADER_DIRS) -type f -name '*.h' | egrep -v 'port/|plugin/|lua/|range_tree/')
 else
 	DEV_HEADERS :=
 endif
@@ -710,6 +632,7 @@ TESTS_PLATFORM_DEPENDENT := \
 	db_basic_test \
 	db_blob_basic_test \
 	db_encryption_test \
+	db_test2 \
 	external_sst_file_basic_test \
 	auto_roll_logger_test \
 	bloom_test \
@@ -731,6 +654,7 @@ TESTS_PLATFORM_DEPENDENT := \
 	rate_limiter_test \
 	perf_context_test \
 	iostats_context_test \
+	db_wal_test \

 # Sort ROCKSDBTESTS_SUBSET for filtering, except db_test is special (expensive)
 # so is placed first (out-of-order)
@@ -795,9 +719,9 @@ TOOLS_LIBRARY=$(STATIC_TOOLS_LIBRARY)
 endif
 STRESS_LIBRARY=$(STATIC_STRESS_LIBRARY)

-ROCKSDB_MAJOR = $(shell grep -E "ROCKSDB_MAJOR.[0-9]" include/rocksdb/version.h | cut -d ' ' -f 3)
-ROCKSDB_MINOR = $(shell grep -E "ROCKSDB_MINOR.[0-9]" include/rocksdb/version.h | cut -d ' ' -f 3)
-ROCKSDB_PATCH = $(shell grep -E "ROCKSDB_PATCH.[0-9]" include/rocksdb/version.h | cut -d ' ' -f 3)
+ROCKSDB_MAJOR = $(shell egrep "ROCKSDB_MAJOR.[0-9]" include/rocksdb/version.h | cut -d ' ' -f 3)
+ROCKSDB_MINOR = $(shell egrep "ROCKSDB_MINOR.[0-9]" include/rocksdb/version.h | cut -d ' ' -f 3)
+ROCKSDB_PATCH = $(shell egrep "ROCKSDB_PATCH.[0-9]" include/rocksdb/version.h | cut -d ' ' -f 3)

 # If NO_UPDATE_BUILD_VERSION is set we don't update util/build_version.cc, but
 # the file needs to already exist or else the build will fail
@@ -871,10 +795,17 @@ $(SHARED4): $(LIB_OBJECTS)
 	$(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLAGS)$(SHARED3) $(LIB_OBJECTS) $(LDFLAGS) -o $@
 endif  # PLATFORM_SHARED_EXT

-.PHONY: check clean coverage ldb_tests package dbg gen-pc build_size \
-	release tags tags0 valgrind_check format static_lib shared_lib all \
-	rocksdbjavastatic rocksdbjava install install-static install-shared \
-	uninstall analyze tools tools_lib check-headers checkout_folly
+.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 checkout_folly \
+	blackbox_crash_test_with_atomic_flush whitebox_crash_test_with_atomic_flush  \
+	blackbox_crash_test_with_txn whitebox_crash_test_with_txn \
+	blackbox_crash_test_with_best_efforts_recovery \
+	blackbox_crash_test_with_ts whitebox_crash_test_with_ts \
+	blackbox_crash_test_with_multiops_wc_txn \
+	blackbox_crash_test_with_multiops_wp_txn
+

 all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(TESTS)

@@ -911,6 +842,18 @@ coverage: clean
 	# Delete intermediate files
 	$(FIND) . -type f \( -name "*.gcda" -o -name "*.gcno" \) -exec rm -f {} \;

+ifneq (,$(filter check parallel_check,$(MAKECMDGOALS)),)
+# Use /dev/shm if it has the sticky bit set (otherwise, /tmp),
+# and create a randomly-named rocksdb.XXXX directory therein.
+# We'll use that directory in the "make check" rules.
+ifeq ($(TMPD),)
+TMPDIR := $(shell echo $${TMPDIR:-/tmp})
+TMPD := $(shell f=/dev/shm; test -k $$f || f=$(TMPDIR);     \
+  perl -le 'use File::Temp "tempdir";'					\
+    -e 'print tempdir("'$$f'/rocksdb.XXXX", CLEANUP => 0)')
+endif
+endif
+
 # Run all tests in parallel, accumulating per-test logs in t/log-*.
 #
 # Each t/run-* file is a tiny generated bourne shell script that invokes one of
@@ -950,7 +893,7 @@ $(parallel_tests):
 		TEST_SCRIPT=t/run-$$TEST_BINARY-$${TEST_NAME//\//-}; \
    printf '%s\n' \
      '#!/bin/sh' \
-      "d=\$(TEST_TMPDIR)$$TEST_SCRIPT" \
+      "d=\$(TMPD)$$TEST_SCRIPT" \
      'mkdir -p $$d' \
      "TEST_TMPDIR=\$$d $(DRIVER) ./$$TEST_BINARY --gtest_filter=$$TEST_NAME" \
 		> $$TEST_SCRIPT; \
@@ -1010,6 +953,7 @@ endif

 .PHONY: check_0
 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' '';		\
@@ -1020,8 +964,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 \
-	    --tmpdir=$(TEST_TMPDIR) '{} $(parallel_redir)' ; \
+	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG --eta --gnu '{} $(parallel_redir)' ; \
 	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=$$?; \
@@ -1032,6 +975,7 @@ valgrind-exclude-regexp = InlineSkipTest.ConcurrentInsert|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' '';		\
@@ -1043,11 +987,10 @@ valgrind_check_0:
 	  | grep -E '$(tests-regexp)'					\
 	  | grep -E -v '$(valgrind-exclude-regexp)'					\
 	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG --eta --gnu \
-	   --tmpdir=$(TEST_TMPDIR) \
-	   '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) \
+	  '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) \
 	  $(parallel_redir)' \

-CLEAN_FILES += t LOG $(TEST_TMPDIR)
+CLEAN_FILES += t LOG $(TMPD)

 # When running parallel "make check", you can monitor its progress
 # from another window.
@@ -1070,12 +1013,12 @@ check: all
 	    && (build_tools/gnu_parallel --gnu --help 2>/dev/null) |                    \
 	        grep -q 'GNU Parallel';                                 \
 	then                                                            \
-	    $(MAKE) T="$$t" check_0;                       \
+	    $(MAKE) T="$$t" TMPD=$(TMPD) check_0;                       \
 	else                                                            \
 	    for t in $(TESTS); do                                       \
 	      echo "===== Running $$t (`date`)"; ./$$t || exit 1; done;          \
 	fi
-	rm -rf $(TEST_TMPDIR)
+	rm -rf $(TMPD)
 ifneq ($(PLATFORM), OS_AIX)
 	$(PYTHON) tools/check_all_python.py
 ifeq ($(filter -DROCKSDB_LITE,$(OPT)),)
@@ -1172,11 +1115,11 @@ valgrind_test_some:
 valgrind_check: $(TESTS)
 	$(MAKE) DRIVER="$(VALGRIND_VER) $(VALGRIND_OPTS)" gen_parallel_tests
 	$(AM_V_GEN)if test "$(J)" != 1                                  \
-	    && (build_tools/gnu_parallel --gnu --help 2>/dev/null) |    \
+	    && (build_tools/gnu_parallel --gnu --help 2>/dev/null) |                    \
 	        grep -q 'GNU Parallel';                                 \
 	then                                                            \
-	  $(MAKE)                                                       \
-	  DRIVER="$(VALGRIND_VER) $(VALGRIND_OPTS)" valgrind_check_0;   \
+      $(MAKE) TMPD=$(TMPD)                                        \
+      DRIVER="$(VALGRIND_VER) $(VALGRIND_OPTS)" valgrind_check_0; \
 	else                                                            \
 		for t in $(filter-out %skiplist_test options_settable_test,$(TESTS)); do \
 			$(VALGRIND_VER) $(VALGRIND_OPTS) ./$$t; \
@@ -1196,6 +1139,27 @@ valgrind_check_some: $(ROCKSDBTESTS_SUBSET)
 		fi; \
 	done

+ifneq ($(PAR_TEST),)
+parloop:
+	ret_bad=0;							\
+	for t in $(PAR_TEST); do		\
+		echo "===== Running $$t in parallel $(NUM_PAR) (`date`)";\
+		if [ $(db_test) -eq 1 ]; then \
+			seq $(J) | v="$$t" build_tools/gnu_parallel --gnu --plain 's=$(TMPD)/rdb-{};  export TEST_TMPDIR=$$s;' \
+				'timeout 2m ./db_test --gtest_filter=$$v >> $$s/log-{} 2>1'; \
+		else\
+			seq $(J) | v="./$$t" build_tools/gnu_parallel --gnu --plain 's=$(TMPD)/rdb-{};' \
+			     'export TEST_TMPDIR=$$s; timeout 10m $$v >> $$s/log-{} 2>1'; \
+		fi; \
+		ret_code=$$?; \
+		if [ $$ret_code -ne 0 ]; then \
+			ret_bad=$$ret_code; \
+			echo $$t exited with $$ret_code; \
+		fi; \
+	done; \
+	exit $$ret_bad;
+endif
+
 test_names = \
  ./db_test --gtest_list_tests						\
    | perl -n								\
@@ -1203,6 +1167,24 @@ test_names = \
      -e '/^(\s*)(\S+)/; !$$1 and do {$$p=$$2; break};'			\
      -e 'print qq! $$p$$2!'

+parallel_check: $(TESTS)
+	$(AM_V_GEN)if test "$(J)" > 1                                  \
+	    && (build_tools/gnu_parallel --gnu --help 2>/dev/null) |                    \
+	        grep -q 'GNU Parallel';                                 \
+	then                                                            \
+	    echo Running in parallel $(J);			\
+	else                                                            \
+	    echo "Need to have GNU Parallel and J > 1"; exit 1;		\
+	fi;								\
+	ret_bad=0;							\
+	echo $(J);\
+	echo Test Dir: $(TMPD); \
+        seq $(J) | build_tools/gnu_parallel --gnu --plain 's=$(TMPD)/rdb-{}; rm -rf $$s; mkdir $$s'; \
+	$(MAKE)  PAR_TEST="$(shell $(test_names))" TMPD=$(TMPD) \
+		J=$(J) db_test=1 parloop; \
+	$(MAKE) PAR_TEST="$(filter-out db_test, $(TESTS))" \
+		TMPD=$(TMPD) J=$(J) db_test=0 parloop;
+
 analyze: clean
 	USE_CLANG=1 $(MAKE) analyze_incremental

@@ -1448,12 +1430,6 @@ db_blob_basic_test: $(OBJ_DIR)/db/blob/db_blob_basic_test.o $(TEST_LIBRARY) $(LI
 db_blob_compaction_test: $(OBJ_DIR)/db/blob/db_blob_compaction_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-db_readonly_with_timestamp_test: $(OBJ_DIR)/db/db_readonly_with_timestamp_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
-db_wide_basic_test: $(OBJ_DIR)/db/wide/db_wide_basic_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 db_with_timestamp_basic_test: $(OBJ_DIR)/db/db_with_timestamp_basic_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -1571,9 +1547,6 @@ db_table_properties_test: $(OBJ_DIR)/db/db_table_properties_test.o $(TEST_LIBRAR
 log_write_bench: $(OBJ_DIR)/util/log_write_bench.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK) $(PROFILING_FLAGS)

-seqno_time_test: $(OBJ_DIR)/db/seqno_time_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 plain_table_db_test: $(OBJ_DIR)/db/plain_table_db_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -1670,6 +1643,9 @@ random_access_file_reader_test: $(OBJ_DIR)/file/random_access_file_reader_test.o
 file_reader_writer_test: $(OBJ_DIR)/util/file_reader_writer_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

+block_based_filter_block_test: $(OBJ_DIR)/table/block_based/block_based_filter_block_test.o $(TEST_LIBRARY) $(LIBRARY)
+	$(AM_LINK)
+
 block_based_table_reader_test: table/block_based/block_based_table_reader_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -1832,7 +1808,7 @@ memtable_list_test: $(OBJ_DIR)/db/memtable_list_test.o $(TEST_LIBRARY) $(LIBRARY
 write_callback_test: $(OBJ_DIR)/db/write_callback_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-heap_test: $(OBJ_DIR)/util/heap_test.o $(TEST_LIBRARY) $(LIBRARY)
+heap_test: $(OBJ_DIR)/util/heap_test.o $(GTEST)
 	$(AM_LINK)

 point_lock_manager_test: utilities/transactions/lock/point/point_lock_manager_test.o $(TEST_LIBRARY) $(LIBRARY)
@@ -1850,12 +1826,6 @@ write_prepared_transaction_test: $(OBJ_DIR)/utilities/transactions/write_prepare
 write_unprepared_transaction_test: $(OBJ_DIR)/utilities/transactions/write_unprepared_transaction_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-timestamped_snapshot_test: $(OBJ_DIR)/utilities/transactions/timestamped_snapshot_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
-tiered_compaction_test: $(OBJ_DIR)/db/compaction/tiered_compaction_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 sst_dump: $(OBJ_DIR)/tools/sst_dump.o $(TOOLS_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -1940,16 +1910,13 @@ blob_file_garbage_test: $(OBJ_DIR)/db/blob/blob_file_garbage_test.o $(TEST_LIBRA
 blob_file_reader_test: $(OBJ_DIR)/db/blob/blob_file_reader_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-blob_source_test: $(OBJ_DIR)/db/blob/blob_source_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 blob_garbage_meter_test: $(OBJ_DIR)/db/blob/blob_garbage_meter_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

 timer_test: $(OBJ_DIR)/util/timer_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-periodic_task_scheduler_test: $(OBJ_DIR)/db/periodic_task_scheduler_test.o $(TEST_LIBRARY) $(LIBRARY)
+periodic_work_scheduler_test: $(OBJ_DIR)/db/periodic_work_scheduler_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

 testutil_test: $(OBJ_DIR)/test_util/testutil_test.o $(TEST_LIBRARY) $(LIBRARY)
@@ -1958,7 +1925,7 @@ testutil_test: $(OBJ_DIR)/test_util/testutil_test.o $(TEST_LIBRARY) $(LIBRARY)
 io_tracer_test: $(OBJ_DIR)/trace_replay/io_tracer_test.o $(OBJ_DIR)/trace_replay/io_tracer.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-prefetch_test: $(OBJ_DIR)/file/prefetch_test.o  $(OBJ_DIR)/tools/io_tracer_parser_tool.o $(TEST_LIBRARY) $(LIBRARY)
+prefetch_test: $(OBJ_DIR)/file/prefetch_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

 io_tracer_parser_test: $(OBJ_DIR)/tools/io_tracer_parser_test.o $(OBJ_DIR)/tools/io_tracer_parser_tool.o $(TEST_LIBRARY) $(LIBRARY)
@@ -1984,10 +1951,6 @@ db_basic_bench: $(OBJ_DIR)/microbench/db_basic_bench.o $(LIBRARY)

 cache_reservation_manager_test: $(OBJ_DIR)/cache/cache_reservation_manager_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
-
-wide_column_serialization_test: $(OBJ_DIR)/db/wide/wide_column_serialization_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 #-------------------------------------------------
 # make install related stuff
 PREFIX ?= /usr/local
@@ -2150,7 +2113,6 @@ ifeq ($(PLATFORM), OS_OPENBSD)
 	ROCKSDBJNILIB = librocksdbjni-openbsd$(ARCH).so
 	ROCKSDB_JAR = rocksdbjni-$(ROCKSDB_JAVA_VERSION)-openbsd$(ARCH).jar
 endif
-export SHA256_CMD

 zlib-$(ZLIB_VER).tar.gz:
 	curl --fail --output zlib-$(ZLIB_VER).tar.gz --location ${ZLIB_DOWNLOAD_BASE}/zlib-$(ZLIB_VER).tar.gz
@@ -2283,7 +2245,7 @@ JAR_CMD := jar
 endif
 endif
 rocksdbjavastatic_javalib:
-	cd java; $(MAKE) javalib
+	cd java; SHA256_CMD='$(SHA256_CMD)' $(MAKE) javalib
 	rm -f java/target/$(ROCKSDBJNILIB)
 	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC \
 	  -o ./java/target/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) \
@@ -2397,7 +2359,7 @@ rocksdbjava: $(LIB_OBJECTS)
 ifeq ($(JAVA_HOME),)
 	$(error JAVA_HOME is not set)
 endif
-	$(AM_V_GEN)cd java; $(MAKE) javalib;
+	$(AM_V_GEN)cd java; SHA256_CMD='$(SHA256_CMD)' $(MAKE) javalib;
 	$(AM_V_at)rm -f ./java/target/$(ROCKSDBJNILIB)
 	$(AM_V_at)$(CXX) $(CXXFLAGS) -I./java/. -I./java/rocksjni $(JAVA_INCLUDE) $(ROCKSDB_PLUGIN_JNI_CXX_INCLUDEFLAGS) -shared -fPIC -o ./java/target/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) $(LIB_OBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
 	$(AM_V_at)cd java; $(JAR_CMD) -cf target/$(ROCKSDB_JAR) HISTORY*.md
@@ -2409,13 +2371,14 @@ jclean:
 	cd java;$(MAKE) clean;

 jtest_compile: rocksdbjava
-	cd java;$(MAKE) java_test
+	cd java; SHA256_CMD='$(SHA256_CMD)' $(MAKE) java_test

 jtest_run:
 	cd java;$(MAKE) run_test

 jtest: rocksdbjava
-	cd java;$(MAKE) sample test
+	cd java;$(MAKE) sample; SHA256_CMD='$(SHA256_CMD)' $(MAKE) test;
+	$(PYTHON) tools/check_all_python.py # TODO peterd: find a better place for this check in CI targets

 jdb_bench:
 	cd java;$(MAKE) db_bench;
@@ -2430,65 +2393,16 @@ commit_prereq:
 # integration.
 checkout_folly:
 	if [ -e third-party/folly ]; then \
-		cd third-party/folly && ${GIT_COMMAND} fetch origin; \
+		cd third-party/folly && git fetch origin; \
 	else \
-		cd third-party && ${GIT_COMMAND} clone https://github.com/facebook/folly.git; \
+		cd third-party && git clone https://github.com/facebook/folly.git; \
 	fi
 	@# Pin to a particular version for public CI, so that PR authors don't
 	@# need to worry about folly breaking our integration. Update periodically
-	cd third-party/folly && git reset --hard beacd86d63cd71c904632262e6c36f60874d78ba
+	cd third-party/folly && git reset --hard 98b9b2c1124e99f50f9085ddee74ce32afffc665
 	@# A hack to remove boost dependency.
-	@# NOTE: this hack is only needed if building using USE_FOLLY_LITE
+	@# NOTE: this hack is not needed if using FBCODE compiler config
 	perl -pi -e 's/^(#include <boost)/\/\/$$1/' third-party/folly/folly/functional/Invoke.h
-	@# NOTE: this hack is required for clang in some cases
-	perl -pi -e 's/int rv = syscall/int rv = (int)syscall/' third-party/folly/folly/detail/Futex.cpp
-	@# NOTE: this hack is required for gcc in some cases
-	perl -pi -e 's/(__has_include.<experimental.memory_resource>.)/__cpp_rtti && $$1/' third-party/folly/folly/memory/MemoryResource.h
-
-build_folly:
-	FOLLY_INST_PATH=`cd third-party/folly; $(PYTHON) build/fbcode_builder/getdeps.py show-inst-dir`; \
-	if [ "$$FOLLY_INST_PATH" ]; then \
-		rm -rf $${FOLLY_INST_PATH}/../../*; \
-	else \
-		echo "Please run checkout_folly first"; \
-		false; \
-	fi
-	# Restore the original version of Invoke.h with boost dependency
-	cd third-party/folly && ${GIT_COMMAND} checkout folly/functional/Invoke.h
-	cd third-party/folly && MAYBE_AVX2=`echo $(CXXFLAGS) | grep -o -- -DHAVE_AVX2 | sed 's/-DHAVE_AVX2/-mavx2/g' || true` && \
-		CXXFLAGS=" $$MAYBE_AVX2 -DHAVE_CXX11_ATOMIC " $(PYTHON) build/fbcode_builder/getdeps.py build --no-tests
-
-# ---------------------------------------------------------------------------
-#   Build size testing
-# ---------------------------------------------------------------------------
-
-REPORT_BUILD_STATISTIC?=echo STATISTIC:
-
-build_size:
-	# === normal build, static ===
-	$(MAKE) clean
-	$(MAKE) static_lib
-	$(REPORT_BUILD_STATISTIC) rocksdb.build_size.static_lib $$(stat --printf="%s" librocksdb.a)
-	strip librocksdb.a
-	$(REPORT_BUILD_STATISTIC) rocksdb.build_size.static_lib_stripped $$(stat --printf="%s" librocksdb.a)
-	# === normal build, shared ===
-	$(MAKE) clean
-	$(MAKE) shared_lib
-	$(REPORT_BUILD_STATISTIC) rocksdb.build_size.shared_lib $$(stat --printf="%s" `readlink -f librocksdb.so`)
-	strip `readlink -f librocksdb.so`
-	$(REPORT_BUILD_STATISTIC) rocksdb.build_size.shared_lib_stripped $$(stat --printf="%s" `readlink -f librocksdb.so`)
-	# === lite build, static ===
-	$(MAKE) clean
-	$(MAKE) LITE=1 static_lib
-	$(REPORT_BUILD_STATISTIC) rocksdb.build_size.static_lib_lite $$(stat --printf="%s" librocksdb.a)
-	strip librocksdb.a
-	$(REPORT_BUILD_STATISTIC) rocksdb.build_size.static_lib_lite_stripped $$(stat --printf="%s" librocksdb.a)
-	# === lite build, shared ===
-	$(MAKE) clean
-	$(MAKE) LITE=1 shared_lib
-	$(REPORT_BUILD_STATISTIC) rocksdb.build_size.shared_lib_lite $$(stat --printf="%s" `readlink -f librocksdb.so`)
-	strip `readlink -f librocksdb.so`
-	$(REPORT_BUILD_STATISTIC) rocksdb.build_size.shared_lib_lite_stripped $$(stat --printf="%s" `readlink -f librocksdb.so`)

 # ---------------------------------------------------------------------------
 #  	Platform-specific compilation
@@ -2542,7 +2456,7 @@ endif
 ifneq ($(SKIP_DEPENDS), 1)
 DEPFILES = $(patsubst %.cc, $(OBJ_DIR)/%.cc.d, $(ALL_SOURCES))
 DEPFILES+ = $(patsubst %.c, $(OBJ_DIR)/%.c.d, $(LIB_SOURCES_C) $(TEST_MAIN_SOURCES_C))
-ifeq ($(USE_FOLLY_LITE),1)
+ifeq ($(USE_FOLLY),1)
  DEPFILES +=$(patsubst %.cpp, $(OBJ_DIR)/%.cpp.d, $(FOLLY_SOURCES))
 endif
 endif
@@ -4,4 +4,3 @@ This is the list of all known third-party plugins for RocksDB. If something is m
 * [HDFS](https://github.com/riversand963/rocksdb-hdfs-env): an Env used for interacting with HDFS. Migrated from main RocksDB repo
 * [ZenFS](https://github.com/westerndigitalcorporation/zenfs): a file system for zoned block devices
 * [RADOS](https://github.com/riversand963/rocksdb-rados-env): an Env used for interacting with RADOS. Migrated from RocksDB main repo.
-* [PMEM](https://github.com/pmem/pmem-rocksdb-plugin): a collection of plugins to enable Persistent Memory on RocksDB.
@@ -1,6 +1,7 @@
 ## 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)
 [![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)

@@ -13,14 +13,11 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "cache/cache_entry_roles.cc",
        "cache/cache_key.cc",
        "cache/cache_reservation_manager.cc",
-        "cache/charged_cache.cc",
        "cache/clock_cache.cc",
        "cache/compressed_secondary_cache.cc",
-        "cache/fast_lru_cache.cc",
        "cache/lru_cache.cc",
        "cache/sharded_cache.cc",
        "db/arena_wrapped_db_iter.cc",
-        "db/blob/blob_contents.cc",
        "db/blob/blob_fetcher.cc",
        "db/blob/blob_file_addition.cc",
        "db/blob/blob_file_builder.cc",
@@ -32,7 +29,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "db/blob/blob_log_format.cc",
        "db/blob/blob_log_sequential_reader.cc",
        "db/blob/blob_log_writer.cc",
-        "db/blob/blob_source.cc",
        "db/blob/prefetch_buffer_collection.cc",
        "db/builder.cc",
        "db/c.cc",
@@ -40,15 +36,11 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "db/compaction/compaction.cc",
        "db/compaction/compaction_iterator.cc",
        "db/compaction/compaction_job.cc",
-        "db/compaction/compaction_outputs.cc",
        "db/compaction/compaction_picker.cc",
        "db/compaction/compaction_picker_fifo.cc",
        "db/compaction/compaction_picker_level.cc",
        "db/compaction/compaction_picker_universal.cc",
-        "db/compaction/compaction_service_job.cc",
-        "db/compaction/compaction_state.cc",
        "db/compaction/sst_partitioner.cc",
-        "db/compaction/subcompaction_state.cc",
        "db/convenience.cc",
        "db/db_filesnapshot.cc",
        "db/db_impl/compacted_db_impl.cc",
@@ -83,11 +75,10 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "db/merge_helper.cc",
        "db/merge_operator.cc",
        "db/output_validator.cc",
-        "db/periodic_task_scheduler.cc",
+        "db/periodic_work_scheduler.cc",
        "db/range_del_aggregator.cc",
        "db/range_tombstone_fragmenter.cc",
        "db/repair.cc",
-        "db/seqno_to_time_mapping.cc",
        "db/snapshot_impl.cc",
        "db/table_cache.cc",
        "db/table_properties_collector.cc",
@@ -99,8 +90,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "db/version_set.cc",
        "db/wal_edit.cc",
        "db/wal_manager.cc",
-        "db/wide/wide_column_serialization.cc",
-        "db/wide/wide_columns.cc",
        "db/write_batch.cc",
        "db/write_batch_base.cc",
        "db/write_controller.cc",
@@ -174,6 +163,7 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "table/adaptive/adaptive_table_factory.cc",
        "table/block_based/binary_search_index_reader.cc",
        "table/block_based/block.cc",
+        "table/block_based/block_based_filter_block.cc",
        "table/block_based/block_based_table_builder.cc",
        "table/block_based/block_based_table_factory.cc",
        "table/block_based/block_based_table_iterator.cc",
@@ -233,7 +223,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "trace_replay/trace_record_handler.cc",
        "trace_replay/trace_record_result.cc",
        "trace_replay/trace_replay.cc",
-        "util/async_file_reader.cc",
        "util/build_version.cc",
        "util/cleanable.cc",
        "util/coding.cc",
@@ -253,7 +242,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "util/ribbon_config.cc",
        "util/slice.cc",
        "util/status.cc",
-        "util/stderr_logger.cc",
        "util/string_util.cc",
        "util/thread_local.cc",
        "util/threadpool_imp.cc",
@@ -338,28 +326,18 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "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",
-    ], deps=[
-        "//folly/container:f14_hash",
-        "//folly/experimental/coro:blocking_wait",
-        "//folly/experimental/coro:collect",
-        "//folly/experimental/coro:coroutine",
-        "//folly/experimental/coro:task",
-        "//folly/synchronization:distributed_mutex",
-    ], headers=None, link_whole=False, extra_test_libs=False)
+    ], deps=["//folly/container:f14_hash"], headers=None, link_whole=False, extra_test_libs=False)

 cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "cache/cache.cc",
        "cache/cache_entry_roles.cc",
        "cache/cache_key.cc",
        "cache/cache_reservation_manager.cc",
-        "cache/charged_cache.cc",
        "cache/clock_cache.cc",
        "cache/compressed_secondary_cache.cc",
-        "cache/fast_lru_cache.cc",
        "cache/lru_cache.cc",
        "cache/sharded_cache.cc",
        "db/arena_wrapped_db_iter.cc",
-        "db/blob/blob_contents.cc",
        "db/blob/blob_fetcher.cc",
        "db/blob/blob_file_addition.cc",
        "db/blob/blob_file_builder.cc",
@@ -371,7 +349,6 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "db/blob/blob_log_format.cc",
        "db/blob/blob_log_sequential_reader.cc",
        "db/blob/blob_log_writer.cc",
-        "db/blob/blob_source.cc",
        "db/blob/prefetch_buffer_collection.cc",
        "db/builder.cc",
        "db/c.cc",
@@ -379,15 +356,11 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "db/compaction/compaction.cc",
        "db/compaction/compaction_iterator.cc",
        "db/compaction/compaction_job.cc",
-        "db/compaction/compaction_outputs.cc",
        "db/compaction/compaction_picker.cc",
        "db/compaction/compaction_picker_fifo.cc",
        "db/compaction/compaction_picker_level.cc",
        "db/compaction/compaction_picker_universal.cc",
-        "db/compaction/compaction_service_job.cc",
-        "db/compaction/compaction_state.cc",
        "db/compaction/sst_partitioner.cc",
-        "db/compaction/subcompaction_state.cc",
        "db/convenience.cc",
        "db/db_filesnapshot.cc",
        "db/db_impl/compacted_db_impl.cc",
@@ -422,11 +395,10 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "db/merge_helper.cc",
        "db/merge_operator.cc",
        "db/output_validator.cc",
-        "db/periodic_task_scheduler.cc",
+        "db/periodic_work_scheduler.cc",
        "db/range_del_aggregator.cc",
        "db/range_tombstone_fragmenter.cc",
        "db/repair.cc",
-        "db/seqno_to_time_mapping.cc",
        "db/snapshot_impl.cc",
        "db/table_cache.cc",
        "db/table_properties_collector.cc",
@@ -438,8 +410,6 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "db/version_set.cc",
        "db/wal_edit.cc",
        "db/wal_manager.cc",
-        "db/wide/wide_column_serialization.cc",
-        "db/wide/wide_columns.cc",
        "db/write_batch.cc",
        "db/write_batch_base.cc",
        "db/write_controller.cc",
@@ -513,6 +483,7 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "table/adaptive/adaptive_table_factory.cc",
        "table/block_based/binary_search_index_reader.cc",
        "table/block_based/block.cc",
+        "table/block_based/block_based_filter_block.cc",
        "table/block_based/block_based_table_builder.cc",
        "table/block_based/block_based_table_factory.cc",
        "table/block_based/block_based_table_iterator.cc",
@@ -572,7 +543,6 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "trace_replay/trace_record_handler.cc",
        "trace_replay/trace_record_result.cc",
        "trace_replay/trace_replay.cc",
-        "util/async_file_reader.cc",
        "util/build_version.cc",
        "util/cleanable.cc",
        "util/coding.cc",
@@ -592,7 +562,6 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "util/ribbon_config.cc",
        "util/slice.cc",
        "util/status.cc",
-        "util/stderr_logger.cc",
        "util/string_util.cc",
        "util/thread_local.cc",
        "util/threadpool_imp.cc",
@@ -677,18 +646,10 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
        "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",
-    ], deps=[
-        "//folly/container:f14_hash",
-        "//folly/experimental/coro:blocking_wait",
-        "//folly/experimental/coro:collect",
-        "//folly/experimental/coro:coroutine",
-        "//folly/experimental/coro:task",
-        "//folly/synchronization:distributed_mutex",
-    ], headers=None, link_whole=True, extra_test_libs=False)
+    ], deps=["//folly/container:f14_hash"], headers=None, link_whole=True, extra_test_libs=False)

 cpp_library_wrapper(name="rocksdb_test_lib", srcs=[
        "db/db_test_util.cc",
-        "db/db_with_timestamp_test_util.cc",
        "table/mock_table.cc",
        "test_util/mock_time_env.cc",
        "test_util/testharness.cc",
@@ -4820,8 +4781,8 @@ cpp_unittest_wrapper(name="blob_garbage_meter_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="blob_source_test",
-            srcs=["db/blob/blob_source_test.cc"],
+cpp_unittest_wrapper(name="block_based_filter_block_test",
+            srcs=["table/block_based/block_based_filter_block_test.cc"],
            deps=[":rocksdb_test_lib"],
            extra_compiler_flags=[])

@@ -5198,12 +5159,6 @@ cpp_unittest_wrapper(name="db_rate_limiter_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="db_readonly_with_timestamp_test",
-            srcs=["db/db_readonly_with_timestamp_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_secondary_test",
            srcs=["db/db_secondary_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5258,12 +5213,6 @@ cpp_unittest_wrapper(name="db_wal_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="db_wide_basic_test",
-            srcs=["db/wide/db_wide_basic_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_with_timestamp_basic_test",
            srcs=["db/db_with_timestamp_basic_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5602,8 +5551,8 @@ cpp_unittest_wrapper(name="perf_context_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="periodic_task_scheduler_test",
-            srcs=["db/periodic_task_scheduler_test.cc"],
+cpp_unittest_wrapper(name="periodic_work_scheduler_test",
+            srcs=["db/periodic_work_scheduler_test.cc"],
            deps=[":rocksdb_test_lib"],
            extra_compiler_flags=[])

@@ -5698,12 +5647,6 @@ cpp_unittest_wrapper(name="ribbon_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="seqno_time_test",
-            srcs=["db/seqno_time_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="sim_cache_test",
            srcs=["utilities/simulator_cache/sim_cache_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5788,12 +5731,6 @@ cpp_unittest_wrapper(name="thread_local_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="tiered_compaction_test",
-            srcs=["db/compaction/tiered_compaction_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="timer_queue_test",
            srcs=["util/timer_queue_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5806,12 +5743,6 @@ cpp_unittest_wrapper(name="timer_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="timestamped_snapshot_test",
-            srcs=["utilities/transactions/timestamped_snapshot_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="trace_analyzer_test",
            srcs=["tools/trace_analyzer_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5860,12 +5791,6 @@ cpp_unittest_wrapper(name="wal_manager_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="wide_column_serialization_test",
-            srcs=["db/wide/wide_column_serialization_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="work_queue_test",
            srcs=["util/work_queue_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -1,18 +1,19 @@
 #!/usr/bin/env python3
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-from __future__ import absolute_import, division, print_function, unicode_literals
-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 try:
    from builtins import str
 except ImportError:
    from __builtin__ import str
-import fnmatch
+from targets_builder import TARGETSBuilder
 import json
 import os
+import fnmatch
 import sys

-from targets_builder import TARGETSBuilder
-
 from util import ColorString

 # This script generates TARGETS file for Buck.
@@ -43,13 +44,13 @@ def parse_src_mk(repo_path):
    src_files = {}
    for line in open(src_mk):
        line = line.strip()
-        if len(line) == 0 or line[0] == "#":
+        if len(line) == 0 or line[0] == '#':
            continue
-        if "=" in line:
-            current_src = line.split("=")[0].strip()
+        if '=' in line:
+            current_src = line.split('=')[0].strip()
            src_files[current_src] = []
-        elif ".c" in line:
-            src_path = line.split("\\")[0].strip()
+        elif '.c' in line:
+            src_path = line.split('\\')[0].strip()
            src_files[current_src].append(src_path)
    return src_files

@@ -57,16 +58,14 @@ def parse_src_mk(repo_path):
 # get all .cc / .c files
 def get_cc_files(repo_path):
    cc_files = []
-    for root, _dirnames, filenames in os.walk(
-        repo_path
-    ):  # noqa: B007 T25377293 Grandfathered in
-        root = root[(len(repo_path) + 1) :]
+    for root, dirnames, filenames in os.walk(repo_path):  # noqa: B007 T25377293 Grandfathered in
+        root = root[(len(repo_path) + 1):]
        if "java" in root:
            # Skip java
            continue
-        for filename in fnmatch.filter(filenames, "*.cc"):
+        for filename in fnmatch.filter(filenames, '*.cc'):
            cc_files.append(os.path.join(root, filename))
-        for filename in fnmatch.filter(filenames, "*.c"):
+        for filename in fnmatch.filter(filenames, '*.c'):
            cc_files.append(os.path.join(root, filename))
    return cc_files

@@ -94,10 +93,14 @@ def get_non_parallel_tests(repo_path):

    return s

-
 # Parse extra dependencies passed by user from command line
 def get_dependencies():
-    deps_map = {"": {"extra_deps": [], "extra_compiler_flags": []}}
+    deps_map = {
+        '': {
+            'extra_deps': [],
+            'extra_compiler_flags': []
+        }
+    }
    if len(sys.argv) < 2:
        return deps_map

@@ -108,7 +111,6 @@ def get_dependencies():
                v = encode_dict(v)
            rv[k] = v
        return rv
-
    extra_deps = json.loads(sys.argv[1], object_hook=encode_dict)
    for target_alias, deps in extra_deps.items():
        deps_map[target_alias] = deps
@@ -141,73 +143,61 @@ def generate_targets(repo_path, deps_map):
        "rocksdb_lib",
        src_mk["LIB_SOURCES"] +
        # always add range_tree, it's only excluded on ppc64, which we don't use internally
-        src_mk["RANGE_TREE_SOURCES"] + src_mk["TOOL_LIB_SOURCES"],
-        deps=[
-            "//folly/container:f14_hash",
-            "//folly/experimental/coro:blocking_wait",
-            "//folly/experimental/coro:collect",
-            "//folly/experimental/coro:coroutine",
-            "//folly/experimental/coro:task",
-            "//folly/synchronization:distributed_mutex",
-        ],
-    )
+        src_mk["RANGE_TREE_SOURCES"] +
+        src_mk["TOOL_LIB_SOURCES"],
+        deps=["//folly/container:f14_hash"])
    # rocksdb_whole_archive_lib
    TARGETS.add_library(
        "rocksdb_whole_archive_lib",
        src_mk["LIB_SOURCES"] +
        # always add range_tree, it's only excluded on ppc64, which we don't use internally
-        src_mk["RANGE_TREE_SOURCES"] + src_mk["TOOL_LIB_SOURCES"],
-        deps=[
-            "//folly/container:f14_hash",
-            "//folly/experimental/coro:blocking_wait",
-            "//folly/experimental/coro:collect",
-            "//folly/experimental/coro:coroutine",
-            "//folly/experimental/coro:task",
-            "//folly/synchronization:distributed_mutex",
-        ],
+        src_mk["RANGE_TREE_SOURCES"] +
+        src_mk["TOOL_LIB_SOURCES"],
+        deps=["//folly/container:f14_hash"],
        headers=None,
        extra_external_deps="",
-        link_whole=True,
-    )
+        link_whole=True)
    # rocksdb_test_lib
    TARGETS.add_library(
        "rocksdb_test_lib",
-        src_mk.get("MOCK_LIB_SOURCES", [])
-        + src_mk.get("TEST_LIB_SOURCES", [])
-        + src_mk.get("EXP_LIB_SOURCES", [])
-        + src_mk.get("ANALYZER_LIB_SOURCES", []),
+        src_mk.get("MOCK_LIB_SOURCES", []) +
+        src_mk.get("TEST_LIB_SOURCES", []) +
+        src_mk.get("EXP_LIB_SOURCES", []) +
+        src_mk.get("ANALYZER_LIB_SOURCES", []),
        [":rocksdb_lib"],
-        extra_test_libs=True,
-    )
+        extra_test_libs=True
+        )
    # rocksdb_tools_lib
    TARGETS.add_library(
        "rocksdb_tools_lib",
-        src_mk.get("BENCH_LIB_SOURCES", [])
-        + src_mk.get("ANALYZER_LIB_SOURCES", [])
-        + ["test_util/testutil.cc"],
-        [":rocksdb_lib"],
-    )
+        src_mk.get("BENCH_LIB_SOURCES", []) +
+        src_mk.get("ANALYZER_LIB_SOURCES", []) +
+        ["test_util/testutil.cc"],
+        [":rocksdb_lib"])
    # rocksdb_cache_bench_tools_lib
    TARGETS.add_library(
        "rocksdb_cache_bench_tools_lib",
        src_mk.get("CACHE_BENCH_LIB_SOURCES", []),
-        [":rocksdb_lib"],
-    )
+        [":rocksdb_lib"])
    # rocksdb_stress_lib
    TARGETS.add_rocksdb_library(
        "rocksdb_stress_lib",
        src_mk.get("ANALYZER_LIB_SOURCES", [])
-        + src_mk.get("STRESS_LIB_SOURCES", [])
-        + ["test_util/testutil.cc"],
-    )
+        + src_mk.get('STRESS_LIB_SOURCES', [])
+        + ["test_util/testutil.cc"])
    # db_stress binary
-    TARGETS.add_binary(
-        "db_stress", ["db_stress_tool/db_stress.cc"], [":rocksdb_stress_lib"]
-    )
+    TARGETS.add_binary("db_stress",
+                       ["db_stress_tool/db_stress.cc"],
+                       [":rocksdb_stress_lib"])
    # bench binaries
    for src in src_mk.get("MICROBENCH_SOURCES", []):
-        name = src.rsplit("/", 1)[1].split(".")[0] if "/" in src else src.split(".")[0]
-        TARGETS.add_binary(name, [src], [], extra_bench_libs=True)
+        name =  src.rsplit('/',1)[1].split('.')[0] if '/' in src else src.split('.')[0]
+        TARGETS.add_binary(
+            name,
+            [src],
+            [],
+            extra_bench_libs=True
+            )
    print("Extra dependencies:\n{0}".format(json.dumps(deps_map)))

    # Dictionary test executable name -> relative source file path
@@ -217,7 +207,7 @@ def generate_targets(repo_path, deps_map):
    # are more than one .c test file, we need to extend
    # TARGETS.add_c_test() to include other C tests too.
    for test_src in src_mk.get("TEST_MAIN_SOURCES_C", []):
-        if test_src != "db/c_test.c":
+        if test_src != 'db/c_test.c':
            print("Don't know how to deal with " + test_src)
            return False
    TARGETS.add_c_test()
@@ -227,7 +217,7 @@ def generate_targets(repo_path, deps_map):
            fast_fancy_bench_config_list = json.load(json_file)
            for config_dict in fast_fancy_bench_config_list:
                clean_benchmarks = {}
-                benchmarks = config_dict["benchmarks"]
+                benchmarks = config_dict['benchmarks']
                for binary, benchmark_dict in benchmarks.items():
                    clean_benchmarks[binary] = {}
                    for benchmark, overloaded_metric_list in benchmark_dict.items():
@@ -235,20 +225,13 @@ def generate_targets(repo_path, deps_map):
                        for metric in overloaded_metric_list:
                            if not isinstance(metric, dict):
                                clean_benchmarks[binary][benchmark].append(metric)
-                TARGETS.add_fancy_bench_config(
-                    config_dict["name"],
-                    clean_benchmarks,
-                    False,
-                    config_dict["expected_runtime_one_iter"],
-                    config_dict["sl_iterations"],
-                    config_dict["regression_threshold"],
-                )
+                TARGETS.add_fancy_bench_config(config_dict['name'], clean_benchmarks, False, config_dict['expected_runtime_one_iter'], config_dict['sl_iterations'], config_dict['regression_threshold'])

        with open(f"{repo_path}/buckifier/bench-slow.json") as json_file:
            slow_fancy_bench_config_list = json.load(json_file)
            for config_dict in slow_fancy_bench_config_list:
                clean_benchmarks = {}
-                benchmarks = config_dict["benchmarks"]
+                benchmarks = config_dict['benchmarks']
                for binary, benchmark_dict in benchmarks.items():
                    clean_benchmarks[binary] = {}
                    for benchmark, overloaded_metric_list in benchmark_dict.items():
@@ -257,14 +240,7 @@ def generate_targets(repo_path, deps_map):
                            if not isinstance(metric, dict):
                                clean_benchmarks[binary][benchmark].append(metric)
            for config_dict in slow_fancy_bench_config_list:
-                TARGETS.add_fancy_bench_config(
-                    config_dict["name"] + "_slow",
-                    clean_benchmarks,
-                    True,
-                    config_dict["expected_runtime_one_iter"],
-                    config_dict["sl_iterations"],
-                    config_dict["regression_threshold"],
-                )
+                TARGETS.add_fancy_bench_config(config_dict['name']+"_slow", clean_benchmarks, True, config_dict['expected_runtime_one_iter'], config_dict['sl_iterations'], config_dict['regression_threshold'])
    # it is better servicelab experiments break
    # than rocksdb github ci
    except Exception:
@@ -273,7 +249,7 @@ def generate_targets(repo_path, deps_map):
    TARGETS.add_test_header()

    for test_src in src_mk.get("TEST_MAIN_SOURCES", []):
-        test = test_src.split(".c")[0].strip().split("/")[-1].strip()
+        test = test_src.split('.c')[0].strip().split('/')[-1].strip()
        test_source_map[test] = test_src
        print("" + test + " " + test_src)

@@ -283,29 +259,23 @@ def generate_targets(repo_path, deps_map):
                print(ColorString.warning("Failed to get test name for %s" % test_src))
                continue

-            test_target_name = test if not target_alias else test + "_" + target_alias
+            test_target_name = \
+                test if not target_alias else test + "_" + target_alias

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

    print(ColorString.info("Generated TARGETS Summary:"))
    print(ColorString.info("- %d libs" % TARGETS.total_lib))
@@ -318,7 +288,8 @@ def get_rocksdb_path():
    # rocksdb = {script_dir}/..
    script_dir = os.path.dirname(sys.argv[0])
    script_dir = os.path.abspath(script_dir)
-    rocksdb_path = os.path.abspath(os.path.join(script_dir, "../"))
+    rocksdb_path = os.path.abspath(
+        os.path.join(script_dir, "../"))

    return rocksdb_path

@@ -335,6 +306,5 @@ def main():
    if not ok:
        exit_with_error("Failed to generate TARGETS files")

-
 if __name__ == "__main__":
    main()
@@ -1,150 +1,113 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-from __future__ import absolute_import, division, print_function, unicode_literals
-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 try:
-    from builtins import object, str
+    from builtins import object
+    from builtins import str
 except ImportError:
-    from __builtin__ import object, str
-import pprint
-
+    from __builtin__ import object
+    from __builtin__ import str
 import targets_cfg
-
+import pprint

 def pretty_list(lst, indent=8):
    if lst is None or len(lst) == 0:
        return ""

    if len(lst) == 1:
-        return '"%s"' % lst[0]
+        return "\"%s\"" % lst[0]

-    separator = '",\n%s"' % (" " * indent)
+    separator = "\",\n%s\"" % (" " * indent)
    res = separator.join(sorted(lst))
-    res = "\n" + (" " * indent) + '"' + res + '",\n' + (" " * (indent - 4))
+    res = "\n" + (" " * indent) + "\"" + res + "\",\n" + (" " * (indent - 4))
    return res


 class TARGETSBuilder(object):
    def __init__(self, path, extra_argv):
        self.path = path
+        self.targets_file = open(path, 'wb')
        header = targets_cfg.rocksdb_target_header_template.format(
-            extra_argv=extra_argv
-        )
-        with open(path, "wb") as targets_file:
-            targets_file.write(header.encode("utf-8"))
+            extra_argv=extra_argv)
+        self.targets_file.write(header.encode("utf-8"))
        self.total_lib = 0
        self.total_bin = 0
        self.total_test = 0
        self.tests_cfg = ""

-    def add_library(
-        self,
-        name,
-        srcs,
-        deps=None,
-        headers=None,
-        extra_external_deps="",
-        link_whole=False,
-        external_dependencies=None,
-        extra_test_libs=False,
-    ):
+    def __del__(self):
+        self.targets_file.close()
+
+    def add_library(self, name, srcs, deps=None, headers=None,
+                    extra_external_deps="", link_whole=False,
+                     external_dependencies=None, extra_test_libs=False):
        if headers is not None:
            headers = "[" + pretty_list(headers) + "]"
-        with open(self.path, "ab") as targets_file:
-            targets_file.write(
-                targets_cfg.library_template.format(
-                    name=name,
-                    srcs=pretty_list(srcs),
-                    headers=headers,
-                    deps=pretty_list(deps),
-                    extra_external_deps=extra_external_deps,
-                    link_whole=link_whole,
-                    external_dependencies=pretty_list(external_dependencies),
-                    extra_test_libs=extra_test_libs,
-                ).encode("utf-8")
+        self.targets_file.write(targets_cfg.library_template.format(
+            name=name,
+            srcs=pretty_list(srcs),
+            headers=headers,
+            deps=pretty_list(deps),
+            extra_external_deps=extra_external_deps,
+            link_whole=link_whole,
+            external_dependencies=pretty_list(external_dependencies),
+            extra_test_libs=extra_test_libs
+            ).encode("utf-8"))
+        self.total_lib = self.total_lib + 1
+
+    def add_rocksdb_library(self, name, srcs, headers=None,
+                            external_dependencies=None):
+        if headers is not None:
+            headers = "[" + pretty_list(headers) + "]"
+        self.targets_file.write(targets_cfg.rocksdb_library_template.format(
+            name=name,
+            srcs=pretty_list(srcs),
+            headers=headers,
+            external_dependencies=pretty_list(external_dependencies)
+            ).encode("utf-8")
            )
        self.total_lib = self.total_lib + 1

-    def add_rocksdb_library(self, name, srcs, headers=None, external_dependencies=None):
-        if headers is not None:
-            headers = "[" + pretty_list(headers) + "]"
-        with open(self.path, "ab") as targets_file:
-            targets_file.write(
-                targets_cfg.rocksdb_library_template.format(
-                    name=name,
-                    srcs=pretty_list(srcs),
-                    headers=headers,
-                    external_dependencies=pretty_list(external_dependencies),
-                ).encode("utf-8")
-            )
-        self.total_lib = self.total_lib + 1
-
-    def add_binary(
-        self,
-        name,
-        srcs,
-        deps=None,
-        extra_preprocessor_flags=None,
-        extra_bench_libs=False,
-    ):
-        with open(self.path, "ab") as targets_file:
-            targets_file.write(
-                targets_cfg.binary_template.format(
-                    name=name,
-                    srcs=pretty_list(srcs),
-                    deps=pretty_list(deps),
-                    extra_preprocessor_flags=pretty_list(extra_preprocessor_flags),
-                    extra_bench_libs=extra_bench_libs,
-                ).encode("utf-8")
-            )
+    def add_binary(self, name, srcs, deps=None, extra_preprocessor_flags=None,extra_bench_libs=False):
+        self.targets_file.write(targets_cfg.binary_template.format(
+            name=name,
+            srcs=pretty_list(srcs),
+            deps=pretty_list(deps),
+            extra_preprocessor_flags=pretty_list(extra_preprocessor_flags),
+            extra_bench_libs=extra_bench_libs,
+            ).encode("utf-8"))
        self.total_bin = self.total_bin + 1

    def add_c_test(self):
-        with open(self.path, "ab") as targets_file:
-            targets_file.write(
-                b"""
+        self.targets_file.write(b"""
 add_c_test_wrapper()
-"""
-            )
+""")

    def add_test_header(self):
-        with open(self.path, "ab") as targets_file:
-            targets_file.write(
-                b"""
+        self.targets_file.write(b"""
        # Generate a test rule for each entry in ROCKS_TESTS
        # Do not build the tests in opt mode, since SyncPoint and other test code
        # will not be included.
-"""
-            )
+""")

-    def add_fancy_bench_config(
-        self,
-        name,
-        bench_config,
-        slow,
-        expected_runtime,
-        sl_iterations,
-        regression_threshold,
-    ):
-        with open(self.path, "ab") as targets_file:
-            targets_file.write(
-                targets_cfg.fancy_bench_template.format(
+    def add_fancy_bench_config(self, name, bench_config, slow, expected_runtime, sl_iterations, regression_threshold):
+        self.targets_file.write(targets_cfg.fancy_bench_template.format(
                    name=name,
                    bench_config=pprint.pformat(bench_config),
                    slow=slow,
                    expected_runtime=expected_runtime,
                    sl_iterations=sl_iterations,
-                    regression_threshold=regression_threshold,
-                ).encode("utf-8")
-            )
+                    regression_threshold=regression_threshold
+                    ).encode("utf-8"))

-    def register_test(self, test_name, src, deps, extra_compiler_flags):
-        with open(self.path, "ab") as targets_file:
-            targets_file.write(
-                targets_cfg.unittests_template.format(
-                    test_name=test_name,
-                    test_cc=str(src),
-                    deps=deps,
-                    extra_compiler_flags=extra_compiler_flags,
-                ).encode("utf-8")
-            )
+    def register_test(self,
+                      test_name,
+                      src,
+                      deps,
+                      extra_compiler_flags):
+
+        self.targets_file.write(targets_cfg.unittests_template.format(test_name=test_name,test_cc=str(src),deps=deps,
+            extra_compiler_flags=extra_compiler_flags).encode("utf-8"))
        self.total_test = self.total_test + 1
@@ -1,7 +1,11 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals

-rocksdb_target_header_template = """# This file \100generated by:
+rocksdb_target_header_template = \
+    """# This file \100generated by:
 #$ python3 buckifier/buckify_rocksdb.py{extra_argv}
 # --> DO NOT EDIT MANUALLY <--
 # This file is a Facebook-specific integration for buck builds, so can
@@ -23,6 +27,7 @@ rocks_cpp_library_wrapper(name="{name}", srcs=[{srcs}], headers={headers})
 """


+
 binary_template = """
 cpp_binary_wrapper(name="{name}", srcs=[{srcs}], deps=[{deps}], extra_preprocessor_flags=[{extra_preprocessor_flags}], extra_bench_libs={extra_bench_libs})
 """
@@ -2,35 +2,37 @@
 """
 This module keeps commonly used components.
 """
-from __future__ import absolute_import, division, print_function, unicode_literals
-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 try:
    from builtins import object
 except ImportError:
    from __builtin__ import object
-import os
 import subprocess
 import sys
+import os
 import time

-
 class ColorString(object):
-    """Generate colorful strings on terminal"""
-
-    HEADER = "\033[95m"
-    BLUE = "\033[94m"
-    GREEN = "\033[92m"
-    WARNING = "\033[93m"
-    FAIL = "\033[91m"
-    ENDC = "\033[0m"
+    """ Generate colorful strings on terminal """
+    HEADER = '\033[95m'
+    BLUE = '\033[94m'
+    GREEN = '\033[92m'
+    WARNING = '\033[93m'
+    FAIL = '\033[91m'
+    ENDC = '\033[0m'

    @staticmethod
    def _make_color_str(text, color):
        # In Python2, default encoding for unicode string is ASCII
        if sys.version_info.major <= 2:
-            return "".join([color, text.encode("utf-8"), ColorString.ENDC])
+            return "".join(
+                [color, text.encode('utf-8'), ColorString.ENDC])
        # From Python3, default encoding for unicode string is UTF-8
-        return "".join([color, text, ColorString.ENDC])
+        return "".join(
+            [color, text, ColorString.ENDC])

    @staticmethod
    def ok(text):
@@ -66,38 +68,37 @@ class ColorString(object):


 def run_shell_command(shell_cmd, cmd_dir=None):
-    """Run a single shell command.
-    @returns a tuple of shell command return code, stdout, stderr"""
+    """ Run a single shell command.
+        @returns a tuple of shell command return code, stdout, stderr """

    if cmd_dir is not None and not os.path.exists(cmd_dir):
        run_shell_command("mkdir -p %s" % cmd_dir)

    start = time.time()
    print("\t>>> Running: " + shell_cmd)
-    p = subprocess.Popen(  # noqa
-        shell_cmd,
-        shell=True,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        cwd=cmd_dir,
-    )
+    p = subprocess.Popen(shell_cmd,
+                         shell=True,
+                         stdout=subprocess.PIPE,
+                         stderr=subprocess.PIPE,
+                         cwd=cmd_dir)
    stdout, stderr = p.communicate()
    end = time.time()

    # Report time if we spent more than 5 minutes executing a command
    execution_time = end - start
    if execution_time > (60 * 5):
-        mins = execution_time / 60
-        secs = execution_time % 60
+        mins = (execution_time / 60)
+        secs = (execution_time % 60)
        print("\t>time spent: %d minutes %d seconds" % (mins, secs))

+
    return p.returncode, stdout, stderr


 def run_shell_commands(shell_cmds, cmd_dir=None, verbose=False):
-    """Execute a sequence of shell commands, which is equivalent to
-    running `cmd1 && cmd2 && cmd3`
-    @returns boolean indication if all commands succeeds.
+    """ Execute a sequence of shell commands, which is equivalent to
+        running `cmd1 && cmd2 && cmd3`
+        @returns boolean indication if all commands succeeds.
    """

    if cmd_dir:
@@ -28,15 +28,14 @@
 from __future__ import print_function

 import argparse
+from os import path
 import re
 import sys
-from os import path

 include_re = re.compile('^[ \t]*#include[ \t]+"(.*)"[ \t]*$')
 included = set()
 excluded = set()

-
 def find_header(name, abs_path, include_paths):
    samedir = path.join(path.dirname(abs_path), name)
    if path.exists(samedir):
@@ -47,31 +46,17 @@ def find_header(name, abs_path, include_paths):
            return include_path
    return None

-
-def expand_include(
-    include_path,
-    f,
-    abs_path,
-    source_out,
-    header_out,
-    include_paths,
-    public_include_paths,
-):
+def expand_include(include_path, f, abs_path, source_out, header_out, include_paths, public_include_paths):
    if include_path in included:
        return False

    included.add(include_path)
    with open(include_path) as f:
        print('#line 1 "{}"'.format(include_path), file=source_out)
-        process_file(
-            f, include_path, source_out, header_out, include_paths, public_include_paths
-        )
+        process_file(f, include_path, source_out, header_out, include_paths, public_include_paths)
    return True

-
-def process_file(
-    f, abs_path, source_out, header_out, include_paths, public_include_paths
-):
+def process_file(f, abs_path, source_out, header_out, include_paths, public_include_paths):
    for (line, text) in enumerate(f):
        m = include_re.match(text)
        if m:
@@ -83,15 +68,7 @@ def process_file(
                    source_out.write(text)
                    expanded = False
                else:
-                    expanded = expand_include(
-                        include_path,
-                        f,
-                        abs_path,
-                        source_out,
-                        header_out,
-                        include_paths,
-                        public_include_paths,
-                    )
+                    expanded = expand_include(include_path, f, abs_path, source_out, header_out, include_paths, public_include_paths)
            else:
                # now try public headers
                include_path = find_header(filename, abs_path, public_include_paths)
@@ -101,52 +78,23 @@ def process_file(
                    if include_path in excluded:
                        source_out.write(text)
                    else:
-                        expand_include(
-                            include_path,
-                            f,
-                            abs_path,
-                            header_out,
-                            None,
-                            public_include_paths,
-                            [],
-                        )
+                        expand_include(include_path, f, abs_path, header_out, None, public_include_paths, [])
                else:
-                    sys.exit(
-                        "unable to find {}, included in {} on line {}".format(
-                            filename, abs_path, line
-                        )
-                    )
+                    sys.exit("unable to find {}, included in {} on line {}".format(filename, abs_path, line))

            if expanded:
-                print('#line {} "{}"'.format(line + 1, abs_path), file=source_out)
+                print('#line {} "{}"'.format(line+1, abs_path), file=source_out)
        elif text != "#pragma once\n":
            source_out.write(text)

-
 def main():
-    parser = argparse.ArgumentParser(
-        description="Transform a unity build into an amalgamation"
-    )
+    parser = argparse.ArgumentParser(description="Transform a unity build into an amalgamation")
    parser.add_argument("source", help="source file")
-    parser.add_argument(
-        "-I",
-        action="append",
-        dest="include_paths",
-        help="include paths for private headers",
-    )
-    parser.add_argument(
-        "-i",
-        action="append",
-        dest="public_include_paths",
-        help="include paths for public headers",
-    )
-    parser.add_argument(
-        "-x", action="append", dest="excluded", help="excluded header files"
-    )
+    parser.add_argument("-I", action="append", dest="include_paths", help="include paths for private headers")
+    parser.add_argument("-i", action="append", dest="public_include_paths", help="include paths for public headers")
+    parser.add_argument("-x", action="append", dest="excluded", help="excluded header files")
    parser.add_argument("-o", dest="source_out", help="output C++ file", required=True)
-    parser.add_argument(
-        "-H", dest="header_out", help="output C++ header file", required=True
-    )
+    parser.add_argument("-H", dest="header_out", help="output C++ header file", required=True)
    args = parser.parse_args()

    include_paths = list(map(path.abspath, args.include_paths or []))
@@ -154,15 +102,10 @@ def main():
    excluded.update(map(path.abspath, args.excluded or []))
    filename = args.source
    abs_path = path.abspath(filename)
-    with open(filename) as f, open(args.source_out, "w") as source_out, open(
-        args.header_out, "w"
-    ) as header_out:
+    with open(filename) as f, open(args.source_out, 'w') as source_out, open(args.header_out, 'w') as header_out:
        print('#line 1 "{}"'.format(filename), file=source_out)
        print('#include "{}"'.format(header_out.name), file=source_out)
-        process_file(
-            f, abs_path, source_out, header_out, include_paths, public_include_paths
-        )
-
+        process_file(f, abs_path, source_out, header_out, include_paths, public_include_paths)

 if __name__ == "__main__":
    main()
@@ -1,238 +0,0 @@
-#!/usr/bin/env python3
-#  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).
-
-"""Access the results of benchmark runs
-Send these results on to OpenSearch graphing service
-"""
-
-import argparse
-import itertools
-import logging
-import os
-import re
-import sys
-
-import requests
-from dateutil import parser
-
-logging.basicConfig(level=logging.DEBUG)
-
-
-class Configuration:
-    opensearch_user = os.environ["ES_USER"]
-    opensearch_pass = os.environ["ES_PASS"]
-
-
-class BenchmarkResultException(Exception):
-    def __init__(self, message, content):
-        super().__init__(self, message)
-        self.content = content
-
-
-class BenchmarkUtils:
-
-    expected_keys = [
-        "ops_sec",
-        "mb_sec",
-        "lsm_sz",
-        "blob_sz",
-        "c_wgb",
-        "w_amp",
-        "c_mbps",
-        "c_wsecs",
-        "c_csecs",
-        "b_rgb",
-        "b_wgb",
-        "usec_op",
-        "p50",
-        "p99",
-        "p99.9",
-        "p99.99",
-        "pmax",
-        "uptime",
-        "stall%",
-        "Nstall",
-        "u_cpu",
-        "s_cpu",
-        "rss",
-        "test",
-        "date",
-        "version",
-        "job_id",
-    ]
-
-    def sanity_check(row):
-        if "test" not in row:
-            logging.debug(f"not 'test' in row: {row}")
-            return False
-        if row["test"] == "":
-            logging.debug(f"row['test'] == '': {row}")
-            return False
-        if "date" not in row:
-            logging.debug(f"not 'date' in row: {row}")
-            return False
-        if "ops_sec" not in row:
-            logging.debug(f"not 'ops_sec' in row: {row}")
-            return False
-        try:
-            _ = int(row["ops_sec"])
-        except (ValueError, TypeError):
-            logging.debug(f"int(row['ops_sec']): {row}")
-            return False
-        try:
-            (_, _) = parser.parse(row["date"], fuzzy_with_tokens=True)
-        except (parser.ParserError):
-            logging.error(
-                f"parser.parse((row['date']): not a valid format for date in row: {row}"
-            )
-            return False
-        return True
-
-    def conform_opensearch(row):
-        (dt, _) = parser.parse(row["date"], fuzzy_with_tokens=True)
-        # create a test_date field, which was previously what was expected
-        # repair the date field, which has what can be a WRONG ISO FORMAT, (no leading 0 on single-digit day-of-month)
-        # e.g. 2022-07-1T00:14:55 should be 2022-07-01T00:14:55
-        row["test_date"] = dt.isoformat()
-        row["date"] = dt.isoformat()
-        return {key.replace(".", "_"): value for key, value in row.items()}
-
-
-class ResultParser:
-    def __init__(self, field="(\w|[+-:.%])+", intrafield="(\s)+", separator="\t"):
-        self.field = re.compile(field)
-        self.intra = re.compile(intrafield)
-        self.sep = re.compile(separator)
-
-    def ignore(self, l_in: str):
-        if len(l_in) == 0:
-            return True
-        if l_in[0:1] == "#":
-            return True
-        return False
-
-    def line(self, line_in: str):
-        """Parse a line into items
-        Being clever about separators
-        """
-        line = line_in
-        row = []
-        while line != "":
-            match_item = self.field.match(line)
-            if match_item:
-                item = match_item.group(0)
-                row.append(item)
-                line = line[len(item) :]
-            else:
-                match_intra = self.intra.match(line)
-                if match_intra:
-                    intra = match_intra.group(0)
-                    # Count the separators
-                    # If there are >1 then generate extra blank fields
-                    # White space with no true separators fakes up a single separator
-                    tabbed = self.sep.split(intra)
-                    sep_count = len(tabbed) - 1
-                    if sep_count == 0:
-                        sep_count = 1
-                    for _ in range(sep_count - 1):
-                        row.append("")
-                    line = line[len(intra) :]
-                else:
-                    raise BenchmarkResultException(
-                        "Invalid TSV line", f"{line_in} at {line}"
-                    )
-        return row
-
-    def parse(self, lines):
-        """Parse something that iterates lines"""
-        rows = [self.line(line) for line in lines if not self.ignore(line)]
-        header = rows[0]
-        width = len(header)
-        records = [
-            {k: v for (k, v) in itertools.zip_longest(header, row[:width])}
-            for row in rows[1:]
-        ]
-        return records
-
-
-def load_report_from_tsv(filename: str):
-    file = open(filename, "r")
-    contents = file.readlines()
-    file.close()
-    parser = ResultParser()
-    report = parser.parse(contents)
-    logging.debug(f"Loaded TSV Report: {report}")
-    return report
-
-
-def push_report_to_opensearch(report, esdocument):
-    sanitized = [
-        BenchmarkUtils.conform_opensearch(row)
-        for row in report
-        if BenchmarkUtils.sanity_check(row)
-    ]
-    logging.debug(
-        f"upload {len(sanitized)} sane of {len(report)} benchmarks to opensearch"
-    )
-    for single_benchmark in sanitized:
-        logging.debug(f"upload benchmark: {single_benchmark}")
-        response = requests.post(
-            esdocument,
-            json=single_benchmark,
-            auth=(os.environ["ES_USER"], os.environ["ES_PASS"]),
-        )
-        logging.debug(
-            f"Sent to OpenSearch, status: {response.status_code}, result: {response.text}"
-        )
-        response.raise_for_status()
-
-
-def push_report_to_null(report):
-
-    for row in report:
-        if BenchmarkUtils.sanity_check(row):
-            logging.debug(f"row {row}")
-            conformed = BenchmarkUtils.conform_opensearch(row)
-            logging.debug(f"conformed row {conformed}")
-
-
-def main():
-    """Tool for fetching, parsing and uploading benchmark results to OpenSearch / ElasticSearch
-    This tool will
-
-    (1) Open a local tsv benchmark report file
-    (2) Upload to OpenSearch document, via https/JSON
-    """
-
-    parser = argparse.ArgumentParser(description="CircleCI benchmark scraper.")
-
-    # --tsvfile is the name of the file to read results from
-    # --esdocument is the ElasticSearch document to push these results into
-    #
-    parser.add_argument(
-        "--tsvfile",
-        default="build_tools/circle_api_scraper_input.txt",
-        help="File from which to read tsv report",
-    )
-    parser.add_argument(
-        "--esdocument",
-        help="ElasticSearch/OpenSearch document URL to upload report into",
-    )
-    parser.add_argument(
-        "--upload", choices=["opensearch", "none"], default="opensearch"
-    )
-
-    args = parser.parse_args()
-    logging.debug(f"Arguments: {args}")
-    reports = load_report_from_tsv(args.tsvfile)
-    if args.upload == "opensearch":
-        push_report_to_opensearch(reports, args.esdocument)
-    else:
-        push_report_to_null(reports)
-
-
-if __name__ == "__main__":
-    sys.exit(main())
@@ -277,7 +277,6 @@ if [ "$CROSS_COMPILE" = "true" -o "$FBCODE_BUILD" = "true" ]; then
    if [ "$FBCODE_BUILD" = "true" ]; then
      # Enable backtrace on fbcode since the necessary libraries are present
      COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_BACKTRACE"
-      FOLLY_DIR="third-party/folly"
    fi
    true
 else
@@ -470,7 +469,7 @@ EOF

    if ! test $ROCKSDB_DISABLE_MEMKIND; then
        # Test whether memkind library is installed
-        $CXX $PLATFORM_CXXFLAGS $LDFLAGS -x c++ - -o test.o -lmemkind 2>/dev/null  <<EOF
+        $CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -lmemkind -x c++ - -o test.o 2>/dev/null  <<EOF
          #include <memkind.h>
          int main() {
            memkind_malloc(MEMKIND_DAX_KMEM, 1024);
@@ -602,17 +601,6 @@ EOF
            PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lbenchmark"
        fi
    fi
-    if test $USE_FOLLY; then
-        # Test whether libfolly library is installed
-        $CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null  <<EOF
-          #include <folly/synchronization/DistributedMutex.h>
-          int main() {}
-EOF
-        if [ "$?" != 0 ]; then
-          FOLLY_DIR="./third-party/folly"
-        fi
-    fi
-
 fi

 # TODO(tec): Fix -Wshorten-64-to-32 errors on FreeBSD and enable the warning.
@@ -674,13 +662,13 @@ else
  fi

  if [[ "${PLATFORM}" == "OS_MACOSX" ]]; then
-    # For portability compile for macOS 10.13 (2017) or newer
-    COMMON_FLAGS="$COMMON_FLAGS -mmacosx-version-min=10.13"
-    PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -mmacosx-version-min=10.13"
+    # 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.13 $PLATFORM_SHARED_LDFLAGS"
-    PLATFORM_CMAKE_FLAGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13"
-    JAVA_STATIC_DEPS_COMMON_FLAGS="-mmacosx-version-min=10.13"
+    PLATFORM_SHARED_LDFLAGS="-mmacosx-version-min=10.12 $PLATFORM_SHARED_LDFLAGS"
+    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"
    JAVA_STATIC_DEPS_CCFLAGS="$JAVA_STATIC_DEPS_COMMON_FLAGS"
    JAVA_STATIC_DEPS_CXXFLAGS="$JAVA_STATIC_DEPS_COMMON_FLAGS"
@@ -812,6 +800,9 @@ if [ "$?" = 0 ]; then
  COMMON_FLAGS="$COMMON_FLAGS -DHAVE_UINT128_EXTENSION"
 fi

+# thread_local is part of C++11 and later (TODO: clean up this define)
+COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_SUPPORT_THREAD_LOCAL"
+
 if [ "$FBCODE_BUILD" != "true" -a "$PLATFORM" = OS_LINUX ]; then
  $CXX $COMMON_FLAGS $PLATFORM_SHARED_CFLAGS -x c++ -c - -o test_dl.o 2>/dev/null <<EOF
  void dummy_func() {}
@@ -839,13 +830,6 @@ fi

 rm -f test.o test_dl.o

-# Get the path for the folly installation dir
-if [ "$USE_FOLLY" ]; then
-  if [ "$FOLLY_DIR" ]; then
-    FOLLY_PATH=`cd $FOLLY_DIR && $PYTHON build/fbcode_builder/getdeps.py show-inst-dir folly`
-  fi
-fi
-
 PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
 PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS $COMMON_FLAGS"

@@ -885,8 +869,6 @@ echo "CLANG_ANALYZER=$CLANG_ANALYZER" >> "$OUTPUT"
 echo "PROFILING_FLAGS=$PROFILING_FLAGS" >> "$OUTPUT"
 echo "FIND=$FIND" >> "$OUTPUT"
 echo "WATCH=$WATCH" >> "$OUTPUT"
-echo "FOLLY_PATH=$FOLLY_PATH" >> "$OUTPUT"
-
 # This will enable some related identifiers for the preprocessor
 if test -n "$JEMALLOC"; then
  echo "JEMALLOC=1" >> "$OUTPUT"
@@ -5,31 +5,25 @@

 BAD=""

-git grep -n 'namespace rocksdb' -- '*.[ch]*'
+git grep 'namespace rocksdb' -- '*.[ch]*'
 if [ "$?" != "1" ]; then
  echo "^^^^^ Do not hardcode namespace rocksdb. Use ROCKSDB_NAMESPACE"
  BAD=1
 fi

-git grep -n -i 'nocommit' -- ':!build_tools/check-sources.sh'
+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 -n 'include <rocksdb/' -- ':!build_tools/check-sources.sh'
+git grep '<rocksdb/' -- ':!build_tools/check-sources.sh'
 if [ "$?" != "1" ]; then
  echo '^^^^^ Use double-quotes as in #include "rocksdb/something.h"'
  BAD=1
 fi

-git grep -n 'include "include/rocksdb/' -- ':!build_tools/check-sources.sh'
-if [ "$?" != "1" ]; then
-  echo '^^^^^ Use #include "rocksdb/something.h" instead of #include "include/rocksdb/something.h"'
-  BAD=1
-fi
-
-git grep -n 'using namespace' -- ':!build_tools' ':!docs' \
+git grep 'using namespace' -- ':!build_tools' ':!docs' \
    ':!third-party/folly/folly/lang/Align.h' \
    ':!third-party/gtest-1.8.1/fused-src/gtest/gtest.h'
 if [ "$?" != "1" ]; then
@@ -37,12 +31,6 @@ if [ "$?" != "1" ]; then
  BAD=1
 fi

-git grep -n -P "[\x80-\xFF]" -- ':!docs' ':!*.md'
-if [ "$?" != "1" ]; then
-  echo '^^^^ Use only ASCII characters in source files'
-  BAD=1
-fi
-
 if [ "$BAD" ]; then
  exit 1
 fi
@@ -6,10 +6,10 @@ GLIBC_BASE=/mnt/gvfs/third-party2/glibc/45ce3375cdc77ecb2520bbf8f0ecddd3f98efd7a
 SNAPPY_BASE=/mnt/gvfs/third-party2/snappy/be4de3205e029101b18aa8103daa696c2bef3b19/1.1.3/platform009/7f3b187
 ZLIB_BASE=/mnt/gvfs/third-party2/zlib/3c160ac5c67e257501e24c6c1d00ad5e01d73db6/1.2.8/platform009/7f3b187
 BZIP2_BASE=/mnt/gvfs/third-party2/bzip2/73a237ac5bc0a5f5d67b39b8d253cfebaab88684/1.0.6/platform009/7f3b187
-LZ4_BASE=/mnt/gvfs/third-party2/lz4/6ca38d3c390be2774d61a300f151464bbd632d62/1.9.1/platform009/7f3b187
+LZ4_BASE=/mnt/gvfs/third-party2/lz4/ec6573523b0ce55ef6373a4801189027cf07bb2c/1.9.1/platform009/7f3b187
 ZSTD_BASE=/mnt/gvfs/third-party2/zstd/64c58a207d2495e83abc57a500a956df09b79a7c/1.4.x/platform009/ba86d1f
 GFLAGS_BASE=/mnt/gvfs/third-party2/gflags/824d0a8a5abb5b121afd1b35fc3896407ea50092/2.2.0/platform009/7f3b187
-JEMALLOC_BASE=/mnt/gvfs/third-party2/jemalloc/b62912d333ef33f9760efa6219dbe3fe6abb3b0e/master/platform009/c305944
+JEMALLOC_BASE=/mnt/gvfs/third-party2/jemalloc/d9aef9feb850b168a68736420f217b01cce11a89/master/platform009/c305944
 NUMA_BASE=/mnt/gvfs/third-party2/numa/0af65f71e23a67bf65dc91b11f95caa39325c432/2.0.11/platform009/7f3b187
 LIBUNWIND_BASE=/mnt/gvfs/third-party2/libunwind/02486dac347645d31dce116f44e1de3177315be2/1.4/platform009/5191652
 TBB_BASE=/mnt/gvfs/third-party2/tbb/2e0ec671e550bfca347300bf3f789d9c0fff24ad/2018_U5/platform009/7f3b187
@@ -19,4 +19,4 @@ BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/08634589372fa5f237bfd374e8c644a836
 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/30bf49ad6414325e17f3425b0edcb64239427ae3/1.6.1/platform009/7f3b187
-GLOG_BASE=/mnt/gvfs/third-party2/glog/32d751bd5673375b438158717ab6a57c1cc57e3d/0.3.2_fb/platform009/10a364d
+BOOST_BASE=/mnt/gvfs/third-party2/boost/201b7d74941e54b436dfa364a063aa6d2cd7de4c/1.69.0/platform009/8a7ffdf
@@ -3,13 +3,16 @@
 #  COPYING file in the root directory) and Apache 2.0 License
 #  (found in the LICENSE.Apache file in the root directory).

-"""Filter for error messages in test output:
+'''Filter for error messages in test output:
    - Receives merged stdout/stderr from test on stdin
    - Finds patterns of known error messages for test name (first argument)
    - Prints those error messages to stdout
-"""
+'''

-from __future__ import absolute_import, division, print_function, unicode_literals
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals

 import re
 import sys
@@ -17,24 +20,23 @@ import sys

 class ErrorParserBase(object):
    def parse_error(self, line):
-        """Parses a line of test output. If it contains an error, returns a
+        '''Parses a line of test output. If it contains an error, returns a
        formatted message describing the error; otherwise, returns None.
        Subclasses must override this method.
-        """
+        '''
        raise NotImplementedError


 class GTestErrorParser(ErrorParserBase):
-    """A parser that remembers the last test that began running so it can print
+    '''A parser that remembers the last test that began running so it can print
    that test's name upon detecting failure.
-    """
-
-    _GTEST_NAME_PATTERN = re.compile(r"\[ RUN      \] (\S+)$")
+    '''
+    _GTEST_NAME_PATTERN = re.compile(r'\[ RUN      \] (\S+)$')
    # format: '<filename or "unknown file">:<line #>: Failure'
-    _GTEST_FAIL_PATTERN = re.compile(r"(unknown file|\S+:\d+): Failure$")
+    _GTEST_FAIL_PATTERN = re.compile(r'(unknown file|\S+:\d+): Failure$')

    def __init__(self):
-        self._last_gtest_name = "Unknown test"
+        self._last_gtest_name = 'Unknown test'

    def parse_error(self, line):
        gtest_name_match = self._GTEST_NAME_PATTERN.match(line)
@@ -43,13 +45,14 @@ class GTestErrorParser(ErrorParserBase):
            return None
        gtest_fail_match = self._GTEST_FAIL_PATTERN.match(line)
        if gtest_fail_match:
-            return "%s failed: %s" % (self._last_gtest_name, gtest_fail_match.group(1))
+            return '%s failed: %s' % (
+                    self._last_gtest_name, gtest_fail_match.group(1))
        return None


 class MatchErrorParser(ErrorParserBase):
-    """A simple parser that returns the whole line if it matches the pattern."""
-
+    '''A simple parser that returns the whole line if it matches the pattern.
+    '''
    def __init__(self, pattern):
        self._pattern = re.compile(pattern)

@@ -66,104 +69,97 @@ class CompilerErrorParser(MatchErrorParser):
        # format (link error):
        #   '<filename>:<line #>: error: <error msg>'
        # The below regex catches both
-        super(CompilerErrorParser, self).__init__(r"\S+:\d+: error:")
+        super(CompilerErrorParser, self).__init__(r'\S+:\d+: error:')


 class ScanBuildErrorParser(MatchErrorParser):
    def __init__(self):
-        super(ScanBuildErrorParser, self).__init__(r"scan-build: \d+ bugs found.$")
+        super(ScanBuildErrorParser, self).__init__(
+                r'scan-build: \d+ bugs found.$')


 class DbCrashErrorParser(MatchErrorParser):
    def __init__(self):
-        super(DbCrashErrorParser, self).__init__(r"\*\*\*.*\^$|TEST FAILED.")
+        super(DbCrashErrorParser, self).__init__(r'\*\*\*.*\^$|TEST FAILED.')


 class WriteStressErrorParser(MatchErrorParser):
    def __init__(self):
        super(WriteStressErrorParser, self).__init__(
-            r"ERROR: write_stress died with exitcode=\d+"
-        )
+                r'ERROR: write_stress died with exitcode=\d+')


 class AsanErrorParser(MatchErrorParser):
    def __init__(self):
-        super(AsanErrorParser, self).__init__(r"==\d+==ERROR: AddressSanitizer:")
+        super(AsanErrorParser, self).__init__(
+                r'==\d+==ERROR: AddressSanitizer:')


 class UbsanErrorParser(MatchErrorParser):
    def __init__(self):
        # format: '<filename>:<line #>:<column #>: runtime error: <error msg>'
-        super(UbsanErrorParser, self).__init__(r"\S+:\d+:\d+: runtime error:")
+        super(UbsanErrorParser, self).__init__(r'\S+:\d+:\d+: runtime error:')


 class ValgrindErrorParser(MatchErrorParser):
    def __init__(self):
        # just grab the summary, valgrind doesn't clearly distinguish errors
        # from other log messages.
-        super(ValgrindErrorParser, self).__init__(r"==\d+== ERROR SUMMARY:")
+        super(ValgrindErrorParser, self).__init__(r'==\d+== ERROR SUMMARY:')


 class CompatErrorParser(MatchErrorParser):
    def __init__(self):
-        super(CompatErrorParser, self).__init__(r"==== .*[Ee]rror.* ====$")
+        super(CompatErrorParser, self).__init__(r'==== .*[Ee]rror.* ====$')


 class TsanErrorParser(MatchErrorParser):
    def __init__(self):
-        super(TsanErrorParser, self).__init__(r"WARNING: ThreadSanitizer:")
+        super(TsanErrorParser, self).__init__(r'WARNING: ThreadSanitizer:')


 _TEST_NAME_TO_PARSERS = {
-    "punit": [CompilerErrorParser, GTestErrorParser],
-    "unit": [CompilerErrorParser, GTestErrorParser],
-    "release": [CompilerErrorParser, GTestErrorParser],
-    "unit_481": [CompilerErrorParser, GTestErrorParser],
-    "release_481": [CompilerErrorParser, GTestErrorParser],
-    "clang_unit": [CompilerErrorParser, GTestErrorParser],
-    "clang_release": [CompilerErrorParser, GTestErrorParser],
-    "clang_analyze": [CompilerErrorParser, ScanBuildErrorParser],
-    "code_cov": [CompilerErrorParser, GTestErrorParser],
-    "unity": [CompilerErrorParser, GTestErrorParser],
-    "lite": [CompilerErrorParser],
-    "lite_test": [CompilerErrorParser, GTestErrorParser],
-    "stress_crash": [CompilerErrorParser, DbCrashErrorParser],
-    "stress_crash_with_atomic_flush": [CompilerErrorParser, DbCrashErrorParser],
-    "stress_crash_with_txn": [CompilerErrorParser, DbCrashErrorParser],
-    "write_stress": [CompilerErrorParser, WriteStressErrorParser],
-    "asan": [CompilerErrorParser, GTestErrorParser, AsanErrorParser],
-    "asan_crash": [CompilerErrorParser, AsanErrorParser, DbCrashErrorParser],
-    "asan_crash_with_atomic_flush": [
-        CompilerErrorParser,
-        AsanErrorParser,
-        DbCrashErrorParser,
-    ],
-    "asan_crash_with_txn": [CompilerErrorParser, AsanErrorParser, DbCrashErrorParser],
-    "ubsan": [CompilerErrorParser, GTestErrorParser, UbsanErrorParser],
-    "ubsan_crash": [CompilerErrorParser, UbsanErrorParser, DbCrashErrorParser],
-    "ubsan_crash_with_atomic_flush": [
-        CompilerErrorParser,
-        UbsanErrorParser,
-        DbCrashErrorParser,
-    ],
-    "ubsan_crash_with_txn": [CompilerErrorParser, UbsanErrorParser, DbCrashErrorParser],
-    "valgrind": [CompilerErrorParser, GTestErrorParser, ValgrindErrorParser],
-    "tsan": [CompilerErrorParser, GTestErrorParser, TsanErrorParser],
-    "format_compatible": [CompilerErrorParser, CompatErrorParser],
-    "run_format_compatible": [CompilerErrorParser, CompatErrorParser],
-    "no_compression": [CompilerErrorParser, GTestErrorParser],
-    "run_no_compression": [CompilerErrorParser, GTestErrorParser],
-    "regression": [CompilerErrorParser],
-    "run_regression": [CompilerErrorParser],
+    'punit': [CompilerErrorParser, GTestErrorParser],
+    'unit': [CompilerErrorParser, GTestErrorParser],
+    'release': [CompilerErrorParser, GTestErrorParser],
+    'unit_481': [CompilerErrorParser, GTestErrorParser],
+    'release_481': [CompilerErrorParser, GTestErrorParser],
+    'clang_unit': [CompilerErrorParser, GTestErrorParser],
+    'clang_release': [CompilerErrorParser, GTestErrorParser],
+    'clang_analyze': [CompilerErrorParser, ScanBuildErrorParser],
+    'code_cov': [CompilerErrorParser, GTestErrorParser],
+    'unity': [CompilerErrorParser, GTestErrorParser],
+    'lite': [CompilerErrorParser],
+    'lite_test': [CompilerErrorParser, GTestErrorParser],
+    'stress_crash': [CompilerErrorParser, DbCrashErrorParser],
+    'stress_crash_with_atomic_flush': [CompilerErrorParser, DbCrashErrorParser],
+    'stress_crash_with_txn': [CompilerErrorParser, DbCrashErrorParser],
+    'write_stress': [CompilerErrorParser, WriteStressErrorParser],
+    'asan': [CompilerErrorParser, GTestErrorParser, AsanErrorParser],
+    'asan_crash': [CompilerErrorParser, AsanErrorParser, DbCrashErrorParser],
+    'asan_crash_with_atomic_flush': [CompilerErrorParser, AsanErrorParser, DbCrashErrorParser],
+    'asan_crash_with_txn': [CompilerErrorParser, AsanErrorParser, DbCrashErrorParser],
+    'ubsan': [CompilerErrorParser, GTestErrorParser, UbsanErrorParser],
+    'ubsan_crash': [CompilerErrorParser, UbsanErrorParser, DbCrashErrorParser],
+    'ubsan_crash_with_atomic_flush': [CompilerErrorParser, UbsanErrorParser, DbCrashErrorParser],
+    'ubsan_crash_with_txn': [CompilerErrorParser, UbsanErrorParser, DbCrashErrorParser],
+    'valgrind': [CompilerErrorParser, GTestErrorParser, ValgrindErrorParser],
+    'tsan': [CompilerErrorParser, GTestErrorParser, TsanErrorParser],
+    'format_compatible': [CompilerErrorParser, CompatErrorParser],
+    'run_format_compatible': [CompilerErrorParser, CompatErrorParser],
+    'no_compression': [CompilerErrorParser, GTestErrorParser],
+    'run_no_compression': [CompilerErrorParser, GTestErrorParser],
+    'regression': [CompilerErrorParser],
+    'run_regression': [CompilerErrorParser],
 }


 def main():
    if len(sys.argv) != 2:
-        return "Usage: %s <test name>" % sys.argv[0]
+        return 'Usage: %s <test name>' % sys.argv[0]
    test_name = sys.argv[1]
    if test_name not in _TEST_NAME_TO_PARSERS:
-        return "Unknown test name: %s" % test_name
+        return 'Unknown test name: %s' % test_name

    error_parsers = []
    for parser_cls in _TEST_NAME_TO_PARSERS[test_name]:
@@ -177,5 +173,5 @@ def main():
                print(error_msg)


-if __name__ == "__main__":
+if __name__ == '__main__':
    sys.exit(main())
@@ -147,7 +147,7 @@ else
 fi

 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 -DHAVE_SSE42"
+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"
 CXXFLAGS+=" $CFLAGS"

 EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $TBB_LIBS"
@@ -14,7 +14,7 @@ source "$BASEDIR/dependencies_platform009.sh"
 CFLAGS=""

 # libgcc
-LIBGCC_INCLUDE="$LIBGCC_BASE/include/c++/9.3.0 -I $LIBGCC_BASE/include/c++/9.3.0/backward"
+LIBGCC_INCLUDE="$LIBGCC_BASE/include/c++/9.3.0"
 LIBGCC_LIBS=" -L $LIBGCC_BASE/lib"

 # glibc
@@ -68,8 +68,7 @@ CFLAGS+=" -DGFLAGS=gflags"
 BENCHMARK_INCLUDE=" -I $BENCHMARK_BASE/include/"
 BENCHMARK_LIBS=" $BENCHMARK_BASE/lib/libbenchmark${MAYBE_PIC}.a"

-GLOG_INCLUDE=" -I $GLOG_BASE/include/"
-GLOG_LIBS=" $GLOG_BASE/lib/libglog${MAYBE_PIC}.a"
+BOOST_INCLUDE=" -I $BOOST_BASE/include/"

 # location of jemalloc
 JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/"
@@ -102,7 +101,7 @@ 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 $GLOG_INCLUDE"
+DEPS_INCLUDE="$SNAPPY_INCLUDE $ZLIB_INCLUDE $BZIP_INCLUDE $LZ4_INCLUDE $ZSTD_INCLUDE $GFLAGS_INCLUDE $NUMA_INCLUDE $TBB_INCLUDE $LIBURING_INCLUDE $BENCHMARK_INCLUDE $BOOST_INCLUDE"

 STDLIBS="-L $GCC_BASE/lib64"

@@ -145,7 +144,7 @@ else
 fi

 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 -DHAVE_SSE42 -DROCKSDB_IOURING_PRESENT"
+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"
@@ -118,19 +118,10 @@ if [ -z "$USE_CLANG" ]; then
  CXX="$GCC_BASE/bin/g++"
  AR="$GCC_BASE/bin/gcc-ar"

-  CFLAGS+=" -B$BINUTILS -nostdinc -nostdlib"
-  CFLAGS+=" -I$GCC_BASE/include"
-  CFLAGS+=" -isystem $GCC_BASE/lib/gcc/x86_64-redhat-linux-gnu/11.2.1/include"
-  CFLAGS+=" -isystem $GCC_BASE/lib/gcc/x86_64-redhat-linux-gnu/11.2.1/install-tools/include"
-  CFLAGS+=" -isystem $GCC_BASE/lib/gcc/x86_64-redhat-linux-gnu/11.2.1/include-fixed/"
+
+  CFLAGS+=" -B$BINUTILS"
  CFLAGS+=" -isystem $LIBGCC_INCLUDE"
  CFLAGS+=" -isystem $GLIBC_INCLUDE"
-  CFLAGS+=" -I$GLIBC_INCLUDE"
-  CFLAGS+=" -I$LIBGCC_BASE/include"
-  CFLAGS+=" -I$LIBGCC_BASE/include/c++/11.x/"
-  CFLAGS+=" -I$LIBGCC_BASE/include/c++/11.x/x86_64-facebook-linux/"
-  CFLAGS+=" -I$LIBGCC_BASE/include/c++/11.x/backward"
-  CFLAGS+=" -isystem $GLIBC_INCLUDE -I$GLIBC_INCLUDE"
  JEMALLOC=1
 else
  # clang
@@ -154,7 +145,7 @@ CFLAGS+=" -isystem $KERNEL_HEADERS_INCLUDE/linux "
 CFLAGS+=" -isystem $KERNEL_HEADERS_INCLUDE "

 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 -DHAVE_SSE42 -DROCKSDB_IOURING_PRESENT"
+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"
@@ -170,6 +170,11 @@ echo "$diffs" |
  sed -e "s/\(^-.*$\)/`echo -e \"$COLOR_RED\1$COLOR_END\"`/" |
  sed -e "s/\(^+.*$\)/`echo -e \"$COLOR_GREEN\1$COLOR_END\"`/"

+if [[ "$OPT" == *"-DTRAVIS"* ]]
+then
+  exit 1
+fi
+
 echo -e "Would you like to fix the format automatically (y/n): \c"

 # Make sure under any mode, we can read user input.
@@ -1170,7 +1170,7 @@ sub parse_env_var {
    # Check if any variables contain \n
    if(my @v = map { s/BASH_FUNC_(.*)\(\)/$1/; $_ } grep { $ENV{$_}=~/\n/ } @vars) {
 	# \n is bad for csh and will cause it to fail.
-	$Global::envwarn = ::shell_quote_scalar(q{echo $SHELL | grep -E "/t?csh" > /dev/null && echo CSH/TCSH DO NOT SUPPORT newlines IN VARIABLES/FUNCTIONS. Unset }."@v".q{ && exec false;}."\n\n") . $Global::envwarn;
+	$Global::envwarn = ::shell_quote_scalar(q{echo $SHELL | egrep "/t?csh" > /dev/null && echo CSH/TCSH DO NOT SUPPORT newlines IN VARIABLES/FUNCTIONS. Unset }."@v".q{ && exec false;}."\n\n") . $Global::envwarn;
    }

    if(not @qcsh) { push @qcsh, "true"; }
@@ -1916,8 +1916,7 @@ sub drain_job_queue {
                } elsif (not $ps_reported and (time() - $last_progress_time) >= 60) {
                    # No progress in at least 60 seconds: run ps
                    print $Global::original_stderr "\n";
-                    my $script_dir = ::dirname($0);
-                    system("$script_dir/ps_with_stack || ps -wwf");
+                    system("ps", "-wf");
                    $ps_reported = 1;
                }
                $last_left = $Global::left;
@@ -1,38 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-
-open(my $ps, "-|", "ps -wwf");
-my $cols_known = 0;
-my $cmd_col = 0;
-my $pid_col = 0;
-while (<$ps>) {
-  print;
-  my @cols = split(/\s+/);
-
-  if (!$cols_known && /CMD/) {
-    # Parse relevant ps column headers
-    for (my $i = 0; $i <= $#cols; $i++) {
-      if ($cols[$i] eq "CMD") {
-        $cmd_col = $i;
-      }
-      if ($cols[$i] eq "PID") {
-        $pid_col = $i;
-      }
-    }
-    $cols_known = 1;
-  } else {
-    my $pid = $cols[$pid_col];
-    my $cmd = $cols[$cmd_col];
-    # Match numeric PID and relative path command
-    # -> The intention is only to dump stack traces for hangs in code under
-    # test, which means we probably just built it and are executing by
-    # relative path (e.g. ./my_test or foo/bar_test) rather then by absolute
-    # path (e.g. /usr/bin/time) or PATH search (e.g. grep).
-    if ($pid =~ /^[0-9]+$/ && $cmd =~ /^[^\/ ]+[\/]/) {
-      print "Dumping stacks for $pid...\n";
-      system("pstack $pid || gdb -batch -p $pid -ex 'thread apply all bt'");
-    }
-  }
-}
-close $ps;
@@ -1,57 +0,0 @@
-# from official ubuntu 20.04
-FROM ubuntu:20.04
-# update system
-RUN apt-get update && apt-get upgrade -y
-# install basic tools
-RUN apt-get install -y vim wget curl
-# install tzdata noninteractive
-RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-# install git and default compilers
-RUN apt-get install -y git gcc g++ clang clang-tools
-# install basic package
-RUN apt-get install -y lsb-release software-properties-common gnupg
-# install gflags, tbb
-RUN apt-get install -y libgflags-dev libtbb-dev
-# install compression libs
-RUN apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
-# install cmake
-RUN apt-get install -y cmake
-RUN apt-get install -y libssl-dev
-# install clang-13
-WORKDIR /root
-RUN wget https://apt.llvm.org/llvm.sh
-RUN chmod +x llvm.sh
-RUN ./llvm.sh 13 all
-# install gcc-7, 8, 10, 11, default is 9
-RUN apt-get install -y gcc-7 g++-7
-RUN apt-get install -y gcc-8 g++-8
-RUN apt-get install -y gcc-10 g++-10
-RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
-RUN apt-get install -y gcc-11 g++-11
-# install apt-get install -y valgrind
-RUN apt-get install -y valgrind
-# install folly depencencies
-RUN apt-get install -y libgoogle-glog-dev
-# install openjdk 8
-RUN apt-get install -y openjdk-8-jdk
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd64
-# install mingw
-RUN apt-get install -y mingw-w64
-
-# install gtest-parallel package
-RUN git clone --single-branch --branch master --depth 1 https://github.com/google/gtest-parallel.git ~/gtest-parallel
-ENV PATH $PATH:/root/gtest-parallel
-
-# install libprotobuf for fuzzers test
-RUN apt-get install -y ninja-build binutils liblzma-dev libz-dev pkg-config autoconf libtool
-RUN git clone --branch v1.0 https://github.com/google/libprotobuf-mutator.git ~/libprotobuf-mutator && cd ~/libprotobuf-mutator && git checkout ffd86a32874e5c08a143019aad1aaf0907294c9f && mkdir build && cd build && cmake .. -GNinja -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang++-13 -DCMAKE_BUILD_TYPE=Release -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON && ninja && ninja install
-ENV PKG_CONFIG_PATH /usr/local/OFF/:/root/libprotobuf-mutator/build/external.protobuf/lib/pkgconfig/
-ENV PROTOC_BIN /root/libprotobuf-mutator/build/external.protobuf/bin/protoc
-
-# install the latest google benchmark
-RUN git clone --depth 1 --branch v1.7.0 https://github.com/google/benchmark.git ~/benchmark
-RUN cd ~/benchmark && mkdir build && cd build && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=0 && ninja && ninja install
-
-# clean up
-RUN rm -rf /var/lib/apt/lists/*
-RUN rm -rf /root/benchmark
@@ -33,71 +33,14 @@ static std::unordered_map<std::string, OptionTypeInfo>
         {offsetof(struct LRUCacheOptions, high_pri_pool_ratio),
          OptionType::kDouble, OptionVerificationType::kNormal,
          OptionTypeFlags::kMutable}},
-        {"low_pri_pool_ratio",
-         {offsetof(struct LRUCacheOptions, low_pri_pool_ratio),
-          OptionType::kDouble, OptionVerificationType::kNormal,
-          OptionTypeFlags::kMutable}},
-};
-
-static std::unordered_map<std::string, OptionTypeInfo>
-    comp_sec_cache_options_type_info = {
-        {"capacity",
-         {offsetof(struct CompressedSecondaryCacheOptions, capacity),
-          OptionType::kSizeT, OptionVerificationType::kNormal,
-          OptionTypeFlags::kMutable}},
-        {"num_shard_bits",
-         {offsetof(struct CompressedSecondaryCacheOptions, num_shard_bits),
-          OptionType::kInt, OptionVerificationType::kNormal,
-          OptionTypeFlags::kMutable}},
-        {"compression_type",
-         {offsetof(struct CompressedSecondaryCacheOptions, compression_type),
-          OptionType::kCompressionType, OptionVerificationType::kNormal,
-          OptionTypeFlags::kMutable}},
-        {"compress_format_version",
-         {offsetof(struct CompressedSecondaryCacheOptions,
-                   compress_format_version),
-          OptionType::kUInt32T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kMutable}},
-        {"enable_custom_split_merge",
-         {offsetof(struct CompressedSecondaryCacheOptions,
-                   enable_custom_split_merge),
-          OptionType::kBoolean, OptionVerificationType::kNormal,
-          OptionTypeFlags::kMutable}},
 };
 #endif  // ROCKSDB_LITE

 Status SecondaryCache::CreateFromString(
    const ConfigOptions& config_options, const std::string& value,
    std::shared_ptr<SecondaryCache>* result) {
-  if (value.find("compressed_secondary_cache://") == 0) {
-    std::string args = value;
-    args.erase(0, std::strlen("compressed_secondary_cache://"));
-    Status status;
-    std::shared_ptr<SecondaryCache> sec_cache;
-
-#ifndef ROCKSDB_LITE
-    CompressedSecondaryCacheOptions sec_cache_opts;
-    status = OptionTypeInfo::ParseStruct(config_options, "",
-                                         &comp_sec_cache_options_type_info, "",
-                                         args, &sec_cache_opts);
-    if (status.ok()) {
-      sec_cache = NewCompressedSecondaryCache(sec_cache_opts);
-    }
-
-#else
-    (void)config_options;
-    status = Status::NotSupported(
-        "Cannot load compressed secondary cache in LITE mode ", args);
-#endif  //! ROCKSDB_LITE
-
-    if (status.ok()) {
-      result->swap(sec_cache);
-    }
-    return status;
-  } else {
-    return LoadSharedObject<SecondaryCache>(config_options, value, nullptr,
-                                            result);
-  }
+  return LoadSharedObject<SecondaryCache>(config_options, value, nullptr,
+                                          result);
 }

 Status Cache::CreateFromString(const ConfigOptions& config_options,
@@ -3,7 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include "cache_key.h"
 #ifdef GFLAGS
 #include <cinttypes>
 #include <cstddef>
@@ -13,7 +12,6 @@
 #include <set>
 #include <sstream>

-#include "cache/fast_lru_cache.h"
 #include "db/db_impl/db_impl.h"
 #include "monitoring/histogram.h"
 #include "port/port.h"
@@ -27,7 +25,6 @@
 #include "table/block_based/block_based_table_reader.h"
 #include "table/block_based/cachable_entry.h"
 #include "util/coding.h"
-#include "util/distributed_mutex.h"
 #include "util/gflags_compat.h"
 #include "util/hash.h"
 #include "util/mutexlock.h"
@@ -73,18 +70,13 @@ DEFINE_uint32(
 DEFINE_uint32(gather_stats_entries_per_lock, 256,
              "For Cache::ApplyToAllEntries");
 DEFINE_bool(skewed, false, "If true, skew the key access distribution");
-
-DEFINE_bool(lean, false,
-            "If true, no additional computation is performed besides cache "
-            "operations.");
-
 #ifndef ROCKSDB_LITE
 DEFINE_string(secondary_cache_uri, "",
              "Full URI for creating a custom secondary cache object");
 static class std::shared_ptr<ROCKSDB_NAMESPACE::SecondaryCache> secondary_cache;
 #endif  // ROCKSDB_LITE

-DEFINE_string(cache_type, "lru_cache", "Type of block cache.");
+DEFINE_bool(use_clock_cache, false, "");

 // ## BEGIN stress_cache_key sub-tool options ##
 // See class StressCacheKey below.
@@ -113,8 +105,6 @@ DEFINE_uint32(
    "(-stress_cache_key) Simulated file size in MiB, for accounting purposes");
 DEFINE_uint32(sck_reopen_nfiles, 100,
              "(-stress_cache_key) Simulate DB re-open average every n files");
-DEFINE_uint32(sck_newdb_nreopen, 1000,
-              "(-stress_cache_key) Simulate new DB average every n re-opens");
 DEFINE_uint32(sck_restarts_per_day, 24,
              "(-stress_cache_key) Average simulated process restarts per day "
              "(across DBs)");
@@ -222,8 +212,7 @@ struct KeyGen {
    EncodeFixed64(key_data + 10, key);
    key_data[18] = char{4};
    EncodeFixed64(key_data + 19, key);
-    assert(27 >= kCacheKeySize);
-    return Slice(&key_data[off], kCacheKeySize);
+    return Slice(&key_data[off], sizeof(key_data) - off);
  }
 };

@@ -290,21 +279,14 @@ class CacheBench {
      if (max_key > (static_cast<uint64_t>(1) << max_log_)) max_log_++;
    }

-    if (FLAGS_cache_type == "clock_cache") {
-      fprintf(stderr, "Old clock cache implementation has been removed.\n");
-      exit(1);
-    } else if (FLAGS_cache_type == "hyper_clock_cache") {
-      cache_ = HyperClockCacheOptions(FLAGS_cache_size, FLAGS_value_bytes,
-                                      FLAGS_num_shard_bits)
-                   .MakeSharedCache();
-    } else if (FLAGS_cache_type == "fast_lru_cache") {
-      cache_ = NewFastLRUCache(
-          FLAGS_cache_size, FLAGS_value_bytes, FLAGS_num_shard_bits,
-          false /*strict_capacity_limit*/, kDefaultCacheMetadataChargePolicy);
-    } else if (FLAGS_cache_type == "lru_cache") {
-      LRUCacheOptions opts(FLAGS_cache_size, FLAGS_num_shard_bits,
-                           false /* strict_capacity_limit */,
-                           0.5 /* high_pri_pool_ratio */);
+    if (FLAGS_use_clock_cache) {
+      cache_ = NewClockCache(FLAGS_cache_size, FLAGS_num_shard_bits);
+      if (!cache_) {
+        fprintf(stderr, "Clock cache not supported.\n");
+        exit(1);
+      }
+    } else {
+      LRUCacheOptions opts(FLAGS_cache_size, FLAGS_num_shard_bits, false, 0.5);
 #ifndef ROCKSDB_LITE
      if (!FLAGS_secondary_cache_uri.empty()) {
        Status s = SecondaryCache::CreateFromString(
@@ -321,9 +303,6 @@ class CacheBench {
 #endif  // ROCKSDB_LITE

      cache_ = NewLRUCache(opts);
-    } else {
-      fprintf(stderr, "Cache type not supported.");
-      exit(1);
    }
  }

@@ -333,9 +312,8 @@ class CacheBench {
    Random64 rnd(1);
    KeyGen keygen;
    for (uint64_t i = 0; i < 2 * FLAGS_cache_size; i += FLAGS_value_bytes) {
-      Status s = cache_->Insert(keygen.GetRand(rnd, max_key_, max_log_),
-                                createValue(rnd), &helper1, FLAGS_value_bytes);
-      assert(s.ok());
+      cache_->Insert(keygen.GetRand(rnd, max_key_, max_log_), createValue(rnd),
+                     &helper1, FLAGS_value_bytes);
    }
  }

@@ -439,8 +417,6 @@ class CacheBench {
    uint64_t total_key_size = 0;
    uint64_t total_charge = 0;
    uint64_t total_entry_count = 0;
-    uint64_t table_occupancy = 0;
-    uint64_t table_size = 0;
    std::set<Cache::DeleterFn> deleters;
    StopWatchNano timer(clock);

@@ -456,9 +432,6 @@ class CacheBench {
            std::ostringstream ostr;
            ostr << "Most recent cache entry stats:\n"
                 << "Number of entries: " << total_entry_count << "\n"
-                 << "Table occupancy: " << table_occupancy << " / "
-                 << table_size << " = "
-                 << (100.0 * table_occupancy / table_size) << "%\n"
                 << "Total charge: " << BytesToHumanString(total_charge) << "\n"
                 << "Average key size: "
                 << (1.0 * total_key_size / total_entry_count) << "\n"
@@ -495,8 +468,6 @@ class CacheBench {
      Cache::ApplyToAllEntriesOptions opts;
      opts.average_entries_per_lock = FLAGS_gather_stats_entries_per_lock;
      shared->GetCacheBench()->cache_->ApplyToAllEntries(fn, opts);
-      table_occupancy = shared->GetCacheBench()->cache_->GetOccupancyCount();
-      table_size = shared->GetCacheBench()->cache_->GetTableAddressCount();
      stats_hist->Add(timer.ElapsedNanos() / 1000);
    }
  }
@@ -536,6 +507,7 @@ class CacheBench {
    StopWatchNano timer(clock);

    for (uint64_t i = 0; i < FLAGS_ops_per_thread; i++) {
+      timer.Start();
      Slice key = gen.GetRand(thread->rnd, max_key_, max_log_);
      uint64_t random_op = thread->rnd.Next();
      Cache::CreateCallback create_cb = [](const void* buf, size_t size,
@@ -547,8 +519,6 @@ class CacheBench {
        return Status::OK();
      };

-      timer.Start();
-
      if (random_op < lookup_insert_threshold_) {
        if (handle) {
          cache_->Release(handle);
@@ -558,16 +528,13 @@ class CacheBench {
        handle = cache_->Lookup(key, &helper2, create_cb, Cache::Priority::LOW,
                                true);
        if (handle) {
-          if (!FLAGS_lean) {
-            // do something with the data
-            result += NPHash64(static_cast<char*>(cache_->Value(handle)),
-                               FLAGS_value_bytes);
-          }
+          // do something with the data
+          result += NPHash64(static_cast<char*>(cache_->Value(handle)),
+                             FLAGS_value_bytes);
        } else {
          // do insert
-          Status s = cache_->Insert(key, createValue(thread->rnd), &helper2,
-                                    FLAGS_value_bytes, &handle);
-          assert(s.ok());
+          cache_->Insert(key, createValue(thread->rnd), &helper2,
+                         FLAGS_value_bytes, &handle);
        }
      } else if (random_op < insert_threshold_) {
        if (handle) {
@@ -575,9 +542,8 @@ class CacheBench {
          handle = nullptr;
        }
        // do insert
-        Status s = cache_->Insert(key, createValue(thread->rnd), &helper3,
-                                  FLAGS_value_bytes, &handle);
-        assert(s.ok());
+        cache_->Insert(key, createValue(thread->rnd), &helper3,
+                       FLAGS_value_bytes, &handle);
      } else if (random_op < lookup_threshold_) {
        if (handle) {
          cache_->Release(handle);
@@ -587,11 +553,9 @@ class CacheBench {
        handle = cache_->Lookup(key, &helper2, create_cb, Cache::Priority::LOW,
                                true);
        if (handle) {
-          if (!FLAGS_lean) {
-            // do something with the data
-            result += NPHash64(static_cast<char*>(cache_->Value(handle)),
-                               FLAGS_value_bytes);
-          }
+          // do something with the data
+          result += NPHash64(static_cast<char*>(cache_->Value(handle)),
+                             FLAGS_value_bytes);
        }
      } else if (random_op < erase_threshold_) {
        // do erase
@@ -615,15 +579,7 @@ class CacheBench {
  }

  void PrintEnv() const {
-#if defined(__GNUC__) && !defined(__OPTIMIZE__)
-    printf(
-        "WARNING: Optimization is disabled: benchmarks unnecessarily slow\n");
-#endif
-#ifndef NDEBUG
-    printf("WARNING: Assertions are enabled; benchmarks unnecessarily slow\n");
-#endif
    printf("RocksDB version     : %d.%d\n", kMajorVersion, kMinorVersion);
-    printf("DMutex impl name    : %s\n", DMutex::kName());
    printf("Number of threads   : %u\n", FLAGS_threads);
    printf("Ops per thread      : %" PRIu64 "\n", FLAGS_ops_per_thread);
    printf("Cache size          : %s\n",
@@ -789,7 +745,7 @@ class StressCacheKey {

  void RunOnce() {
    // Re-initialized simulated state
-    const size_t db_count = std::max(size_t{FLAGS_sck_db_count}, size_t{1});
+    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]{});
@@ -806,13 +762,13 @@ class StressCacheKey {

    process_count_ = 0;
    session_count_ = 0;
-    newdb_count_ = 0;
-    ResetProcess(/*newdbs*/ true);
+    ResetProcess();

    Random64 r{std::random_device{}()};

    uint64_t max_file_count =
        uint64_t{FLAGS_sck_files_per_day} * FLAGS_sck_days_per_run;
+    uint64_t file_size = FLAGS_sck_file_size_mb * uint64_t{1024} * 1024U;
    uint32_t report_count = 0;
    uint32_t collisions_this_run = 0;
    size_t db_i = 0;
@@ -825,9 +781,9 @@ class StressCacheKey {
      }
      // Any other periodic actions before simulating next file
      if (!FLAGS_sck_footer_unique_id && r.OneIn(FLAGS_sck_reopen_nfiles)) {
-        ResetSession(db_i, /*newdb*/ r.OneIn(FLAGS_sck_newdb_nreopen));
+        ResetSession(db_i);
      } else if (r.OneIn(restart_nfiles_)) {
-        ResetProcess(/*newdbs*/ false);
+        ResetProcess();
      }
      // Simulate next file
      OffsetableCacheKey ock;
@@ -840,7 +796,8 @@ class StressCacheKey {
      }
      bool is_stable;
      BlockBasedTable::SetupBaseCacheKey(&dbs_[db_i], /* ignored */ "",
-                                         /* ignored */ 42, &ock, &is_stable);
+                                         /* ignored */ 42, file_size, &ock,
+                                         &is_stable);
      assert(is_stable);
      // Get a representative cache key, which later we analytically generalize
      // to a range.
@@ -850,11 +807,13 @@ class StressCacheKey {
        reduced_key = GetSliceHash64(ck.AsSlice()) >> shift_away;
      } else if (FLAGS_sck_footer_unique_id) {
        // Special case: keep only file number, not session counter
-        reduced_key = DecodeFixed64(ck.AsSlice().data()) >> shift_away;
+        uint32_t a = DecodeFixed32(ck.AsSlice().data() + 4) >> shift_away_a;
+        uint32_t b = DecodeFixed32(ck.AsSlice().data() + 12) >> shift_away_b;
+        reduced_key = (uint64_t{a} << 32) + b;
      } else {
        // Try to keep file number and session counter (shift away other bits)
        uint32_t a = DecodeFixed32(ck.AsSlice().data()) << shift_away_a;
-        uint32_t b = DecodeFixed32(ck.AsSlice().data() + 4) >> shift_away_b;
+        uint32_t b = DecodeFixed32(ck.AsSlice().data() + 12) >> shift_away_b;
        reduced_key = (uint64_t{a} << 32) + b;
      }
      if (reduced_key == 0) {
@@ -876,7 +835,7 @@ class StressCacheKey {
        // Our goal is to predict probability of no collisions, not expected
        // number of collisions. To make the distinction, we have to get rid
        // of observing correlated collisions, which this takes care of:
-        ResetProcess(/*newdbs*/ false);
+        ResetProcess();
      } else {
        // Replace (end of lifetime for file that was in this slot)
        table_[pos] = reduced_key;
@@ -894,11 +853,10 @@ class StressCacheKey {
        }
        // Report
        printf(
-            "%" PRIu64 " days, %" PRIu64 " proc, %" PRIu64 " sess, %" PRIu64
-            " newdb, %u coll, occ %g%%, ejected %g%%      \r",
+            "%" PRIu64 " days, %" PRIu64 " proc, %" PRIu64
+            " sess, %u coll, occ %g%%, ejected %g%%   \r",
            file_count / FLAGS_sck_files_per_day, process_count_,
-            session_count_, newdb_count_ - FLAGS_sck_db_count,
-            collisions_this_run, 100.0 * sampled_count / 1000.0,
+            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);
      }
@@ -906,27 +864,16 @@ class StressCacheKey {
    collisions_ += collisions_this_run;
  }

-  void ResetSession(size_t i, bool newdb) {
+  void ResetSession(size_t i) {
    dbs_[i].db_session_id = DBImpl::GenerateDbSessionId(nullptr);
-    if (newdb) {
-      ++newdb_count_;
-      if (FLAGS_sck_footer_unique_id) {
-        // Simulate how footer id would behave
-        dbs_[i].db_id = "none";
-      } else {
-        // db_id might be ignored, depending on the implementation details
-        dbs_[i].db_id = std::to_string(newdb_count_);
-        dbs_[i].orig_file_number = 0;
-      }
-    }
    session_count_++;
  }

-  void ResetProcess(bool newdbs) {
+  void ResetProcess() {
    process_count_++;
    DBImpl::TEST_ResetDbSessionIdGen();
    for (size_t i = 0; i < FLAGS_sck_db_count; ++i) {
-      ResetSession(i, newdbs);
+      ResetSession(i);
    }
    if (FLAGS_sck_footer_unique_id) {
      // For footer unique ID, this tracks process-wide generated SST file
@@ -941,7 +888,6 @@ class StressCacheKey {
  std::unique_ptr<uint64_t[]> table_;
  uint64_t process_count_ = 0;
  uint64_t session_count_ = 0;
-  uint64_t newdb_count_ = 0;
  uint64_t collisions_ = 0;
  uint32_t restart_nfiles_ = 0;
  double multiplier_ = 0.0;
@@ -22,9 +22,6 @@ std::array<std::string, kNumCacheEntryRoles> kCacheEntryRoleToCamelString{{
    "CompressionDictionaryBuildingBuffer",
    "FilterConstruction",
    "BlockBasedTableReader",
-    "FileMetadata",
-    "BlobValue",
-    "BlobCache",
    "Misc",
 }};

@@ -39,9 +36,6 @@ std::array<std::string, kNumCacheEntryRoles> kCacheEntryRoleToHyphenString{{
    "compression-dictionary-building-buffer",
    "filter-construction",
    "block-based-table-reader",
-    "file-metadata",
-    "blob-value",
-    "blob-cache",
    "misc",
 }};

@@ -84,16 +84,6 @@ class CacheHandleGuard {
  Cache::Handle* GetCacheHandle() const { return handle_; }
  T* GetValue() const { return value_; }

-  void TransferTo(Cleanable* cleanable) {
-    if (cleanable) {
-      if (handle_ != nullptr) {
-        assert(cache_);
-        cleanable->RegisterCleanup(&ReleaseCacheHandle, cache_, handle_);
-      }
-    }
-    ResetFields();
-  }
-
  void Reset() {
    ReleaseHandle();
    ResetFields();
@@ -115,16 +105,6 @@ class CacheHandleGuard {
    value_ = nullptr;
  }

-  static void ReleaseCacheHandle(void* arg1, void* arg2) {
-    Cache* const cache = static_cast<Cache*>(arg1);
-    assert(cache);
-
-    Cache::Handle* const cache_handle = static_cast<Cache::Handle*>(arg2);
-    assert(cache_handle);
-
-    cache->Release(cache_handle);
-  }
-
 private:
  Cache* cache_ = nullptr;
  Cache::Handle* handle_ = nullptr;
@@ -17,7 +17,7 @@ namespace ROCKSDB_NAMESPACE {

 // Value space plan for CacheKey:
 //
-// file_num_etc64_ | offset_etc64_ | Only generated by
+// session_etc64_ | offset_etc64_ | Only generated by
 // ---------------+---------------+------------------------------------------
 //              0 |             0 | Reserved for "empty" CacheKey()
 //              0 |  > 0, < 1<<63 | CreateUniqueForCacheLifetime
@@ -44,7 +44,7 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
  return CacheKey(0, id);
 }

-// How we generate CacheKeys and base OffsetableCacheKey, assuming that
+// 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):
@@ -56,108 +56,63 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 //   base_session_id         (unstructured, from GenerateRawUniqueId)
 //   session_id_counter      (structured)
 //                           * usually much smaller than 2**24
-//   orig_file_number        (structured)
+//   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
 //
-// Overall approach (see https://github.com/pdillinger/unique_id for
-// background):
+// Outputs come from bitwise-xor of the constituent pieces, low bits on left:
 //
-// First, we have three "structured" values, up to 64 bits each, that we
-// need to fit, without losses, into 128 bits. In practice, the values will
-// be small enough that they should fit. For example, applications generating
-// large SST files (large offsets) will naturally produce fewer files (small
-// file numbers). But we don't know ahead of time what bounds the values will
-// have.
-//
-// Second, we have unstructured inputs that enable distinct RocksDB processes
-// to pick a random point in space, likely very different from others. Xoring
-// the structured with the unstructured give us a cache key that is
-// structurally distinct between related keys (e.g. same file or same RocksDB
-// process) and distinct with high probability between unrelated keys.
-//
-// The problem of packing three structured values into the space for two is
-// complicated by the fact that we want to derive cache keys from SST unique
-// IDs, which have already combined structured and unstructured inputs in a
-// practically inseparable way. And we want a base cache key that works
-// with an offset of any size. So basically, we need to encode these three
-// structured values, each up to 64 bits, into 128 bits without knowing any
-// of their sizes. The DownwardInvolution() function gives us a mechanism to
-// accomplish this. (See its properties in math.h.) Specifically, for inputs
-// a, b, and c:
-//   lower64 = DownwardInvolution(a) ^ ReverseBits(b);
-//   upper64 = c ^ ReverseBits(a);
-// The 128-bit output is unique assuming there exist some i, j, and k
-// where a < 2**i, b < 2**j, c < 2**k, i <= 64, j <= 64, k <= 64, and
-// i + j + k <= 128. In other words, as long as there exist some bounds
-// that would allow us to pack the bits of a, b, and c into the output
-// if we know the bound, we can generate unique outputs without knowing
-// those bounds. To validate this claim, the inversion function (given
-// the bounds) has been implemented in CacheKeyDecoder in
-// db_block_cache_test.cc.
-//
-// With that in mind, the outputs in terms of the conceptual inputs look
-// like this, using bitwise-xor of the constituent pieces, low bits on left:
-//
-// |------------------------- file_num_etc64 -------------------------|
-// | +++++++++ base_session_id (lower 64 bits, involution) +++++++++ |
+// |------------------------- session_etc64 -------------------------|
+// | +++++++++++++++ base_session_id (lower 64 bits) +++++++++++++++ |
 // |-----------------------------------------------------------------|
-// | session_id_counter (involution) ..... |                         |
+// | session_id_counter ...|                                         |
 // |-----------------------------------------------------------------|
-// | hash of: ++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
-// |  * base_session_id (upper ~39 bits)                             |
-// |  * db_id (~122 bits entropy)                                    |
-// |-----------------------------------------------------------------|
-// |                             | ..... orig_file_number (reversed) |
+// |                                               | ... file_number |
+// |                                               | overflow & meta |
 // |-----------------------------------------------------------------|
 //
 //
 // |------------------------- offset_etc64 --------------------------|
-// | ++++++++++ base_session_id (lower 64 bits, reversed) ++++++++++ |
-// |-----------------------------------------------------------------|
-// |                           | ..... session_id_counter (reversed) |
+// | hash of: ++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
+// |  * base_session_id (upper ~39 bits)                             |
+// |  * db_id (~122 bits entropy)                                    |
 // |-----------------------------------------------------------------|
 // | offset_in_file ............... |                                |
 // |-----------------------------------------------------------------|
+// |                                              | file_number, 0-3 |
+// |                                              | lower bytes      |
+// |-----------------------------------------------------------------|
 //
-// Some oddities or inconveniences of this layout are due to deriving
-// the "base" cache key (without offset) from the SST unique ID (see
-// GetSstInternalUniqueId). Specifically,
-// * Lower 64 of base_session_id occurs in both output words (ok but
-//   weird)
-// * The inclusion of db_id is bad for the conditions under which we
-//   can guarantee uniqueness, but could be useful in some cases with
-//   few small files per process, to make up for db session id only having
-//   ~103 bits of entropy.
+// 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.
 //
-// In fact, if DB ids were not involved, we would be guaranteed unique
-// cache keys for files generated in a single process until total bits for
-// biggest session_id_counter, orig_file_number, and offset_in_file
-// reach 128 bits.
+// 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.
 //
-// With the DB id limitation, we only have nice guaranteed unique cache
-// keys for files generated in a single process until biggest
-// session_id_counter and offset_in_file reach combined 64 bits. This
-// is quite good in practice because we can have millions of DB Opens
-// with terabyte size SST files, or billions of DB Opens with gigabyte
-// size SST files.
+// 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.
 //
-// One of the considerations in the translation between existing SST unique
-// IDs and base cache keys is supporting better SST unique IDs in a future
-// format_version. If we use a process-wide file counter instead of
-// session counter and file numbers, we only need to combine two 64-bit values
-// instead of three. But we don't want to track unique ID versions in the
-// manifest, so we want to keep the same translation layer between SST unique
-// IDs and base cache keys, even with updated SST unique IDs. If the new
-// unique IDs put the file counter where the orig_file_number was, and
-// use no structured field where session_id_counter was, then our translation
-// layer works fine for two structured fields as well as three (for
-// compatibility). The small computation for the translation (one
-// DownwardInvolution(), two ReverseBits(), both ~log(64) instructions deep)
-// is negligible for computing as part of SST file reader open.
-//
-// More on how https://github.com/pdillinger/unique_id applies here:
+// 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
@@ -186,11 +141,12 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 // 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
 // ----
-//   73 <- bits remaining for distinguishing session IDs
-// The probability of a collision in 73 bits of session ID data is less than
-// 1 in 2**(73 - (2 * 16)), or roughly 1 in a trillion. And this assumes all
+//   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.
@@ -204,7 +160,7 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 // 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**(83 - (2 * 26)),
+// 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
@@ -220,17 +176,17 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 // activity over many months, by making some pessimistic simplifying
 // assumptions. See class StressCacheKey in cache_bench_tool.cc for details.
 // Here is some sample output with
-// `./cache_bench -stress_cache_key -sck_keep_bits=43`:
+// `./cache_bench -stress_cache_key -sck_keep_bits=40`:
 //
 //   Total cache or DBs size: 32TiB  Writing 925.926 MiB/s or 76.2939TiB/day
-//   Multiply by 1.15292e+18 to correct for simulation losses (but still
+//   Multiply by 9.22337e+18 to correct for simulation losses (but still
 //   assume whole file cached)
 //
 // These come from default settings of 2.5M files per day of 32 MB each, and
-// `-sck_keep_bits=43` means that to represent a single file, we are only
-// keeping 43 bits of the 128-bit (base) cache key.  With file size of 2**25
-// contiguous keys (pessimistic), our simulation is about 2\*\*(128-43-25) or
-// about 1 billion billion times more prone to collision than reality.
+// `-sck_keep_bits=40` means that to represent a single file, we are only
+// keeping 40 bits of the 128-bit (base) cache key.  With file size of 2**25
+// contiguous keys (pessimistic), our simulation is about 2\*\*(128-40-25) or
+// about 9 billion billion times more prone to collision than reality.
 //
 // More default assumptions, relatively pessimistic:
 // * 100 DBs in same process (doesn't matter much)
@@ -238,55 +194,49 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 // average every 100 files generated
 // * Restart process (all new session IDs unrelated to old) 24 times per day
 //
-// After enough data, we get a result at the end (-sck_keep_bits=43):
+// After enough data, we get a result at the end (-sck_keep_bits=40):
 //
-//   (keep 43 bits)  18 collisions after 2 x 90 days, est 10 days between
-//                   (1.15292e+19 corrected)
+//   (keep 40 bits)  17 collisions after 2 x 90 days, est 10.5882 days between
+//                   (9.76592e+19 corrected)
 //
 // If we believe the (pessimistic) simulation and the mathematical
-// extrapolation, we would need to run a billion machines all for 11 billion
+// extrapolation, we would need to run a billion machines all for 97 billion
 // days to expect a cache key collision. To help verify that our extrapolation
-// ("corrected") is robust, we can make our simulation more precise by
-// increasing the "keep" bits, which takes more running time to get enough
+// ("corrected") is robust, we can make our simulation more precise with
+// `-sck_keep_bits=41` and `42`, which takes more running time to get enough
 // collision data:
 //
-//   (keep 44 bits)  16 collisions after 5 x 90 days, est 28.125 days between
-//                   (1.6213e+19 corrected)
-//   (keep 45 bits)  15 collisions after 7 x 90 days, est 42 days between
-//                   (1.21057e+19 corrected)
-//   (keep 46 bits)  15 collisions after 17 x 90 days, est 102 days between
-//                   (1.46997e+19 corrected)
-//   (keep 47 bits)  15 collisions after 49 x 90 days, est 294 days between
-//                   (2.11849e+19 corrected)
+//   (keep 41 bits)  16 collisions after 4 x 90 days, est 22.5 days between
+//                   (1.03763e+20 corrected)
+//   (keep 42 bits)  19 collisions after 10 x 90 days, est 47.3684 days between
+//                   (1.09224e+20 corrected)
 //
-// The extrapolated prediction seems to be within noise (sampling error).
+// The extrapolated prediction is very close. If anything, we might have some
+// very small losses of structured data (see class StressCacheKey in
+// cache_bench_tool.cc) leading to more accurate & more attractive prediction
+// with more bits kept.
 //
 // With the `-sck_randomize` option, we can see that typical workloads like
 // above have lower collision probability than "random" cache keys (note:
-// offsets still non-randomized) by a modest amount (roughly 2-3x less
-// collision prone than random), which should make us reasonably comfortable
-// even in "degenerate" cases (e.g. repeatedly launch a process to generate
-// one file with SstFileWriter):
+// offsets still non-randomized) by a modest amount (roughly 20x less collision
+// prone than random), which should make us reasonably comfortable even in
+// "degenerate" cases (e.g. repeatedly launch a process to generate 1 file
+// with SstFileWriter):
 //
-//   (rand 43 bits) 22 collisions after 1 x 90 days, est 4.09091 days between
-//                  (4.7165e+18 corrected)
+//   (rand 40 bits) 197 collisions after 1 x 90 days, est 0.456853 days between
+//                  (4.21372e+18 corrected)
 //
-// We can see that with more frequent process restarts,
-// -sck_restarts_per_day=5000, which means more all-new session IDs, we get
-// closer to the "random" cache key performance:
+// We can see that with more frequent process restarts (all new session IDs),
+// we get closer to the "random" cache key performance:
 //
-// 15 collisions after 1 x 90 days, est 6 days between (6.91753e+18 corrected)
-//
-// And with less frequent process restarts and re-opens,
-// -sck_restarts_per_day=1 -sck_reopen_nfiles=1000, we get lower collision
-// probability:
-//
-// 18 collisions after 8 x 90 days, est 40 days between (4.61169e+19 corrected)
+//   (-sck_restarts_per_day=5000): 140 collisions after 1 x 90 days, ...
+//                  (5.92931e+18 corrected)
 //
 // Other tests have been run to validate other conditions behave as expected,
 // never behaving "worse than random" unless we start chopping off structured
 // data.
 //
+//
 // Conclusion: Even in extreme cases, rapidly burning through "all new" IDs
 // that only arise when a new process is started, the chance of any cache key
 // collisions in a giant fleet of machines is negligible. Especially when
@@ -299,66 +249,96 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 // quantify) block cache corruptions, including collisions, should be added.
 OffsetableCacheKey::OffsetableCacheKey(const std::string &db_id,
                                       const std::string &db_session_id,
-                                       uint64_t file_number) {
-  UniqueId64x2 internal_id;
-  Status s = GetSstInternalUniqueId(db_id, db_session_id, file_number,
-                                    &internal_id, /*force=*/true);
-  assert(s.ok());
-  *this = FromInternalUniqueId(&internal_id);
-}
-
-OffsetableCacheKey OffsetableCacheKey::FromInternalUniqueId(UniqueIdPtr id) {
-  uint64_t session_lower = id.ptr[0];
-  uint64_t file_num_etc = id.ptr[1];
-
+                                       uint64_t file_number,
+                                       uint64_t max_offset) {
 #ifndef NDEBUG
-  bool is_empty = session_lower == 0 && file_num_etc == 0;
+  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 file_num_etc64_ is
+  // 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*)
-  // However, if we are given an "empty" id as input, then we should produce
-  // "empty" as output.
-  // As a consequence, this function is only bijective assuming
-  // id[0] == 0 only if id[1] == 0.
-  if (session_lower == 0U) {
-    session_lower = file_num_etc;
+  if (session_etc64_ == 0U) {
+    session_etc64_ = session_upper | 1U;
  }
-
-  // See comments above for how DownwardInvolution and ReverseBits
-  // make this function invertible under various assumptions.
-  OffsetableCacheKey rv;
-  rv.file_num_etc64_ =
-      DownwardInvolution(session_lower) ^ ReverseBits(file_num_etc);
-  rv.offset_etc64_ = ReverseBits(session_lower);
-
-  // Because of these transformations and needing to allow arbitrary
-  // offset (thus, second 64 bits of cache key might be 0), we need to
-  // make some correction to ensure the first 64 bits is not 0.
-  // Fortunately, the transformation ensures the second 64 bits is not 0
-  // for non-empty base key, so we can swap in the case one is 0 without
-  // breaking bijectivity (assuming condition above).
-  assert(is_empty || rv.offset_etc64_ > 0);
-  if (rv.file_num_etc64_ == 0) {
-    std::swap(rv.file_num_etc64_, rv.offset_etc64_);
-  }
-  assert(is_empty || rv.file_num_etc64_ > 0);
-  return rv;
-}
-
-// Inverse of FromInternalUniqueId (assuming file_num_etc64 == 0 only if
-// offset_etc64 == 0)
-UniqueId64x2 OffsetableCacheKey::ToInternalUniqueId() {
-  uint64_t a = file_num_etc64_;
-  uint64_t b = offset_etc64_;
-  if (b == 0) {
-    std::swap(a, b);
-  }
-  UniqueId64x2 rv;
-  rv[0] = ReverseBits(b);
-  rv[1] = ReverseBits(a ^ DownwardInvolution(rv[0]));
-  return rv;
+  assert(session_etc64_ != 0);
 }

 }  // namespace ROCKSDB_NAMESPACE
@@ -9,7 +9,6 @@

 #include "rocksdb/rocksdb_namespace.h"
 #include "rocksdb/slice.h"
-#include "table/unique_id_impl.h"

 namespace ROCKSDB_NAMESPACE {

@@ -34,10 +33,10 @@ class CacheKey {
 public:
  // For convenience, constructs an "empty" cache key that is never returned
  // by other means.
-  inline CacheKey() : file_num_etc64_(), offset_etc64_() {}
+  inline CacheKey() : session_etc64_(), offset_etc64_() {}

  inline bool IsEmpty() const {
-    return (file_num_etc64_ == 0) & (offset_etc64_ == 0);
+    return (session_etc64_ == 0) & (offset_etc64_ == 0);
  }

  // Use this cache key as a Slice (byte order is endianness-dependent)
@@ -60,14 +59,12 @@ class CacheKey {

 protected:
  friend class OffsetableCacheKey;
-  CacheKey(uint64_t file_num_etc64, uint64_t offset_etc64)
-      : file_num_etc64_(file_num_etc64), offset_etc64_(offset_etc64) {}
-  uint64_t file_num_etc64_;
+  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_;
 };

-constexpr uint8_t kCacheKeySize = static_cast<uint8_t>(sizeof(CacheKey));
-
 // 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
@@ -86,58 +83,50 @@ class OffsetableCacheKey : private CacheKey {
  inline OffsetableCacheKey() : CacheKey() {}

  // Constructs an OffsetableCacheKey with the given information about a file.
-  // This constructor never generates an "empty" base key.
+  // 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);
-
-  // Creates an OffsetableCacheKey from an SST unique ID, so that cache keys
-  // can be derived from DB manifest data before reading the file from
-  // storage--so that every part of the file can potentially go in a persistent
-  // cache.
-  //
-  // Calling GetSstInternalUniqueId() on a db_id, db_session_id, and
-  // file_number and passing the result to this function produces the same
-  // base cache key as feeding those inputs directly to the constructor.
-  //
-  // This is a bijective transformation assuming either id is empty or
-  // lower 64 bits is non-zero:
-  // * Empty (all zeros) input -> empty (all zeros) output
-  // * Lower 64 input is non-zero -> lower 64 output (file_num_etc64_) is
-  //   non-zero
-  static OffsetableCacheKey FromInternalUniqueId(UniqueIdPtr id);
-
-  // This is the inverse transformation to the above, assuming either empty
-  // or lower 64 bits (file_num_etc64_) is non-zero. Perhaps only useful for
-  // testing.
-  UniqueId64x2 ToInternalUniqueId();
+                     uint64_t file_number, uint64_t max_offset);

  inline bool IsEmpty() const {
-    bool result = file_num_etc64_ == 0;
+    bool result = session_etc64_ == 0;
    assert(!(offset_etc64_ > 0 && result));
    return result;
  }

-  // Construct a CacheKey for an offset within a file. An offset is not
-  // necessarily a byte offset if a smaller unique identifier of keyable
-  // offsets is used.
+  // 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());
-    return CacheKey(file_num_etc64_, offset_etc64_ ^ offset);
+    assert(offset <= max_offset_);
+    return CacheKey(session_etc64_, offset_etc64_ ^ offset);
  }

-  // The "common prefix" is a shared prefix for all the returned CacheKeys.
-  // It is specific to the file but the same for all offsets within the file.
+  // 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(file_num_etc64_) == kCommonPrefixSize,
+    static_assert(sizeof(session_etc64_) == kCommonPrefixSize,
                  "8 byte common prefix expected");
    assert(!IsEmpty());
-    assert(&this->file_num_etc64_ == static_cast<const void *>(this));
+    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
@@ -180,6 +180,4 @@ template class CacheReservationManagerImpl<
 template class CacheReservationManagerImpl<CacheEntryRole::kFilterConstruction>;
 template class CacheReservationManagerImpl<CacheEntryRole::kMisc>;
 template class CacheReservationManagerImpl<CacheEntryRole::kWriteBuffer>;
-template class CacheReservationManagerImpl<CacheEntryRole::kFileMetadata>;
-template class CacheReservationManagerImpl<CacheEntryRole::kBlobCache>;
 }  // namespace ROCKSDB_NAMESPACE
@@ -36,12 +36,6 @@ class CacheReservationManager {
  };
  virtual ~CacheReservationManager() {}
  virtual Status UpdateCacheReservation(std::size_t new_memory_used) = 0;
-  // TODO(hx235): replace the usage of
-  // `UpdateCacheReservation(memory_used_delta, increase)` with
-  // `UpdateCacheReservation(new_memory_used)` so that we only have one
-  // `UpdateCacheReservation` function
-  virtual Status UpdateCacheReservation(std::size_t memory_used_delta,
-                                        bool increase) = 0;
  virtual Status MakeCacheReservation(
      std::size_t incremental_memory_used,
      std::unique_ptr<CacheReservationManager::CacheReservationHandle>
@@ -134,11 +128,6 @@ class CacheReservationManagerImpl
  //         On keeping dummy entries the same, it always returns Status::OK().
  Status UpdateCacheReservation(std::size_t new_memory_used) override;

-  Status UpdateCacheReservation(std::size_t /* memory_used_delta */,
-                                bool /* increase */) override {
-    return Status::NotSupported();
-  }
-
  // One of the two ways of reserving cache space and releasing is done through
  // destruction of CacheReservationHandle.
  // See UpdateCacheReservation() for the other way.
@@ -265,23 +254,6 @@ class ConcurrentCacheReservationManager
    std::lock_guard<std::mutex> lock(cache_res_mgr_mu_);
    return cache_res_mgr_->UpdateCacheReservation(new_memory_used);
  }
-
-  inline Status UpdateCacheReservation(std::size_t memory_used_delta,
-                                       bool increase) override {
-    std::lock_guard<std::mutex> lock(cache_res_mgr_mu_);
-    std::size_t total_mem_used = cache_res_mgr_->GetTotalMemoryUsed();
-    Status s;
-    if (!increase) {
-      assert(total_mem_used >= memory_used_delta);
-      s = cache_res_mgr_->UpdateCacheReservation(total_mem_used -
-                                                 memory_used_delta);
-    } else {
-      s = cache_res_mgr_->UpdateCacheReservation(total_mem_used +
-                                                 memory_used_delta);
-    }
-    return s;
-  }
-
  inline Status MakeCacheReservation(
      std::size_t incremental_memory_used,
      std::unique_ptr<CacheReservationManager::CacheReservationHandle> *handle)
@@ -48,13 +48,13 @@ TEST_F(CacheReservationManagerTest, GenerateCacheKey) {
  // Next unique Cache key
  CacheKey ckey = CacheKey::CreateUniqueForCacheLifetime(cache.get());
  // Get to the underlying values
-  uint64_t* ckey_data = reinterpret_cast<uint64_t*>(&ckey);
+  using PairU64 = std::array<uint64_t, 2>;
+  auto& ckey_pair = *reinterpret_cast<PairU64*>(&ckey);
  // Back it up to the one used by CRM (using CacheKey implementation details)
-  ckey_data[1]--;
+  ckey_pair[1]--;

  // Specific key (subject to implementation details)
-  EXPECT_EQ(ckey_data[0], 0);
-  EXPECT_EQ(ckey_data[1], 2);
+  EXPECT_EQ(ckey_pair, PairU64({0, 2}));

  Cache::Handle* handle = cache->Lookup(ckey.AsSlice());
  EXPECT_NE(handle, nullptr)
@@ -147,7 +147,7 @@ TEST(CacheReservationManagerIncreaseReservcationOnFullCacheTest,

  std::size_t new_mem_used = kSmallCacheCapacity + 1;
  Status s = test_cache_rev_mng->UpdateCacheReservation(new_mem_used);
-  EXPECT_EQ(s, Status::MemoryLimit())
+  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(),
@@ -192,7 +192,7 @@ TEST(CacheReservationManagerIncreaseReservcationOnFullCacheTest,
  // Create cache full again for subsequent tests
  new_mem_used = kSmallCacheCapacity + 1;
  s = test_cache_rev_mng->UpdateCacheReservation(new_mem_used);
-  EXPECT_EQ(s, Status::MemoryLimit())
+  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(),
@@ -463,7 +463,6 @@ TEST(CacheReservationHandleTest, HandleTest) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -14,83 +14,45 @@
 #include <iostream>
 #include <string>
 #include <vector>
-
-#include "cache/fast_lru_cache.h"
+#include "cache/clock_cache.h"
 #include "cache/lru_cache.h"
-#include "port/stack_trace.h"
 #include "test_util/testharness.h"
 #include "util/coding.h"
 #include "util/string_util.h"

-// FastLRUCache and HyperClockCache only support 16-byte keys, so some of
-// the tests originally wrote for LRUCache do not work on the other caches.
-// Those tests were adapted to use 16-byte keys. We kept the original ones.
-// TODO: Remove the original tests if they ever become unused.
-
 namespace ROCKSDB_NAMESPACE {

-namespace {
-
 // Conversions between numeric keys/values and the types expected by Cache.
-std::string EncodeKey16Bytes(int k) {
-  std::string result;
-  PutFixed32(&result, k);
-  result.append(std::string(12, 'a'));  // Because we need a 16B output, we
-                                        // add a 12-byte padding.
-  return result;
-}
-
-int DecodeKey16Bytes(const Slice& k) {
-  assert(k.size() == 16);
-  return DecodeFixed32(k.data());  // Decodes only the first 4 bytes of k.
-}
-
-std::string EncodeKey32Bits(int k) {
+static std::string EncodeKey(int k) {
  std::string result;
  PutFixed32(&result, k);
  return result;
 }
-
-int DecodeKey32Bits(const Slice& k) {
+static int DecodeKey(const Slice& k) {
  assert(k.size() == 4);
  return DecodeFixed32(k.data());
 }
-
-void* EncodeValue(uintptr_t v) { return reinterpret_cast<void*>(v); }
-
-int DecodeValue(void* v) {
+static void* EncodeValue(uintptr_t v) { return reinterpret_cast<void*>(v); }
+static int DecodeValue(void* v) {
  return static_cast<int>(reinterpret_cast<uintptr_t>(v));
 }

-void DumbDeleter(const Slice& /*key*/, void* /*value*/) {}
+const std::string kLRU = "lru";
+const std::string kClock = "clock";

-void EraseDeleter1(const Slice& /*key*/, void* value) {
+void dumbDeleter(const Slice& /*key*/, void* /*value*/) {}
+
+void eraseDeleter(const Slice& /*key*/, void* value) {
  Cache* cache = reinterpret_cast<Cache*>(value);
  cache->Erase("foo");
 }

-void EraseDeleter2(const Slice& /*key*/, void* value) {
-  Cache* cache = reinterpret_cast<Cache*>(value);
-  cache->Erase(EncodeKey16Bytes(1234));
-}
-
-const std::string kLRU = "lru";
-const std::string kHyperClock = "hyper_clock";
-const std::string kFast = "fast";
-
-}  // anonymous namespace
-
 class CacheTest : public testing::TestWithParam<std::string> {
 public:
  static CacheTest* current_;
-  static std::string type_;

  static void Deleter(const Slice& key, void* v) {
-    if (type_ == kFast || type_ == kHyperClock) {
-      current_->deleted_keys_.push_back(DecodeKey16Bytes(key));
-    } else {
-      current_->deleted_keys_.push_back(DecodeKey32Bits(key));
-    }
+    current_->deleted_keys_.push_back(DecodeKey(key));
    current_->deleted_values_.push_back(DecodeValue(v));
  }

@@ -105,13 +67,10 @@ class CacheTest : public testing::TestWithParam<std::string> {
  std::shared_ptr<Cache> cache_;
  std::shared_ptr<Cache> cache2_;

-  size_t estimated_value_size_ = 1;
-
  CacheTest()
      : cache_(NewCache(kCacheSize, kNumShardBits, false)),
        cache2_(NewCache(kCacheSize2, kNumShardBits2, false)) {
    current_ = this;
-    type_ = GetParam();
  }

  ~CacheTest() override {}
@@ -121,15 +80,8 @@ class CacheTest : public testing::TestWithParam<std::string> {
    if (type == kLRU) {
      return NewLRUCache(capacity);
    }
-    if (type == kHyperClock) {
-      return HyperClockCacheOptions(
-                 capacity, estimated_value_size_ /*estimated_value_size*/)
-          .MakeSharedCache();
-    }
-    if (type == kFast) {
-      return NewFastLRUCache(
-          capacity, estimated_value_size_, -1 /*num_shard_bits*/,
-          false /*strict_capacity_limit*/, kDefaultCacheMetadataChargePolicy);
+    if (type == kClock) {
+      return NewClockCache(capacity);
    }
    return nullptr;
  }
@@ -147,42 +99,13 @@ class CacheTest : public testing::TestWithParam<std::string> {
      co.metadata_charge_policy = charge_policy;
      return NewLRUCache(co);
    }
-    if (type == kHyperClock) {
-      return HyperClockCacheOptions(capacity, 1 /*estimated_value_size*/,
-                                    num_shard_bits, strict_capacity_limit,
-                                    nullptr /*allocator*/, charge_policy)
-          .MakeSharedCache();
-    }
-    if (type == kFast) {
-      return NewFastLRUCache(capacity, 1 /*estimated_value_size*/,
-                             num_shard_bits, strict_capacity_limit,
-                             charge_policy);
+    if (type == kClock) {
+      return NewClockCache(capacity, num_shard_bits, strict_capacity_limit,
+                           charge_policy);
    }
    return nullptr;
  }

-  // These functions encode/decode keys in tests cases that use
-  // int keys.
-  // Currently, HyperClockCache requires keys to be 16B long, whereas
-  // LRUCache doesn't, so the encoding depends on the cache type.
-  std::string EncodeKey(int k) {
-    auto type = GetParam();
-    if (type == kFast || type == kHyperClock) {
-      return EncodeKey16Bytes(k);
-    } else {
-      return EncodeKey32Bits(k);
-    }
-  }
-
-  int DecodeKey(const Slice& k) {
-    auto type = GetParam();
-    if (type == kFast || type == kHyperClock) {
-      return DecodeKey16Bytes(k);
-    } else {
-      return DecodeKey32Bits(k);
-    }
-  }
-
  int Lookup(std::shared_ptr<Cache> cache, int key) {
    Cache::Handle* handle = cache->Lookup(EncodeKey(key));
    const int r = (handle == nullptr) ? -1 : DecodeValue(cache->Value(handle));
@@ -226,101 +149,59 @@ class CacheTest : public testing::TestWithParam<std::string> {
    Erase(cache2_, key);
  }
 };
-
 CacheTest* CacheTest::current_;
-std::string CacheTest::type_;

 class LRUCacheTest : public CacheTest {};

 TEST_P(CacheTest, UsageTest) {
-  auto type = GetParam();
-
  // cache is std::shared_ptr and will be automatically cleaned up.
-  const size_t kCapacity = 100000;
+  const uint64_t kCapacity = 100000;
  auto cache = NewCache(kCapacity, 8, false, kDontChargeCacheMetadata);
  auto precise_cache = NewCache(kCapacity, 0, false, kFullChargeCacheMetadata);
  ASSERT_EQ(0, cache->GetUsage());
-  size_t baseline_meta_usage = precise_cache->GetUsage();
-  if (type != kHyperClock) {
-    ASSERT_EQ(0, baseline_meta_usage);
-  }
+  ASSERT_EQ(0, precise_cache->GetUsage());

  size_t usage = 0;
  char value[10] = "abcdef";
  // make sure everything will be cached
  for (int i = 1; i < 100; ++i) {
-    std::string key;
-    if (type == kLRU) {
-      key = std::string(i, 'a');
-    } else {
-      key = EncodeKey(i);
-    }
+    std::string key(i, 'a');
    auto kv_size = key.size() + 5;
    ASSERT_OK(cache->Insert(key, reinterpret_cast<void*>(value), kv_size,
-                            DumbDeleter));
+                            dumbDeleter));
    ASSERT_OK(precise_cache->Insert(key, reinterpret_cast<void*>(value),
-                                    kv_size, DumbDeleter));
+                                    kv_size, dumbDeleter));
    usage += kv_size;
    ASSERT_EQ(usage, cache->GetUsage());
-    if (type == kHyperClock) {
-      ASSERT_EQ(baseline_meta_usage + usage, precise_cache->GetUsage());
-    } else {
-      ASSERT_LT(usage, precise_cache->GetUsage());
-    }
+    ASSERT_LT(usage, precise_cache->GetUsage());
  }

  cache->EraseUnRefEntries();
  precise_cache->EraseUnRefEntries();
  ASSERT_EQ(0, cache->GetUsage());
-  ASSERT_EQ(baseline_meta_usage, precise_cache->GetUsage());
+  ASSERT_EQ(0, precise_cache->GetUsage());

  // make sure the cache will be overloaded
-  for (size_t i = 1; i < kCapacity; ++i) {
-    std::string key;
-    if (type == kLRU) {
-      key = std::to_string(i);
-    } else {
-      key = EncodeKey(static_cast<int>(1000 + i));
-    }
+  for (uint64_t i = 1; i < kCapacity; ++i) {
+    auto key = ToString(i);
    ASSERT_OK(cache->Insert(key, reinterpret_cast<void*>(value), key.size() + 5,
-                            DumbDeleter));
+                            dumbDeleter));
    ASSERT_OK(precise_cache->Insert(key, reinterpret_cast<void*>(value),
-                                    key.size() + 5, DumbDeleter));
+                                    key.size() + 5, dumbDeleter));
  }

  // the usage should be close to the capacity
  ASSERT_GT(kCapacity, cache->GetUsage());
  ASSERT_GT(kCapacity, precise_cache->GetUsage());
  ASSERT_LT(kCapacity * 0.95, cache->GetUsage());
-  if (type != kHyperClock) {
-    ASSERT_LT(kCapacity * 0.95, precise_cache->GetUsage());
-  } else {
-    // estimated value size of 1 is weird for clock cache, because
-    // almost all of the capacity will be used for metadata, and due to only
-    // using power of 2 table sizes, we might hit strict occupancy limit
-    // before hitting capacity limit.
-    ASSERT_LT(kCapacity * 0.80, precise_cache->GetUsage());
-  }
+  ASSERT_LT(kCapacity * 0.95, precise_cache->GetUsage());
 }

-// TODO: This test takes longer than expected on ClockCache. This is
-// because the values size estimate at construction is too sloppy.
-// Fix this.
-// Why is it so slow? The cache is constructed with an estimate of 1, but
-// then the charge is claimed to be 21. This will cause the hash table
-// to be extremely sparse, which in turn means clock needs to scan too
-// many slots to find victims.
 TEST_P(CacheTest, PinnedUsageTest) {
-  auto type = GetParam();
-
  // cache is std::shared_ptr and will be automatically cleaned up.
-  const size_t kCapacity = 200000;
+  const uint64_t kCapacity = 200000;
  auto cache = NewCache(kCapacity, 8, false, kDontChargeCacheMetadata);
  auto precise_cache = NewCache(kCapacity, 8, false, kFullChargeCacheMetadata);
-  size_t baseline_meta_usage = precise_cache->GetUsage();
-  if (type != kHyperClock) {
-    ASSERT_EQ(0, baseline_meta_usage);
-  }

  size_t pinned_usage = 0;
  char value[10] = "abcdef";
@@ -331,20 +212,15 @@ TEST_P(CacheTest, PinnedUsageTest) {
  // Add entries. Unpin some of them after insertion. Then, pin some of them
  // again. Check GetPinnedUsage().
  for (int i = 1; i < 100; ++i) {
-    std::string key;
-    if (type == kLRU) {
-      key = std::string(i, 'a');
-    } else {
-      key = EncodeKey(i);
-    }
+    std::string key(i, 'a');
    auto kv_size = key.size() + 5;
    Cache::Handle* handle;
    Cache::Handle* handle_in_precise_cache;
    ASSERT_OK(cache->Insert(key, reinterpret_cast<void*>(value), kv_size,
-                            DumbDeleter, &handle));
+                            dumbDeleter, &handle));
    assert(handle);
    ASSERT_OK(precise_cache->Insert(key, reinterpret_cast<void*>(value),
-                                    kv_size, DumbDeleter,
+                                    kv_size, dumbDeleter,
                                    &handle_in_precise_cache));
    assert(handle_in_precise_cache);
    pinned_usage += kv_size;
@@ -378,17 +254,12 @@ TEST_P(CacheTest, PinnedUsageTest) {
  ASSERT_LT(pinned_usage, precise_cache_pinned_usage);

  // check that overloading the cache does not change the pinned usage
-  for (size_t i = 1; i < 2 * kCapacity; ++i) {
-    std::string key;
-    if (type == kLRU) {
-      key = std::to_string(i);
-    } else {
-      key = EncodeKey(static_cast<int>(1000 + i));
-    }
+  for (uint64_t i = 1; i < 2 * kCapacity; ++i) {
+    auto key = ToString(i);
    ASSERT_OK(cache->Insert(key, reinterpret_cast<void*>(value), key.size() + 5,
-                            DumbDeleter));
+                            dumbDeleter));
    ASSERT_OK(precise_cache->Insert(key, reinterpret_cast<void*>(value),
-                                    key.size() + 5, DumbDeleter));
+                                    key.size() + 5, dumbDeleter));
  }
  ASSERT_EQ(pinned_usage, cache->GetPinnedUsage());
  ASSERT_EQ(precise_cache_pinned_usage, precise_cache->GetPinnedUsage());
@@ -410,7 +281,7 @@ TEST_P(CacheTest, PinnedUsageTest) {
  cache->EraseUnRefEntries();
  precise_cache->EraseUnRefEntries();
  ASSERT_EQ(0, cache->GetUsage());
-  ASSERT_EQ(baseline_meta_usage, precise_cache->GetUsage());
+  ASSERT_EQ(0, precise_cache->GetUsage());
 }

 TEST_P(CacheTest, HitAndMiss) {
@@ -427,30 +298,16 @@ TEST_P(CacheTest, HitAndMiss) {
  ASSERT_EQ(-1,  Lookup(300));

  Insert(100, 102);
-  if (GetParam() == kHyperClock) {
-    // ClockCache usually doesn't overwrite on Insert
-    ASSERT_EQ(101, Lookup(100));
-  } else {
-    ASSERT_EQ(102, Lookup(100));
-  }
+  ASSERT_EQ(102, Lookup(100));
  ASSERT_EQ(201, Lookup(200));
  ASSERT_EQ(-1,  Lookup(300));

  ASSERT_EQ(1U, deleted_keys_.size());
  ASSERT_EQ(100, deleted_keys_[0]);
-  if (GetParam() == kHyperClock) {
-    ASSERT_EQ(102, deleted_values_[0]);
-  } else {
-    ASSERT_EQ(101, deleted_values_[0]);
-  }
+  ASSERT_EQ(101, deleted_values_[0]);
 }

 TEST_P(CacheTest, InsertSameKey) {
-  if (GetParam() == kHyperClock) {
-    ROCKSDB_GTEST_BYPASS(
-        "ClockCache doesn't guarantee Insert overwrite same key.");
-    return;
-  }
  Insert(1, 1);
  Insert(1, 2);
  ASSERT_EQ(2, Lookup(1));
@@ -476,11 +333,6 @@ TEST_P(CacheTest, Erase) {
 }

 TEST_P(CacheTest, EntriesArePinned) {
-  if (GetParam() == kHyperClock) {
-    ROCKSDB_GTEST_BYPASS(
-        "ClockCache doesn't guarantee Insert overwrite same key.");
-    return;
-  }
  Insert(100, 101);
  Cache::Handle* h1 = cache_->Lookup(EncodeKey(100));
  ASSERT_EQ(101, DecodeValue(cache_->Value(h1)));
@@ -513,8 +365,9 @@ TEST_P(CacheTest, EntriesArePinned) {
 TEST_P(CacheTest, EvictionPolicy) {
  Insert(100, 101);
  Insert(200, 201);
+
  // Frequently used entry must be kept around
-  for (int i = 0; i < 2 * kCacheSize; i++) {
+  for (int i = 0; i < kCacheSize * 2; i++) {
    Insert(1000+i, 2000+i);
    ASSERT_EQ(101, Lookup(100));
  }
@@ -541,12 +394,6 @@ TEST_P(CacheTest, ExternalRefPinsEntries) {
    for (int j = 0; j < 2 * kCacheSize + 100; j++) {
      Insert(1000 + j, 2000 + j);
    }
-    // Clock cache is even more stateful and needs more churn to evict
-    if (GetParam() == kHyperClock) {
-      for (int j = 0; j < kCacheSize; j++) {
-        Insert(11000 + j, 11000 + j);
-      }
-    }
    if (i < 2) {
      ASSERT_EQ(101, Lookup(100));
    }
@@ -572,8 +419,8 @@ TEST_P(CacheTest, EvictionPolicyRef) {
  Insert(302, 103);
  Insert(303, 104);

-  // Insert entries much more than cache capacity.
-  for (int i = 0; i < 100 * kCacheSize; i++) {
+  // Insert entries much more than Cache capacity
+  for (int i = 0; i < kCacheSize * 2; i++) {
    Insert(1000 + i, 2000 + i);
  }

@@ -603,41 +450,20 @@ TEST_P(CacheTest, EvictionPolicyRef) {
 }

 TEST_P(CacheTest, EvictEmptyCache) {
-  auto type = GetParam();
-
  // Insert item large than capacity to trigger eviction on empty cache.
  auto cache = NewCache(1, 0, false);
-  if (type == kLRU) {
-    ASSERT_OK(cache->Insert("foo", nullptr, 10, DumbDeleter));
-  } else {
-    ASSERT_OK(cache->Insert(EncodeKey(1000), nullptr, 10, DumbDeleter));
-  }
+  ASSERT_OK(cache->Insert("foo", nullptr, 10, dumbDeleter));
 }

 TEST_P(CacheTest, EraseFromDeleter) {
-  auto type = GetParam();
-
  // Have deleter which will erase item from cache, which will re-enter
  // the cache at that point.
  std::shared_ptr<Cache> cache = NewCache(10, 0, false);
-  std::string foo, bar;
-  Cache::DeleterFn erase_deleter;
-  if (type == kLRU) {
-    foo = "foo";
-    bar = "bar";
-    erase_deleter = EraseDeleter1;
-  } else {
-    foo = EncodeKey(1234);
-    bar = EncodeKey(5678);
-    erase_deleter = EraseDeleter2;
-  }
-
-  ASSERT_OK(cache->Insert(foo, nullptr, 1, DumbDeleter));
-  ASSERT_OK(cache->Insert(bar, cache.get(), 1, erase_deleter));
-
-  cache->Erase(bar);
-  ASSERT_EQ(nullptr, cache->Lookup(foo));
-  ASSERT_EQ(nullptr, cache->Lookup(bar));
+  ASSERT_OK(cache->Insert("foo", nullptr, 1, dumbDeleter));
+  ASSERT_OK(cache->Insert("bar", cache.get(), 1, eraseDeleter));
+  cache->Erase("bar");
+  ASSERT_EQ(nullptr, cache->Lookup("foo"));
+  ASSERT_EQ(nullptr, cache->Lookup("bar"));
 }

 TEST_P(CacheTest, ErasedHandleState) {
@@ -670,9 +496,9 @@ TEST_P(CacheTest, HeavyEntries) {
  const int kHeavy = 10;
  int added = 0;
  int index = 0;
-  while (added < 2 * kCacheSize) {
+  while (added < 2*kCacheSize) {
    const int weight = (index & 1) ? kLight : kHeavy;
-    Insert(index, 1000 + index, weight);
+    Insert(index, 1000+index, weight);
    added += weight;
    index++;
  }
@@ -683,7 +509,7 @@ TEST_P(CacheTest, HeavyEntries) {
    int r = Lookup(i);
    if (r >= 0) {
      cached_weight += weight;
-      ASSERT_EQ(1000 + i, r);
+      ASSERT_EQ(1000+i, r);
    }
  }
  ASSERT_LE(cached_weight, kCacheSize + kCacheSize/10);
@@ -695,11 +521,12 @@ TEST_P(CacheTest, NewId) {
  ASSERT_NE(a, b);
 }

+
 class Value {
 public:
-  explicit Value(int v) : v_(v) {}
+  explicit Value(size_t v) : v_(v) { }

-  int v_;
+  size_t v_;
 };

 namespace {
@@ -740,13 +567,6 @@ TEST_P(CacheTest, ReleaseWithoutErase) {
 }

 TEST_P(CacheTest, SetCapacity) {
-  auto type = GetParam();
-  if (type == kFast || type == kHyperClock) {
-    ROCKSDB_GTEST_BYPASS(
-        "FastLRUCache and HyperClockCache don't support arbitrary capacity "
-        "adjustments.");
-    return;
-  }
  // test1: increase capacity
  // lets create a cache with capacity 5,
  // then, insert 5 elements, then increase capacity
@@ -754,8 +574,8 @@ TEST_P(CacheTest, SetCapacity) {
  std::shared_ptr<Cache> cache = NewCache(5, 0, false);
  std::vector<Cache::Handle*> handles(10);
  // Insert 5 entries, but not releasing.
-  for (int i = 0; i < 5; i++) {
-    std::string key = EncodeKey(i + 1);
+  for (size_t i = 0; i < 5; i++) {
+    std::string key = ToString(i+1);
    Status s = cache->Insert(key, new Value(i + 1), 1, &deleter, &handles[i]);
    ASSERT_TRUE(s.ok());
  }
@@ -769,14 +589,14 @@ TEST_P(CacheTest, SetCapacity) {
  // insert 5 more elements to cache, then release 5,
  // then decrease capacity to 7, final capacity should be 7
  // and usage should be 7
-  for (int i = 5; i < 10; i++) {
-    std::string key = EncodeKey(i + 1);
+  for (size_t i = 5; i < 10; i++) {
+    std::string key = ToString(i+1);
    Status s = cache->Insert(key, new Value(i + 1), 1, &deleter, &handles[i]);
    ASSERT_TRUE(s.ok());
  }
  ASSERT_EQ(10U, cache->GetCapacity());
  ASSERT_EQ(10U, cache->GetUsage());
-  for (int i = 0; i < 5; i++) {
+  for (size_t i = 0; i < 5; i++) {
    cache->Release(handles[i]);
  }
  ASSERT_EQ(10U, cache->GetCapacity());
@@ -786,7 +606,7 @@ TEST_P(CacheTest, SetCapacity) {
  ASSERT_EQ(7, cache->GetUsage());

  // release remaining 5 to keep valgrind happy
-  for (int i = 5; i < 10; i++) {
+  for (size_t i = 5; i < 10; i++) {
    cache->Release(handles[i]);
  }

@@ -795,21 +615,13 @@ TEST_P(CacheTest, SetCapacity) {
 }

 TEST_P(LRUCacheTest, SetStrictCapacityLimit) {
-  auto type = GetParam();
-  if (type == kFast) {
-    ROCKSDB_GTEST_BYPASS(
-        "FastLRUCache only supports a limited number of "
-        "inserts beyond "
-        "capacity.");
-    return;
-  }
  // test1: set the flag to false. Insert more keys than capacity. See if they
  // all go through.
  std::shared_ptr<Cache> cache = NewCache(5, 0, false);
  std::vector<Cache::Handle*> handles(10);
  Status s;
-  for (int i = 0; i < 10; i++) {
-    std::string key = EncodeKey(i + 1);
+  for (size_t i = 0; i < 10; i++) {
+    std::string key = ToString(i + 1);
    s = cache->Insert(key, new Value(i + 1), 1, &deleter, &handles[i]);
    ASSERT_OK(s);
    ASSERT_NE(nullptr, handles[i]);
@@ -817,29 +629,29 @@ TEST_P(LRUCacheTest, SetStrictCapacityLimit) {
  ASSERT_EQ(10, cache->GetUsage());

  // test2: set the flag to true. Insert and check if it fails.
-  std::string extra_key = EncodeKey(100);
+  std::string extra_key = "extra";
  Value* extra_value = new Value(0);
  cache->SetStrictCapacityLimit(true);
  Cache::Handle* handle;
  s = cache->Insert(extra_key, extra_value, 1, &deleter, &handle);
-  ASSERT_TRUE(s.IsMemoryLimit());
+  ASSERT_TRUE(s.IsIncomplete());
  ASSERT_EQ(nullptr, handle);
  ASSERT_EQ(10, cache->GetUsage());

-  for (int i = 0; i < 10; i++) {
+  for (size_t i = 0; i < 10; i++) {
    cache->Release(handles[i]);
  }

  // test3: init with flag being true.
  std::shared_ptr<Cache> cache2 = NewCache(5, 0, true);
-  for (int i = 0; i < 5; i++) {
-    std::string key = EncodeKey(i + 1);
+  for (size_t i = 0; i < 5; i++) {
+    std::string key = ToString(i + 1);
    s = cache2->Insert(key, new Value(i + 1), 1, &deleter, &handles[i]);
    ASSERT_OK(s);
    ASSERT_NE(nullptr, handles[i]);
  }
  s = cache2->Insert(extra_key, extra_value, 1, &deleter, &handle);
-  ASSERT_TRUE(s.IsMemoryLimit());
+  ASSERT_TRUE(s.IsIncomplete());
  ASSERT_EQ(nullptr, handle);
  // test insert without handle
  s = cache2->Insert(extra_key, extra_value, 1, &deleter);
@@ -848,7 +660,7 @@ TEST_P(LRUCacheTest, SetStrictCapacityLimit) {
  ASSERT_EQ(5, cache2->GetUsage());
  ASSERT_EQ(nullptr, cache2->Lookup(extra_key));

-  for (int i = 0; i < 5; i++) {
+  for (size_t i = 0; i < 5; i++) {
    cache2->Release(handles[i]);
  }
 }
@@ -862,15 +674,15 @@ TEST_P(CacheTest, OverCapacity) {
  std::vector<Cache::Handle*> handles(n+1);

  // Insert n+1 entries, but not releasing.
-  for (int i = 0; i < static_cast<int>(n + 1); i++) {
-    std::string key = EncodeKey(i + 1);
+  for (size_t i = 0; i < n + 1; i++) {
+    std::string key = ToString(i+1);
    Status s = cache->Insert(key, new Value(i + 1), 1, &deleter, &handles[i]);
    ASSERT_TRUE(s.ok());
  }

  // Guess what's in the cache now?
-  for (int i = 0; i < static_cast<int>(n + 1); i++) {
-    std::string key = EncodeKey(i + 1);
+  for (size_t i = 0; i < n + 1; i++) {
+    std::string key = ToString(i+1);
    auto h = cache->Lookup(key);
    ASSERT_TRUE(h != nullptr);
    if (h) cache->Release(h);
@@ -878,37 +690,26 @@ TEST_P(CacheTest, OverCapacity) {

  // the cache is over capacity since nothing could be evicted
  ASSERT_EQ(n + 1U, cache->GetUsage());
-  for (int i = 0; i < static_cast<int>(n + 1); i++) {
+  for (size_t i = 0; i < n + 1; i++) {
    cache->Release(handles[i]);
  }
+  // Make sure eviction is triggered.
+  cache->SetCapacity(n);

-  if (GetParam() == kHyperClock) {
-    // Make sure eviction is triggered.
-    ASSERT_OK(cache->Insert(EncodeKey(-1), nullptr, 1, &deleter, &handles[0]));
+  // cache is under capacity now since elements were released
+  ASSERT_EQ(n, cache->GetUsage());

-    // cache is under capacity now since elements were released
-    ASSERT_GE(n, cache->GetUsage());
-
-    // clean up
-    cache->Release(handles[0]);
-  } else {
-    // LRUCache checks for over-capacity in Release.
-
-    // cache is exactly at capacity now with minimal eviction
-    ASSERT_EQ(n, cache->GetUsage());
-
-    // element 0 is evicted and the rest is there
-    // This is consistent with the LRU policy since the element 0
-    // was released first
-    for (int i = 0; i < static_cast<int>(n + 1); i++) {
-      std::string key = EncodeKey(i + 1);
-      auto h = cache->Lookup(key);
-      if (h) {
-        ASSERT_NE(static_cast<size_t>(i), 0U);
-        cache->Release(h);
-      } else {
-        ASSERT_EQ(static_cast<size_t>(i), 0U);
-      }
+  // element 0 is evicted and the rest is there
+  // This is consistent with the LRU policy since the element 0
+  // was released first
+  for (size_t i = 0; i < n + 1; i++) {
+    std::string key = ToString(i+1);
+    auto h = cache->Lookup(key);
+    if (h) {
+      ASSERT_NE(i, 0U);
+      cache->Release(h);
+    } else {
+      ASSERT_EQ(i, 0U);
    }
  }
 }
@@ -934,7 +735,7 @@ TEST_P(CacheTest, ApplyToAllCacheEntriesTest) {
  std::sort(inserted.begin(), inserted.end());
  std::sort(legacy_callback_state.begin(), legacy_callback_state.end());
  ASSERT_EQ(inserted.size(), legacy_callback_state.size());
-  for (int i = 0; i < static_cast<int>(inserted.size()); ++i) {
+  for (size_t i = 0; i < inserted.size(); ++i) {
    EXPECT_EQ(inserted[i], legacy_callback_state[i]);
  }
 }
@@ -943,9 +744,9 @@ TEST_P(CacheTest, ApplyToAllEntriesTest) {
  std::vector<std::string> callback_state;
  const auto callback = [&](const Slice& key, void* value, size_t charge,
                            Cache::DeleterFn deleter) {
-    callback_state.push_back(std::to_string(DecodeKey(key)) + "," +
-                             std::to_string(DecodeValue(value)) + "," +
-                             std::to_string(charge));
+    callback_state.push_back(ToString(DecodeKey(key)) + "," +
+                             ToString(DecodeValue(value)) + "," +
+                             ToString(charge));
    assert(deleter == &CacheTest::Deleter);
  };

@@ -954,15 +755,15 @@ TEST_P(CacheTest, ApplyToAllEntriesTest) {

  for (int i = 0; i < 10; ++i) {
    Insert(i, i * 2, i + 1);
-    inserted.push_back(std::to_string(i) + "," + std::to_string(i * 2) + "," +
-                       std::to_string(i + 1));
+    inserted.push_back(ToString(i) + "," + ToString(i * 2) + "," +
+                       ToString(i + 1));
  }
  cache_->ApplyToAllEntries(callback, /*opts*/ {});

  std::sort(inserted.begin(), inserted.end());
  std::sort(callback_state.begin(), callback_state.end());
  ASSERT_EQ(inserted.size(), callback_state.size());
-  for (int i = 0; i < static_cast<int>(inserted.size()); ++i) {
+  for (size_t i = 0; i < inserted.size(); ++i) {
    EXPECT_EQ(inserted[i], callback_state[i]);
  }
 }
@@ -977,10 +778,8 @@ TEST_P(CacheTest, ApplyToAllEntriesDuringResize) {
  constexpr int kSpecialCharge = 2;
  constexpr int kNotSpecialCharge = 1;
  constexpr int kSpecialCount = 100;
-  size_t expected_usage = 0;
  for (int i = 0; i < kSpecialCount; ++i) {
    Insert(i, i * 2, kSpecialCharge);
-    expected_usage += kSpecialCharge;
  }

  // For callback
@@ -1001,46 +800,29 @@ TEST_P(CacheTest, ApplyToAllEntriesDuringResize) {
  });

  // In parallel, add more entries, enough to cause resize but not enough
-  // to cause ejections. (Note: if any cache shard is over capacity, there
-  // will be ejections)
-  for (int i = kSpecialCount * 1; i < kSpecialCount * 5; ++i) {
+  // to cause ejections
+  for (int i = kSpecialCount * 1; i < kSpecialCount * 6; ++i) {
    Insert(i, i * 2, kNotSpecialCharge);
-    expected_usage += kNotSpecialCharge;
  }

  apply_thread.join();
-  // verify no evictions
-  ASSERT_EQ(cache_->GetUsage(), expected_usage);
-  // verify everything seen in ApplyToAllEntries
  ASSERT_EQ(special_count, kSpecialCount);
 }

 TEST_P(CacheTest, DefaultShardBits) {
-  // Prevent excessive allocation (to save time & space)
-  estimated_value_size_ = 100000;
-  // Implementations use different minimum shard sizes
-  size_t min_shard_size =
-      (GetParam() == kHyperClock ? 32U * 1024U : 512U) * 1024U;
-
-  std::shared_ptr<Cache> cache = NewCache(32U * min_shard_size);
-  ShardedCacheBase* sc = dynamic_cast<ShardedCacheBase*>(cache.get());
+  // test1: set the flag to false. Insert more keys than capacity. See if they
+  // all go through.
+  std::shared_ptr<Cache> cache = NewCache(16 * 1024L * 1024L);
+  ShardedCache* sc = dynamic_cast<ShardedCache*>(cache.get());
  ASSERT_EQ(5, sc->GetNumShardBits());

-  cache = NewCache(min_shard_size / 1000U * 999U);
-  sc = dynamic_cast<ShardedCacheBase*>(cache.get());
+  cache = NewLRUCache(511 * 1024L, -1, true);
+  sc = dynamic_cast<ShardedCache*>(cache.get());
  ASSERT_EQ(0, sc->GetNumShardBits());

-  cache = NewCache(3U * 1024U * 1024U * 1024U);
-  sc = dynamic_cast<ShardedCacheBase*>(cache.get());
-  // current maximum of 6
+  cache = NewLRUCache(1024L * 1024L * 1024L, -1, true);
+  sc = dynamic_cast<ShardedCache*>(cache.get());
  ASSERT_EQ(6, sc->GetNumShardBits());
-
-  if constexpr (sizeof(size_t) > 4) {
-    cache = NewCache(128U * min_shard_size);
-    sc = dynamic_cast<ShardedCacheBase*>(cache.get());
-    // current maximum of 6
-    ASSERT_EQ(6, sc->GetNumShardBits());
-  }
 }

 TEST_P(CacheTest, GetChargeAndDeleter) {
@@ -1052,15 +834,19 @@ TEST_P(CacheTest, GetChargeAndDeleter) {
  cache_->Release(h1);
 }

+#ifdef SUPPORT_CLOCK_CACHE
+std::shared_ptr<Cache> (*new_clock_cache_func)(
+    size_t, int, bool, CacheMetadataChargePolicy) = NewClockCache;
 INSTANTIATE_TEST_CASE_P(CacheTestInstance, CacheTest,
-                        testing::Values(kLRU, kHyperClock, kFast));
-INSTANTIATE_TEST_CASE_P(CacheTestInstance, LRUCacheTest,
-                        testing::Values(kLRU, kFast));
+                        testing::Values(kLRU, kClock));
+#else
+INSTANTIATE_TEST_CASE_P(CacheTestInstance, CacheTest, testing::Values(kLRU));
+#endif  // SUPPORT_CLOCK_CACHE
+INSTANTIATE_TEST_CASE_P(CacheTestInstance, LRUCacheTest, testing::Values(kLRU));

 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -1,117 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  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/charged_cache.h"
-
-#include "cache/cache_reservation_manager.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-ChargedCache::ChargedCache(std::shared_ptr<Cache> cache,
-                           std::shared_ptr<Cache> block_cache)
-    : cache_(cache),
-      cache_res_mgr_(std::make_shared<ConcurrentCacheReservationManager>(
-          std::make_shared<
-              CacheReservationManagerImpl<CacheEntryRole::kBlobCache>>(
-              block_cache))) {}
-
-Status ChargedCache::Insert(const Slice& key, void* value, size_t charge,
-                            DeleterFn deleter, Handle** handle,
-                            Priority priority) {
-  Status s = cache_->Insert(key, value, charge, deleter, handle, priority);
-  if (s.ok()) {
-    // Insert may cause the cache entry eviction if the cache is full. So we
-    // directly call the reservation manager to update the total memory used
-    // in the cache.
-    assert(cache_res_mgr_);
-    cache_res_mgr_->UpdateCacheReservation(cache_->GetUsage())
-        .PermitUncheckedError();
-  }
-  return s;
-}
-
-Status ChargedCache::Insert(const Slice& key, void* value,
-                            const CacheItemHelper* helper, size_t charge,
-                            Handle** handle, Priority priority) {
-  Status s = cache_->Insert(key, value, helper, charge, handle, priority);
-  if (s.ok()) {
-    // Insert may cause the cache entry eviction if the cache is full. So we
-    // directly call the reservation manager to update the total memory used
-    // in the cache.
-    assert(cache_res_mgr_);
-    cache_res_mgr_->UpdateCacheReservation(cache_->GetUsage())
-        .PermitUncheckedError();
-  }
-  return s;
-}
-
-Cache::Handle* ChargedCache::Lookup(const Slice& key, Statistics* stats) {
-  return cache_->Lookup(key, stats);
-}
-
-Cache::Handle* ChargedCache::Lookup(const Slice& key,
-                                    const CacheItemHelper* helper,
-                                    const CreateCallback& create_cb,
-                                    Priority priority, bool wait,
-                                    Statistics* stats) {
-  auto handle = cache_->Lookup(key, helper, create_cb, priority, wait, stats);
-  // Lookup may promote the KV pair from the secondary cache to the primary
-  // cache. So we directly call the reservation manager to update the total
-  // memory used in the cache.
-  assert(cache_res_mgr_);
-  cache_res_mgr_->UpdateCacheReservation(cache_->GetUsage())
-      .PermitUncheckedError();
-  return handle;
-}
-
-bool ChargedCache::Release(Cache::Handle* handle, bool useful,
-                           bool erase_if_last_ref) {
-  size_t memory_used_delta = cache_->GetUsage(handle);
-  bool erased = cache_->Release(handle, useful, erase_if_last_ref);
-  if (erased) {
-    assert(cache_res_mgr_);
-    cache_res_mgr_
-        ->UpdateCacheReservation(memory_used_delta, /* increase */ false)
-        .PermitUncheckedError();
-  }
-  return erased;
-}
-
-bool ChargedCache::Release(Cache::Handle* handle, bool erase_if_last_ref) {
-  size_t memory_used_delta = cache_->GetUsage(handle);
-  bool erased = cache_->Release(handle, erase_if_last_ref);
-  if (erased) {
-    assert(cache_res_mgr_);
-    cache_res_mgr_
-        ->UpdateCacheReservation(memory_used_delta, /* increase */ false)
-        .PermitUncheckedError();
-  }
-  return erased;
-}
-
-void ChargedCache::Erase(const Slice& key) {
-  cache_->Erase(key);
-  assert(cache_res_mgr_);
-  cache_res_mgr_->UpdateCacheReservation(cache_->GetUsage())
-      .PermitUncheckedError();
-}
-
-void ChargedCache::EraseUnRefEntries() {
-  cache_->EraseUnRefEntries();
-  assert(cache_res_mgr_);
-  cache_res_mgr_->UpdateCacheReservation(cache_->GetUsage())
-      .PermitUncheckedError();
-}
-
-void ChargedCache::SetCapacity(size_t capacity) {
-  cache_->SetCapacity(capacity);
-  // SetCapacity can result in evictions when the cache capacity is decreased,
-  // so we would want to update the cache reservation here as well.
-  assert(cache_res_mgr_);
-  cache_res_mgr_->UpdateCacheReservation(cache_->GetUsage())
-      .PermitUncheckedError();
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,121 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  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 <string>
-
-#include "port/port.h"
-#include "rocksdb/cache.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-class ConcurrentCacheReservationManager;
-
-// A cache interface which wraps around another cache and takes care of
-// reserving space in block cache towards a single global memory limit, and
-// forwards all the calls to the underlying cache.
-class ChargedCache : public Cache {
- public:
-  ChargedCache(std::shared_ptr<Cache> cache,
-               std::shared_ptr<Cache> block_cache);
-  ~ChargedCache() override = default;
-
-  Status Insert(const Slice& key, void* value, size_t charge, DeleterFn deleter,
-                Handle** handle, Priority priority) override;
-  Status Insert(const Slice& key, void* value, const CacheItemHelper* helper,
-                size_t charge, Handle** handle = nullptr,
-                Priority priority = Priority::LOW) override;
-
-  Cache::Handle* Lookup(const Slice& key, Statistics* stats) override;
-  Cache::Handle* Lookup(const Slice& key, const CacheItemHelper* helper,
-                        const CreateCallback& create_cb, Priority priority,
-                        bool wait, Statistics* stats = nullptr) override;
-
-  bool Release(Cache::Handle* handle, bool useful,
-               bool erase_if_last_ref = false) override;
-  bool Release(Cache::Handle* handle, bool erase_if_last_ref = false) override;
-
-  void Erase(const Slice& key) override;
-  void EraseUnRefEntries() override;
-
-  static const char* kClassName() { return "ChargedCache"; }
-  const char* Name() const override { return kClassName(); }
-
-  uint64_t NewId() override { return cache_->NewId(); }
-
-  void SetCapacity(size_t capacity) override;
-
-  void SetStrictCapacityLimit(bool strict_capacity_limit) override {
-    cache_->SetStrictCapacityLimit(strict_capacity_limit);
-  }
-
-  bool HasStrictCapacityLimit() const override {
-    return cache_->HasStrictCapacityLimit();
-  }
-
-  void* Value(Cache::Handle* handle) override { return cache_->Value(handle); }
-
-  bool IsReady(Cache::Handle* handle) override {
-    return cache_->IsReady(handle);
-  }
-
-  void Wait(Cache::Handle* handle) override { cache_->Wait(handle); }
-
-  void WaitAll(std::vector<Handle*>& handles) override {
-    cache_->WaitAll(handles);
-  }
-
-  bool Ref(Cache::Handle* handle) override { return cache_->Ref(handle); }
-
-  size_t GetCapacity() const override { return cache_->GetCapacity(); }
-
-  size_t GetUsage() const override { return cache_->GetUsage(); }
-
-  size_t GetUsage(Cache::Handle* handle) const override {
-    return cache_->GetUsage(handle);
-  }
-
-  size_t GetPinnedUsage() const override { return cache_->GetPinnedUsage(); }
-
-  size_t GetCharge(Cache::Handle* handle) const override {
-    return cache_->GetCharge(handle);
-  }
-
-  Cache::DeleterFn GetDeleter(Cache::Handle* handle) const override {
-    return cache_->GetDeleter(handle);
-  }
-
-  void ApplyToAllEntries(
-      const std::function<void(const Slice& key, void* value, size_t charge,
-                               Cache::DeleterFn deleter)>& callback,
-      const Cache::ApplyToAllEntriesOptions& opts) override {
-    cache_->ApplyToAllEntries(callback, opts);
-  }
-
-  void ApplyToAllCacheEntries(void (*callback)(void* value, size_t charge),
-                              bool thread_safe) override {
-    cache_->ApplyToAllCacheEntries(callback, thread_safe);
-  }
-
-  std::string GetPrintableOptions() const override {
-    return cache_->GetPrintableOptions();
-  }
-
-  void DisownData() override { return cache_->DisownData(); }
-
-  inline Cache* GetCache() const { return cache_.get(); }
-
-  inline ConcurrentCacheReservationManager* TEST_GetCacheReservationManager()
-      const {
-    return cache_res_mgr_.get();
-  }
-
- private:
-  std::shared_ptr<Cache> cache_;
-  std::shared_ptr<ConcurrentCacheReservationManager> cache_res_mgr_;
-};
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -9,624 +9,8 @@

 #pragma once

-#include <array>
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <string>
-
-#include "cache/cache_key.h"
-#include "cache/sharded_cache.h"
-#include "port/lang.h"
-#include "port/malloc.h"
-#include "port/port.h"
 #include "rocksdb/cache.h"
-#include "rocksdb/secondary_cache.h"
-#include "util/autovector.h"

-namespace ROCKSDB_NAMESPACE {
-
-namespace hyper_clock_cache {
-
-// Forward declaration of friend class.
-class ClockCacheTest;
-
-// HyperClockCache is an experimental alternative to LRUCache.
-//
-// Benefits
-// --------
-// * Fully lock free (no waits or spins) for efficiency under high concurrency
-// * Optimized for hot path reads. For concurrency control, most Lookup() and
-// essentially all Release() are a single atomic add operation.
-// * Eviction on insertion is fully parallel and lock-free.
-// * Uses a generalized + aging variant of CLOCK eviction that might outperform
-// LRU in some cases. (For background, see
-// https://en.wikipedia.org/wiki/Page_replacement_algorithm)
-//
-// Costs
-// -----
-// * Hash table is not resizable (for lock-free efficiency) so capacity is not
-// dynamically changeable. Rely on an estimated average value (block) size for
-// space+time efficiency. (See estimated_entry_charge option details.)
-// * Insert usually does not (but might) overwrite a previous entry associated
-// with a cache key. This is OK for RocksDB uses of Cache.
-// * Only supports keys of exactly 16 bytes, which is what RocksDB uses for
-// block cache (not row cache or table cache).
-// * SecondaryCache is not supported.
-// * Cache priorities are less aggressively enforced. Unlike LRUCache, enough
-// transient LOW or BOTTOM priority items can evict HIGH priority entries that
-// are not referenced recently (or often) enough.
-// * If pinned entries leave little or nothing eligible for eviction,
-// performance can degrade substantially, because of clock eviction eating
-// CPU looking for evictable entries and because Release does not
-// pro-actively delete unreferenced entries when the cache is over-full.
-// Specifically, this makes this implementation more susceptible to the
-// following combination:
-//   * num_shard_bits is high (e.g. 6)
-//   * capacity small (e.g. some MBs)
-//   * some large individual entries (e.g. non-partitioned filters)
-// where individual entries occupy a large portion of their shard capacity.
-// This should be mostly mitigated by the implementation picking a lower
-// number of cache shards than LRUCache for a given capacity (when
-// num_shard_bits is not overridden; see calls to GetDefaultCacheShardBits()).
-// * With strict_capacity_limit=false, respecting the capacity limit is not as
-// aggressive as LRUCache. The limit might be transiently exceeded by a very
-// small number of entries even when not strictly necessary, and slower to
-// recover after pinning forces limit to be substantially exceeded. (Even with
-// strict_capacity_limit=true, RocksDB will nevertheless transiently allocate
-// memory before discovering it is over the block cache capacity, so this
-// should not be a detectable regression in respecting memory limits, except
-// on exceptionally small caches.)
-// * In some cases, erased or duplicated entries might not be freed
-// immediately. They will eventually be freed by eviction from further Inserts.
-// * Internal metadata can overflow if the number of simultaneous references
-// to a cache handle reaches many millions.
-//
-// High-level eviction algorithm
-// -----------------------------
-// A score (or "countdown") is maintained for each entry, initially determined
-// by priority. The score is incremented on each Lookup, up to a max of 3,
-// though is easily returned to previous state if useful=false with Release.
-// During CLOCK-style eviction iteration, entries with score > 0 are
-// decremented if currently unreferenced and entries with score == 0 are
-// evicted if currently unreferenced. Note that scoring might not be perfect
-// because entries can be referenced transiently within the cache even when
-// there are no outside references to the entry.
-//
-// Cache sharding like LRUCache is used to reduce contention on usage+eviction
-// state, though here the performance improvement from more shards is small,
-// and (as noted above) potentially detrimental if shard capacity is too close
-// to largest entry size. Here cache sharding mostly only affects cache update
-// (Insert / Erase) performance, not read performance.
-//
-// Read efficiency (hot path)
-// --------------------------
-// Mostly to minimize the cost of accessing metadata blocks with
-// cache_index_and_filter_blocks=true, we focus on optimizing Lookup and
-// Release. In terms of concurrency, at a minimum, these operations have
-// to do reference counting (and Lookup has to compare full keys in a safe
-// way). Can we fold in all the other metadata tracking *for free* with
-// Lookup and Release doing a simple atomic fetch_add/fetch_sub? (Assume
-// for the moment that Lookup succeeds on the first probe.)
-//
-// We have a clever way of encoding an entry's reference count and countdown
-// clock so that Lookup and Release are each usually a single atomic addition.
-// In a single metadata word we have both an "acquire" count, incremented by
-// Lookup, and a "release" count, incremented by Release. If useful=false,
-// Release can instead decrement the acquire count. Thus the current ref
-// count is (acquires - releases), and the countdown clock is min(3, acquires).
-// Note that only unreferenced entries (acquires == releases) are eligible
-// for CLOCK manipulation and eviction. We tolerate use of more expensive
-// compare_exchange operations for cache writes (insertions and erasures).
-//
-// In a cache receiving many reads and little or no writes, it is possible
-// for the acquire and release counters to overflow. Assuming the *current*
-// refcount never reaches to many millions, we only have to correct for
-// overflow in both counters in Release, not in Lookup. The overflow check
-// should be only 1-2 CPU cycles per Release because it is a predictable
-// branch on a simple condition on data already in registers.
-//
-// Slot states
-// -----------
-// We encode a state indicator into the same metadata word with the
-// acquire and release counters. This allows bigger state transitions to
-// be atomic. States:
-//
-// * Empty - slot is not in use and unowned. All other metadata and data is
-// in an undefined state.
-// * Construction - slot is exclusively owned by one thread, the thread
-// successfully entering this state, for populating or freeing data.
-// * Shareable (group) - slot holds an entry with counted references for
-// pinning and reading, including
-//   * Visible - slot holds an entry that can be returned by Lookup
-//   * Invisible - slot holds an entry that is not visible to Lookup
-//     (erased by user) but can be read by existing references, and ref count
-//     changed by Ref and Release.
-//
-// A special case is "detached" entries, which are heap-allocated handles
-// not in the table. They are always Invisible and freed on zero refs.
-//
-// State transitions:
-// Empty -> Construction (in Insert): The encoding of state enables Insert to
-// perform an optimistic atomic bitwise-or to take ownership if a slot is
-// empty, or otherwise make no state change.
-//
-// Construction -> Visible (in Insert): This can be a simple assignment to the
-// metadata word because the current thread has exclusive ownership and other
-// metadata is meaningless.
-//
-// Visible -> Invisible (in Erase): This can be a bitwise-and while holding
-// a shared reference, which is safe because the change is idempotent (in case
-// of parallel Erase). By the way, we never go Invisible->Visible.
-//
-// Shareable -> Construction (in Evict part of Insert, in Erase, and in
-// Release if Invisible): This is for starting to freeing/deleting an
-// unreferenced entry. We have to use compare_exchange to ensure we only make
-// this transition when there are zero refs.
-//
-// Construction -> Empty (in same places): This is for completing free/delete
-// of an entry. A "release" atomic store suffices, as we have exclusive
-// ownership of the slot but have to ensure none of the data member reads are
-// re-ordered after committing the state transition.
-//
-// Insert
-// ------
-// If Insert were to guarantee replacing an existing entry for a key, there
-// would be complications for concurrency and efficiency. First, consider how
-// many probes to get to an entry. To ensure Lookup never waits and
-// availability of a key is uninterrupted, we would need to use a different
-// slot for a new entry for the same key. This means it is most likely in a
-// later probing position than the old version, which should soon be removed.
-// (Also, an entry is too big to replace atomically, even if no current refs.)
-//
-// However, overwrite capability is not really needed by RocksDB. Also, we
-// know from our "redundant" stats that overwrites are very rare for the block
-// cache, so we should not spend much to make them effective.
-//
-// So instead we Insert as soon as we find an empty slot in the probing
-// sequence without seeing an existing (visible) entry for the same key. This
-// way we only insert if we can improve the probing performance, and we don't
-// need to probe beyond our insert position, assuming we are willing to let
-// the previous entry for the same key die of old age (eventual eviction from
-// not being used). We can reach a similar state with concurrent insertions,
-// where one will pass over the other while it is "under construction."
-// This temporary duplication is acceptable for RocksDB block cache because
-// we know redundant insertion is rare.
-//
-// Another problem to solve is what to return to the caller when we find an
-// existing entry whose probing position we cannot improve on, or when the
-// table occupancy limit has been reached. If strict_capacity_limit=false,
-// we must never fail Insert, and if a Handle* is provided, we have to return
-// a usable Cache handle on success. The solution to this (typically rare)
-// problem is "detached" handles, which are usable by the caller but not
-// actually available for Lookup in the Cache. Detached handles are allocated
-// independently on the heap and specially marked so that they are freed on
-// the heap when their last reference is released.
-//
-// Usage on capacity
-// -----------------
-// Insert takes different approaches to usage tracking depending on
-// strict_capacity_limit setting. If true, we enforce a kind of strong
-// consistency where compare-exchange is used to ensure the usage number never
-// exceeds its limit, and provide threads with an authoritative signal on how
-// much "usage" they have taken ownership of. With strict_capacity_limit=false,
-// we use a kind of "eventual consistency" where all threads Inserting to the
-// same cache shard might race on reserving the same space, but the
-// over-commitment will be worked out in later insertions. It is kind of a
-// dance because we don't want threads racing each other too much on paying
-// down the over-commitment (with eviction) either.
-//
-// Eviction
-// --------
-// A key part of Insert is evicting some entries currently unreferenced to
-// make room for new entries. The high-level eviction algorithm is described
-// above, but the details are also interesting. A key part is parallelizing
-// eviction with a single CLOCK pointer. This works by each thread working on
-// eviction pre-emptively incrementing the CLOCK pointer, and then CLOCK-
-// updating or evicting the incremented-over slot(s). To reduce contention at
-// the cost of possibly evicting too much, each thread increments the clock
-// pointer by 4, so commits to updating at least 4 slots per batch. As
-// described above, a CLOCK update will decrement the "countdown" of
-// unreferenced entries, or evict unreferenced entries with zero countdown.
-// Referenced entries are not updated, because we (presumably) don't want
-// long-referenced entries to age while referenced. Note however that we
-// cannot distinguish transiently referenced entries from cache user
-// references, so some CLOCK updates might be somewhat arbitrarily skipped.
-// This is OK as long as it is rare enough that eviction order is still
-// pretty good.
-//
-// There is no synchronization on the completion of the CLOCK updates, so it
-// is theoretically possible for another thread to cycle back around and have
-// two threads racing on CLOCK updates to the same slot. Thus, we cannot rely
-// on any implied exclusivity to make the updates or eviction more efficient.
-// These updates use an opportunistic compare-exchange (no loop), where a
-// racing thread might cause the update to be skipped without retry, but in
-// such case the update is likely not needed because the most likely update
-// to an entry is that it has become referenced. (TODO: test efficiency of
-// avoiding compare-exchange loop)
-//
-// Release
-// -------
-// In the common case, Release is a simple atomic increment of the release
-// counter. There is a simple overflow check that only does another atomic
-// update in extremely rare cases, so costs almost nothing.
-//
-// If the Release specifies "not useful", we can instead decrement the
-// acquire counter, which returns to the same CLOCK state as before Lookup
-// or Ref.
-//
-// Adding a check for over-full cache on every release to zero-refs would
-// likely be somewhat expensive, increasing read contention on cache shard
-// metadata. Instead we are less aggressive about deleting entries right
-// away in those cases.
-//
-// However Release tries to immediately delete entries reaching zero refs
-// if (a) erase_if_last_ref is set by the caller, or (b) the entry is already
-// marked invisible. Both of these are checks on values already in CPU
-// registers so do not increase cross-CPU contention when not applicable.
-// When applicable, they use a compare-exchange loop to take exclusive
-// ownership of the slot for freeing the entry. These are rare cases
-// that should not usually affect performance.
-//
-// Erase
-// -----
-// Searches for an entry like Lookup but moves it to Invisible state if found.
-// This state transition is with bit operations so is idempotent and safely
-// done while only holding a shared "read" reference. Like Release, it makes
-// a best effort to immediately release an Invisible entry that reaches zero
-// refs, but there are some corner cases where it will only be freed by the
-// clock eviction process.
-
-// ----------------------------------------------------------------------- //
-
-// The load factor p is a real number in (0, 1) such that at all
-// times at most a fraction p of all slots, without counting tombstones,
-// are occupied by elements. This means that the probability that a random
-// probe hits an occupied slot is at most p, and thus at most 1/p probes
-// are required on average. For example, p = 70% implies that between 1 and 2
-// probes are needed on average (bear in mind that this reasoning doesn't
-// consider the effects of clustering over time, which should be negligible
-// with double hashing).
-// Because the size of the hash table is always rounded up to the next
-// power of 2, p is really an upper bound on the actual load factor---the
-// actual load factor is anywhere between p/2 and p. This is a bit wasteful,
-// but bear in mind that slots only hold metadata, not actual values.
-// Since space cost is dominated by the values (the LSM blocks),
-// overprovisioning the table with metadata only increases the total cache space
-// usage by a tiny fraction.
-constexpr double kLoadFactor = 0.7;
-
-// The user can exceed kLoadFactor if the sizes of the inserted values don't
-// match estimated_value_size, or in some rare cases with
-// strict_capacity_limit == false. To avoid degenerate performance, we set a
-// strict upper bound on the load factor.
-constexpr double kStrictLoadFactor = 0.84;
-
-struct ClockHandleBasicData {
-  void* value = nullptr;
-  Cache::DeleterFn deleter = nullptr;
-  // A lossless, reversible hash of the fixed-size (16 byte) cache key. This
-  // eliminates the need to store a hash separately.
-  UniqueId64x2 hashed_key = kNullUniqueId64x2;
-  size_t total_charge = 0;
-
-  // Calls deleter (if non-null) on cache key and value
-  void FreeData() const;
-
-  // Required by concept HandleImpl
-  const UniqueId64x2& GetHash() const { return hashed_key; }
-};
-
-// Target size to be exactly a common cache line size (see static_assert in
-// clock_cache.cc)
-struct ALIGN_AS(64U) ClockHandle : public ClockHandleBasicData {
-  // Constants for handling the atomic `meta` word, which tracks most of the
-  // state of the handle. The meta word looks like this:
-  // low bits                                                     high bits
-  // -----------------------------------------------------------------------
-  // | acquire counter          | release counter           | state marker |
-  // -----------------------------------------------------------------------
-
-  // For reading or updating counters in meta word.
-  static constexpr uint8_t kCounterNumBits = 30;
-  static constexpr uint64_t kCounterMask = (uint64_t{1} << kCounterNumBits) - 1;
-
-  static constexpr uint8_t kAcquireCounterShift = 0;
-  static constexpr uint64_t kAcquireIncrement = uint64_t{1}
-                                                << kAcquireCounterShift;
-  static constexpr uint8_t kReleaseCounterShift = kCounterNumBits;
-  static constexpr uint64_t kReleaseIncrement = uint64_t{1}
-                                                << kReleaseCounterShift;
-
-  // For reading or updating the state marker in meta word
-  static constexpr uint8_t kStateShift = 2U * kCounterNumBits;
-
-  // Bits contribution to state marker.
-  // Occupied means any state other than empty
-  static constexpr uint8_t kStateOccupiedBit = 0b100;
-  // Shareable means the entry is reference counted (visible or invisible)
-  // (only set if also occupied)
-  static constexpr uint8_t kStateShareableBit = 0b010;
-  // Visible is only set if also shareable
-  static constexpr uint8_t kStateVisibleBit = 0b001;
-
-  // Complete state markers (not shifted into full word)
-  static constexpr uint8_t kStateEmpty = 0b000;
-  static constexpr uint8_t kStateConstruction = kStateOccupiedBit;
-  static constexpr uint8_t kStateInvisible =
-      kStateOccupiedBit | kStateShareableBit;
-  static constexpr uint8_t kStateVisible =
-      kStateOccupiedBit | kStateShareableBit | kStateVisibleBit;
-
-  // Constants for initializing the countdown clock. (Countdown clock is only
-  // in effect with zero refs, acquire counter == release counter, and in that
-  // case the countdown clock == both of those counters.)
-  static constexpr uint8_t kHighCountdown = 3;
-  static constexpr uint8_t kLowCountdown = 2;
-  static constexpr uint8_t kBottomCountdown = 1;
-  // During clock update, treat any countdown clock value greater than this
-  // value the same as this value.
-  static constexpr uint8_t kMaxCountdown = kHighCountdown;
-  // TODO: make these coundown values tuning parameters for eviction?
-
-  // See above
-  std::atomic<uint64_t> meta{};
-  // The number of elements that hash to this slot or a lower one, but wind
-  // up in this slot or a higher one.
-  std::atomic<uint32_t> displacements{};
-
-  // True iff the handle is allocated separately from hash table.
-  bool detached = false;
-};  // struct ClockHandle
-
-class ClockHandleTable {
- public:
-  explicit ClockHandleTable(int hash_bits, bool initial_charge_metadata);
-  ~ClockHandleTable();
-
-  Status Insert(const ClockHandleBasicData& proto, ClockHandle** handle,
-                Cache::Priority priority, size_t capacity,
-                bool strict_capacity_limit);
-
-  ClockHandle* Lookup(const UniqueId64x2& hashed_key);
-
-  bool Release(ClockHandle* handle, bool useful, bool erase_if_last_ref);
-
-  void Ref(ClockHandle& handle);
-
-  void Erase(const UniqueId64x2& hashed_key);
-
-  void ConstApplyToEntriesRange(std::function<void(const ClockHandle&)> func,
-                                size_t index_begin, size_t index_end,
-                                bool apply_if_will_be_deleted) const;
-
-  void EraseUnRefEntries();
-
-  size_t GetTableSize() const { return size_t{1} << length_bits_; }
-
-  int GetLengthBits() const { return length_bits_; }
-
-  size_t GetOccupancyLimit() const { return occupancy_limit_; }
-
-  size_t GetOccupancy() const {
-    return occupancy_.load(std::memory_order_relaxed);
-  }
-
-  size_t GetUsage() const { return usage_.load(std::memory_order_relaxed); }
-
-  size_t GetDetachedUsage() const {
-    return detached_usage_.load(std::memory_order_relaxed);
-  }
-
-  // Acquire/release N references
-  void TEST_RefN(ClockHandle& handle, size_t n);
-  void TEST_ReleaseN(ClockHandle* handle, size_t n);
-
- private:  // functions
-  // Returns x mod 2^{length_bits_}.
-  inline size_t ModTableSize(uint64_t x) {
-    return static_cast<size_t>(x) & length_bits_mask_;
-  }
-
-  // Runs the clock eviction algorithm trying to reclaim at least
-  // requested_charge. Returns how much is evicted, which could be less
-  // if it appears impossible to evict the requested amount without blocking.
-  void Evict(size_t requested_charge, size_t* freed_charge,
-             size_t* freed_count);
-
-  // Returns the first slot in the probe sequence, starting from the given
-  // probe number, with a handle e such that match(e) is true. At every
-  // step, the function first tests whether match(e) holds. If this is false,
-  // it evaluates abort(e) to decide whether the search should be aborted,
-  // and in the affirmative returns -1. For every handle e probed except
-  // the last one, the function runs update(e).
-  // The probe parameter is modified as follows. We say a probe to a handle
-  // e is aborting if match(e) is false and abort(e) is true. Then the final
-  // value of probe is one more than the last non-aborting probe during the
-  // call. This is so that that the variable can be used to keep track of
-  // progress across consecutive calls to FindSlot.
-  inline ClockHandle* FindSlot(const UniqueId64x2& hashed_key,
-                               std::function<bool(ClockHandle*)> match,
-                               std::function<bool(ClockHandle*)> stop,
-                               std::function<void(ClockHandle*)> update,
-                               size_t& probe);
-
-  // Re-decrement all displacements in probe path starting from beginning
-  // until (not including) the given handle
-  void Rollback(const UniqueId64x2& hashed_key, const ClockHandle* h);
-
- private:  // data
-  // Number of hash bits used for table index.
-  // The size of the table is 1 << length_bits_.
-  const int length_bits_;
-
-  // For faster computation of ModTableSize.
-  const size_t length_bits_mask_;
-
-  // Maximum number of elements the user can store in the table.
-  const size_t occupancy_limit_;
-
-  // Array of slots comprising the hash table.
-  const std::unique_ptr<ClockHandle[]> array_;
-
-  // We partition the following members into different cache lines
-  // to avoid false sharing among Lookup, Release, Erase and Insert
-  // operations in ClockCacheShard.
-
-  ALIGN_AS(CACHE_LINE_SIZE)
-  // Clock algorithm sweep pointer.
-  std::atomic<uint64_t> clock_pointer_{};
-
-  ALIGN_AS(CACHE_LINE_SIZE)
-  // Number of elements in the table.
-  std::atomic<size_t> occupancy_{};
-
-  // Memory usage by entries tracked by the cache (including detached)
-  std::atomic<size_t> usage_{};
-
-  // Part of usage by detached entries (not in table)
-  std::atomic<size_t> detached_usage_{};
-};  // class ClockHandleTable
-
-// A single shard of sharded cache.
-class ALIGN_AS(CACHE_LINE_SIZE) ClockCacheShard final : public CacheShardBase {
- public:
-  ClockCacheShard(size_t capacity, size_t estimated_value_size,
-                  bool strict_capacity_limit,
-                  CacheMetadataChargePolicy metadata_charge_policy);
-
-  // For CacheShard concept
-  using HandleImpl = ClockHandle;
-  // Hash is lossless hash of 128-bit key
-  using HashVal = UniqueId64x2;
-  using HashCref = const HashVal&;
-  static inline uint32_t HashPieceForSharding(HashCref hash) {
-    return Upper32of64(hash[0]);
-  }
-  static inline HashVal ComputeHash(const Slice& key) {
-    assert(key.size() == kCacheKeySize);
-    HashVal in;
-    HashVal out;
-    // NOTE: endian dependence
-    // TODO: use GetUnaligned?
-    std::memcpy(&in, key.data(), kCacheKeySize);
-    BijectiveHash2x64(in[1], in[0], &out[1], &out[0]);
-    return out;
-  }
-
-  // For reconstructing key from hashed_key. Requires the caller to provide
-  // backing storage for the Slice in `unhashed`
-  static inline Slice ReverseHash(const UniqueId64x2& hashed,
-                                  UniqueId64x2* unhashed) {
-    BijectiveUnhash2x64(hashed[1], hashed[0], &(*unhashed)[1], &(*unhashed)[0]);
-    // NOTE: endian dependence
-    return Slice(reinterpret_cast<const char*>(unhashed), kCacheKeySize);
-  }
-
-  // Although capacity is dynamically changeable, the number of table slots is
-  // not, so growing capacity substantially could lead to hitting occupancy
-  // limit.
-  void SetCapacity(size_t capacity);
-
-  void SetStrictCapacityLimit(bool strict_capacity_limit);
-
-  Status Insert(const Slice& key, const UniqueId64x2& hashed_key, void* value,
-                size_t charge, Cache::DeleterFn deleter, ClockHandle** handle,
-                Cache::Priority priority);
-
-  ClockHandle* Lookup(const Slice& key, const UniqueId64x2& hashed_key);
-
-  bool Release(ClockHandle* handle, bool useful, bool erase_if_last_ref);
-
-  bool Release(ClockHandle* handle, bool erase_if_last_ref = false);
-
-  bool Ref(ClockHandle* handle);
-
-  void Erase(const Slice& key, const UniqueId64x2& hashed_key);
-
-  size_t GetUsage() const;
-
-  size_t GetPinnedUsage() const;
-
-  size_t GetOccupancyCount() const;
-
-  size_t GetTableAddressCount() const;
-
-  void ApplyToSomeEntries(
-      const std::function<void(const Slice& key, void* value, size_t charge,
-                               DeleterFn deleter)>& callback,
-      size_t average_entries_per_lock, size_t* state);
-
-  void EraseUnRefEntries();
-
-  std::string GetPrintableOptions() const { return std::string{}; }
-
-  // SecondaryCache not yet supported
-  Status Insert(const Slice& key, const UniqueId64x2& hashed_key, void* value,
-                const Cache::CacheItemHelper* helper, size_t charge,
-                ClockHandle** handle, Cache::Priority priority) {
-    return Insert(key, hashed_key, value, charge, helper->del_cb, handle,
-                  priority);
-  }
-
-  ClockHandle* Lookup(const Slice& key, const UniqueId64x2& hashed_key,
-                      const Cache::CacheItemHelper* /*helper*/,
-                      const Cache::CreateCallback& /*create_cb*/,
-                      Cache::Priority /*priority*/, bool /*wait*/,
-                      Statistics* /*stats*/) {
-    return Lookup(key, hashed_key);
-  }
-
-  bool IsReady(ClockHandle* /*handle*/) { return true; }
-
-  void Wait(ClockHandle* /*handle*/) {}
-
-  // Acquire/release N references
-  void TEST_RefN(ClockHandle* handle, size_t n);
-  void TEST_ReleaseN(ClockHandle* handle, size_t n);
-
- private:  // functions
-  friend class ClockCache;
-  friend class ClockCacheTest;
-
-  ClockHandle* DetachedInsert(const ClockHandleBasicData& h);
-
-  // Returns the number of bits used to hash an element in the hash
-  // table.
-  static int CalcHashBits(size_t capacity, size_t estimated_value_size,
-                          CacheMetadataChargePolicy metadata_charge_policy);
-
- private:  // data
-  ClockHandleTable table_;
-
-  // Maximum total charge of all elements stored in the table.
-  std::atomic<size_t> capacity_;
-
-  // Whether to reject insertion if cache reaches its full capacity.
-  std::atomic<bool> strict_capacity_limit_;
-};  // class ClockCacheShard
-
-class HyperClockCache
-#ifdef NDEBUG
-    final
+#if defined(TBB) && !defined(ROCKSDB_LITE)
+#define SUPPORT_CLOCK_CACHE
 #endif
-    : public ShardedCache<ClockCacheShard> {
- public:
-  HyperClockCache(size_t capacity, size_t estimated_value_size,
-                  int num_shard_bits, bool strict_capacity_limit,
-                  CacheMetadataChargePolicy metadata_charge_policy,
-                  std::shared_ptr<MemoryAllocator> memory_allocator);
-
-  const char* Name() const override { return "HyperClockCache"; }
-
-  void* Value(Handle* handle) override;
-
-  size_t GetCharge(Handle* handle) const override;
-
-  DeleterFn GetDeleter(Handle* handle) const override;
-};  // class HyperClockCache
-
-}  // namespace hyper_clock_cache
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -5,127 +5,91 @@

 #include "cache/compressed_secondary_cache.h"

-#include <algorithm>
-#include <cstdint>
 #include <memory>

 #include "memory/memory_allocator.h"
-#include "monitoring/perf_context_imp.h"
 #include "util/compression.h"
 #include "util/string_util.h"

 namespace ROCKSDB_NAMESPACE {

+namespace {
+
+void DeletionCallback(const Slice& /*key*/, void* obj) {
+  delete reinterpret_cast<CacheAllocationPtr*>(obj);
+  obj = nullptr;
+}
+
+}  // namespace
+
 CompressedSecondaryCache::CompressedSecondaryCache(
    size_t capacity, int num_shard_bits, bool strict_capacity_limit,
-    double high_pri_pool_ratio, double low_pri_pool_ratio,
+    double high_pri_pool_ratio,
    std::shared_ptr<MemoryAllocator> memory_allocator, bool use_adaptive_mutex,
    CacheMetadataChargePolicy metadata_charge_policy,
-    CompressionType compression_type, uint32_t compress_format_version,
-    bool enable_custom_split_merge)
+    CompressionType compression_type, uint32_t compress_format_version)
    : cache_options_(capacity, num_shard_bits, strict_capacity_limit,
-                     high_pri_pool_ratio, low_pri_pool_ratio, memory_allocator,
-                     use_adaptive_mutex, metadata_charge_policy,
-                     compression_type, compress_format_version,
-                     enable_custom_split_merge) {
-  cache_ =
-      NewLRUCache(capacity, num_shard_bits, strict_capacity_limit,
-                  high_pri_pool_ratio, memory_allocator, use_adaptive_mutex,
-                  metadata_charge_policy, low_pri_pool_ratio);
+                     high_pri_pool_ratio, memory_allocator, use_adaptive_mutex,
+                     metadata_charge_policy, compression_type,
+                     compress_format_version) {
+  cache_ = NewLRUCache(capacity, num_shard_bits, strict_capacity_limit,
+                       high_pri_pool_ratio, memory_allocator,
+                       use_adaptive_mutex, metadata_charge_policy);
 }

 CompressedSecondaryCache::~CompressedSecondaryCache() { cache_.reset(); }

 std::unique_ptr<SecondaryCacheResultHandle> CompressedSecondaryCache::Lookup(
    const Slice& key, const Cache::CreateCallback& create_cb, bool /*wait*/,
-    bool advise_erase, bool& is_in_sec_cache) {
+    bool& is_in_sec_cache) {
  std::unique_ptr<SecondaryCacheResultHandle> handle;
  is_in_sec_cache = false;
  Cache::Handle* lru_handle = cache_->Lookup(key);
  if (lru_handle == nullptr) {
-    return nullptr;
-  }
-
-  void* handle_value = cache_->Value(lru_handle);
-  if (handle_value == nullptr) {
-    cache_->Release(lru_handle, /*erase_if_last_ref=*/false);
-    return nullptr;
-  }
-
-  CacheAllocationPtr* ptr{nullptr};
-  CacheAllocationPtr merged_value;
-  size_t handle_value_charge{0};
-  if (cache_options_.enable_custom_split_merge) {
-    CacheValueChunk* value_chunk_ptr =
-        reinterpret_cast<CacheValueChunk*>(handle_value);
-    merged_value = MergeChunksIntoValue(value_chunk_ptr, handle_value_charge);
-    ptr = &merged_value;
-  } else {
-    ptr = reinterpret_cast<CacheAllocationPtr*>(handle_value);
-    handle_value_charge = cache_->GetCharge(lru_handle);
+    return handle;
  }

+  CacheAllocationPtr* ptr =
+      reinterpret_cast<CacheAllocationPtr*>(cache_->Value(lru_handle));
+  void* value = nullptr;
+  size_t charge = 0;
  Status s;
-  void* value{nullptr};
-  size_t charge{0};
+
  if (cache_options_.compression_type == kNoCompression) {
-    s = create_cb(ptr->get(), handle_value_charge, &value, &charge);
+    s = create_cb(ptr->get(), cache_->GetCharge(lru_handle), &value, &charge);
  } else {
    UncompressionContext uncompression_context(cache_options_.compression_type);
    UncompressionInfo uncompression_info(uncompression_context,
                                         UncompressionDict::GetEmptyDict(),
                                         cache_options_.compression_type);

-    size_t uncompressed_size{0};
-    CacheAllocationPtr uncompressed = UncompressData(
-        uncompression_info, (char*)ptr->get(), handle_value_charge,
+    size_t uncompressed_size = 0;
+    CacheAllocationPtr uncompressed;
+    uncompressed = UncompressData(
+        uncompression_info, (char*)ptr->get(), cache_->GetCharge(lru_handle),
        &uncompressed_size, cache_options_.compress_format_version,
        cache_options_.memory_allocator.get());

    if (!uncompressed) {
-      cache_->Release(lru_handle, /*erase_if_last_ref=*/true);
-      return nullptr;
+      cache_->Release(lru_handle, /* erase_if_last_ref */ true);
+      return handle;
    }
    s = create_cb(uncompressed.get(), uncompressed_size, &value, &charge);
  }

  if (!s.ok()) {
-    cache_->Release(lru_handle, /*erase_if_last_ref=*/true);
-    return nullptr;
+    cache_->Release(lru_handle, /* erase_if_last_ref */ true);
+    return handle;
  }

-  if (advise_erase) {
-    cache_->Release(lru_handle, /*erase_if_last_ref=*/true);
-    // Insert a dummy handle.
-    cache_
-        ->Insert(key, /*value=*/nullptr, /*charge=*/0,
-                 GetDeletionCallback(cache_options_.enable_custom_split_merge))
-        .PermitUncheckedError();
-  } else {
-    is_in_sec_cache = true;
-    cache_->Release(lru_handle, /*erase_if_last_ref=*/false);
-  }
+  cache_->Release(lru_handle, /* erase_if_last_ref */ true);
  handle.reset(new CompressedSecondaryCacheResultHandle(value, charge));
+
  return handle;
 }

 Status CompressedSecondaryCache::Insert(const Slice& key, void* value,
                                        const Cache::CacheItemHelper* helper) {
-  if (value == nullptr) {
-    return Status::InvalidArgument();
-  }
-
-  Cache::Handle* lru_handle = cache_->Lookup(key);
-  Cache::DeleterFn del_cb =
-      GetDeletionCallback(cache_options_.enable_custom_split_merge);
-  if (lru_handle == nullptr) {
-    PERF_COUNTER_ADD(compressed_sec_cache_insert_dummy_count, 1);
-    // Insert a dummy handle if the handle is evicted for the first time.
-    return cache_->Insert(key, /*value=*/nullptr, /*charge=*/0, del_cb);
-  } else {
-    cache_->Release(lru_handle, /*erase_if_last_ref=*/false);
-  }
-
  size_t size = (*helper->size_cb)(value);
  CacheAllocationPtr ptr =
      AllocateBlock(size, cache_options_.memory_allocator.get());
@@ -138,10 +102,9 @@ Status CompressedSecondaryCache::Insert(const Slice& key, void* value,

  std::string compressed_val;
  if (cache_options_.compression_type != kNoCompression) {
-    PERF_COUNTER_ADD(compressed_sec_cache_uncompressed_bytes, size);
    CompressionOptions compression_opts;
    CompressionContext compression_context(cache_options_.compression_type);
-    uint64_t sample_for_compression{0};
+    uint64_t sample_for_compression = 0;
    CompressionInfo compression_info(
        compression_opts, compression_context, CompressionDict::GetEmptyDict(),
        cache_options_.compression_type, sample_for_compression);
@@ -156,158 +119,42 @@ Status CompressedSecondaryCache::Insert(const Slice& key, void* value,

    val = Slice(compressed_val);
    size = compressed_val.size();
-    PERF_COUNTER_ADD(compressed_sec_cache_compressed_bytes, size);
-
-    if (!cache_options_.enable_custom_split_merge) {
-      ptr = AllocateBlock(size, cache_options_.memory_allocator.get());
-      memcpy(ptr.get(), compressed_val.data(), size);
-    }
+    ptr = AllocateBlock(size, cache_options_.memory_allocator.get());
+    memcpy(ptr.get(), compressed_val.data(), size);
  }

-  PERF_COUNTER_ADD(compressed_sec_cache_insert_real_count, 1);
-  if (cache_options_.enable_custom_split_merge) {
-    size_t charge{0};
-    CacheValueChunk* value_chunks_head =
-        SplitValueIntoChunks(val, cache_options_.compression_type, charge);
-    return cache_->Insert(key, value_chunks_head, charge, del_cb);
-  } else {
-    CacheAllocationPtr* buf = new CacheAllocationPtr(std::move(ptr));
-    return cache_->Insert(key, buf, size, del_cb);
-  }
+  CacheAllocationPtr* buf = new CacheAllocationPtr(std::move(ptr));
+
+  return cache_->Insert(key, buf, size, DeletionCallback);
 }

 void CompressedSecondaryCache::Erase(const Slice& key) { cache_->Erase(key); }

-Status CompressedSecondaryCache::SetCapacity(size_t capacity) {
-  MutexLock l(&capacity_mutex_);
-  cache_options_.capacity = capacity;
-  cache_->SetCapacity(capacity);
-  return Status::OK();
-}
-
-Status CompressedSecondaryCache::GetCapacity(size_t& capacity) {
-  MutexLock l(&capacity_mutex_);
-  capacity = cache_options_.capacity;
-  return Status::OK();
-}
-
 std::string CompressedSecondaryCache::GetPrintableOptions() const {
  std::string ret;
  ret.reserve(20000);
-  const int kBufferSize{200};
+  const int kBufferSize = 200;
  char buffer[kBufferSize];
  ret.append(cache_->GetPrintableOptions());
  snprintf(buffer, kBufferSize, "    compression_type : %s\n",
           CompressionTypeToString(cache_options_.compression_type).c_str());
  ret.append(buffer);
-  snprintf(buffer, kBufferSize, "    compress_format_version : %d\n",
+  snprintf(buffer, kBufferSize, "    compression_type : %d\n",
           cache_options_.compress_format_version);
  ret.append(buffer);
  return ret;
 }

-CompressedSecondaryCache::CacheValueChunk*
-CompressedSecondaryCache::SplitValueIntoChunks(const Slice& value,
-                                               CompressionType compression_type,
-                                               size_t& charge) {
-  assert(!value.empty());
-  const char* src_ptr = value.data();
-  size_t src_size{value.size()};
-
-  CacheValueChunk dummy_head = CacheValueChunk();
-  CacheValueChunk* current_chunk = &dummy_head;
-  // Do not split when value size is large or there is no compression.
-  size_t predicted_chunk_size{0};
-  size_t actual_chunk_size{0};
-  size_t tmp_size{0};
-  while (src_size > 0) {
-    predicted_chunk_size = sizeof(CacheValueChunk) - 1 + src_size;
-    auto upper =
-        std::upper_bound(malloc_bin_sizes_.begin(), malloc_bin_sizes_.end(),
-                         predicted_chunk_size);
-    // Do not split when value size is too small, too large, close to a bin
-    // size, or there is no compression.
-    if (upper == malloc_bin_sizes_.begin() ||
-        upper == malloc_bin_sizes_.end() ||
-        *upper - predicted_chunk_size < malloc_bin_sizes_.front() ||
-        compression_type == kNoCompression) {
-      tmp_size = predicted_chunk_size;
-    } else {
-      tmp_size = *(--upper);
-    }
-
-    CacheValueChunk* new_chunk =
-        reinterpret_cast<CacheValueChunk*>(new char[tmp_size]);
-    current_chunk->next = new_chunk;
-    current_chunk = current_chunk->next;
-    actual_chunk_size = tmp_size - sizeof(CacheValueChunk) + 1;
-    memcpy(current_chunk->data, src_ptr, actual_chunk_size);
-    current_chunk->size = actual_chunk_size;
-    src_ptr += actual_chunk_size;
-    src_size -= actual_chunk_size;
-    charge += tmp_size;
-  }
-  current_chunk->next = nullptr;
-
-  return dummy_head.next;
-}
-
-CacheAllocationPtr CompressedSecondaryCache::MergeChunksIntoValue(
-    const void* chunks_head, size_t& charge) {
-  const CacheValueChunk* head =
-      reinterpret_cast<const CacheValueChunk*>(chunks_head);
-  const CacheValueChunk* current_chunk = head;
-  charge = 0;
-  while (current_chunk != nullptr) {
-    charge += current_chunk->size;
-    current_chunk = current_chunk->next;
-  }
-
-  CacheAllocationPtr ptr =
-      AllocateBlock(charge, cache_options_.memory_allocator.get());
-  current_chunk = head;
-  size_t pos{0};
-  while (current_chunk != nullptr) {
-    memcpy(ptr.get() + pos, current_chunk->data, current_chunk->size);
-    pos += current_chunk->size;
-    current_chunk = current_chunk->next;
-  }
-
-  return ptr;
-}
-
-Cache::DeleterFn CompressedSecondaryCache::GetDeletionCallback(
-    bool enable_custom_split_merge) {
-  if (enable_custom_split_merge) {
-    return [](const Slice& /*key*/, void* obj) {
-      CacheValueChunk* chunks_head = reinterpret_cast<CacheValueChunk*>(obj);
-      while (chunks_head != nullptr) {
-        CacheValueChunk* tmp_chunk = chunks_head;
-        chunks_head = chunks_head->next;
-        tmp_chunk->Free();
-        obj = nullptr;
-      };
-    };
-  } else {
-    return [](const Slice& /*key*/, void* obj) {
-      delete reinterpret_cast<CacheAllocationPtr*>(obj);
-      obj = nullptr;
-    };
-  }
-}
-
 std::shared_ptr<SecondaryCache> NewCompressedSecondaryCache(
    size_t capacity, int num_shard_bits, bool strict_capacity_limit,
-    double high_pri_pool_ratio, double low_pri_pool_ratio,
+    double high_pri_pool_ratio,
    std::shared_ptr<MemoryAllocator> memory_allocator, bool use_adaptive_mutex,
    CacheMetadataChargePolicy metadata_charge_policy,
-    CompressionType compression_type, uint32_t compress_format_version,
-    bool enable_custom_split_merge) {
+    CompressionType compression_type, uint32_t compress_format_version) {
  return std::make_shared<CompressedSecondaryCache>(
      capacity, num_shard_bits, strict_capacity_limit, high_pri_pool_ratio,
-      low_pri_pool_ratio, memory_allocator, use_adaptive_mutex,
-      metadata_charge_policy, compression_type, compress_format_version,
-      enable_custom_split_merge);
+      memory_allocator, use_adaptive_mutex, metadata_charge_policy,
+      compression_type, compress_format_version);
 }

 std::shared_ptr<SecondaryCache> NewCompressedSecondaryCache(
@@ -316,10 +163,9 @@ std::shared_ptr<SecondaryCache> NewCompressedSecondaryCache(
  assert(opts.secondary_cache == nullptr);
  return NewCompressedSecondaryCache(
      opts.capacity, opts.num_shard_bits, opts.strict_capacity_limit,
-      opts.high_pri_pool_ratio, opts.low_pri_pool_ratio, opts.memory_allocator,
-      opts.use_adaptive_mutex, opts.metadata_charge_policy,
-      opts.compression_type, opts.compress_format_version,
-      opts.enable_custom_split_merge);
+      opts.high_pri_pool_ratio, opts.memory_allocator, opts.use_adaptive_mutex,
+      opts.metadata_charge_policy, opts.compression_type,
+      opts.compress_format_version);
 }

 }  // namespace ROCKSDB_NAMESPACE
@@ -5,8 +5,6 @@

 #pragma once

-#include <array>
-#include <cstddef>
 #include <memory>

 #include "cache/lru_cache.h"
@@ -15,7 +13,6 @@
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"
 #include "util/compression.h"
-#include "util/mutexlock.h"

 namespace ROCKSDB_NAMESPACE {

@@ -23,7 +20,7 @@ class CompressedSecondaryCacheResultHandle : public SecondaryCacheResultHandle {
 public:
  CompressedSecondaryCacheResultHandle(void* value, size_t size)
      : value_(value), size_(size) {}
-  ~CompressedSecondaryCacheResultHandle() override = default;
+  virtual ~CompressedSecondaryCacheResultHandle() override = default;

  CompressedSecondaryCacheResultHandle(
      const CompressedSecondaryCacheResultHandle&) = delete;
@@ -46,21 +43,7 @@ class CompressedSecondaryCacheResultHandle : public SecondaryCacheResultHandle {
 // The CompressedSecondaryCache is a concrete implementation of
 // rocksdb::SecondaryCache.
 //
-// When a block is found from CompressedSecondaryCache::Lookup, we check whether
-// there is a dummy block with the same key in the primary cache.
-// 1. If the dummy block exits, we erase the block from
-//    CompressedSecondaryCache and insert it into the primary cache.
-// 2. If not, we just insert a dummy block into the primary cache
-//    (charging the actual size of the block) and don not erase the block from
-//    CompressedSecondaryCache. A standalone handle is returned to the caller.
-//
-// When a block is evicted from the primary cache, we check whether
-// there is a dummy block with the same key in CompressedSecondaryCache.
-// 1. If the dummy block exits, the block is inserted into
-//    CompressedSecondaryCache.
-// 2. If not, we just insert a dummy block (size 0) in CompressedSecondaryCache.
-//
-// Users can also cast a pointer to CompressedSecondaryCache and call methods on
+// Users can also cast a pointer to it and call methods on
 // it directly, especially custom methods that may be added
 // in the future.  For example -
 // std::unique_ptr<rocksdb::SecondaryCache> cache =
@@ -71,15 +54,14 @@ class CompressedSecondaryCache : public SecondaryCache {
 public:
  CompressedSecondaryCache(
      size_t capacity, int num_shard_bits, bool strict_capacity_limit,
-      double high_pri_pool_ratio, double low_pri_pool_ratio,
+      double high_pri_pool_ratio,
      std::shared_ptr<MemoryAllocator> memory_allocator = nullptr,
      bool use_adaptive_mutex = kDefaultToAdaptiveMutex,
      CacheMetadataChargePolicy metadata_charge_policy =
-          kDefaultCacheMetadataChargePolicy,
+          kDontChargeCacheMetadata,
      CompressionType compression_type = CompressionType::kLZ4Compression,
-      uint32_t compress_format_version = 2,
-      bool enable_custom_split_merge = false);
-  ~CompressedSecondaryCache() override;
+      uint32_t compress_format_version = 2);
+  virtual ~CompressedSecondaryCache() override;

  const char* Name() const override { return "CompressedSecondaryCache"; }

@@ -88,52 +70,17 @@ class CompressedSecondaryCache : public SecondaryCache {

  std::unique_ptr<SecondaryCacheResultHandle> Lookup(
      const Slice& key, const Cache::CreateCallback& create_cb, bool /*wait*/,
-      bool advise_erase, bool& is_in_sec_cache) override;
-
-  bool SupportForceErase() const override { return true; }
+      bool& is_in_sec_cache) override;

  void Erase(const Slice& key) override;

  void WaitAll(std::vector<SecondaryCacheResultHandle*> /*handles*/) override {}

-  Status SetCapacity(size_t capacity) override;
-
-  Status GetCapacity(size_t& capacity) override;
-
  std::string GetPrintableOptions() const override;

 private:
-  friend class CompressedSecondaryCacheTest;
-  static constexpr std::array<uint16_t, 8> malloc_bin_sizes_{
-      128, 256, 512, 1024, 2048, 4096, 8192, 16384};
-
-  struct CacheValueChunk {
-    // TODO try "CacheAllocationPtr next;".
-    CacheValueChunk* next;
-    size_t size;
-    // Beginning of the chunk data (MUST BE THE LAST FIELD IN THIS STRUCT!)
-    char data[1];
-
-    void Free() { delete[] reinterpret_cast<char*>(this); }
-  };
-
-  // Split value into chunks to better fit into jemalloc bins. The chunks
-  // are stored in CacheValueChunk and extra charge is needed for each chunk,
-  // so the cache charge is recalculated here.
-  CacheValueChunk* SplitValueIntoChunks(const Slice& value,
-                                        CompressionType compression_type,
-                                        size_t& charge);
-
-  // After merging chunks, the extra charge for each chunk is removed, so
-  // the charge is recalculated.
-  CacheAllocationPtr MergeChunksIntoValue(const void* chunks_head,
-                                          size_t& charge);
-
-  // An implementation of Cache::DeleterFn.
-  static Cache::DeleterFn GetDeletionCallback(bool enable_custom_split_merge);
  std::shared_ptr<Cache> cache_;
  CompressedSecondaryCacheOptions cache_options_;
-  mutable port::Mutex capacity_mutex_;
 };

 }  // namespace ROCKSDB_NAMESPACE
@@ -1,580 +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/fast_lru_cache.h"
-
-#include <cassert>
-#include <cstdint>
-#include <cstdio>
-#include <functional>
-
-#include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics.h"
-#include "port/lang.h"
-#include "util/distributed_mutex.h"
-#include "util/hash.h"
-#include "util/math.h"
-#include "util/random.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-namespace fast_lru_cache {
-
-LRUHandleTable::LRUHandleTable(int hash_bits)
-    : length_bits_(hash_bits),
-      length_bits_mask_((uint32_t{1} << length_bits_) - 1),
-      occupancy_(0),
-      occupancy_limit_(static_cast<uint32_t>((uint32_t{1} << length_bits_) *
-                                             kStrictLoadFactor)),
-      array_(new LRUHandle[size_t{1} << length_bits_]) {
-  assert(hash_bits <= 32);
-}
-
-LRUHandleTable::~LRUHandleTable() {
-  ApplyToEntriesRange([](LRUHandle* h) { h->FreeData(); }, 0, GetTableSize());
-}
-
-LRUHandle* LRUHandleTable::Lookup(const Slice& key, uint32_t hash) {
-  int probe = 0;
-  int slot = FindVisibleElement(key, hash, probe, 0);
-  return (slot == -1) ? nullptr : &array_[slot];
-}
-
-LRUHandle* LRUHandleTable::Insert(LRUHandle* h, LRUHandle** old) {
-  int probe = 0;
-  int slot = FindVisibleElementOrAvailableSlot(h->key(), h->hash, probe,
-                                               1 /*displacement*/);
-  *old = nullptr;
-  if (slot == -1) {
-    // TODO(Guido) Don't we need to roll back displacements here?
-    return nullptr;
-  }
-
-  if (array_[slot].IsEmpty() || array_[slot].IsTombstone()) {
-    bool empty = array_[slot].IsEmpty();
-    Assign(slot, h);
-    LRUHandle* new_entry = &array_[slot];
-    if (empty) {
-      // This used to be an empty slot.
-      return new_entry;
-    }
-    // It used to be a tombstone, so there may already be a copy of the
-    // key in the table.
-    slot = FindVisibleElement(h->key(), h->hash, probe, 0 /*displacement*/);
-    if (slot == -1) {
-      // No existing copy of the key.
-      return new_entry;
-    }
-    *old = &array_[slot];
-    return new_entry;
-  } else {
-    // There is an existing copy of the key.
-    *old = &array_[slot];
-    // Find an available slot for the new element.
-    array_[slot].displacements++;
-    slot = FindAvailableSlot(h->key(), probe, 1 /*displacement*/);
-    if (slot == -1) {
-      // No available slots. Roll back displacements.
-      probe = 0;
-      slot = FindVisibleElement(h->key(), h->hash, probe, -1);
-      array_[slot].displacements--;
-      FindAvailableSlot(h->key(), probe, -1);
-      return nullptr;
-    }
-    Assign(slot, h);
-    return &array_[slot];
-  }
-}
-
-void LRUHandleTable::Remove(LRUHandle* h) {
-  assert(h->next == nullptr &&
-         h->prev == nullptr);  // Already off the LRU list.
-  int probe = 0;
-  FindSlot(
-      h->key(), [&h](LRUHandle* e) { return e == h; }, probe,
-      -1 /*displacement*/);
-  h->SetIsVisible(false);
-  h->SetIsElement(false);
-  occupancy_--;
-}
-
-void LRUHandleTable::Assign(int slot, LRUHandle* h) {
-  LRUHandle* dst = &array_[slot];
-  uint32_t disp = dst->displacements;
-  *dst = *h;
-  dst->displacements = disp;
-  dst->SetIsVisible(true);
-  dst->SetIsElement(true);
-  occupancy_++;
-}
-
-void LRUHandleTable::Exclude(LRUHandle* h) { h->SetIsVisible(false); }
-
-int LRUHandleTable::FindVisibleElement(const Slice& key, uint32_t hash,
-                                       int& probe, int displacement) {
-  return FindSlot(
-      key,
-      [&](LRUHandle* h) { return h->Matches(key, hash) && h->IsVisible(); },
-      probe, displacement);
-}
-
-int LRUHandleTable::FindAvailableSlot(const Slice& key, int& probe,
-                                      int displacement) {
-  return FindSlot(
-      key, [](LRUHandle* h) { return h->IsEmpty() || h->IsTombstone(); }, probe,
-      displacement);
-}
-
-int LRUHandleTable::FindVisibleElementOrAvailableSlot(const Slice& key,
-                                                      uint32_t hash, int& probe,
-                                                      int displacement) {
-  return FindSlot(
-      key,
-      [&](LRUHandle* h) {
-        return h->IsEmpty() || h->IsTombstone() ||
-               (h->Matches(key, hash) && h->IsVisible());
-      },
-      probe, displacement);
-}
-
-inline int LRUHandleTable::FindSlot(const Slice& key,
-                                    std::function<bool(LRUHandle*)> cond,
-                                    int& probe, int displacement) {
-  uint32_t base = ModTableSize(Hash(key.data(), key.size(), kProbingSeed1));
-  uint32_t increment =
-      ModTableSize((Hash(key.data(), key.size(), kProbingSeed2) << 1) | 1);
-  uint32_t current = ModTableSize(base + probe * increment);
-  while (true) {
-    LRUHandle* h = &array_[current];
-    probe++;
-    if (current == base && probe > 1) {
-      // We looped back.
-      return -1;
-    }
-    if (cond(h)) {
-      return current;
-    }
-    if (h->IsEmpty()) {
-      // We check emptyness after the condition, because
-      // the condition may be emptyness.
-      return -1;
-    }
-    h->displacements += displacement;
-    current = ModTableSize(current + increment);
-  }
-}
-
-LRUCacheShard::LRUCacheShard(size_t capacity, size_t estimated_value_size,
-                             bool strict_capacity_limit,
-                             CacheMetadataChargePolicy metadata_charge_policy)
-    : CacheShardBase(metadata_charge_policy),
-      capacity_(capacity),
-      strict_capacity_limit_(strict_capacity_limit),
-      table_(
-          CalcHashBits(capacity, estimated_value_size, metadata_charge_policy)),
-      usage_(0),
-      lru_usage_(0) {
-  // Make empty circular linked list.
-  lru_.next = &lru_;
-  lru_.prev = &lru_;
-  lru_low_pri_ = &lru_;
-}
-
-void LRUCacheShard::EraseUnRefEntries() {
-  autovector<LRUHandle> last_reference_list;
-  {
-    DMutexLock l(mutex_);
-    while (lru_.next != &lru_) {
-      LRUHandle* old = lru_.next;
-      // LRU list contains only elements which can be evicted.
-      assert(old->IsVisible() && !old->HasRefs());
-      LRU_Remove(old);
-      table_.Remove(old);
-      assert(usage_ >= old->total_charge);
-      usage_ -= old->total_charge;
-      last_reference_list.push_back(*old);
-    }
-  }
-
-  // Free the entries here outside of mutex for performance reasons.
-  for (auto& h : last_reference_list) {
-    h.FreeData();
-  }
-}
-
-void LRUCacheShard::ApplyToSomeEntries(
-    const std::function<void(const Slice& key, void* value, size_t charge,
-                             DeleterFn deleter)>& callback,
-    size_t average_entries_per_lock, size_t* state) {
-  // The state is essentially going to be the starting hash, which works
-  // nicely even if we resize between calls because we use upper-most
-  // hash bits for table indexes.
-  DMutexLock l(mutex_);
-  size_t length_bits = table_.GetLengthBits();
-  size_t length = table_.GetTableSize();
-
-  assert(average_entries_per_lock > 0);
-  // Assuming we are called with same average_entries_per_lock repeatedly,
-  // this simplifies some logic (index_end will not overflow).
-  assert(average_entries_per_lock < length || *state == 0);
-
-  size_t index_begin = *state >> (sizeof(size_t) * 8u - length_bits);
-  size_t index_end = index_begin + average_entries_per_lock;
-  if (index_end >= length) {
-    // Going to end
-    index_end = length;
-    *state = SIZE_MAX;
-  } else {
-    *state = index_end << (sizeof(size_t) * 8u - length_bits);
-  }
-
-  table_.ApplyToEntriesRange(
-      [callback,
-       metadata_charge_policy = metadata_charge_policy_](LRUHandle* h) {
-        callback(h->key(), h->value, h->GetCharge(metadata_charge_policy),
-                 h->deleter);
-      },
-      index_begin, index_end);
-}
-
-void LRUCacheShard::LRU_Remove(LRUHandle* h) {
-  assert(h->next != nullptr);
-  assert(h->prev != nullptr);
-  h->next->prev = h->prev;
-  h->prev->next = h->next;
-  h->prev = h->next = nullptr;
-  assert(lru_usage_ >= h->total_charge);
-  lru_usage_ -= h->total_charge;
-}
-
-void LRUCacheShard::LRU_Insert(LRUHandle* h) {
-  assert(h->next == nullptr);
-  assert(h->prev == nullptr);
-  // Insert h to head of LRU list.
-  h->next = &lru_;
-  h->prev = lru_.prev;
-  h->prev->next = h;
-  h->next->prev = h;
-  lru_usage_ += h->total_charge;
-}
-
-void LRUCacheShard::EvictFromLRU(size_t charge,
-                                 autovector<LRUHandle>* deleted) {
-  while ((usage_ + charge) > capacity_ && lru_.next != &lru_) {
-    LRUHandle* old = lru_.next;
-    // LRU list contains only elements which can be evicted.
-    assert(old->IsVisible() && !old->HasRefs());
-    LRU_Remove(old);
-    table_.Remove(old);
-    assert(usage_ >= old->total_charge);
-    usage_ -= old->total_charge;
-    deleted->push_back(*old);
-  }
-}
-
-size_t LRUCacheShard::CalcEstimatedHandleCharge(
-    size_t estimated_value_size,
-    CacheMetadataChargePolicy metadata_charge_policy) {
-  LRUHandle h;
-  h.CalcTotalCharge(estimated_value_size, metadata_charge_policy);
-  return h.total_charge;
-}
-
-int LRUCacheShard::CalcHashBits(
-    size_t capacity, size_t estimated_value_size,
-    CacheMetadataChargePolicy metadata_charge_policy) {
-  size_t handle_charge =
-      CalcEstimatedHandleCharge(estimated_value_size, metadata_charge_policy);
-  assert(handle_charge > 0);
-  uint32_t num_entries =
-      static_cast<uint32_t>(capacity / (kLoadFactor * handle_charge)) + 1;
-  assert(num_entries <= uint32_t{1} << 31);
-  return FloorLog2((num_entries << 1) - 1);
-}
-
-void LRUCacheShard::SetCapacity(size_t capacity) {
-  autovector<LRUHandle> last_reference_list;
-  {
-    DMutexLock l(mutex_);
-    if (capacity > capacity_) {
-      assert(false);  // Not supported.
-    }
-    capacity_ = capacity;
-    EvictFromLRU(0, &last_reference_list);
-  }
-
-  // Free the entries here outside of mutex for performance reasons.
-  for (auto& h : last_reference_list) {
-    h.FreeData();
-  }
-}
-
-void LRUCacheShard::SetStrictCapacityLimit(bool strict_capacity_limit) {
-  DMutexLock l(mutex_);
-  strict_capacity_limit_ = strict_capacity_limit;
-}
-
-Status LRUCacheShard::Insert(const Slice& key, uint32_t hash, void* value,
-                             size_t charge, Cache::DeleterFn deleter,
-                             LRUHandle** handle, Cache::Priority /*priority*/) {
-  if (key.size() != kCacheKeySize) {
-    return Status::NotSupported("FastLRUCache only supports key size " +
-                                std::to_string(kCacheKeySize) + "B");
-  }
-
-  LRUHandle tmp;
-  tmp.value = value;
-  tmp.deleter = deleter;
-  tmp.hash = hash;
-  tmp.CalcTotalCharge(charge, metadata_charge_policy_);
-  for (int i = 0; i < kCacheKeySize; i++) {
-    tmp.key_data[i] = key.data()[i];
-  }
-
-  Status s = Status::OK();
-  autovector<LRUHandle> last_reference_list;
-  {
-    DMutexLock l(mutex_);
-    assert(table_.GetOccupancy() <= table_.GetOccupancyLimit());
-
-    // Free the space following strict LRU policy until enough space
-    // is freed or the lru list is empty.
-    EvictFromLRU(tmp.total_charge, &last_reference_list);
-    if ((usage_ + tmp.total_charge > capacity_ &&
-         (strict_capacity_limit_ || handle == nullptr)) ||
-        table_.GetOccupancy() == table_.GetOccupancyLimit()) {
-      // There are two measures of capacity:
-      // - Space (or charge) capacity: The maximum possible sum of the charges
-      //    of the elements.
-      // - Table capacity: The number of slots in the hash table.
-      // These are incomparable, in the sense that one doesn't imply the other.
-      // Typically we will reach space capacity before table capacity---
-      // if the user always inserts values with size equal to
-      // estimated_value_size, then at most a kLoadFactor fraction of slots
-      // will ever be occupied. But in some cases we may reach table capacity
-      // before space capacity---if the user initially claims a very large
-      // estimated_value_size but then inserts tiny values, more elements than
-      // initially estimated will be inserted.
-
-      // TODO(Guido) Some tests (at least two from cache_test, as well as the
-      // stress tests) currently assume the table capacity is unbounded.
-      if (handle == nullptr) {
-        // Don't insert the entry but still return ok, as if the entry inserted
-        // into cache and get evicted immediately.
-        last_reference_list.push_back(tmp);
-      } else {
-        if (table_.GetOccupancy() == table_.GetOccupancyLimit()) {
-          // TODO: Consider using a distinct status for this case, but usually
-          // it will be handled the same way as reaching charge capacity limit
-          s = Status::MemoryLimit(
-              "Insert failed because all slots in the hash table are full.");
-        } else {
-          s = Status::MemoryLimit(
-              "Insert failed because the total charge has exceeded the "
-              "capacity.");
-        }
-      }
-    } else {
-      // Insert into the cache. Note that the cache might get larger than its
-      // capacity if not enough space was freed up.
-      LRUHandle* old;
-      LRUHandle* h = table_.Insert(&tmp, &old);
-      assert(h != nullptr);  // We're below occupancy, so this insertion should
-                             // never fail.
-      usage_ += h->total_charge;
-      if (old != nullptr) {
-        s = Status::OkOverwritten();
-        assert(old->IsVisible());
-        table_.Exclude(old);
-        if (!old->HasRefs()) {
-          // old is on LRU because it's in cache and its reference count is 0.
-          LRU_Remove(old);
-          table_.Remove(old);
-          assert(usage_ >= old->total_charge);
-          usage_ -= old->total_charge;
-          last_reference_list.push_back(*old);
-        }
-      }
-      if (handle == nullptr) {
-        LRU_Insert(h);
-      } else {
-        // If caller already holds a ref, no need to take one here.
-        if (!h->HasRefs()) {
-          h->Ref();
-        }
-        *handle = h;
-      }
-    }
-  }
-
-  // Free the entries here outside of mutex for performance reasons.
-  for (auto& h : last_reference_list) {
-    h.FreeData();
-  }
-
-  return s;
-}
-
-LRUHandle* LRUCacheShard::Lookup(const Slice& key, uint32_t hash) {
-  LRUHandle* h = nullptr;
-  {
-    DMutexLock l(mutex_);
-    h = table_.Lookup(key, hash);
-    if (h != nullptr) {
-      assert(h->IsVisible());
-      if (!h->HasRefs()) {
-        // The entry is in LRU since it's in hash and has no external
-        // references.
-        LRU_Remove(h);
-      }
-      h->Ref();
-    }
-  }
-  return h;
-}
-
-bool LRUCacheShard::Ref(LRUHandle* h) {
-  DMutexLock l(mutex_);
-  // To create another reference - entry must be already externally referenced.
-  assert(h->HasRefs());
-  h->Ref();
-  return true;
-}
-
-bool LRUCacheShard::Release(LRUHandle* h, bool erase_if_last_ref) {
-  if (h == nullptr) {
-    return false;
-  }
-  LRUHandle copy;
-  bool last_reference = false;
-  {
-    DMutexLock l(mutex_);
-    last_reference = h->Unref();
-    if (last_reference && h->IsVisible()) {
-      // The item is still in cache, and nobody else holds a reference to it.
-      if (usage_ > capacity_ || erase_if_last_ref) {
-        // The LRU list must be empty since the cache is full.
-        assert(lru_.next == &lru_ || erase_if_last_ref);
-        // Take this opportunity and remove the item.
-        table_.Remove(h);
-      } else {
-        // Put the item back on the LRU list, and don't free it.
-        LRU_Insert(h);
-        last_reference = false;
-      }
-    }
-    // If it was the last reference, then decrement the cache usage.
-    if (last_reference) {
-      assert(usage_ >= h->total_charge);
-      usage_ -= h->total_charge;
-      copy = *h;
-    }
-  }
-
-  // Free the entry here outside of mutex for performance reasons.
-  if (last_reference) {
-    copy.FreeData();
-  }
-  return last_reference;
-}
-
-void LRUCacheShard::Erase(const Slice& key, uint32_t hash) {
-  LRUHandle copy;
-  bool last_reference = false;
-  {
-    DMutexLock l(mutex_);
-    LRUHandle* h = table_.Lookup(key, hash);
-    if (h != nullptr) {
-      table_.Exclude(h);
-      if (!h->HasRefs()) {
-        // The entry is in LRU since it's in cache and has no external
-        // references.
-        LRU_Remove(h);
-        table_.Remove(h);
-        assert(usage_ >= h->total_charge);
-        usage_ -= h->total_charge;
-        last_reference = true;
-        copy = *h;
-      }
-    }
-  }
-  // Free the entry here outside of mutex for performance reasons.
-  // last_reference will only be true if e != nullptr.
-  if (last_reference) {
-    copy.FreeData();
-  }
-}
-
-size_t LRUCacheShard::GetUsage() const {
-  DMutexLock l(mutex_);
-  return usage_;
-}
-
-size_t LRUCacheShard::GetPinnedUsage() const {
-  DMutexLock l(mutex_);
-  assert(usage_ >= lru_usage_);
-  return usage_ - lru_usage_;
-}
-
-size_t LRUCacheShard::GetOccupancyCount() const {
-  DMutexLock l(mutex_);
-  return table_.GetOccupancy();
-}
-
-size_t LRUCacheShard::GetTableAddressCount() const {
-  DMutexLock l(mutex_);
-  return table_.GetTableSize();
-}
-
-LRUCache::LRUCache(size_t capacity, size_t estimated_value_size,
-                   int num_shard_bits, bool strict_capacity_limit,
-                   CacheMetadataChargePolicy metadata_charge_policy)
-    : ShardedCache(capacity, num_shard_bits, strict_capacity_limit,
-                   nullptr /*allocator*/) {
-  assert(estimated_value_size > 0 ||
-         metadata_charge_policy != kDontChargeCacheMetadata);
-  size_t per_shard = GetPerShardCapacity();
-  InitShards([=](LRUCacheShard* cs) {
-    new (cs) LRUCacheShard(per_shard, estimated_value_size,
-                           strict_capacity_limit, metadata_charge_policy);
-  });
-}
-
-void* LRUCache::Value(Handle* handle) {
-  return reinterpret_cast<const LRUHandle*>(handle)->value;
-}
-
-size_t LRUCache::GetCharge(Handle* handle) const {
-  return reinterpret_cast<const LRUHandle*>(handle)->GetCharge(
-      GetShard(0).metadata_charge_policy_);
-}
-
-Cache::DeleterFn LRUCache::GetDeleter(Handle* handle) const {
-  auto h = reinterpret_cast<const LRUHandle*>(handle);
-  return h->deleter;
-}
-
-}  // namespace fast_lru_cache
-
-std::shared_ptr<Cache> NewFastLRUCache(
-    size_t capacity, size_t estimated_value_size, int num_shard_bits,
-    bool strict_capacity_limit,
-    CacheMetadataChargePolicy metadata_charge_policy) {
-  if (num_shard_bits >= 20) {
-    return nullptr;  // The cache cannot be sharded into too many fine pieces.
-  }
-  if (num_shard_bits < 0) {
-    num_shard_bits = GetDefaultCacheShardBits(capacity);
-  }
-  return std::make_shared<fast_lru_cache::LRUCache>(
-      capacity, estimated_value_size, num_shard_bits, strict_capacity_limit,
-      metadata_charge_policy);
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,477 +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 <array>
-#include <memory>
-#include <string>
-
-#include "cache/cache_key.h"
-#include "cache/sharded_cache.h"
-#include "port/lang.h"
-#include "port/malloc.h"
-#include "port/port.h"
-#include "rocksdb/secondary_cache.h"
-#include "util/autovector.h"
-#include "util/distributed_mutex.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-namespace fast_lru_cache {
-
-// Forward declaration of friend class.
-class FastLRUCacheTest;
-
-// LRU cache implementation using an open-address hash table.
-//
-// Every slot in the hash table is an LRUHandle. Because handles can be
-// referenced externally, we can't discard them immediately once they are
-// deleted (via a delete or an LRU eviction) or replaced by a new version
-// (via an insert of the same key). The state of an element is defined by
-// the following two properties:
-// (R) Referenced: An element can be referenced externally (refs > 0), or not.
-//    Importantly, an element can be evicted if and only if it's not
-//    referenced. In particular, when an element becomes referenced, it's
-//    temporarily taken out of the LRU list until all references to it
-//    are dropped.
-// (V) Visible: An element can visible for lookups (IS_VISIBLE set), or not.
-//    Initially, every element is visible. An element that is not visible is
-//    called a ghost.
-// These properties induce 4 different states, with transitions defined as
-// follows:
-// - V --> not V: When a visible element is deleted or replaced by a new
-//    version.
-// - Not V --> V: This cannot happen. A ghost remains in that state until it's
-//    not referenced any more, at which point it's ready to be removed from the
-//    hash table. (A ghost simply waits to transition to the afterlife---it will
-//    never be visible again.)
-// - R --> not R: When all references to an element are dropped.
-// - Not R --> R: When an unreferenced element becomes referenced. This can only
-//    happen if the element is V, since references to an element can only be
-//    created when it's visible.
-//
-// Internally, the cache uses an open-addressed hash table to index the handles.
-// We use tombstone counters to keep track of displacements.
-// Because of the tombstones and the two possible visibility states of an
-// element, the table slots can be in 4 different states:
-// 1. Visible element (IS_ELEMENT set and IS_VISIBLE set): The slot contains a
-//    key-value element.
-// 2. Ghost element (IS_ELEMENT set and IS_VISIBLE unset): The slot contains an
-//    element that has been removed, but it's still referenced. It's invisible
-//    to lookups.
-// 3. Tombstone (IS_ELEMENT unset and displacements > 0): The slot contains a
-//    tombstone.
-// 4. Empty (IS_ELEMENT unset and displacements == 0): The slot is unused.
-//    A slot that is an element can further have IS_VISIBLE set or not.
-// When a ghost is removed from the table, it can either transition to being a
-// tombstone or an empty slot, depending on the number of displacements of the
-// slot. In any case, the slot becomes available. When a handle is inserted
-// into that slot, it becomes a visible element again.
-
-// The load factor p is a real number in (0, 1) such that at all
-// times at most a fraction p of all slots, without counting tombstones,
-// are occupied by elements. This means that the probability that a
-// random probe hits an empty slot is at most p, and thus at most 1/p probes
-// are required on average. For example, p = 70% implies that between 1 and 2
-// probes are needed on average (bear in mind that this reasoning doesn't
-// consider the effects of clustering over time).
-// Because the size of the hash table is always rounded up to the next
-// power of 2, p is really an upper bound on the actual load factor---the
-// actual load factor is anywhere between p/2 and p. This is a bit wasteful,
-// but bear in mind that slots only hold metadata, not actual values.
-// Since space cost is dominated by the values (the LSM blocks),
-// overprovisioning the table with metadata only increases the total cache space
-// usage by a tiny fraction.
-constexpr double kLoadFactor = 0.35;
-
-// The user can exceed kLoadFactor if the sizes of the inserted values don't
-// match estimated_value_size, or if strict_capacity_limit == false. To
-// avoid performance to plunge, we set a strict upper bound on the load factor.
-constexpr double kStrictLoadFactor = 0.7;
-
-// Arbitrary seeds.
-constexpr uint32_t kProbingSeed1 = 0xbc9f1d34;
-constexpr uint32_t kProbingSeed2 = 0x7a2bb9d5;
-
-// An experimental (under development!) alternative to LRUCache
-
-struct LRUHandle {
-  void* value;
-  Cache::DeleterFn deleter;
-  LRUHandle* next;
-  LRUHandle* prev;
-  size_t total_charge;  // TODO(opt): Only allow uint32_t?
-  // The hash of key(). Used for fast sharding and comparisons.
-  uint32_t hash;
-  // The number of external refs to this entry.
-  uint32_t refs;
-
-  enum Flags : uint8_t {
-    // Whether the handle is visible to Lookups.
-    IS_VISIBLE = (1 << 0),
-    // Whether the slot is in use by an element.
-    IS_ELEMENT = (1 << 1),
-  };
-  uint8_t flags;
-
-  // The number of elements that hash to this slot or a lower one,
-  // but wind up in a higher slot.
-  uint32_t displacements;
-
-  std::array<char, kCacheKeySize> key_data;
-
-  LRUHandle() {
-    value = nullptr;
-    deleter = nullptr;
-    next = nullptr;
-    prev = nullptr;
-    total_charge = 0;
-    hash = 0;
-    refs = 0;
-    flags = 0;
-    displacements = 0;
-    key_data.fill(0);
-  }
-
-  Slice key() const { return Slice(key_data.data(), kCacheKeySize); }
-
-  // For HandleImpl concept
-  uint32_t GetHash() const { return hash; }
-
-  // Increase the reference count by 1.
-  void Ref() { refs++; }
-
-  // Just reduce the reference count by 1. Return true if it was last reference.
-  bool Unref() {
-    assert(refs > 0);
-    refs--;
-    return refs == 0;
-  }
-
-  // Return true if there are external refs, false otherwise.
-  bool HasRefs() const { return refs > 0; }
-
-  bool IsVisible() const { return flags & IS_VISIBLE; }
-
-  void SetIsVisible(bool is_visible) {
-    if (is_visible) {
-      flags |= IS_VISIBLE;
-    } else {
-      flags &= ~IS_VISIBLE;
-    }
-  }
-
-  bool IsElement() const { return flags & IS_ELEMENT; }
-
-  void SetIsElement(bool is_element) {
-    if (is_element) {
-      flags |= IS_ELEMENT;
-    } else {
-      flags &= ~IS_ELEMENT;
-    }
-  }
-
-  void FreeData() {
-    assert(refs == 0);
-    if (deleter) {
-      (*deleter)(key(), value);
-    }
-  }
-
-  // Calculate the memory usage by metadata.
-  inline size_t CalcMetaCharge(
-      CacheMetadataChargePolicy metadata_charge_policy) const {
-    if (metadata_charge_policy != kFullChargeCacheMetadata) {
-      return 0;
-    } else {
-      // #ifdef ROCKSDB_MALLOC_USABLE_SIZE
-      //       return malloc_usable_size(
-      //           const_cast<void*>(static_cast<const void*>(this)));
-      // #else
-      // TODO(Guido) malloc_usable_size only works when we call it on
-      // a pointer allocated with malloc. Because our handles are all
-      // allocated in a single shot as an array, the user can't call
-      // CalcMetaCharge (or CalcTotalCharge or GetCharge) on a handle
-      // pointer returned by the cache. Moreover, malloc_usable_size
-      // expects a heap-allocated handle, but sometimes in our code we
-      // wish to pass a stack-allocated handle (this is only a performance
-      // concern).
-      // What is the right way to compute metadata charges with pre-allocated
-      // handles?
-      return sizeof(LRUHandle);
-      // #endif
-    }
-  }
-
-  inline void CalcTotalCharge(
-      size_t charge, CacheMetadataChargePolicy metadata_charge_policy) {
-    total_charge = charge + CalcMetaCharge(metadata_charge_policy);
-  }
-
-  inline size_t GetCharge(
-      CacheMetadataChargePolicy metadata_charge_policy) const {
-    size_t meta_charge = CalcMetaCharge(metadata_charge_policy);
-    assert(total_charge >= meta_charge);
-    return total_charge - meta_charge;
-  }
-
-  inline bool IsEmpty() {
-    return !this->IsElement() && this->displacements == 0;
-  }
-
-  inline bool IsTombstone() {
-    return !this->IsElement() && this->displacements > 0;
-  }
-
-  inline bool Matches(const Slice& some_key, uint32_t some_hash) {
-    return this->IsElement() && this->hash == some_hash &&
-           this->key() == some_key;
-  }
-};
-
-
-class LRUHandleTable {
- public:
-  explicit LRUHandleTable(int hash_bits);
-  ~LRUHandleTable();
-
-  // Returns a pointer to a visible element matching the key/hash, or
-  // nullptr if not present.
-  LRUHandle* Lookup(const Slice& key, uint32_t hash);
-
-  // Inserts a copy of h into the hash table.
-  // Returns a pointer to the inserted handle, or nullptr if no slot
-  // available was found. If an existing visible element matching the
-  // key/hash is already present in the hash table, the argument old
-  // is set to pointe to it; otherwise, it's set to nullptr.
-  LRUHandle* Insert(LRUHandle* h, LRUHandle** old);
-
-  // Removes h from the hash table. The handle must already be off
-  // the LRU list.
-  void Remove(LRUHandle* h);
-
-  // Turns a visible element h into a ghost (i.e., not visible).
-  void Exclude(LRUHandle* h);
-
-  // Assigns a copy of h to the given slot.
-  void Assign(int slot, LRUHandle* h);
-
-  template <typename T>
-  void ApplyToEntriesRange(T func, size_t index_begin, size_t index_end) {
-    for (size_t i = index_begin; i < index_end; i++) {
-      LRUHandle* h = &array_[i];
-      if (h->IsVisible()) {
-        func(h);
-      }
-    }
-  }
-
-  uint32_t GetTableSize() const { return uint32_t{1} << length_bits_; }
-
-  int GetLengthBits() const { return length_bits_; }
-
-  uint32_t GetOccupancyLimit() const { return occupancy_limit_; }
-
-  uint32_t GetOccupancy() const { return occupancy_; }
-
-  // Returns x mod 2^{length_bits_}.
-  uint32_t ModTableSize(uint32_t x) { return x & length_bits_mask_; }
-
- private:
-  int FindVisibleElement(const Slice& key, uint32_t hash, int& probe,
-                         int displacement);
-
-  int FindAvailableSlot(const Slice& key, int& probe, int displacement);
-
-  int FindVisibleElementOrAvailableSlot(const Slice& key, uint32_t hash,
-                                        int& probe, int displacement);
-
-  // Returns the index of the first slot probed (hashing with
-  // the given key) with a handle e such that cond(e) is true.
-  // Otherwise, if no match is found, returns -1.
-  // For every handle e probed except the final slot, updates
-  // e->displacements += displacement.
-  // The argument probe is modified such that consecutive calls
-  // to FindSlot continue probing right after where the previous
-  // call left.
-  int FindSlot(const Slice& key, std::function<bool(LRUHandle*)> cond,
-               int& probe, int displacement);
-
-  // Number of hash bits used for table index.
-  // The size of the table is 1 << length_bits_.
-  int length_bits_;
-
-  const uint32_t length_bits_mask_;
-
-  // Number of elements in the table.
-  uint32_t occupancy_;
-
-  // Maximum number of elements the user can store in the table.
-  uint32_t occupancy_limit_;
-
-  std::unique_ptr<LRUHandle[]> array_;
-};
-
-// A single shard of sharded cache.
-class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShardBase {
- public:
-  LRUCacheShard(size_t capacity, size_t estimated_value_size,
-                bool strict_capacity_limit,
-                CacheMetadataChargePolicy metadata_charge_policy);
-
-  // For CacheShard concept
-  using HandleImpl = LRUHandle;
-
-  // Keep 32-bit hashing for now (FIXME: upgrade to 64-bit)
-  using HashVal = uint32_t;
-  using HashCref = uint32_t;
-  static inline HashVal ComputeHash(const Slice& key) {
-    return Lower32of64(GetSliceNPHash64(key));
-  }
-  static inline uint32_t HashPieceForSharding(HashCref hash) { return hash; }
-
-  // Separate from constructor so caller can easily make an array of LRUCache
-  // if current usage is more than new capacity, the function will attempt to
-  // free the needed space.
-  void SetCapacity(size_t capacity);
-
-  // Set the flag to reject insertion if cache if full.
-  void SetStrictCapacityLimit(bool strict_capacity_limit);
-
-  // Like Cache methods, but with an extra "hash" parameter.
-  // Insert an item into the hash table and, if handle is null, insert into
-  // the LRU list. Older items are evicted as necessary. If the cache is full
-  // and free_handle_on_fail is true, the item is deleted and handle is set to
-  // nullptr.
-  Status Insert(const Slice& key, uint32_t hash, void* value, size_t charge,
-                Cache::DeleterFn deleter, LRUHandle** handle,
-                Cache::Priority priority);
-
-  Status Insert(const Slice& key, uint32_t hash, void* value,
-                const Cache::CacheItemHelper* helper, size_t charge,
-                LRUHandle** handle, Cache::Priority priority) {
-    return Insert(key, hash, value, charge, helper->del_cb, handle, priority);
-  }
-
-  LRUHandle* Lookup(const Slice& key, uint32_t hash,
-                    const Cache::CacheItemHelper* /*helper*/,
-                    const Cache::CreateCallback& /*create_cb*/,
-                    Cache::Priority /*priority*/, bool /*wait*/,
-                    Statistics* /*stats*/) {
-    return Lookup(key, hash);
-  }
-  LRUHandle* Lookup(const Slice& key, uint32_t hash);
-
-  bool Release(LRUHandle* handle, bool /*useful*/, bool erase_if_last_ref) {
-    return Release(handle, erase_if_last_ref);
-  }
-  bool IsReady(LRUHandle* /*handle*/) { return true; }
-  void Wait(LRUHandle* /*handle*/) {}
-
-  bool Ref(LRUHandle* handle);
-  bool Release(LRUHandle* handle, bool erase_if_last_ref = false);
-  void Erase(const Slice& key, uint32_t hash);
-
-  size_t GetUsage() const;
-  size_t GetPinnedUsage() const;
-  size_t GetOccupancyCount() const;
-  size_t GetTableAddressCount() const;
-
-  void ApplyToSomeEntries(
-      const std::function<void(const Slice& key, void* value, size_t charge,
-                               DeleterFn deleter)>& callback,
-      size_t average_entries_per_lock, size_t* state);
-
-  void EraseUnRefEntries();
-
- private:
-  friend class LRUCache;
-  friend class FastLRUCacheTest;
-
-  void LRU_Remove(LRUHandle* e);
-  void LRU_Insert(LRUHandle* e);
-
-  // Free some space following strict LRU policy until enough space
-  // to hold (usage_ + charge) is freed or the LRU list is empty
-  // This function is not thread safe - it needs to be executed while
-  // holding the mutex_.
-  void EvictFromLRU(size_t charge, autovector<LRUHandle>* deleted);
-
-  // Returns the charge of a single handle.
-  static size_t CalcEstimatedHandleCharge(
-      size_t estimated_value_size,
-      CacheMetadataChargePolicy metadata_charge_policy);
-
-  // Returns the number of bits used to hash an element in the hash
-  // table.
-  static int CalcHashBits(size_t capacity, size_t estimated_value_size,
-                          CacheMetadataChargePolicy metadata_charge_policy);
-
-  // Initialized before use.
-  size_t capacity_;
-
-  // Whether to reject insertion if cache reaches its full capacity.
-  bool strict_capacity_limit_;
-
-  // Dummy head of LRU list.
-  // lru.prev is newest entry, lru.next is oldest entry.
-  // LRU contains items which can be evicted, ie reference only by cache
-  LRUHandle lru_;
-
-  // Pointer to head of low-pri pool in LRU list.
-  LRUHandle* lru_low_pri_;
-
-  // ------------^^^^^^^^^^^^^-----------
-  // Not frequently modified data members
-  // ------------------------------------
-  //
-  // We separate data members that are updated frequently from the ones that
-  // are not frequently updated so that they don't share the same cache line
-  // which will lead into false cache sharing
-  //
-  // ------------------------------------
-  // Frequently modified data members
-  // ------------vvvvvvvvvvvvv-----------
-  LRUHandleTable table_;
-
-  // Memory size for entries residing in the cache.
-  size_t usage_;
-
-  // Memory size for entries residing only in the LRU list.
-  size_t lru_usage_;
-
-  // mutex_ protects the following state.
-  // We don't count mutex_ as the cache's internal state so semantically we
-  // don't mind mutex_ invoking the non-const actions.
-  mutable DMutex mutex_;
-};
-
-class LRUCache
-#ifdef NDEBUG
-    final
-#endif
-    : public ShardedCache<LRUCacheShard> {
- public:
-  LRUCache(size_t capacity, size_t estimated_value_size, int num_shard_bits,
-           bool strict_capacity_limit,
-           CacheMetadataChargePolicy metadata_charge_policy =
-               kDontChargeCacheMetadata);
-  const char* Name() const override { return "LRUCache"; }
-  void* Value(Handle* handle) override;
-  size_t GetCharge(Handle* handle) const override;
-  DeleterFn GetDeleter(Handle* handle) const override;
-};
-}  // namespace fast_lru_cache
-
-std::shared_ptr<Cache> NewFastLRUCache(
-    size_t capacity, size_t estimated_value_size, int num_shard_bits,
-    bool strict_capacity_limit,
-    CacheMetadataChargePolicy metadata_charge_policy);
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -12,18 +12,13 @@
 #include <cassert>
 #include <cstdint>
 #include <cstdio>
-#include <cstdlib>

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

 namespace ROCKSDB_NAMESPACE {
-namespace lru_cache {
-
-// A distinct pointer value for marking "dummy" cache entries
-void* const kDummyValueMarker = const_cast<char*>("kDummyValueMarker");

 LRUHandleTable::LRUHandleTable(int max_upper_hash_bits)
    : length_bits_(/* historical starting size*/ 4),
@@ -38,7 +33,7 @@ LRUHandleTable::~LRUHandleTable() {
          h->Free();
        }
      },
-      0, size_t{1} << length_bits_);
+      0, uint32_t{1} << length_bits_);
 }

 LRUHandle* LRUHandleTable::Lookup(const Slice& key, uint32_t hash) {
@@ -113,38 +108,33 @@ void LRUHandleTable::Resize() {
  length_bits_ = new_length_bits;
 }

-LRUCacheShard::LRUCacheShard(size_t capacity, bool strict_capacity_limit,
-                             double high_pri_pool_ratio,
-                             double low_pri_pool_ratio, bool use_adaptive_mutex,
-                             CacheMetadataChargePolicy metadata_charge_policy,
-                             int max_upper_hash_bits,
-                             SecondaryCache* secondary_cache)
-    : CacheShardBase(metadata_charge_policy),
-      capacity_(0),
+LRUCacheShard::LRUCacheShard(
+    size_t capacity, bool strict_capacity_limit, double high_pri_pool_ratio,
+    bool use_adaptive_mutex, CacheMetadataChargePolicy metadata_charge_policy,
+    int max_upper_hash_bits,
+    const std::shared_ptr<SecondaryCache>& secondary_cache)
+    : capacity_(0),
      high_pri_pool_usage_(0),
-      low_pri_pool_usage_(0),
      strict_capacity_limit_(strict_capacity_limit),
      high_pri_pool_ratio_(high_pri_pool_ratio),
      high_pri_pool_capacity_(0),
-      low_pri_pool_ratio_(low_pri_pool_ratio),
-      low_pri_pool_capacity_(0),
      table_(max_upper_hash_bits),
      usage_(0),
      lru_usage_(0),
      mutex_(use_adaptive_mutex),
      secondary_cache_(secondary_cache) {
+  set_metadata_charge_policy(metadata_charge_policy);
  // Make empty circular linked list.
  lru_.next = &lru_;
  lru_.prev = &lru_;
  lru_low_pri_ = &lru_;
-  lru_bottom_pri_ = &lru_;
  SetCapacity(capacity);
 }

 void LRUCacheShard::EraseUnRefEntries() {
  autovector<LRUHandle*> last_reference_list;
  {
-    DMutexLock l(mutex_);
+    MutexLock l(&mutex_);
    while (lru_.next != &lru_) {
      LRUHandle* old = lru_.next;
      // LRU list contains only elements which can be evicted.
@@ -152,8 +142,9 @@ void LRUCacheShard::EraseUnRefEntries() {
      LRU_Remove(old);
      table_.Remove(old->key(), old->hash);
      old->SetInCache(false);
-      assert(usage_ >= old->total_charge);
-      usage_ -= old->total_charge;
+      size_t total_charge = old->CalcTotalCharge(metadata_charge_policy_);
+      assert(usage_ >= total_charge);
+      usage_ -= total_charge;
      last_reference_list.push_back(old);
    }
  }
@@ -166,51 +157,47 @@ void LRUCacheShard::EraseUnRefEntries() {
 void LRUCacheShard::ApplyToSomeEntries(
    const std::function<void(const Slice& key, void* value, size_t charge,
                             DeleterFn deleter)>& callback,
-    size_t average_entries_per_lock, size_t* state) {
+    uint32_t average_entries_per_lock, uint32_t* state) {
  // The state is essentially going to be the starting hash, which works
  // nicely even if we resize between calls because we use upper-most
  // hash bits for table indexes.
-  DMutexLock l(mutex_);
-  int length_bits = table_.GetLengthBits();
-  size_t length = size_t{1} << length_bits;
+  MutexLock l(&mutex_);
+  uint32_t length_bits = table_.GetLengthBits();
+  uint32_t length = uint32_t{1} << length_bits;

  assert(average_entries_per_lock > 0);
  // Assuming we are called with same average_entries_per_lock repeatedly,
  // this simplifies some logic (index_end will not overflow).
  assert(average_entries_per_lock < length || *state == 0);

-  size_t index_begin = *state >> (sizeof(size_t) * 8u - length_bits);
-  size_t index_end = index_begin + average_entries_per_lock;
+  uint32_t index_begin = *state >> (32 - length_bits);
+  uint32_t index_end = index_begin + average_entries_per_lock;
  if (index_end >= length) {
    // Going to end
    index_end = length;
-    *state = SIZE_MAX;
+    *state = UINT32_MAX;
  } else {
-    *state = index_end << (sizeof(size_t) * 8u - length_bits);
+    *state = index_end << (32 - length_bits);
  }

  table_.ApplyToEntriesRange(
-      [callback,
-       metadata_charge_policy = metadata_charge_policy_](LRUHandle* h) {
+      [callback](LRUHandle* h) {
        DeleterFn deleter = h->IsSecondaryCacheCompatible()
                                ? h->info_.helper->del_cb
                                : h->info_.deleter;
-        callback(h->key(), h->value, h->GetCharge(metadata_charge_policy),
-                 deleter);
+        callback(h->key(), h->value, h->charge, deleter);
      },
      index_begin, index_end);
 }

-void LRUCacheShard::TEST_GetLRUList(LRUHandle** lru, LRUHandle** lru_low_pri,
-                                    LRUHandle** lru_bottom_pri) {
-  DMutexLock l(mutex_);
+void LRUCacheShard::TEST_GetLRUList(LRUHandle** lru, LRUHandle** lru_low_pri) {
+  MutexLock l(&mutex_);
  *lru = &lru_;
  *lru_low_pri = lru_low_pri_;
-  *lru_bottom_pri = lru_bottom_pri_;
 }

 size_t LRUCacheShard::TEST_GetLRUSize() {
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
  LRUHandle* lru_handle = lru_.next;
  size_t lru_size = 0;
  while (lru_handle != &lru_) {
@@ -221,42 +208,32 @@ size_t LRUCacheShard::TEST_GetLRUSize() {
 }

 double LRUCacheShard::GetHighPriPoolRatio() {
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
  return high_pri_pool_ratio_;
 }

-double LRUCacheShard::GetLowPriPoolRatio() {
-  DMutexLock l(mutex_);
-  return low_pri_pool_ratio_;
-}
-
 void LRUCacheShard::LRU_Remove(LRUHandle* e) {
  assert(e->next != nullptr);
  assert(e->prev != nullptr);
  if (lru_low_pri_ == e) {
    lru_low_pri_ = e->prev;
  }
-  if (lru_bottom_pri_ == e) {
-    lru_bottom_pri_ = e->prev;
-  }
  e->next->prev = e->prev;
  e->prev->next = e->next;
  e->prev = e->next = nullptr;
-  assert(lru_usage_ >= e->total_charge);
-  lru_usage_ -= e->total_charge;
-  assert(!e->InHighPriPool() || !e->InLowPriPool());
+  size_t total_charge = e->CalcTotalCharge(metadata_charge_policy_);
+  assert(lru_usage_ >= total_charge);
+  lru_usage_ -= total_charge;
  if (e->InHighPriPool()) {
-    assert(high_pri_pool_usage_ >= e->total_charge);
-    high_pri_pool_usage_ -= e->total_charge;
-  } else if (e->InLowPriPool()) {
-    assert(low_pri_pool_usage_ >= e->total_charge);
-    low_pri_pool_usage_ -= e->total_charge;
+    assert(high_pri_pool_usage_ >= total_charge);
+    high_pri_pool_usage_ -= total_charge;
  }
 }

 void LRUCacheShard::LRU_Insert(LRUHandle* e) {
  assert(e->next == nullptr);
  assert(e->prev == nullptr);
+  size_t total_charge = e->CalcTotalCharge(metadata_charge_policy_);
  if (high_pri_pool_ratio_ > 0 && (e->IsHighPri() || e->HasHit())) {
    // Inset "e" to head of LRU list.
    e->next = &lru_;
@@ -264,36 +241,19 @@ void LRUCacheShard::LRU_Insert(LRUHandle* e) {
    e->prev->next = e;
    e->next->prev = e;
    e->SetInHighPriPool(true);
-    e->SetInLowPriPool(false);
-    high_pri_pool_usage_ += e->total_charge;
+    high_pri_pool_usage_ += total_charge;
    MaintainPoolSize();
-  } else if (low_pri_pool_ratio_ > 0 &&
-             (e->IsHighPri() || e->IsLowPri() || e->HasHit())) {
-    // Insert "e" to the head of low-pri pool.
+  } else {
+    // Insert "e" to the head of low-pri pool. Note that when
+    // high_pri_pool_ratio is 0, head of low-pri pool is also head of LRU list.
    e->next = lru_low_pri_->next;
    e->prev = lru_low_pri_;
    e->prev->next = e;
    e->next->prev = e;
    e->SetInHighPriPool(false);
-    e->SetInLowPriPool(true);
-    low_pri_pool_usage_ += e->total_charge;
-    MaintainPoolSize();
    lru_low_pri_ = e;
-  } else {
-    // Insert "e" to the head of bottom-pri pool.
-    e->next = lru_bottom_pri_->next;
-    e->prev = lru_bottom_pri_;
-    e->prev->next = e;
-    e->next->prev = e;
-    e->SetInHighPriPool(false);
-    e->SetInLowPriPool(false);
-    // if the low-pri pool is empty, lru_low_pri_ also needs to be updated.
-    if (lru_bottom_pri_ == lru_low_pri_) {
-      lru_low_pri_ = e;
-    }
-    lru_bottom_pri_ = e;
  }
-  lru_usage_ += e->total_charge;
+  lru_usage_ += total_charge;
 }

 void LRUCacheShard::MaintainPoolSize() {
@@ -302,20 +262,10 @@ void LRUCacheShard::MaintainPoolSize() {
    lru_low_pri_ = lru_low_pri_->next;
    assert(lru_low_pri_ != &lru_);
    lru_low_pri_->SetInHighPriPool(false);
-    lru_low_pri_->SetInLowPriPool(true);
-    assert(high_pri_pool_usage_ >= lru_low_pri_->total_charge);
-    high_pri_pool_usage_ -= lru_low_pri_->total_charge;
-    low_pri_pool_usage_ += lru_low_pri_->total_charge;
-  }
-
-  while (low_pri_pool_usage_ > low_pri_pool_capacity_) {
-    // Overflow last entry in low-pri pool to bottom-pri pool.
-    lru_bottom_pri_ = lru_bottom_pri_->next;
-    assert(lru_bottom_pri_ != &lru_);
-    lru_bottom_pri_->SetInHighPriPool(false);
-    lru_bottom_pri_->SetInLowPriPool(false);
-    assert(low_pri_pool_usage_ >= lru_bottom_pri_->total_charge);
-    low_pri_pool_usage_ -= lru_bottom_pri_->total_charge;
+    size_t total_charge =
+        lru_low_pri_->CalcTotalCharge(metadata_charge_policy_);
+    assert(high_pri_pool_usage_ >= total_charge);
+    high_pri_pool_usage_ -= total_charge;
  }
 }

@@ -328,56 +278,53 @@ void LRUCacheShard::EvictFromLRU(size_t charge,
    LRU_Remove(old);
    table_.Remove(old->key(), old->hash);
    old->SetInCache(false);
-    assert(usage_ >= old->total_charge);
-    usage_ -= old->total_charge;
+    size_t old_total_charge = old->CalcTotalCharge(metadata_charge_policy_);
+    assert(usage_ >= old_total_charge);
+    usage_ -= old_total_charge;
    deleted->push_back(old);
  }
 }

-void LRUCacheShard::TryInsertIntoSecondaryCache(
-    autovector<LRUHandle*> evicted_handles) {
-  for (auto entry : evicted_handles) {
-    if (secondary_cache_ && entry->IsSecondaryCacheCompatible() &&
-        !entry->IsInSecondaryCache()) {
-      secondary_cache_->Insert(entry->key(), entry->value, entry->info_.helper)
-          .PermitUncheckedError();
-    }
-    // Free the entries here outside of mutex for performance reasons.
-    entry->Free();
-  }
-}
-
 void LRUCacheShard::SetCapacity(size_t capacity) {
  autovector<LRUHandle*> last_reference_list;
  {
-    DMutexLock l(mutex_);
+    MutexLock l(&mutex_);
    capacity_ = capacity;
    high_pri_pool_capacity_ = capacity_ * high_pri_pool_ratio_;
-    low_pri_pool_capacity_ = capacity_ * low_pri_pool_ratio_;
    EvictFromLRU(0, &last_reference_list);
  }

-  TryInsertIntoSecondaryCache(last_reference_list);
+  // Try to insert the evicted entries into tiered cache.
+  // Free the entries outside of mutex for performance reasons.
+  for (auto entry : last_reference_list) {
+    if (secondary_cache_ && entry->IsSecondaryCacheCompatible() &&
+        !entry->IsInSecondaryCache()) {
+      secondary_cache_->Insert(entry->key(), entry->value, entry->info_.helper)
+          .PermitUncheckedError();
+    }
+    entry->Free();
+  }
 }

 void LRUCacheShard::SetStrictCapacityLimit(bool strict_capacity_limit) {
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
  strict_capacity_limit_ = strict_capacity_limit;
 }

-Status LRUCacheShard::InsertItem(LRUHandle* e, LRUHandle** handle,
+Status LRUCacheShard::InsertItem(LRUHandle* e, Cache::Handle** handle,
                                 bool free_handle_on_fail) {
  Status s = Status::OK();
  autovector<LRUHandle*> last_reference_list;
+  size_t total_charge = e->CalcTotalCharge(metadata_charge_policy_);

  {
-    DMutexLock l(mutex_);
+    MutexLock l(&mutex_);

    // Free the space following strict LRU policy until enough space
    // is freed or the lru list is empty.
-    EvictFromLRU(e->total_charge, &last_reference_list);
+    EvictFromLRU(total_charge, &last_reference_list);

-    if ((usage_ + e->total_charge) > capacity_ &&
+    if ((usage_ + total_charge) > capacity_ &&
        (strict_capacity_limit_ || handle == nullptr)) {
      e->SetInCache(false);
      if (handle == nullptr) {
@@ -386,16 +333,16 @@ Status LRUCacheShard::InsertItem(LRUHandle* e, LRUHandle** handle,
        last_reference_list.push_back(e);
      } else {
        if (free_handle_on_fail) {
-          free(e);
+          delete[] reinterpret_cast<char*>(e);
          *handle = nullptr;
        }
-        s = Status::MemoryLimit("Insert failed due to LRU cache being full.");
+        s = Status::Incomplete("Insert failed due to LRU cache being full.");
      }
    } else {
      // Insert into the cache. Note that the cache might get larger than its
      // capacity if not enough space was freed up.
      LRUHandle* old = table_.Insert(e);
-      usage_ += e->total_charge;
+      usage_ += total_charge;
      if (old != nullptr) {
        s = Status::OkOverwritten();
        assert(old->InCache());
@@ -403,8 +350,10 @@ Status LRUCacheShard::InsertItem(LRUHandle* e, LRUHandle** handle,
        if (!old->HasRefs()) {
          // old is on LRU because it's in cache and its reference count is 0.
          LRU_Remove(old);
-          assert(usage_ >= old->total_charge);
-          usage_ -= old->total_charge;
+          size_t old_total_charge =
+              old->CalcTotalCharge(metadata_charge_policy_);
+          assert(usage_ >= old_total_charge);
+          usage_ -= old_total_charge;
          last_reference_list.push_back(old);
        }
      }
@@ -415,12 +364,21 @@ Status LRUCacheShard::InsertItem(LRUHandle* e, LRUHandle** handle,
        if (!e->HasRefs()) {
          e->Ref();
        }
-        *handle = e;
+        *handle = reinterpret_cast<Cache::Handle*>(e);
      }
    }
  }

-  TryInsertIntoSecondaryCache(last_reference_list);
+  // Try to insert the evicted entries into the secondary cache.
+  // Free the entries here outside of mutex for performance reasons.
+  for (auto entry : last_reference_list) {
+    if (secondary_cache_ && entry->IsSecondaryCacheCompatible() &&
+        !entry->IsInSecondaryCache()) {
+      secondary_cache_->Insert(entry->key(), entry->value, entry->info_.helper)
+          .PermitUncheckedError();
+    }
+    entry->Free();
+  }

  return s;
 }
@@ -429,124 +387,57 @@ void LRUCacheShard::Promote(LRUHandle* e) {
  SecondaryCacheResultHandle* secondary_handle = e->sec_handle;

  assert(secondary_handle->IsReady());
-  // e is not thread-shared here; OK to modify "immutable" fields as well as
-  // "mutable" (normally requiring mutex)
-  e->SetIsPending(false);
+  e->SetIncomplete(false);
+  e->SetInCache(true);
  e->value = secondary_handle->Value();
-  assert(e->total_charge == 0);
-  size_t value_size = secondary_handle->Size();
+  e->charge = secondary_handle->Size();
  delete secondary_handle;

+  // This call could fail if the cache is over capacity and
+  // strict_capacity_limit_ is true. In such a case, we don't want
+  // InsertItem() to free the handle, since the item is already in memory
+  // and the caller will most likely just read from disk if we erase it here.
  if (e->value) {
-    e->CalcTotalCharge(value_size, metadata_charge_policy_);
-    Status s;
-    if (e->IsStandalone()) {
-      assert(secondary_cache_ && secondary_cache_->SupportForceErase());
-
-      // Insert a dummy handle and return a standalone handle to caller.
-      // Charge the standalone handle.
-      autovector<LRUHandle*> last_reference_list;
-      bool free_standalone_handle{false};
-      {
-        DMutexLock l(mutex_);
-
-        // Free the space following strict LRU policy until enough space
-        // is freed or the lru list is empty.
-        EvictFromLRU(e->total_charge, &last_reference_list);
-
-        if ((usage_ + e->total_charge) > capacity_ && strict_capacity_limit_) {
-          free_standalone_handle = true;
-        } else {
-          usage_ += e->total_charge;
-        }
-      }
-
-      TryInsertIntoSecondaryCache(last_reference_list);
-      if (free_standalone_handle) {
-        e->Unref();
-        e->Free();
-        e = nullptr;
-      } else {
-        PERF_COUNTER_ADD(block_cache_standalone_handle_count, 1);
-      }
-
-      // Insert a dummy handle into the primary cache. This dummy handle is
-      // not IsSecondaryCacheCompatible().
-      // FIXME? This should not overwrite an existing non-dummy entry in the
-      // rare case that one exists
-      Cache::Priority priority =
-          e->IsHighPri() ? Cache::Priority::HIGH : Cache::Priority::LOW;
-      s = Insert(e->key(), e->hash, kDummyValueMarker, /*charge=*/0,
-                 /*deleter=*/nullptr, /*helper=*/nullptr, /*handle=*/nullptr,
-                 priority);
-    } else {
-      e->SetInCache(true);
-      LRUHandle* handle = e;
-      // This InsertItem() could fail if the cache is over capacity and
-      // strict_capacity_limit_ is true. In such a case, we don't want
-      // InsertItem() to free the handle, since the item is already in memory
-      // and the caller will most likely just read it from disk if we erase it
-      // here.
-      s = InsertItem(e, &handle, /*free_handle_on_fail=*/false);
-      if (s.ok()) {
-        PERF_COUNTER_ADD(block_cache_real_handle_count, 1);
-      }
-    }
-
+    Cache::Handle* handle = reinterpret_cast<Cache::Handle*>(e);
+    Status s = InsertItem(e, &handle, /*free_handle_on_fail=*/false);
    if (!s.ok()) {
      // Item is in memory, but not accounted against the cache capacity.
      // When the handle is released, the item should get deleted.
      assert(!e->InCache());
    }
  } else {
-    // Secondary cache lookup failed. The caller will take care of detecting
-    // this and eventually releasing e.
-    assert(!e->value);
-    assert(!e->InCache());
+    // Since the secondary cache lookup failed, mark the item as not in cache
+    // Don't charge the cache as its only metadata that'll shortly be released
+    MutexLock l(&mutex_);
+    e->charge = 0;
+    e->SetInCache(false);
  }
 }

-LRUHandle* LRUCacheShard::Lookup(const Slice& key, uint32_t hash,
-                                 const Cache::CacheItemHelper* helper,
-                                 const Cache::CreateCallback& create_cb,
-                                 Cache::Priority priority, bool wait,
-                                 Statistics* stats) {
+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) {
  LRUHandle* e = nullptr;
-  bool found_dummy_entry{false};
  {
-    DMutexLock l(mutex_);
+    MutexLock l(&mutex_);
    e = table_.Lookup(key, hash);
    if (e != nullptr) {
      assert(e->InCache());
-      if (e->value == kDummyValueMarker) {
-        // For a dummy handle, if it was retrieved from secondary cache,
-        // it may still exist in secondary cache.
-        // If the handle exists in secondary cache, the value should be
-        // erased from sec cache and be inserted into primary cache.
-        found_dummy_entry = true;
-        // Let the dummy entry be overwritten
-        e = nullptr;
-      } else {
-        if (!e->HasRefs()) {
-          // The entry is in LRU since it's in hash and has no external
-          // references.
-          LRU_Remove(e);
-        }
-        e->Ref();
-        e->SetHit();
+      if (!e->HasRefs()) {
+        // The entry is in LRU since it's in hash and has no external references
+        LRU_Remove(e);
      }
+      e->Ref();
+      e->SetHit();
    }
  }

-  // If handle table lookup failed or the handle is a dummy one, allocate
-  // a handle outside the mutex if we re going to lookup in the secondary cache.
-  //
-  // When a block is firstly Lookup from CompressedSecondaryCache, we just
-  // insert a dummy block into the primary cache (charging the actual size of
-  // the block) and don't erase the block from CompressedSecondaryCache. A
-  // standalone handle is returned to the caller. Only if the block is hit
-  // again, we erase it from CompressedSecondaryCache and add it into the
-  // primary cache.
+  // If handle table lookup failed, then allocate a handle outside the
+  // mutex if we're going to lookup in the secondary cache.
+  // Only support synchronous for now.
+  // TODO: Support asynchronous lookup in secondary cache
  if (!e && secondary_cache_ && helper && helper->saveto_cb) {
    // For objects from the secondary cache, we expect the caller to provide
    // a way to create/delete the primary cache object. The only case where
@@ -556,13 +447,12 @@ LRUHandle* LRUCacheShard::Lookup(const Slice& key, uint32_t hash,
    assert(create_cb && helper->del_cb);
    bool is_in_sec_cache{false};
    std::unique_ptr<SecondaryCacheResultHandle> secondary_handle =
-        secondary_cache_->Lookup(key, create_cb, wait, found_dummy_entry,
-                                 is_in_sec_cache);
+        secondary_cache_->Lookup(key, create_cb, wait, is_in_sec_cache);
    if (secondary_handle != nullptr) {
-      e = static_cast<LRUHandle*>(malloc(sizeof(LRUHandle) - 1 + key.size()));
+      e = reinterpret_cast<LRUHandle*>(
+          new char[sizeof(LRUHandle) - 1 + key.size()]);

-      e->m_flags = 0;
-      e->im_flags = 0;
+      e->flags = 0;
      e->SetSecondaryCacheCompatible(true);
      e->info_.helper = helper;
      e->key_length = key.size();
@@ -573,78 +463,59 @@ LRUHandle* LRUCacheShard::Lookup(const Slice& key, uint32_t hash,
      memcpy(e->key_data, key.data(), key.size());
      e->value = nullptr;
      e->sec_handle = secondary_handle.release();
-      e->total_charge = 0;
      e->Ref();
-      e->SetIsInSecondaryCache(is_in_sec_cache);
-      e->SetIsStandalone(secondary_cache_->SupportForceErase() &&
-                         !found_dummy_entry);

      if (wait) {
        Promote(e);
-        if (e) {
-          if (!e->value) {
-            // The secondary cache returned a handle, but the lookup failed.
-            e->Unref();
-            e->Free();
-            e = nullptr;
-          } else {
-            PERF_COUNTER_ADD(secondary_cache_hit_count, 1);
-            RecordTick(stats, SECONDARY_CACHE_HITS);
-          }
+        e->SetIsInSecondaryCache(is_in_sec_cache);
+        if (!e->value) {
+          // The secondary cache returned a handle, but the lookup failed.
+          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->SetIsPending(true);
+        e->SetIncomplete(true);
+        e->SetIsInSecondaryCache(is_in_sec_cache);
        // 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);
      }
-    } else {
-      // Caller will most likely overwrite the dummy entry with an Insert
-      // after this Lookup fails
-      assert(e == nullptr);
    }
  }
-  return e;
+  return reinterpret_cast<Cache::Handle*>(e);
 }

-bool LRUCacheShard::Ref(LRUHandle* e) {
-  DMutexLock l(mutex_);
+bool LRUCacheShard::Ref(Cache::Handle* h) {
+  LRUHandle* e = reinterpret_cast<LRUHandle*>(h);
+  MutexLock l(&mutex_);
  // To create another reference - entry must be already externally referenced.
  assert(e->HasRefs());
-  // Pending handles are not for sharing
-  assert(!e->IsPending());
  e->Ref();
  return true;
 }

 void LRUCacheShard::SetHighPriorityPoolRatio(double high_pri_pool_ratio) {
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
  high_pri_pool_ratio_ = high_pri_pool_ratio;
  high_pri_pool_capacity_ = capacity_ * high_pri_pool_ratio_;
  MaintainPoolSize();
 }

-void LRUCacheShard::SetLowPriorityPoolRatio(double low_pri_pool_ratio) {
-  DMutexLock l(mutex_);
-  low_pri_pool_ratio_ = low_pri_pool_ratio;
-  low_pri_pool_capacity_ = capacity_ * low_pri_pool_ratio_;
-  MaintainPoolSize();
-}
-
-bool LRUCacheShard::Release(LRUHandle* e, bool /*useful*/,
-                            bool erase_if_last_ref) {
-  if (e == nullptr) {
+bool LRUCacheShard::Release(Cache::Handle* handle, bool erase_if_last_ref) {
+  if (handle == nullptr) {
    return false;
  }
+  LRUHandle* e = reinterpret_cast<LRUHandle*>(handle);
  bool last_reference = false;
-  // Must Wait or WaitAll first on pending handles. Otherwise, would leak
-  // a secondary cache handle.
-  assert(!e->IsPending());
  {
-    DMutexLock l(mutex_);
+    MutexLock l(&mutex_);
    last_reference = e->Unref();
    if (last_reference && e->InCache()) {
      // The item is still in cache, and nobody else holds a reference to it.
@@ -660,10 +531,15 @@ bool LRUCacheShard::Release(LRUHandle* e, bool /*useful*/,
        last_reference = false;
      }
    }
-    // If it was the last reference, then decrement the cache usage.
-    if (last_reference) {
-      assert(usage_ >= e->total_charge);
-      usage_ -= e->total_charge;
+    // If it was the last reference, and the entry is either not secondary
+    // cache compatible (i.e a dummy entry for accounting), or is secondary
+    // cache compatible and has a non-null value, then decrement the cache
+    // usage. If value is null in the latter case, taht means the lookup
+    // failed and we didn't charge the cache.
+    if (last_reference && (!e->IsSecondaryCacheCompatible() || e->value)) {
+      size_t total_charge = e->CalcTotalCharge(metadata_charge_policy_);
+      assert(usage_ >= total_charge);
+      usage_ -= total_charge;
    }
  }

@@ -678,27 +554,25 @@ Status LRUCacheShard::Insert(const Slice& key, uint32_t hash, void* value,
                             size_t charge,
                             void (*deleter)(const Slice& key, void* value),
                             const Cache::CacheItemHelper* helper,
-                             LRUHandle** handle, Cache::Priority priority) {
+                             Cache::Handle** handle, Cache::Priority priority) {
  // Allocate the memory here outside of the mutex.
  // If the cache is full, we'll have to release it.
  // It shouldn't happen very often though.
-  LRUHandle* e =
-      static_cast<LRUHandle*>(malloc(sizeof(LRUHandle) - 1 + key.size()));
+  LRUHandle* e = reinterpret_cast<LRUHandle*>(
+      new char[sizeof(LRUHandle) - 1 + key.size()]);

  e->value = value;
-  e->m_flags = 0;
-  e->im_flags = 0;
+  e->flags = 0;
  if (helper) {
-    // Use only one of the two parameters
-    assert(deleter == nullptr);
-    // value == nullptr is reserved for indicating failure for when secondary
-    // cache compatible
-    assert(value != nullptr);
    e->SetSecondaryCacheCompatible(true);
    e->info_.helper = helper;
  } else {
+#ifdef __SANITIZE_THREAD__
+    e->is_secondary_cache_compatible_for_tsan = false;
+#endif  // __SANITIZE_THREAD__
    e->info_.deleter = deleter;
  }
+  e->charge = charge;
  e->key_length = key.size();
  e->hash = hash;
  e->refs = 0;
@@ -706,7 +580,6 @@ Status LRUCacheShard::Insert(const Slice& key, uint32_t hash, void* value,
  e->SetInCache(true);
  e->SetPriority(priority);
  memcpy(e->key_data, key.data(), key.size());
-  e->CalcTotalCharge(charge, metadata_charge_policy_);

  return InsertItem(e, handle, /* free_handle_on_fail */ true);
 }
@@ -715,7 +588,7 @@ void LRUCacheShard::Erase(const Slice& key, uint32_t hash) {
  LRUHandle* e;
  bool last_reference = false;
  {
-    DMutexLock l(mutex_);
+    MutexLock l(&mutex_);
    e = table_.Remove(key, hash);
    if (e != nullptr) {
      assert(e->InCache());
@@ -723,8 +596,9 @@ void LRUCacheShard::Erase(const Slice& key, uint32_t hash) {
      if (!e->HasRefs()) {
        // The entry is in LRU since it's in hash and has no external references
        LRU_Remove(e);
-        assert(usage_ >= e->total_charge);
-        usage_ -= e->total_charge;
+        size_t total_charge = e->CalcTotalCharge(metadata_charge_policy_);
+        assert(usage_ >= total_charge);
+        usage_ -= total_charge;
        last_reference = true;
      }
    }
@@ -737,7 +611,9 @@ void LRUCacheShard::Erase(const Slice& key, uint32_t hash) {
  }
 }

-bool LRUCacheShard::IsReady(LRUHandle* e) {
+bool LRUCacheShard::IsReady(Cache::Handle* handle) {
+  LRUHandle* e = reinterpret_cast<LRUHandle*>(handle);
+  MutexLock l(&mutex_);
  bool ready = true;
  if (e->IsPending()) {
    assert(secondary_cache_);
@@ -748,69 +624,72 @@ bool LRUCacheShard::IsReady(LRUHandle* e) {
 }

 size_t LRUCacheShard::GetUsage() const {
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
  return usage_;
 }

 size_t LRUCacheShard::GetPinnedUsage() const {
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
  assert(usage_ >= lru_usage_);
  return usage_ - lru_usage_;
 }

-size_t LRUCacheShard::GetOccupancyCount() const {
-  DMutexLock l(mutex_);
-  return table_.GetOccupancyCount();
-}
-
-size_t LRUCacheShard::GetTableAddressCount() const {
-  DMutexLock l(mutex_);
-  return size_t{1} << table_.GetLengthBits();
-}
-
-void LRUCacheShard::AppendPrintableOptions(std::string& str) const {
+std::string LRUCacheShard::GetPrintableOptions() const {
  const int kBufferSize = 200;
  char buffer[kBufferSize];
  {
-    DMutexLock l(mutex_);
+    MutexLock l(&mutex_);
    snprintf(buffer, kBufferSize, "    high_pri_pool_ratio: %.3lf\n",
             high_pri_pool_ratio_);
-    snprintf(buffer + strlen(buffer), kBufferSize - strlen(buffer),
-             "    low_pri_pool_ratio: %.3lf\n", low_pri_pool_ratio_);
  }
-  str.append(buffer);
+  return std::string(buffer);
 }

 LRUCache::LRUCache(size_t capacity, int num_shard_bits,
                   bool strict_capacity_limit, double high_pri_pool_ratio,
-                   double low_pri_pool_ratio,
                   std::shared_ptr<MemoryAllocator> allocator,
                   bool use_adaptive_mutex,
                   CacheMetadataChargePolicy metadata_charge_policy,
-                   std::shared_ptr<SecondaryCache> _secondary_cache)
+                   const std::shared_ptr<SecondaryCache>& secondary_cache)
    : ShardedCache(capacity, num_shard_bits, strict_capacity_limit,
-                   std::move(allocator)),
-      secondary_cache_(std::move(_secondary_cache)) {
-  size_t per_shard = GetPerShardCapacity();
-  SecondaryCache* secondary_cache = secondary_cache_.get();
-  InitShards([=](LRUCacheShard* cs) {
-    new (cs) LRUCacheShard(
+                   std::move(allocator)) {
+  num_shards_ = 1 << num_shard_bits;
+  shards_ = reinterpret_cast<LRUCacheShard*>(
+      port::cacheline_aligned_alloc(sizeof(LRUCacheShard) * num_shards_));
+  size_t per_shard = (capacity + (num_shards_ - 1)) / num_shards_;
+  for (int i = 0; i < num_shards_; i++) {
+    new (&shards_[i]) LRUCacheShard(
        per_shard, strict_capacity_limit, high_pri_pool_ratio,
-        low_pri_pool_ratio, use_adaptive_mutex, metadata_charge_policy,
+        use_adaptive_mutex, metadata_charge_policy,
        /* max_upper_hash_bits */ 32 - num_shard_bits, secondary_cache);
-  });
+  }
+  secondary_cache_ = secondary_cache;
+}
+
+LRUCache::~LRUCache() {
+  if (shards_ != nullptr) {
+    assert(num_shards_ > 0);
+    for (int i = 0; i < num_shards_; i++) {
+      shards_[i].~LRUCacheShard();
+    }
+    port::cacheline_aligned_free(shards_);
+  }
+}
+
+CacheShard* LRUCache::GetShard(uint32_t shard) {
+  return reinterpret_cast<CacheShard*>(&shards_[shard]);
+}
+
+const CacheShard* LRUCache::GetShard(uint32_t shard) const {
+  return reinterpret_cast<CacheShard*>(&shards_[shard]);
 }

 void* LRUCache::Value(Handle* handle) {
-  auto h = reinterpret_cast<const LRUHandle*>(handle);
-  assert(!h->IsPending() || h->value == nullptr);
-  assert(h->value != kDummyValueMarker);
-  return h->value;
+  return reinterpret_cast<const LRUHandle*>(handle)->value;
 }

 size_t LRUCache::GetCharge(Handle* handle) const {
-  return reinterpret_cast<const LRUHandle*>(handle)->GetCharge(
-      GetShard(0).metadata_charge_policy_);
+  return reinterpret_cast<const LRUHandle*>(handle)->charge;
 }

 Cache::DeleterFn LRUCache::GetDeleter(Handle* handle) const {
@@ -822,12 +701,32 @@ Cache::DeleterFn LRUCache::GetDeleter(Handle* handle) const {
  }
 }

+uint32_t LRUCache::GetHash(Handle* handle) const {
+  return reinterpret_cast<const LRUHandle*>(handle)->hash;
+}
+
+void LRUCache::DisownData() {
+  // Leak data only if that won't generate an ASAN/valgrind warning.
+  if (!kMustFreeHeapAllocations) {
+    shards_ = nullptr;
+    num_shards_ = 0;
+  }
+}
+
 size_t LRUCache::TEST_GetLRUSize() {
-  return SumOverShards([](LRUCacheShard& cs) { return cs.TEST_GetLRUSize(); });
+  size_t lru_size_of_all_shards = 0;
+  for (int i = 0; i < num_shards_; i++) {
+    lru_size_of_all_shards += shards_[i].TEST_GetLRUSize();
+  }
+  return lru_size_of_all_shards;
 }

 double LRUCache::GetHighPriPoolRatio() {
-  return GetShard(0).GetHighPriPoolRatio();
+  double result = 0.0;
+  if (num_shards_ > 0) {
+    result = shards_[0].GetHighPriPoolRatio();
+  }
+  return result;
 }

 void LRUCache::WaitAll(std::vector<Handle*>& handles) {
@@ -853,28 +752,19 @@ void LRUCache::WaitAll(std::vector<Handle*>& handles) {
      if (!lru_handle->IsPending()) {
        continue;
      }
-      GetShard(lru_handle->hash).Promote(lru_handle);
+      uint32_t hash = GetHash(handle);
+      LRUCacheShard* shard = static_cast<LRUCacheShard*>(GetShard(Shard(hash)));
+      shard->Promote(lru_handle);
    }
  }
 }

-void LRUCache::AppendPrintableOptions(std::string& str) const {
-  ShardedCache::AppendPrintableOptions(str);  // options from shard
-  if (secondary_cache_) {
-    str.append("  secondary_cache:\n");
-    str.append(secondary_cache_->GetPrintableOptions());
-  }
-}
-
-}  // namespace lru_cache
-
 std::shared_ptr<Cache> NewLRUCache(
    size_t capacity, int num_shard_bits, bool strict_capacity_limit,
    double high_pri_pool_ratio,
    std::shared_ptr<MemoryAllocator> memory_allocator, bool use_adaptive_mutex,
    CacheMetadataChargePolicy metadata_charge_policy,
-    const std::shared_ptr<SecondaryCache>& secondary_cache,
-    double low_pri_pool_ratio) {
+    const std::shared_ptr<SecondaryCache>& secondary_cache) {
  if (num_shard_bits >= 20) {
    return nullptr;  // The cache cannot be sharded into too many fine pieces.
  }
@@ -882,40 +772,30 @@ std::shared_ptr<Cache> NewLRUCache(
    // Invalid high_pri_pool_ratio
    return nullptr;
  }
-  if (low_pri_pool_ratio < 0.0 || low_pri_pool_ratio > 1.0) {
-    // Invalid low_pri_pool_ratio
-    return nullptr;
-  }
-  if (low_pri_pool_ratio + high_pri_pool_ratio > 1.0) {
-    // Invalid high_pri_pool_ratio and low_pri_pool_ratio combination
-    return nullptr;
-  }
  if (num_shard_bits < 0) {
    num_shard_bits = GetDefaultCacheShardBits(capacity);
  }
  return std::make_shared<LRUCache>(
      capacity, num_shard_bits, strict_capacity_limit, high_pri_pool_ratio,
-      low_pri_pool_ratio, std::move(memory_allocator), use_adaptive_mutex,
-      metadata_charge_policy, secondary_cache);
+      std::move(memory_allocator), use_adaptive_mutex, metadata_charge_policy,
+      secondary_cache);
 }

 std::shared_ptr<Cache> NewLRUCache(const LRUCacheOptions& cache_opts) {
-  return NewLRUCache(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, cache_opts.low_pri_pool_ratio);
+  return NewLRUCache(
+      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> NewLRUCache(
    size_t capacity, int num_shard_bits, bool strict_capacity_limit,
    double high_pri_pool_ratio,
    std::shared_ptr<MemoryAllocator> memory_allocator, bool use_adaptive_mutex,
-    CacheMetadataChargePolicy metadata_charge_policy,
-    double low_pri_pool_ratio) {
+    CacheMetadataChargePolicy metadata_charge_policy) {
  return NewLRUCache(capacity, num_shard_bits, strict_capacity_limit,
                     high_pri_pool_ratio, memory_allocator, use_adaptive_mutex,
-                     metadata_charge_policy, nullptr, low_pri_pool_ratio);
+                     metadata_charge_policy, nullptr);
 }
 }  // namespace ROCKSDB_NAMESPACE
@@ -17,10 +17,8 @@
 #include "port/port.h"
 #include "rocksdb/secondary_cache.h"
 #include "util/autovector.h"
-#include "util/distributed_mutex.h"

 namespace ROCKSDB_NAMESPACE {
-namespace lru_cache {

 // LRU cache implementation. This class is not thread-safe.

@@ -38,14 +36,18 @@ namespace lru_cache {
 //    (refs == 0 && in_cache == true)
 // 3. Referenced externally AND not in hash table.
 //    In that case the entry is not in the LRU list and not in hash table.
-//    The entry must be freed if refs becomes 0 in this state.
+//    The entry can be freed when refs becomes 0.
 //    (refs >= 1 && in_cache == false)
-// If you call LRUCacheShard::Release enough times on an entry in state 1, it
-// will go into state 2. To move from state 1 to state 3, either call
-// LRUCacheShard::Erase or LRUCacheShard::Insert with the same key (but
-// possibly different value). To move from state 2 to state 1, use
-// LRUCacheShard::Lookup.
-// While refs > 0, public properties like value and deleter must not change.
+//
+// All newly created LRUHandles are in state 1. If you call
+// LRUCacheShard::Release on entry in state 1, it will go into state 2.
+// To move from state 1 to state 3, either call LRUCacheShard::Erase or
+// LRUCacheShard::Insert with the same key (but possibly different value).
+// To move from state 2 to state 1, use LRUCacheShard::Lookup.
+// Before destruction, make sure that no handles are in state 1. This means
+// that any successful LRUCacheShard::Lookup/LRUCacheShard::Insert have a
+// matching LRUCache::Release (to move into state 2) or LRUCacheShard::Erase
+// (to move into state 3).

 struct LRUHandle {
  void* value;
@@ -53,7 +55,7 @@ struct LRUHandle {
    Info() {}
    ~Info() {}
    Cache::DeleterFn deleter;
-    const Cache::CacheItemHelper* helper;
+    const ShardedCache::CacheItemHelper* helper;
  } info_;
  // An entry is not added to the LRUHandleTable until the secondary cache
  // lookup is complete, so its safe to have this union.
@@ -63,54 +65,45 @@ struct LRUHandle {
  };
  LRUHandle* next;
  LRUHandle* prev;
-  size_t total_charge;  // TODO(opt): Only allow uint32_t?
+  size_t charge;  // TODO(opt): Only allow uint32_t?
  size_t key_length;
  // The hash of key(). Used for fast sharding and comparisons.
  uint32_t hash;
  // The number of external refs to this entry. The cache itself is not counted.
  uint32_t refs;

-  // Mutable flags - access controlled by mutex
-  // The m_ and M_ prefixes (and im_ and IM_ later) are to hopefully avoid
-  // checking an M_ flag on im_flags or an IM_ flag on m_flags.
-  uint8_t m_flags;
-  enum MFlags : uint8_t {
+  enum Flags : uint8_t {
    // Whether this entry is referenced by the hash table.
-    M_IN_CACHE = (1 << 0),
-    // Whether this entry has had any lookups (hits).
-    M_HAS_HIT = (1 << 1),
+    IN_CACHE = (1 << 0),
+    // Whether this entry is high priority entry.
+    IS_HIGH_PRI = (1 << 1),
    // Whether this entry is in high-pri pool.
-    M_IN_HIGH_PRI_POOL = (1 << 2),
-    // Whether this entry is in low-pri pool.
-    M_IN_LOW_PRI_POOL = (1 << 3),
+    IN_HIGH_PRI_POOL = (1 << 2),
+    // Whether this entry has had any lookups (hits).
+    HAS_HIT = (1 << 3),
+    // Can this be inserted into the secondary cache.
+    IS_SECONDARY_CACHE_COMPATIBLE = (1 << 4),
+    // Is the handle still being read from a lower tier.
+    IS_PENDING = (1 << 5),
+    // Whether this handle is still in a lower tier
+    IS_IN_SECONDARY_CACHE = (1 << 6),
  };

-  // "Immutable" flags - only set in single-threaded context and then
-  // can be accessed without mutex
-  uint8_t im_flags;
-  enum ImFlags : uint8_t {
-    // Whether this entry is high priority entry.
-    IM_IS_HIGH_PRI = (1 << 0),
-    // Whether this entry is low priority entry.
-    IM_IS_LOW_PRI = (1 << 1),
-    // Can this be inserted into the secondary cache.
-    IM_IS_SECONDARY_CACHE_COMPATIBLE = (1 << 2),
-    // Is the handle still being read from a lower tier.
-    IM_IS_PENDING = (1 << 3),
-    // Whether this handle is still in a lower tier
-    IM_IS_IN_SECONDARY_CACHE = (1 << 4),
-    // Marks result handles that should not be inserted into cache
-    IM_IS_STANDALONE = (1 << 5),
-  };
+  uint8_t flags;
+
+#ifdef __SANITIZE_THREAD__
+  // TSAN can report a false data race on flags, where one thread is writing
+  // to one of the mutable bits and another thread is reading this immutable
+  // bit. So precisely suppress that TSAN warning, we separate out this bit
+  // during TSAN runs.
+  bool is_secondary_cache_compatible_for_tsan;
+#endif  // __SANITIZE_THREAD__

  // Beginning of the key (MUST BE THE LAST FIELD IN THIS STRUCT!)
  char key_data[1];

  Slice key() const { return Slice(key_data, key_length); }

-  // For HandleImpl concept
-  uint32_t GetHash() const { return hash; }
-
  // Increase the reference count by 1.
  void Ref() { refs++; }

@@ -124,95 +117,80 @@ struct LRUHandle {
  // Return true if there are external refs, false otherwise.
  bool HasRefs() const { return refs > 0; }

-  bool InCache() const { return m_flags & M_IN_CACHE; }
-  bool IsHighPri() const { return im_flags & IM_IS_HIGH_PRI; }
-  bool InHighPriPool() const { return m_flags & M_IN_HIGH_PRI_POOL; }
-  bool IsLowPri() const { return im_flags & IM_IS_LOW_PRI; }
-  bool InLowPriPool() const { return m_flags & M_IN_LOW_PRI_POOL; }
-  bool HasHit() const { return m_flags & M_HAS_HIT; }
+  bool InCache() const { return flags & IN_CACHE; }
+  bool IsHighPri() const { return flags & IS_HIGH_PRI; }
+  bool InHighPriPool() const { return flags & IN_HIGH_PRI_POOL; }
+  bool HasHit() const { return flags & HAS_HIT; }
  bool IsSecondaryCacheCompatible() const {
-    return im_flags & IM_IS_SECONDARY_CACHE_COMPATIBLE;
+#ifdef __SANITIZE_THREAD__
+    return is_secondary_cache_compatible_for_tsan;
+#else
+    return flags & IS_SECONDARY_CACHE_COMPATIBLE;
+#endif  // __SANITIZE_THREAD__
  }
-  bool IsPending() const { return im_flags & IM_IS_PENDING; }
-  bool IsInSecondaryCache() const {
-    return im_flags & IM_IS_IN_SECONDARY_CACHE;
-  }
-  bool IsStandalone() const { return im_flags & IM_IS_STANDALONE; }
+  bool IsPending() const { return flags & IS_PENDING; }
+  bool IsInSecondaryCache() const { return flags & IS_IN_SECONDARY_CACHE; }

  void SetInCache(bool in_cache) {
    if (in_cache) {
-      m_flags |= M_IN_CACHE;
+      flags |= IN_CACHE;
    } else {
-      m_flags &= ~M_IN_CACHE;
+      flags &= ~IN_CACHE;
    }
  }

  void SetPriority(Cache::Priority priority) {
    if (priority == Cache::Priority::HIGH) {
-      im_flags |= IM_IS_HIGH_PRI;
-      im_flags &= ~IM_IS_LOW_PRI;
-    } else if (priority == Cache::Priority::LOW) {
-      im_flags &= ~IM_IS_HIGH_PRI;
-      im_flags |= IM_IS_LOW_PRI;
+      flags |= IS_HIGH_PRI;
    } else {
-      im_flags &= ~IM_IS_HIGH_PRI;
-      im_flags &= ~IM_IS_LOW_PRI;
+      flags &= ~IS_HIGH_PRI;
    }
  }

  void SetInHighPriPool(bool in_high_pri_pool) {
    if (in_high_pri_pool) {
-      m_flags |= M_IN_HIGH_PRI_POOL;
+      flags |= IN_HIGH_PRI_POOL;
    } else {
-      m_flags &= ~M_IN_HIGH_PRI_POOL;
+      flags &= ~IN_HIGH_PRI_POOL;
    }
  }

-  void SetInLowPriPool(bool in_low_pri_pool) {
-    if (in_low_pri_pool) {
-      m_flags |= M_IN_LOW_PRI_POOL;
-    } else {
-      m_flags &= ~M_IN_LOW_PRI_POOL;
-    }
-  }
-
-  void SetHit() { m_flags |= M_HAS_HIT; }
+  void SetHit() { flags |= HAS_HIT; }

  void SetSecondaryCacheCompatible(bool compat) {
    if (compat) {
-      im_flags |= IM_IS_SECONDARY_CACHE_COMPATIBLE;
+      flags |= IS_SECONDARY_CACHE_COMPATIBLE;
    } else {
-      im_flags &= ~IM_IS_SECONDARY_CACHE_COMPATIBLE;
+      flags &= ~IS_SECONDARY_CACHE_COMPATIBLE;
    }
+#ifdef __SANITIZE_THREAD__
+    is_secondary_cache_compatible_for_tsan = compat;
+#endif  // __SANITIZE_THREAD__
  }

-  void SetIsPending(bool pending) {
-    if (pending) {
-      im_flags |= IM_IS_PENDING;
+  void SetIncomplete(bool incomp) {
+    if (incomp) {
+      flags |= IS_PENDING;
    } else {
-      im_flags &= ~IM_IS_PENDING;
+      flags &= ~IS_PENDING;
    }
  }

  void SetIsInSecondaryCache(bool is_in_secondary_cache) {
    if (is_in_secondary_cache) {
-      im_flags |= IM_IS_IN_SECONDARY_CACHE;
+      flags |= IS_IN_SECONDARY_CACHE;
    } else {
-      im_flags &= ~IM_IS_IN_SECONDARY_CACHE;
-    }
-  }
-
-  void SetIsStandalone(bool is_standalone) {
-    if (is_standalone) {
-      im_flags |= IM_IS_STANDALONE;
-    } else {
-      im_flags &= ~IM_IS_STANDALONE;
+      flags &= ~IS_IN_SECONDARY_CACHE;
    }
  }

  void Free() {
    assert(refs == 0);
-
+#ifdef __SANITIZE_THREAD__
+    // Here we can safely assert they are the same without a data race reported
+    assert(((flags & IS_SECONDARY_CACHE_COMPATIBLE) != 0) ==
+           is_secondary_cache_compatible_for_tsan);
+#endif  // __SANITIZE_THREAD__
    if (!IsSecondaryCacheCompatible() && info_.deleter) {
      (*info_.deleter)(key(), value);
    } else if (IsSecondaryCacheCompatible()) {
@@ -227,36 +205,22 @@ struct LRUHandle {
        (*info_.helper->del_cb)(key(), value);
      }
    }
-
-    free(this);
-  }
-
-  inline size_t CalcuMetaCharge(
-      CacheMetadataChargePolicy metadata_charge_policy) const {
-    if (metadata_charge_policy != kFullChargeCacheMetadata) {
-      return 0;
-    } else {
-#ifdef ROCKSDB_MALLOC_USABLE_SIZE
-      return malloc_usable_size(
-          const_cast<void*>(static_cast<const void*>(this)));
-#else
-      // This is the size that is used when a new handle is created.
-      return sizeof(LRUHandle) - 1 + key_length;
-#endif
-    }
+    delete[] reinterpret_cast<char*>(this);
  }

  // Calculate the memory usage by metadata.
-  inline void CalcTotalCharge(
-      size_t charge, CacheMetadataChargePolicy metadata_charge_policy) {
-    total_charge = charge + CalcuMetaCharge(metadata_charge_policy);
-  }
-
-  inline size_t GetCharge(
-      CacheMetadataChargePolicy metadata_charge_policy) const {
-    size_t meta_charge = CalcuMetaCharge(metadata_charge_policy);
-    assert(total_charge >= meta_charge);
-    return total_charge - meta_charge;
+  inline size_t CalcTotalCharge(
+      CacheMetadataChargePolicy metadata_charge_policy) {
+    size_t meta_charge = 0;
+    if (metadata_charge_policy == kFullChargeCacheMetadata) {
+#ifdef ROCKSDB_MALLOC_USABLE_SIZE
+      meta_charge += malloc_usable_size(static_cast<void*>(this));
+#else
+      // This is the size that is used when a new handle is created.
+      meta_charge += sizeof(LRUHandle) - 1 + key_length;
+#endif
+    }
+    return charge + meta_charge;
  }
 };

@@ -267,6 +231,9 @@ struct LRUHandle {
 // 4.4.3's builtin hashtable.
 class LRUHandleTable {
 public:
+  // If the table uses more hash bits than `max_upper_hash_bits`,
+  // it will eat into the bits used for sharding, which are constant
+  // for a given LRUHandleTable.
  explicit LRUHandleTable(int max_upper_hash_bits);
  ~LRUHandleTable();

@@ -275,8 +242,8 @@ class LRUHandleTable {
  LRUHandle* Remove(const Slice& key, uint32_t hash);

  template <typename T>
-  void ApplyToEntriesRange(T func, size_t index_begin, size_t index_end) {
-    for (size_t i = index_begin; i < index_end; i++) {
+  void ApplyToEntriesRange(T func, uint32_t index_begin, uint32_t index_end) {
+    for (uint32_t i = index_begin; i < index_end; i++) {
      LRUHandle* h = list_[i];
      while (h != nullptr) {
        auto n = h->next_hash;
@@ -289,8 +256,6 @@ class LRUHandleTable {

  int GetLengthBits() const { return length_bits_; }

-  size_t GetOccupancyCount() const { return elems_; }
-
 private:
  // Return a pointer to slot that points to a cache entry that
  // matches key/hash.  If there is no such cache entry, return a
@@ -315,108 +280,97 @@ class LRUHandleTable {
 };

 // A single shard of sharded cache.
-class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShardBase {
+class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShard {
 public:
  LRUCacheShard(size_t capacity, bool strict_capacity_limit,
-                double high_pri_pool_ratio, double low_pri_pool_ratio,
-                bool use_adaptive_mutex,
+                double high_pri_pool_ratio, bool use_adaptive_mutex,
                CacheMetadataChargePolicy metadata_charge_policy,
-                int max_upper_hash_bits, SecondaryCache* secondary_cache);
-
- public:  // Type definitions expected as parameter to ShardedCache
-  using HandleImpl = LRUHandle;
-  using HashVal = uint32_t;
-  using HashCref = uint32_t;
-
- public:  // Function definitions expected as parameter to ShardedCache
-  static inline HashVal ComputeHash(const Slice& key) {
-    return Lower32of64(GetSliceNPHash64(key));
-  }
+                int max_upper_hash_bits,
+                const std::shared_ptr<SecondaryCache>& secondary_cache);
+  virtual ~LRUCacheShard() override = default;

  // Separate from constructor so caller can easily make an array of LRUCache
  // if current usage is more than new capacity, the function will attempt to
  // free the needed space.
-  void SetCapacity(size_t capacity);
+  virtual void SetCapacity(size_t capacity) override;

  // Set the flag to reject insertion if cache if full.
-  void SetStrictCapacityLimit(bool strict_capacity_limit);
+  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;

  // Set percentage of capacity reserved for high-pri cache entries.
  void SetHighPriorityPoolRatio(double high_pri_pool_ratio);

-  // Set percentage of capacity reserved for low-pri cache entries.
-  void SetLowPriorityPoolRatio(double low_pri_pool_ratio);
-
  // Like Cache methods, but with an extra "hash" parameter.
-  inline Status Insert(const Slice& key, uint32_t hash, void* value,
-                       size_t charge, Cache::DeleterFn deleter,
-                       LRUHandle** handle, Cache::Priority priority) {
+  virtual Status Insert(const Slice& key, uint32_t hash, void* value,
+                        size_t charge, Cache::DeleterFn deleter,
+                        Cache::Handle** handle,
+                        Cache::Priority priority) override {
    return Insert(key, hash, value, charge, deleter, nullptr, handle, priority);
  }
-  inline Status Insert(const Slice& key, uint32_t hash, void* value,
-                       const Cache::CacheItemHelper* helper, size_t charge,
-                       LRUHandle** handle, Cache::Priority priority) {
+  virtual Status Insert(const Slice& key, uint32_t hash, void* value,
+                        const Cache::CacheItemHelper* helper, size_t charge,
+                        Cache::Handle** handle,
+                        Cache::Priority priority) override {
    assert(helper);
    return Insert(key, hash, value, charge, nullptr, helper, handle, priority);
  }
  // If helper_cb is null, the values of the following arguments don't matter.
-  LRUHandle* Lookup(const Slice& key, uint32_t hash,
-                    const Cache::CacheItemHelper* helper,
-                    const Cache::CreateCallback& create_cb,
-                    Cache::Priority priority, bool wait, Statistics* stats);
-  inline LRUHandle* Lookup(const Slice& key, uint32_t hash) {
+  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;
+  virtual Cache::Handle* Lookup(const Slice& key, uint32_t hash) override {
    return Lookup(key, hash, nullptr, nullptr, Cache::Priority::LOW, true,
                  nullptr);
  }
-  bool Release(LRUHandle* handle, bool useful, bool erase_if_last_ref);
-  bool IsReady(LRUHandle* /*handle*/);
-  void Wait(LRUHandle* /*handle*/) {}
-  bool Ref(LRUHandle* handle);
-  void Erase(const Slice& key, uint32_t hash);
+  virtual bool Release(Cache::Handle* handle, bool /*useful*/,
+                       bool erase_if_last_ref) override {
+    return Release(handle, erase_if_last_ref);
+  }
+  virtual bool IsReady(Cache::Handle* /*handle*/) override;
+  virtual void Wait(Cache::Handle* /*handle*/) override {}
+  virtual bool Ref(Cache::Handle* handle) override;
+  virtual bool Release(Cache::Handle* handle,
+                       bool erase_if_last_ref = false) override;
+  virtual void Erase(const Slice& key, uint32_t hash) override;

  // Although in some platforms the update of size_t is atomic, to make sure
  // GetUsage() and GetPinnedUsage() work correctly under any platform, we'll
  // protect them with mutex_.

-  size_t GetUsage() const;
-  size_t GetPinnedUsage() const;
-  size_t GetOccupancyCount() const;
-  size_t GetTableAddressCount() const;
+  virtual size_t GetUsage() const override;
+  virtual size_t GetPinnedUsage() const override;

-  void ApplyToSomeEntries(
+  virtual void ApplyToSomeEntries(
      const std::function<void(const Slice& key, void* value, size_t charge,
                               DeleterFn deleter)>& callback,
-      size_t average_entries_per_lock, size_t* state);
+      uint32_t average_entries_per_lock, uint32_t* state) override;

-  void EraseUnRefEntries();
+  virtual void EraseUnRefEntries() override;

- public:  // other function definitions
-  void TEST_GetLRUList(LRUHandle** lru, LRUHandle** lru_low_pri,
-                       LRUHandle** lru_bottom_pri);
+  virtual std::string GetPrintableOptions() const override;

-  // Retrieves number of elements in LRU, for unit test purpose only.
-  // Not threadsafe.
+  void TEST_GetLRUList(LRUHandle** lru, LRUHandle** lru_low_pri);
+
+  //  Retrieves number of elements in LRU, for unit test purpose only.
+  //  Not threadsafe.
  size_t TEST_GetLRUSize();

-  // Retrieves high pri pool ratio
+  //  Retrieves high pri pool ratio
  double GetHighPriPoolRatio();

-  // Retrieves low pri pool ratio
-  double GetLowPriPoolRatio();
-
-  void AppendPrintableOptions(std::string& /*str*/) const;
-
 private:
  friend class LRUCache;
  // Insert an item into the hash table and, if handle is null, insert into
  // the LRU list. Older items are evicted as necessary. If the cache is full
  // and free_handle_on_fail is true, the item is deleted and handle is set to
  // nullptr.
-  Status InsertItem(LRUHandle* item, LRUHandle** handle,
+  Status InsertItem(LRUHandle* item, Cache::Handle** handle,
                    bool free_handle_on_fail);
  Status Insert(const Slice& key, uint32_t hash, void* value, size_t charge,
                DeleterFn deleter, const Cache::CacheItemHelper* helper,
-                LRUHandle** handle, Cache::Priority priority);
+                Cache::Handle** handle, Cache::Priority priority);
  // Promote an item looked up from the secondary cache to the LRU cache.
  // The item may be still in the secondary cache.
  // It is only inserted into the hash table and not the LRU list, and only
@@ -439,18 +393,12 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShardBase {
  // holding the mutex_.
  void EvictFromLRU(size_t charge, autovector<LRUHandle*>* deleted);

-  // Try to insert the evicted handles into the secondary cache.
-  void TryInsertIntoSecondaryCache(autovector<LRUHandle*> evicted_handles);
-
  // Initialized before use.
  size_t capacity_;

  // Memory size for entries in high-pri pool.
  size_t high_pri_pool_usage_;

-  // Memory size for entries in low-pri pool.
-  size_t low_pri_pool_usage_;
-
  // Whether to reject insertion if cache reaches its full capacity.
  bool strict_capacity_limit_;

@@ -461,13 +409,6 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShardBase {
  // Remember the value to avoid recomputing each time.
  double high_pri_pool_capacity_;

-  // Ratio of capacity reserved for low priority cache entries.
-  double low_pri_pool_ratio_;
-
-  // Low-pri pool size, equals to capacity * low_pri_pool_ratio.
-  // Remember the value to avoid recomputing each time.
-  double low_pri_pool_capacity_;
-
  // Dummy head of LRU list.
  // lru.prev is newest entry, lru.next is oldest entry.
  // LRU contains items which can be evicted, ie reference only by cache
@@ -476,9 +417,6 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShardBase {
  // Pointer to head of low-pri pool in LRU list.
  LRUHandle* lru_low_pri_;

-  // Pointer to head of bottom-pri pool in LRU list.
-  LRUHandle* lru_bottom_pri_;
-
  // ------------^^^^^^^^^^^^^-----------
  // Not frequently modified data members
  // ------------------------------------
@@ -501,46 +439,44 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShardBase {
  // mutex_ protects the following state.
  // We don't count mutex_ as the cache's internal state so semantically we
  // don't mind mutex_ invoking the non-const actions.
-  mutable DMutex mutex_;
+  mutable port::Mutex mutex_;

-  // Owned by LRUCache
-  SecondaryCache* secondary_cache_;
+  std::shared_ptr<SecondaryCache> secondary_cache_;
 };

 class LRUCache
 #ifdef NDEBUG
    final
 #endif
-    : public ShardedCache<LRUCacheShard> {
+    : public ShardedCache {
 public:
  LRUCache(size_t capacity, int num_shard_bits, bool strict_capacity_limit,
-           double high_pri_pool_ratio, double low_pri_pool_ratio,
+           double high_pri_pool_ratio,
           std::shared_ptr<MemoryAllocator> memory_allocator = nullptr,
           bool use_adaptive_mutex = kDefaultToAdaptiveMutex,
           CacheMetadataChargePolicy metadata_charge_policy =
               kDontChargeCacheMetadata,
-           std::shared_ptr<SecondaryCache> secondary_cache = nullptr);
-  const char* Name() const override { return "LRUCache"; }
-  void* Value(Handle* handle) override;
-  size_t GetCharge(Handle* handle) const override;
-  DeleterFn GetDeleter(Handle* handle) const override;
-  void WaitAll(std::vector<Handle*>& handles) override;
+           const std::shared_ptr<SecondaryCache>& secondary_cache = nullptr);
+  virtual ~LRUCache();
+  virtual const char* Name() const override { return "LRUCache"; }
+  virtual CacheShard* GetShard(uint32_t shard) override;
+  virtual const CacheShard* GetShard(uint32_t shard) const override;
+  virtual void* Value(Handle* handle) override;
+  virtual size_t GetCharge(Handle* handle) const override;
+  virtual uint32_t GetHash(Handle* handle) const override;
+  virtual DeleterFn GetDeleter(Handle* handle) const override;
+  virtual void DisownData() override;
+  virtual void WaitAll(std::vector<Handle*>& handles) override;

-  // Retrieves number of elements in LRU, for unit test purpose only.
+  //  Retrieves number of elements in LRU, for unit test purpose only.
  size_t TEST_GetLRUSize();
-  // Retrieves high pri pool ratio.
+  //  Retrieves high pri pool ratio.
  double GetHighPriPoolRatio();

-  void AppendPrintableOptions(std::string& str) const override;
-
 private:
+  LRUCacheShard* shards_ = nullptr;
+  int num_shards_ = 0;
  std::shared_ptr<SecondaryCache> secondary_cache_;
 };

-}  // namespace lru_cache
-
-using LRUCache = lru_cache::LRUCache;
-using LRUHandle = lru_cache::LRUHandle;
-using LRUCacheShard = lru_cache::LRUCacheShard;
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -19,49 +19,184 @@

 namespace ROCKSDB_NAMESPACE {

-ShardedCacheBase::ShardedCacheBase(size_t capacity, int num_shard_bits,
-                                   bool strict_capacity_limit,
-                                   std::shared_ptr<MemoryAllocator> allocator)
+namespace {
+
+inline uint32_t HashSlice(const Slice& s) {
+  return Lower32of64(GetSliceNPHash64(s));
+}
+
+}  // namespace
+
+ShardedCache::ShardedCache(size_t capacity, int num_shard_bits,
+                           bool strict_capacity_limit,
+                           std::shared_ptr<MemoryAllocator> allocator)
    : Cache(std::move(allocator)),
-      last_id_(1),
      shard_mask_((uint32_t{1} << num_shard_bits) - 1),
+      capacity_(capacity),
      strict_capacity_limit_(strict_capacity_limit),
-      capacity_(capacity) {}
+      last_id_(1) {}

-size_t ShardedCacheBase::ComputePerShardCapacity(size_t capacity) const {
+void ShardedCache::SetCapacity(size_t capacity) {
  uint32_t num_shards = GetNumShards();
-  return (capacity + (num_shards - 1)) / num_shards;
+  const size_t per_shard = (capacity + (num_shards - 1)) / num_shards;
+  MutexLock l(&capacity_mutex_);
+  for (uint32_t s = 0; s < num_shards; s++) {
+    GetShard(s)->SetCapacity(per_shard);
+  }
+  capacity_ = capacity;
 }

-size_t ShardedCacheBase::GetPerShardCapacity() const {
-  return ComputePerShardCapacity(GetCapacity());
+void ShardedCache::SetStrictCapacityLimit(bool strict_capacity_limit) {
+  uint32_t num_shards = GetNumShards();
+  MutexLock l(&capacity_mutex_);
+  for (uint32_t s = 0; s < num_shards; s++) {
+    GetShard(s)->SetStrictCapacityLimit(strict_capacity_limit);
+  }
+  strict_capacity_limit_ = strict_capacity_limit;
 }

-uint64_t ShardedCacheBase::NewId() {
+Status ShardedCache::Insert(const Slice& key, void* value, size_t charge,
+                            DeleterFn deleter, Handle** handle,
+                            Priority priority) {
+  uint32_t hash = HashSlice(key);
+  return GetShard(Shard(hash))
+      ->Insert(key, hash, value, charge, deleter, handle, priority);
+}
+
+Status ShardedCache::Insert(const Slice& key, void* value,
+                            const CacheItemHelper* helper, size_t charge,
+                            Handle** handle, Priority priority) {
+  uint32_t hash = HashSlice(key);
+  if (!helper) {
+    return Status::InvalidArgument();
+  }
+  return GetShard(Shard(hash))
+      ->Insert(key, hash, value, helper, charge, handle, priority);
+}
+
+Cache::Handle* ShardedCache::Lookup(const Slice& key, Statistics* /*stats*/) {
+  uint32_t hash = HashSlice(key);
+  return GetShard(Shard(hash))->Lookup(key, hash);
+}
+
+Cache::Handle* ShardedCache::Lookup(const Slice& key,
+                                    const CacheItemHelper* helper,
+                                    const CreateCallback& create_cb,
+                                    Priority priority, bool wait,
+                                    Statistics* stats) {
+  uint32_t hash = HashSlice(key);
+  return GetShard(Shard(hash))
+      ->Lookup(key, hash, helper, create_cb, priority, wait, stats);
+}
+
+bool ShardedCache::IsReady(Handle* handle) {
+  uint32_t hash = GetHash(handle);
+  return GetShard(Shard(hash))->IsReady(handle);
+}
+
+void ShardedCache::Wait(Handle* handle) {
+  uint32_t hash = GetHash(handle);
+  GetShard(Shard(hash))->Wait(handle);
+}
+
+bool ShardedCache::Ref(Handle* handle) {
+  uint32_t hash = GetHash(handle);
+  return GetShard(Shard(hash))->Ref(handle);
+}
+
+bool ShardedCache::Release(Handle* handle, bool erase_if_last_ref) {
+  uint32_t hash = GetHash(handle);
+  return GetShard(Shard(hash))->Release(handle, erase_if_last_ref);
+}
+
+bool ShardedCache::Release(Handle* handle, bool useful,
+                           bool erase_if_last_ref) {
+  uint32_t hash = GetHash(handle);
+  return GetShard(Shard(hash))->Release(handle, useful, erase_if_last_ref);
+}
+
+void ShardedCache::Erase(const Slice& key) {
+  uint32_t hash = HashSlice(key);
+  GetShard(Shard(hash))->Erase(key, hash);
+}
+
+uint64_t ShardedCache::NewId() {
  return last_id_.fetch_add(1, std::memory_order_relaxed);
 }

-size_t ShardedCacheBase::GetCapacity() const {
-  MutexLock l(&config_mutex_);
+size_t ShardedCache::GetCapacity() const {
+  MutexLock l(&capacity_mutex_);
  return capacity_;
 }

-bool ShardedCacheBase::HasStrictCapacityLimit() const {
-  MutexLock l(&config_mutex_);
+bool ShardedCache::HasStrictCapacityLimit() const {
+  MutexLock l(&capacity_mutex_);
  return strict_capacity_limit_;
 }

-size_t ShardedCacheBase::GetUsage(Handle* handle) const {
+size_t ShardedCache::GetUsage() const {
+  // We will not lock the cache when getting the usage from shards.
+  uint32_t num_shards = GetNumShards();
+  size_t usage = 0;
+  for (uint32_t s = 0; s < num_shards; s++) {
+    usage += GetShard(s)->GetUsage();
+  }
+  return usage;
+}
+
+size_t ShardedCache::GetUsage(Handle* handle) const {
  return GetCharge(handle);
 }

-std::string ShardedCacheBase::GetPrintableOptions() const {
+size_t ShardedCache::GetPinnedUsage() const {
+  // We will not lock the cache when getting the usage from shards.
+  uint32_t num_shards = GetNumShards();
+  size_t usage = 0;
+  for (uint32_t s = 0; s < num_shards; s++) {
+    usage += GetShard(s)->GetPinnedUsage();
+  }
+  return usage;
+}
+
+void ShardedCache::ApplyToAllEntries(
+    const std::function<void(const Slice& key, void* value, size_t charge,
+                             DeleterFn deleter)>& callback,
+    const ApplyToAllEntriesOptions& opts) {
+  uint32_t num_shards = GetNumShards();
+  // Iterate over part of each shard, rotating between shards, to
+  // minimize impact on latency of concurrent operations.
+  std::unique_ptr<uint32_t[]> states(new uint32_t[num_shards]{});
+
+  uint32_t aepl_in_32 = static_cast<uint32_t>(
+      std::min(size_t{UINT32_MAX}, opts.average_entries_per_lock));
+  aepl_in_32 = std::min(aepl_in_32, uint32_t{1});
+
+  bool remaining_work;
+  do {
+    remaining_work = false;
+    for (uint32_t s = 0; s < num_shards; s++) {
+      if (states[s] != UINT32_MAX) {
+        GetShard(s)->ApplyToSomeEntries(callback, aepl_in_32, &states[s]);
+        remaining_work |= states[s] != UINT32_MAX;
+      }
+    }
+  } while (remaining_work);
+}
+
+void ShardedCache::EraseUnRefEntries() {
+  uint32_t num_shards = GetNumShards();
+  for (uint32_t s = 0; s < num_shards; s++) {
+    GetShard(s)->EraseUnRefEntries();
+  }
+}
+
+std::string ShardedCache::GetPrintableOptions() const {
  std::string ret;
  ret.reserve(20000);
  const int kBufferSize = 200;
  char buffer[kBufferSize];
  {
-    MutexLock l(&config_mutex_);
+    MutexLock l(&capacity_mutex_);
    snprintf(buffer, kBufferSize, "    capacity : %" ROCKSDB_PRIszt "\n",
             capacity_);
    ret.append(buffer);
@@ -75,12 +210,12 @@ std::string ShardedCacheBase::GetPrintableOptions() const {
  snprintf(buffer, kBufferSize, "    memory_allocator : %s\n",
           memory_allocator() ? memory_allocator()->Name() : "None");
  ret.append(buffer);
-  AppendPrintableOptions(ret);
+  ret.append(GetShard(0)->GetPrintableOptions());
  return ret;
 }
-
-int GetDefaultCacheShardBits(size_t capacity, size_t min_shard_size) {
+int GetDefaultCacheShardBits(size_t capacity) {
  int num_shard_bits = 0;
+  size_t min_shard_size = 512L * 1024L;  // Every shard is at least 512KB.
  size_t num_shards = capacity / min_shard_size;
  while (num_shards >>= 1) {
    if (++num_shard_bits >= 6) {
@@ -91,10 +226,8 @@ int GetDefaultCacheShardBits(size_t capacity, size_t min_shard_size) {
  return num_shard_bits;
 }

-int ShardedCacheBase::GetNumShardBits() const {
-  return BitsSetToOne(shard_mask_);
-}
+int ShardedCache::GetNumShardBits() const { return BitsSetToOne(shard_mask_); }

-uint32_t ShardedCacheBase::GetNumShards() const { return shard_mask_ + 1; }
+uint32_t ShardedCache::GetNumShards() const { return shard_mask_ + 1; }

 }  // namespace ROCKSDB_NAMESPACE
@@ -10,313 +10,123 @@
 #pragma once

 #include <atomic>
-#include <cstdint>
 #include <string>

-#include "port/lang.h"
 #include "port/port.h"
 #include "rocksdb/cache.h"
-#include "util/hash.h"
-#include "util/mutexlock.h"

 namespace ROCKSDB_NAMESPACE {

-// Optional base class for classes implementing the CacheShard concept
-class CacheShardBase {
+// Single cache shard interface.
+class CacheShard {
 public:
-  explicit CacheShardBase(CacheMetadataChargePolicy metadata_charge_policy)
-      : metadata_charge_policy_(metadata_charge_policy) {}
+  CacheShard() = default;
+  virtual ~CacheShard() = default;

  using DeleterFn = Cache::DeleterFn;
-
-  // Expected by concept CacheShard (TODO with C++20 support)
-  // Some Defaults
-  std::string GetPrintableOptions() const { return ""; }
-  using HashVal = uint64_t;
-  using HashCref = uint64_t;
-  static inline HashVal ComputeHash(const Slice& key) {
-    return GetSliceNPHash64(key);
-  }
-  static inline uint32_t HashPieceForSharding(HashCref hash) {
-    return Lower32of64(hash);
-  }
-  void AppendPrintableOptions(std::string& /*str*/) const {}
-
-  // Must be provided for concept CacheShard (TODO with C++20 support)
-  /*
-  struct HandleImpl {  // for concept HandleImpl
-    HashVal hash;
-    HashCref GetHash() const;
-    ...
-  };
-  Status Insert(const Slice& key, HashCref hash, void* value, size_t charge,
-                DeleterFn deleter, HandleImpl** handle,
-                Cache::Priority priority) = 0;
-  Status Insert(const Slice& key, HashCref hash, void* value,
-                const Cache::CacheItemHelper* helper, size_t charge,
-                HandleImpl** handle, Cache::Priority priority) = 0;
-  HandleImpl* Lookup(const Slice& key, HashCref hash) = 0;
-  HandleImpl* Lookup(const Slice& key, HashCref hash,
-                        const Cache::CacheItemHelper* helper,
-                        const Cache::CreateCallback& create_cb,
-                        Cache::Priority priority, bool wait,
-                        Statistics* stats) = 0;
-  bool Release(HandleImpl* handle, bool useful, bool erase_if_last_ref) = 0;
-  bool IsReady(HandleImpl* handle) = 0;
-  void Wait(HandleImpl* handle) = 0;
-  bool Ref(HandleImpl* handle) = 0;
-  void Erase(const Slice& key, HashCref hash) = 0;
-  void SetCapacity(size_t capacity) = 0;
-  void SetStrictCapacityLimit(bool strict_capacity_limit) = 0;
-  size_t GetUsage() const = 0;
-  size_t GetPinnedUsage() const = 0;
-  size_t GetOccupancyCount() const = 0;
-  size_t GetTableAddressCount() const = 0;
+  virtual Status Insert(const Slice& key, uint32_t hash, void* value,
+                        size_t charge, DeleterFn deleter,
+                        Cache::Handle** handle, Cache::Priority priority) = 0;
+  virtual Status Insert(const Slice& key, uint32_t hash, void* value,
+                        const Cache::CacheItemHelper* helper, size_t charge,
+                        Cache::Handle** handle, Cache::Priority priority) = 0;
+  virtual Cache::Handle* Lookup(const Slice& key, uint32_t hash) = 0;
+  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;
+  virtual bool Release(Cache::Handle* handle, bool useful,
+                       bool erase_if_last_ref) = 0;
+  virtual bool IsReady(Cache::Handle* handle) = 0;
+  virtual void Wait(Cache::Handle* handle) = 0;
+  virtual bool Ref(Cache::Handle* handle) = 0;
+  virtual bool Release(Cache::Handle* handle, bool erase_if_last_ref) = 0;
+  virtual void Erase(const Slice& key, uint32_t hash) = 0;
+  virtual void SetCapacity(size_t capacity) = 0;
+  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) = 0;
+  virtual size_t GetUsage() const = 0;
+  virtual size_t GetPinnedUsage() const = 0;
  // Handles iterating over roughly `average_entries_per_lock` entries, using
  // `state` to somehow record where it last ended up. Caller initially uses
-  // *state == 0 and implementation sets *state = SIZE_MAX to indicate
+  // *state == 0 and implementation sets *state = UINT32_MAX to indicate
  // completion.
-  void ApplyToSomeEntries(
+  virtual void ApplyToSomeEntries(
      const std::function<void(const Slice& key, void* value, size_t charge,
                               DeleterFn deleter)>& callback,
-      size_t average_entries_per_lock, size_t* state) = 0;
-  void EraseUnRefEntries() = 0;
-  */
+      uint32_t average_entries_per_lock, uint32_t* state) = 0;
+  virtual void EraseUnRefEntries() = 0;
+  virtual std::string GetPrintableOptions() const { return ""; }
+  void set_metadata_charge_policy(
+      CacheMetadataChargePolicy metadata_charge_policy) {
+    metadata_charge_policy_ = metadata_charge_policy;
+  }

 protected:
-  const CacheMetadataChargePolicy metadata_charge_policy_;
+  CacheMetadataChargePolicy metadata_charge_policy_ = kDontChargeCacheMetadata;
 };

-// Portions of ShardedCache that do not depend on the template parameter
-class ShardedCacheBase : public Cache {
+// Generic cache interface which shards cache by hash of keys. 2^num_shard_bits
+// shards will be created, with capacity split evenly to each of the shards.
+// Keys are sharded by the highest num_shard_bits bits of hash value.
+class ShardedCache : public Cache {
 public:
-  ShardedCacheBase(size_t capacity, int num_shard_bits,
-                   bool strict_capacity_limit,
-                   std::shared_ptr<MemoryAllocator> memory_allocator);
-  virtual ~ShardedCacheBase() = default;
+  ShardedCache(size_t capacity, int num_shard_bits, bool strict_capacity_limit,
+               std::shared_ptr<MemoryAllocator> memory_allocator = nullptr);
+  virtual ~ShardedCache() = default;
+  virtual CacheShard* GetShard(uint32_t shard) = 0;
+  virtual const CacheShard* GetShard(uint32_t shard) const = 0;
+
+  virtual uint32_t GetHash(Handle* handle) const = 0;
+
+  virtual void SetCapacity(size_t capacity) override;
+  virtual void SetStrictCapacityLimit(bool strict_capacity_limit) override;
+
+  virtual Status Insert(const Slice& key, void* value, size_t charge,
+                        DeleterFn deleter, Handle** handle,
+                        Priority priority) override;
+  virtual Status Insert(const Slice& key, void* value,
+                        const CacheItemHelper* helper, size_t chargge,
+                        Handle** handle = nullptr,
+                        Priority priority = Priority::LOW) override;
+  virtual Handle* Lookup(const Slice& key, Statistics* stats) override;
+  virtual Handle* Lookup(const Slice& key, const CacheItemHelper* helper,
+                         const CreateCallback& create_cb, Priority priority,
+                         bool wait, Statistics* stats = nullptr) override;
+  virtual bool Release(Handle* handle, bool useful,
+                       bool erase_if_last_ref = false) override;
+  virtual bool IsReady(Handle* handle) override;
+  virtual void Wait(Handle* handle) override;
+  virtual bool Ref(Handle* handle) override;
+  virtual bool Release(Handle* handle, bool erase_if_last_ref = false) override;
+  virtual void Erase(const Slice& key) override;
+  virtual uint64_t NewId() override;
+  virtual size_t GetCapacity() const override;
+  virtual bool HasStrictCapacityLimit() const override;
+  virtual size_t GetUsage() const override;
+  virtual size_t GetUsage(Handle* handle) const override;
+  virtual size_t GetPinnedUsage() const override;
+  virtual void ApplyToAllEntries(
+      const std::function<void(const Slice& key, void* value, size_t charge,
+                               DeleterFn deleter)>& callback,
+      const ApplyToAllEntriesOptions& opts) override;
+  virtual void EraseUnRefEntries() override;
+  virtual std::string GetPrintableOptions() const override;

  int GetNumShardBits() const;
  uint32_t GetNumShards() const;

-  uint64_t NewId() override;
-
-  bool HasStrictCapacityLimit() const override;
-  size_t GetCapacity() const override;
-
-  using Cache::GetUsage;
-  size_t GetUsage(Handle* handle) const override;
-  std::string GetPrintableOptions() const override;
-
- protected:  // fns
-  virtual void AppendPrintableOptions(std::string& str) const = 0;
-  size_t GetPerShardCapacity() const;
-  size_t ComputePerShardCapacity(size_t capacity) const;
-
- protected:                        // data
-  std::atomic<uint64_t> last_id_;  // For NewId
-  const uint32_t shard_mask_;
-
-  // Dynamic configuration parameters, guarded by config_mutex_
-  bool strict_capacity_limit_;
-  size_t capacity_;
-  mutable port::Mutex config_mutex_;
-};
-
-// Generic cache interface that shards cache by hash of keys. 2^num_shard_bits
-// shards will be created, with capacity split evenly to each of the shards.
-// Keys are typically sharded by the lowest num_shard_bits bits of hash value
-// so that the upper bits of the hash value can keep a stable ordering of
-// table entries even as the table grows (using more upper hash bits).
-// See CacheShardBase above for what is expected of the CacheShard parameter.
-template <class CacheShard>
-class ShardedCache : public ShardedCacheBase {
- public:
-  using HashVal = typename CacheShard::HashVal;
-  using HashCref = typename CacheShard::HashCref;
-  using HandleImpl = typename CacheShard::HandleImpl;
-
-  ShardedCache(size_t capacity, int num_shard_bits, bool strict_capacity_limit,
-               std::shared_ptr<MemoryAllocator> allocator)
-      : ShardedCacheBase(capacity, num_shard_bits, strict_capacity_limit,
-                         allocator),
-        shards_(reinterpret_cast<CacheShard*>(port::cacheline_aligned_alloc(
-            sizeof(CacheShard) * GetNumShards()))),
-        destroy_shards_in_dtor_(false) {}
-
-  virtual ~ShardedCache() {
-    if (destroy_shards_in_dtor_) {
-      ForEachShard([](CacheShard* cs) { cs->~CacheShard(); });
-    }
-    port::cacheline_aligned_free(shards_);
-  }
-
-  CacheShard& GetShard(HashCref hash) {
-    return shards_[CacheShard::HashPieceForSharding(hash) & shard_mask_];
-  }
-
-  const CacheShard& GetShard(HashCref hash) const {
-    return shards_[CacheShard::HashPieceForSharding(hash) & shard_mask_];
-  }
-
-  void SetCapacity(size_t capacity) override {
-    MutexLock l(&config_mutex_);
-    capacity_ = capacity;
-    auto per_shard = ComputePerShardCapacity(capacity);
-    ForEachShard([=](CacheShard* cs) { cs->SetCapacity(per_shard); });
-  }
-
-  void SetStrictCapacityLimit(bool s_c_l) override {
-    MutexLock l(&config_mutex_);
-    strict_capacity_limit_ = s_c_l;
-    ForEachShard(
-        [s_c_l](CacheShard* cs) { cs->SetStrictCapacityLimit(s_c_l); });
-  }
-
-  Status Insert(const Slice& key, void* value, size_t charge, DeleterFn deleter,
-                Handle** handle, Priority priority) override {
-    HashVal hash = CacheShard::ComputeHash(key);
-    auto h_out = reinterpret_cast<HandleImpl**>(handle);
-    return GetShard(hash).Insert(key, hash, value, charge, deleter, h_out,
-                                 priority);
-  }
-  Status Insert(const Slice& key, void* value, const CacheItemHelper* helper,
-                size_t charge, Handle** handle = nullptr,
-                Priority priority = Priority::LOW) override {
-    if (!helper) {
-      return Status::InvalidArgument();
-    }
-    HashVal hash = CacheShard::ComputeHash(key);
-    auto h_out = reinterpret_cast<HandleImpl**>(handle);
-    return GetShard(hash).Insert(key, hash, value, helper, charge, h_out,
-                                 priority);
-  }
-
-  Handle* Lookup(const Slice& key, Statistics* /*stats*/) override {
-    HashVal hash = CacheShard::ComputeHash(key);
-    HandleImpl* result = GetShard(hash).Lookup(key, hash);
-    return reinterpret_cast<Handle*>(result);
-  }
-  Handle* Lookup(const Slice& key, const CacheItemHelper* helper,
-                 const CreateCallback& create_cb, Priority priority, bool wait,
-                 Statistics* stats = nullptr) override {
-    HashVal hash = CacheShard::ComputeHash(key);
-    HandleImpl* result = GetShard(hash).Lookup(key, hash, helper, create_cb,
-                                               priority, wait, stats);
-    return reinterpret_cast<Handle*>(result);
-  }
-
-  void Erase(const Slice& key) override {
-    HashVal hash = CacheShard::ComputeHash(key);
-    GetShard(hash).Erase(key, hash);
-  }
-
-  bool Release(Handle* handle, bool useful,
-               bool erase_if_last_ref = false) override {
-    auto h = reinterpret_cast<HandleImpl*>(handle);
-    return GetShard(h->GetHash()).Release(h, useful, erase_if_last_ref);
-  }
-  bool IsReady(Handle* handle) override {
-    auto h = reinterpret_cast<HandleImpl*>(handle);
-    return GetShard(h->GetHash()).IsReady(h);
-  }
-  void Wait(Handle* handle) override {
-    auto h = reinterpret_cast<HandleImpl*>(handle);
-    GetShard(h->GetHash()).Wait(h);
-  }
-  bool Ref(Handle* handle) override {
-    auto h = reinterpret_cast<HandleImpl*>(handle);
-    return GetShard(h->GetHash()).Ref(h);
-  }
-  bool Release(Handle* handle, bool erase_if_last_ref = false) override {
-    return Release(handle, true /*useful*/, erase_if_last_ref);
-  }
-  using ShardedCacheBase::GetUsage;
-  size_t GetUsage() const override {
-    return SumOverShards2(&CacheShard::GetUsage);
-  }
-  size_t GetPinnedUsage() const override {
-    return SumOverShards2(&CacheShard::GetPinnedUsage);
-  }
-  size_t GetOccupancyCount() const override {
-    return SumOverShards2(&CacheShard::GetPinnedUsage);
-  }
-  size_t GetTableAddressCount() const override {
-    return SumOverShards2(&CacheShard::GetTableAddressCount);
-  }
-  void ApplyToAllEntries(
-      const std::function<void(const Slice& key, void* value, size_t charge,
-                               DeleterFn deleter)>& callback,
-      const ApplyToAllEntriesOptions& opts) override {
-    uint32_t num_shards = GetNumShards();
-    // Iterate over part of each shard, rotating between shards, to
-    // minimize impact on latency of concurrent operations.
-    std::unique_ptr<size_t[]> states(new size_t[num_shards]{});
-
-    size_t aepl = opts.average_entries_per_lock;
-    aepl = std::min(aepl, size_t{1});
-
-    bool remaining_work;
-    do {
-      remaining_work = false;
-      for (uint32_t i = 0; i < num_shards; i++) {
-        if (states[i] != SIZE_MAX) {
-          shards_[i].ApplyToSomeEntries(callback, aepl, &states[i]);
-          remaining_work |= states[i] != SIZE_MAX;
-        }
-      }
-    } while (remaining_work);
-  }
-
-  virtual void EraseUnRefEntries() override {
-    ForEachShard([](CacheShard* cs) { cs->EraseUnRefEntries(); });
-  }
-
-  void DisownData() override {
-    // Leak data only if that won't generate an ASAN/valgrind warning.
-    if (!kMustFreeHeapAllocations) {
-      destroy_shards_in_dtor_ = false;
-    }
-  }
-
 protected:
-  inline void ForEachShard(const std::function<void(CacheShard*)>& fn) {
-    uint32_t num_shards = GetNumShards();
-    for (uint32_t i = 0; i < num_shards; i++) {
-      fn(shards_ + i);
-    }
-  }
-
-  inline size_t SumOverShards(
-      const std::function<size_t(CacheShard&)>& fn) const {
-    uint32_t num_shards = GetNumShards();
-    size_t result = 0;
-    for (uint32_t i = 0; i < num_shards; i++) {
-      result += fn(shards_[i]);
-    }
-    return result;
-  }
-
-  inline size_t SumOverShards2(size_t (CacheShard::*fn)() const) const {
-    return SumOverShards([fn](CacheShard& cs) { return (cs.*fn)(); });
-  }
-
-  // Must be called exactly once by derived class constructor
-  void InitShards(const std::function<void(CacheShard*)>& placement_new) {
-    ForEachShard(placement_new);
-    destroy_shards_in_dtor_ = true;
-  }
-
-  void AppendPrintableOptions(std::string& str) const override {
-    shards_[0].AppendPrintableOptions(str);
-  }
+  inline uint32_t Shard(uint32_t hash) { return hash & shard_mask_; }

 private:
-  CacheShard* const shards_;
-  bool destroy_shards_in_dtor_;
+  const uint32_t shard_mask_;
+  mutable port::Mutex capacity_mutex_;
+  size_t capacity_;
+  bool strict_capacity_limit_;
+  std::atomic<uint64_t> last_id_;
 };

-// 512KB is traditional minimum shard size.
-int GetDefaultCacheShardBits(size_t capacity,
-                             size_t min_shard_size = 512U * 1024U);
+extern int GetDefaultCacheShardBits(size_t capacity);

 }  // namespace ROCKSDB_NAMESPACE
@@ -1,30 +0,0 @@
-ifndef PYTHON
-
-# Default to python3. Some distros like CentOS 8 do not have `python`.
-ifeq ($(origin PYTHON), undefined)
-	PYTHON := $(shell which python3 || which python || echo python3)
-endif
-export PYTHON
-
-endif
-
-# To setup tmp directory, first recognize some old variables for setting
-# test tmp directory or base tmp directory. TEST_TMPDIR is usually read
-# by RocksDB tools though Env/FileSystem::GetTestDirectory.
-ifeq ($(TEST_TMPDIR),)
-TEST_TMPDIR := $(TMPD)
-endif
-ifeq ($(TEST_TMPDIR),)
-ifeq ($(BASE_TMPDIR),)
-BASE_TMPDIR :=$(TMPDIR)
-endif
-ifeq ($(BASE_TMPDIR),)
-BASE_TMPDIR :=/tmp
-endif
-# Use /dev/shm if it has the sticky bit set (otherwise, /tmp or other
-# base dir), and create a randomly-named rocksdb.XXXX directory therein.
-TEST_TMPDIR := $(shell f=/dev/shm; test -k $$f || f=$(BASE_TMPDIR); \
-  perl -le 'use File::Temp "tempdir";'	                            \
-    -e 'print tempdir("'$$f'/rocksdb.XXXX", CLEANUP => 0)')
-endif
-export TEST_TMPDIR
@@ -47,39 +47,35 @@ def parse_gcov_report(gcov_input):

    return per_file_coverage, total_coverage

-
 def get_option_parser():
-    usage = (
-        "Parse the gcov output and generate more human-readable code "
-        + "coverage report."
-    )
+    usage = "Parse the gcov output and generate more human-readable code " +\
+            "coverage report."
    parser = optparse.OptionParser(usage)

    parser.add_option(
-        "--interested-files",
-        "-i",
+        "--interested-files", "-i",
        dest="filenames",
-        help="Comma separated files names. if specified, we will display "
-        + "the coverage report only for interested source files. "
-        + "Otherwise we will display the coverage report for all "
-        + "source files.",
+        help="Comma separated files names. if specified, we will display " +
+             "the coverage report only for interested source files. " +
+             "Otherwise we will display the coverage report for all " +
+             "source files."
    )
    return parser

-
 def display_file_coverage(per_file_coverage, total_coverage):
    # To print out auto-adjustable column, we need to know the longest
    # length of file names.
-    max_file_name_length = max(len(fname) for fname in per_file_coverage.keys())
+    max_file_name_length = max(
+        len(fname) for fname in per_file_coverage.keys()
+    )

    # -- Print header
    # size of separator is determined by 3 column sizes:
    # file name, coverage percentage and lines.
-    header_template = "%" + str(max_file_name_length) + "s\t%s\t%s"
+    header_template = \
+        "%" + str(max_file_name_length) + "s\t%s\t%s"
    separator = "-" * (max_file_name_length + 10 + 20)
-    print(
-        header_template % ("Filename", "Coverage", "Lines")
-    )  # noqa: E999 T25377293 Grandfathered in
+    print(header_template % ("Filename", "Coverage", "Lines"))  # noqa: E999 T25377293 Grandfathered in
    print(separator)

    # -- Print body
@@ -95,14 +91,13 @@ def display_file_coverage(per_file_coverage, total_coverage):
        print(separator)
        print(record_template % ("Total", total_coverage[0], total_coverage[1]))

-
 def report_coverage():
    parser = get_option_parser()
    (options, args) = parser.parse_args()

    interested_files = set()
    if options.filenames is not None:
-        interested_files = {f.strip() for f in options.filenames.split(",")}
+        interested_files = set(f.strip() for f in options.filenames.split(','))

    # To make things simple, right now we only read gcov report from the input
    per_file_coverage, total_coverage = parse_gcov_report(sys.stdin)
@@ -110,8 +105,7 @@ def report_coverage():
    # Check if we need to display coverage info for interested files.
    if len(interested_files):
        per_file_coverage = dict(
-            (fname, per_file_coverage[fname])
-            for fname in interested_files
+            (fname, per_file_coverage[fname]) for fname in interested_files
            if fname in per_file_coverage
        )
        # If we only interested in several files, it makes no sense to report
@@ -123,6 +117,5 @@ def report_coverage():
        return
    display_file_coverage(per_file_coverage, total_coverage)

-
 if __name__ == "__main__":
    report_coverage()
@@ -5,7 +5,7 @@
 # build DB_STRESS_CMD so it must exist prior.
 DB_STRESS_CMD?=./db_stress

-include common.mk
+include python.mk

 CRASHTEST_MAKE=$(MAKE) -f crash_test.mk
 CRASHTEST_PY=$(PYTHON) -u tools/db_crashtest.py --stress_cmd=$(DB_STRESS_CMD)
@@ -18,9 +18,7 @@ CRASHTEST_PY=$(PYTHON) -u tools/db_crashtest.py --stress_cmd=$(DB_STRESS_CMD)
 	whitebox_crash_test whitebox_crash_test_with_atomic_flush \
 	whitebox_crash_test_with_txn whitebox_crash_test_with_ts \
 	blackbox_crash_test_with_multiops_wc_txn \
-	blackbox_crash_test_with_multiops_wp_txn \
-	crash_test_with_tiered_storage blackbox_crash_test_with_tiered_storage \
-	whitebox_crash_test_with_tiered_storage \
+	blackbox_crash_test_with_multiops_wp_txn

 crash_test: $(DB_STRESS_CMD)
 # Do not parallelize
@@ -44,11 +42,6 @@ crash_test_with_ts: $(DB_STRESS_CMD)
 	$(CRASHTEST_MAKE) whitebox_crash_test_with_ts
 	$(CRASHTEST_MAKE) blackbox_crash_test_with_ts

-crash_test_with_tiered_storage: $(DB_STRESS_CMD)
-# Do not parallelize
-	$(CRASHTEST_MAKE) whitebox_crash_test_with_tiered_storage
-	$(CRASHTEST_MAKE) blackbox_crash_test_with_tiered_storage
-
 crash_test_with_multiops_wc_txn: $(DB_STRESS_CMD)
 	$(CRASHTEST_MAKE) blackbox_crash_test_with_multiops_wc_txn

@@ -72,13 +65,10 @@ blackbox_crash_test_with_ts: $(DB_STRESS_CMD)
 	$(CRASHTEST_PY) --enable_ts blackbox $(CRASH_TEST_EXT_ARGS)

 blackbox_crash_test_with_multiops_wc_txn: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --test_multiops_txn --write_policy write_committed blackbox $(CRASH_TEST_EXT_ARGS)
+	$(PYTHON) -u tools/db_crashtest.py --test_multiops_txn --write_policy write_committed blackbox $(CRASH_TEST_EXT_ARGS)

 blackbox_crash_test_with_multiops_wp_txn: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --test_multiops_txn --write_policy write_prepared blackbox $(CRASH_TEST_EXT_ARGS)
-
-blackbox_crash_test_with_tiered_storage: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --test_tiered_storage blackbox $(CRASH_TEST_EXT_ARGS)
+	$(PYTHON) -u tools/db_crashtest.py --test_multiops_txn --write_policy write_prepared blackbox $(CRASH_TEST_EXT_ARGS)

 ifeq ($(CRASH_TEST_KILL_ODD),)
  CRASH_TEST_KILL_ODD=888887
@@ -101,7 +91,3 @@ whitebox_crash_test_with_txn: $(DB_STRESS_CMD)
 whitebox_crash_test_with_ts: $(DB_STRESS_CMD)
 	$(CRASHTEST_PY) --enable_ts whitebox --random_kill_odd \
      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
-
-whitebox_crash_test_with_tiered_storage: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --test_tiered_storage whitebox --random_kill_odd \
-      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
@@ -23,7 +23,7 @@ Status ArenaWrappedDBIter::GetProperty(std::string prop_name,
  if (prop_name == "rocksdb.iterator.super-version-number") {
    // First try to pass the value returned from inner iterator.
    if (!db_iter_->GetProperty(prop_name, prop).ok()) {
-      *prop = std::to_string(sv_number_);
+      *prop = ToString(sv_number_);
    }
    return Status::OK();
  }
@@ -45,7 +45,6 @@ void ArenaWrappedDBIter::Init(
  sv_number_ = version_number;
  read_options_ = read_options;
  allow_refresh_ = allow_refresh;
-  memtable_range_tombstone_iter_ = nullptr;
 }

 Status ArenaWrappedDBIter::Refresh() {
@@ -59,68 +58,41 @@ Status ArenaWrappedDBIter::Refresh() {
  uint64_t cur_sv_number = cfd_->GetSuperVersionNumber();
  TEST_SYNC_POINT("ArenaWrappedDBIter::Refresh:1");
  TEST_SYNC_POINT("ArenaWrappedDBIter::Refresh:2");
-  auto reinit_internal_iter = [&]() {
-    Env* env = db_iter_->env();
-    db_iter_->~DBIter();
-    arena_.~Arena();
-    new (&arena_) Arena();
-
-    SuperVersion* sv = cfd_->GetReferencedSuperVersion(db_impl_);
-    SequenceNumber latest_seq = db_impl_->GetLatestSequenceNumber();
-    if (read_callback_) {
-      read_callback_->Refresh(latest_seq);
-    }
-    Init(env, read_options_, *(cfd_->ioptions()), sv->mutable_cf_options,
-         sv->current, latest_seq,
-         sv->mutable_cf_options.max_sequential_skip_in_iterations,
-         cur_sv_number, read_callback_, db_impl_, cfd_, expose_blob_index_,
-         allow_refresh_);
-
-    InternalIterator* internal_iter = db_impl_->NewInternalIterator(
-        read_options_, cfd_, sv, &arena_, latest_seq,
-        /* allow_unprepared_value */ true, /* db_iter */ this);
-    SetIterUnderDBIter(internal_iter);
-  };
  while (true) {
    if (sv_number_ != cur_sv_number) {
-      reinit_internal_iter();
+      Env* env = db_iter_->env();
+      db_iter_->~DBIter();
+      arena_.~Arena();
+      new (&arena_) Arena();
+
+      SuperVersion* sv = cfd_->GetReferencedSuperVersion(db_impl_);
+      SequenceNumber latest_seq = db_impl_->GetLatestSequenceNumber();
+      if (read_callback_) {
+        read_callback_->Refresh(latest_seq);
+      }
+      Init(env, read_options_, *(cfd_->ioptions()), sv->mutable_cf_options,
+           sv->current, latest_seq,
+           sv->mutable_cf_options.max_sequential_skip_in_iterations,
+           cur_sv_number, read_callback_, db_impl_, cfd_, expose_blob_index_,
+           allow_refresh_);
+
+      InternalIterator* internal_iter = db_impl_->NewInternalIterator(
+          read_options_, cfd_, sv, &arena_, db_iter_->GetRangeDelAggregator(),
+          latest_seq, /* allow_unprepared_value */ true);
+      SetIterUnderDBIter(internal_iter);
      break;
    } else {
      SequenceNumber latest_seq = db_impl_->GetLatestSequenceNumber();
      // Refresh range-tombstones in MemTable
      if (!read_options_.ignore_range_deletions) {
        SuperVersion* sv = cfd_->GetThreadLocalSuperVersion(db_impl_);
-        TEST_SYNC_POINT_CALLBACK("ArenaWrappedDBIter::Refresh:SV", nullptr);
-        auto t = sv->mem->NewRangeTombstoneIterator(
-            read_options_, latest_seq, false /* immutable_memtable */);
-        if (!t || t->empty()) {
-          // If memtable_range_tombstone_iter_ points to a non-empty tombstone
-          // iterator, then it means sv->mem is not the memtable that
-          // memtable_range_tombstone_iter_ points to, so SV must have changed
-          // after the sv_number_ != cur_sv_number check above. We will fall
-          // back to re-init the InternalIterator, and the tombstone iterator
-          // will be freed during db_iter destruction there.
-          if (memtable_range_tombstone_iter_) {
-            assert(!*memtable_range_tombstone_iter_ ||
-                   sv_number_ != cfd_->GetSuperVersionNumber());
-          }
-          delete t;
-        } else {  // current mutable memtable has range tombstones
-          if (!memtable_range_tombstone_iter_) {
-            delete t;
-            db_impl_->ReturnAndCleanupSuperVersion(cfd_, sv);
-            // The memtable under DBIter did not have range tombstone before
-            // refresh.
-            reinit_internal_iter();
-            break;
-          } else {
-            delete *memtable_range_tombstone_iter_;
-            *memtable_range_tombstone_iter_ = new TruncatedRangeDelIterator(
-                std::unique_ptr<FragmentedRangeTombstoneIterator>(t),
-                &cfd_->internal_comparator(), nullptr, nullptr);
-          }
-        }
-        db_impl_->ReturnAndCleanupSuperVersion(cfd_, sv);
+        ReadRangeDelAggregator* range_del_agg =
+            db_iter_->GetRangeDelAggregator();
+        std::unique_ptr<FragmentedRangeTombstoneIterator> range_del_iter;
+        range_del_iter.reset(
+            sv->mem->NewRangeTombstoneIterator(read_options_, latest_seq));
+        range_del_agg->AddTombstones(std::move(range_del_iter));
+        cfd_->ReturnThreadLocalSuperVersion(sv);
      }
      // Refresh latest sequence number
      db_iter_->set_sequence(latest_seq);
@@ -44,7 +44,9 @@ class ArenaWrappedDBIter : public Iterator {
  // Get the arena to be used to allocate memory for DBIter to be wrapped,
  // as well as child iterators in it.
  virtual Arena* GetArena() { return &arena_; }
-
+  virtual ReadRangeDelAggregator* GetRangeDelAggregator() {
+    return db_iter_->GetRangeDelAggregator();
+  }
  const ReadOptions& GetReadOptions() { return read_options_; }

  // Set the internal iterator wrapped inside the DB Iterator. Usually it is
@@ -53,10 +55,6 @@ class ArenaWrappedDBIter : public Iterator {
    db_iter_->SetIter(iter);
  }

-  void SetMemtableRangetombstoneIter(TruncatedRangeDelIterator** iter) {
-    memtable_range_tombstone_iter_ = iter;
-  }
-
  bool Valid() const override { return db_iter_->Valid(); }
  void SeekToFirst() override { db_iter_->SeekToFirst(); }
  void SeekToLast() override { db_iter_->SeekToLast(); }
@@ -70,7 +68,6 @@ class ArenaWrappedDBIter : public Iterator {
  void Prev() override { db_iter_->Prev(); }
  Slice key() const override { return db_iter_->key(); }
  Slice value() const override { return db_iter_->value(); }
-  const WideColumns& columns() const override { return db_iter_->columns(); }
  Status status() const override { return db_iter_->status(); }
  Slice timestamp() const override { return db_iter_->timestamp(); }
  bool IsBlob() const { return db_iter_->IsBlob(); }
@@ -107,9 +104,6 @@ class ArenaWrappedDBIter : public Iterator {
  ReadCallback* read_callback_;
  bool expose_blob_index_ = false;
  bool allow_refresh_ = true;
-  // If this is nullptr, it means the mutable memtable does not contain range
-  // tombstone when added under this DBIter.
-  TruncatedRangeDelIterator** memtable_range_tombstone_iter_ = nullptr;
 };

 // Generate the arena wrapped iterator class.
@@ -1,90 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  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/blob_contents.h"
-
-#include <cassert>
-
-#include "cache/cache_entry_roles.h"
-#include "cache/cache_helpers.h"
-#include "port/malloc.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-std::unique_ptr<BlobContents> BlobContents::Create(
-    CacheAllocationPtr&& allocation, size_t size) {
-  return std::unique_ptr<BlobContents>(
-      new BlobContents(std::move(allocation), size));
-}
-
-size_t BlobContents::ApproximateMemoryUsage() const {
-  size_t usage = 0;
-
-  if (allocation_) {
-    MemoryAllocator* const allocator = allocation_.get_deleter().allocator;
-
-    if (allocator) {
-      usage += allocator->UsableSize(allocation_.get(), data_.size());
-    } else {
-#ifdef ROCKSDB_MALLOC_USABLE_SIZE
-      usage += malloc_usable_size(allocation_.get());
-#else
-      usage += data_.size();
-#endif
-    }
-  }
-
-#ifdef ROCKSDB_MALLOC_USABLE_SIZE
-  usage += malloc_usable_size(const_cast<BlobContents*>(this));
-#else
-  usage += sizeof(*this);
-#endif
-
-  return usage;
-}
-
-size_t BlobContents::SizeCallback(void* obj) {
-  assert(obj);
-
-  return static_cast<const BlobContents*>(obj)->size();
-}
-
-Status BlobContents::SaveToCallback(void* from_obj, size_t from_offset,
-                                    size_t length, void* out) {
-  assert(from_obj);
-
-  const BlobContents* buf = static_cast<const BlobContents*>(from_obj);
-  assert(buf->size() >= from_offset + length);
-
-  memcpy(out, buf->data().data() + from_offset, length);
-
-  return Status::OK();
-}
-
-Cache::CacheItemHelper* BlobContents::GetCacheItemHelper() {
-  static Cache::CacheItemHelper cache_helper(
-      &SizeCallback, &SaveToCallback,
-      GetCacheEntryDeleterForRole<BlobContents, CacheEntryRole::kBlobValue>());
-
-  return &cache_helper;
-}
-
-Status BlobContents::CreateCallback(CacheAllocationPtr&& allocation,
-                                    const void* buf, size_t size,
-                                    void** out_obj, size_t* charge) {
-  assert(allocation);
-
-  memcpy(allocation.get(), buf, size);
-
-  std::unique_ptr<BlobContents> obj = Create(std::move(allocation), size);
-  BlobContents* const contents = obj.release();
-
-  *out_obj = contents;
-  *charge = contents->ApproximateMemoryUsage();
-
-  return Status::OK();
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,56 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#pragma once
-
-#include <memory>
-
-#include "memory/memory_allocator.h"
-#include "rocksdb/cache.h"
-#include "rocksdb/rocksdb_namespace.h"
-#include "rocksdb/slice.h"
-#include "rocksdb/status.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-// A class representing a single uncompressed value read from a blob file.
-class BlobContents {
- public:
-  static std::unique_ptr<BlobContents> Create(CacheAllocationPtr&& allocation,
-                                              size_t size);
-
-  BlobContents(const BlobContents&) = delete;
-  BlobContents& operator=(const BlobContents&) = delete;
-
-  BlobContents(BlobContents&&) = default;
-  BlobContents& operator=(BlobContents&&) = default;
-
-  ~BlobContents() = default;
-
-  const Slice& data() const { return data_; }
-  size_t size() const { return data_.size(); }
-
-  size_t ApproximateMemoryUsage() const;
-
-  // Callbacks for secondary cache
-  static size_t SizeCallback(void* obj);
-
-  static Status SaveToCallback(void* from_obj, size_t from_offset,
-                               size_t length, void* out);
-
-  static Cache::CacheItemHelper* GetCacheItemHelper();
-
-  static Status CreateCallback(CacheAllocationPtr&& allocation, const void* buf,
-                               size_t size, void** out_obj, size_t* charge);
-
- private:
-  BlobContents(CacheAllocationPtr&& allocation, size_t size)
-      : allocation_(std::move(allocation)), data_(allocation_.get(), size) {}
-
-  CacheAllocationPtr allocation_;
-  Slice data_;
-};
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -321,7 +321,6 @@ TEST(BlobCountingIteratorTest, CorruptBlobIndex) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -205,7 +205,6 @@ TEST_F(BlobFileAdditionTest, ForwardIncompatibleCustomField) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -7,7 +7,6 @@

 #include <cassert>

-#include "db/blob/blob_contents.h"
 #include "db/blob/blob_file_addition.h"
 #include "db/blob/blob_file_completion_callback.h"
 #include "db/blob/blob_index.h"
@@ -33,9 +32,9 @@ BlobFileBuilder::BlobFileBuilder(
    VersionSet* versions, FileSystem* fs,
    const ImmutableOptions* immutable_options,
    const MutableCFOptions* mutable_cf_options, const FileOptions* file_options,
-    std::string db_id, std::string db_session_id, int job_id,
-    uint32_t column_family_id, const std::string& column_family_name,
-    Env::IOPriority io_priority, Env::WriteLifeTimeHint write_hint,
+    int job_id, uint32_t column_family_id,
+    const std::string& column_family_name, Env::IOPriority io_priority,
+    Env::WriteLifeTimeHint write_hint,
    const std::shared_ptr<IOTracer>& io_tracer,
    BlobFileCompletionCallback* blob_callback,
    BlobFileCreationReason creation_reason,
@@ -43,18 +42,17 @@ BlobFileBuilder::BlobFileBuilder(
    std::vector<BlobFileAddition>* blob_file_additions)
    : BlobFileBuilder([versions]() { return versions->NewFileNumber(); }, fs,
                      immutable_options, mutable_cf_options, file_options,
-                      db_id, db_session_id, job_id, column_family_id,
-                      column_family_name, io_priority, write_hint, io_tracer,
-                      blob_callback, creation_reason, blob_file_paths,
-                      blob_file_additions) {}
+                      job_id, column_family_id, column_family_name, io_priority,
+                      write_hint, io_tracer, blob_callback, creation_reason,
+                      blob_file_paths, blob_file_additions) {}

 BlobFileBuilder::BlobFileBuilder(
    std::function<uint64_t()> file_number_generator, FileSystem* fs,
    const ImmutableOptions* immutable_options,
    const MutableCFOptions* mutable_cf_options, const FileOptions* file_options,
-    std::string db_id, std::string db_session_id, int job_id,
-    uint32_t column_family_id, const std::string& column_family_name,
-    Env::IOPriority io_priority, Env::WriteLifeTimeHint write_hint,
+    int job_id, uint32_t column_family_id,
+    const std::string& column_family_name, Env::IOPriority io_priority,
+    Env::WriteLifeTimeHint write_hint,
    const std::shared_ptr<IOTracer>& io_tracer,
    BlobFileCompletionCallback* blob_callback,
    BlobFileCreationReason creation_reason,
@@ -66,10 +64,7 @@ BlobFileBuilder::BlobFileBuilder(
      min_blob_size_(mutable_cf_options->min_blob_size),
      blob_file_size_(mutable_cf_options->blob_file_size),
      blob_compression_type_(mutable_cf_options->blob_compression_type),
-      prepopulate_blob_cache_(mutable_cf_options->prepopulate_blob_cache),
      file_options_(file_options),
-      db_id_(std::move(db_id)),
-      db_session_id_(std::move(db_session_id)),
      job_id_(job_id),
      column_family_id_(column_family_id),
      column_family_name_(column_family_name),
@@ -138,16 +133,6 @@ Status BlobFileBuilder::Add(const Slice& key, const Slice& value,
    }
  }

-  {
-    const Status s =
-        PutBlobIntoCacheIfNeeded(value, blob_file_number, blob_offset);
-    if (!s.ok()) {
-      ROCKS_LOG_WARN(immutable_options_->info_log,
-                     "Failed to pre-populate the blob into blob cache: %s",
-                     s.ToString().c_str());
-    }
-  }
-
  BlobIndex::EncodeBlob(blob_index, blob_file_number, blob_offset, blob.size(),
                        blob_compression_type_);

@@ -387,60 +372,4 @@ void BlobFileBuilder::Abandon(const Status& s) {
  blob_count_ = 0;
  blob_bytes_ = 0;
 }
-
-Status BlobFileBuilder::PutBlobIntoCacheIfNeeded(const Slice& blob,
-                                                 uint64_t blob_file_number,
-                                                 uint64_t blob_offset) const {
-  Status s = Status::OK();
-
-  auto blob_cache = immutable_options_->blob_cache;
-  auto statistics = immutable_options_->statistics.get();
-  bool warm_cache =
-      prepopulate_blob_cache_ == PrepopulateBlobCache::kFlushOnly &&
-      creation_reason_ == BlobFileCreationReason::kFlush;
-
-  if (blob_cache && warm_cache) {
-    const OffsetableCacheKey base_cache_key(db_id_, db_session_id_,
-                                            blob_file_number);
-    const CacheKey cache_key = base_cache_key.WithOffset(blob_offset);
-    const Slice key = cache_key.AsSlice();
-
-    const Cache::Priority priority = Cache::Priority::BOTTOM;
-
-    // Objects to be put into the cache have to be heap-allocated and
-    // self-contained, i.e. own their contents. The Cache has to be able to
-    // take unique ownership of them.
-    CacheAllocationPtr allocation =
-        AllocateBlock(blob.size(), blob_cache->memory_allocator());
-    memcpy(allocation.get(), blob.data(), blob.size());
-    std::unique_ptr<BlobContents> buf =
-        BlobContents::Create(std::move(allocation), blob.size());
-
-    Cache::CacheItemHelper* const cache_item_helper =
-        BlobContents::GetCacheItemHelper();
-    assert(cache_item_helper);
-
-    if (immutable_options_->lowest_used_cache_tier ==
-        CacheTier::kNonVolatileBlockTier) {
-      s = blob_cache->Insert(key, buf.get(), cache_item_helper,
-                             buf->ApproximateMemoryUsage(),
-                             nullptr /* cache_handle */, priority);
-    } else {
-      s = blob_cache->Insert(key, buf.get(), buf->ApproximateMemoryUsage(),
-                             cache_item_helper->del_cb,
-                             nullptr /* cache_handle */, priority);
-    }
-
-    if (s.ok()) {
-      RecordTick(statistics, BLOB_DB_CACHE_ADD);
-      RecordTick(statistics, BLOB_DB_CACHE_BYTES_WRITE, buf->size());
-      buf.release();
-    } else {
-      RecordTick(statistics, BLOB_DB_CACHE_ADD_FAILURES);
-    }
-  }
-
-  return s;
-}
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>

-#include "rocksdb/advanced_options.h"
 #include "rocksdb/compression_type.h"
 #include "rocksdb/env.h"
 #include "rocksdb/rocksdb_namespace.h"
@@ -36,8 +35,7 @@ class BlobFileBuilder {
  BlobFileBuilder(VersionSet* versions, FileSystem* fs,
                  const ImmutableOptions* immutable_options,
                  const MutableCFOptions* mutable_cf_options,
-                  const FileOptions* file_options, std::string db_id,
-                  std::string db_session_id, int job_id,
+                  const FileOptions* file_options, int job_id,
                  uint32_t column_family_id,
                  const std::string& column_family_name,
                  Env::IOPriority io_priority,
@@ -51,8 +49,7 @@ class BlobFileBuilder {
  BlobFileBuilder(std::function<uint64_t()> file_number_generator,
                  FileSystem* fs, const ImmutableOptions* immutable_options,
                  const MutableCFOptions* mutable_cf_options,
-                  const FileOptions* file_options, std::string db_id,
-                  std::string db_session_id, int job_id,
+                  const FileOptions* file_options, int job_id,
                  uint32_t column_family_id,
                  const std::string& column_family_name,
                  Env::IOPriority io_priority,
@@ -81,19 +78,13 @@ class BlobFileBuilder {
  Status CloseBlobFile();
  Status CloseBlobFileIfNeeded();

-  Status PutBlobIntoCacheIfNeeded(const Slice& blob, uint64_t blob_file_number,
-                                  uint64_t blob_offset) const;
-
  std::function<uint64_t()> file_number_generator_;
  FileSystem* fs_;
  const ImmutableOptions* immutable_options_;
  uint64_t min_blob_size_;
  uint64_t blob_file_size_;
  CompressionType blob_compression_type_;
-  PrepopulateBlobCache prepopulate_blob_cache_;
  const FileOptions* file_options_;
-  const std::string db_id_;
-  const std::string db_session_id_;
  int job_id_;
  uint32_t column_family_id_;
  std::string column_family_name_;
@@ -144,9 +144,8 @@ TEST_F(BlobFileBuilderTest, BuildAndCheckOneFile) {

  BlobFileBuilder builder(
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
-      &file_options_, "" /*db_id*/, "" /*db_session_id*/, job_id,
-      column_family_id, column_family_name, io_priority, write_hint,
-      nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
+      &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);

  std::vector<std::pair<std::string, std::string>> expected_key_value_pairs(
@@ -229,9 +228,8 @@ TEST_F(BlobFileBuilderTest, BuildAndCheckMultipleFiles) {

  BlobFileBuilder builder(
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
-      &file_options_, "" /*db_id*/, "" /*db_session_id*/, job_id,
-      column_family_id, column_family_name, io_priority, write_hint,
-      nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
+      &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);

  std::vector<std::pair<std::string, std::string>> expected_key_value_pairs(
@@ -317,9 +315,8 @@ TEST_F(BlobFileBuilderTest, InlinedValues) {

  BlobFileBuilder builder(
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
-      &file_options_, "" /*db_id*/, "" /*db_session_id*/, job_id,
-      column_family_id, column_family_name, io_priority, write_hint,
-      nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
+      &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);

  for (size_t i = 0; i < number_of_blobs; ++i) {
@@ -372,9 +369,8 @@ TEST_F(BlobFileBuilderTest, Compression) {

  BlobFileBuilder builder(
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
-      &file_options_, "" /*db_id*/, "" /*db_session_id*/, job_id,
-      column_family_id, column_family_name, io_priority, write_hint,
-      nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
+      &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);

  const std::string key("1");
@@ -456,9 +452,8 @@ TEST_F(BlobFileBuilderTest, CompressionError) {

  BlobFileBuilder builder(
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
-      &file_options_, "" /*db_id*/, "" /*db_session_id*/, job_id,
-      column_family_id, column_family_name, io_priority, write_hint,
-      nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
+      &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);

  SyncPoint::GetInstance()->SetCallBack("CompressData:TamperWithReturnValue",
@@ -536,9 +531,8 @@ TEST_F(BlobFileBuilderTest, Checksum) {

  BlobFileBuilder builder(
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
-      &file_options_, "" /*db_id*/, "" /*db_session_id*/, job_id,
-      column_family_id, column_family_name, io_priority, write_hint,
-      nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
+      &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);

  const std::string key("1");
@@ -634,9 +628,8 @@ TEST_P(BlobFileBuilderIOErrorTest, IOError) {

  BlobFileBuilder builder(
      TestFileNumberGenerator(), fs_, &immutable_options, &mutable_cf_options,
-      &file_options_, "" /*db_id*/, "" /*db_session_id*/, job_id,
-      column_family_id, column_family_name, io_priority, write_hint,
-      nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
+      &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);

  SyncPoint::GetInstance()->SetCallBack(sync_point_, [this](void* arg) {
@@ -674,7 +667,6 @@ TEST_P(BlobFileBuilderIOErrorTest, IOError) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -254,7 +254,7 @@ TEST_F(BlobFileCacheTest, GetBlobFileReader_CacheFull) {
  CacheHandleGuard<BlobFileReader> reader;

  ASSERT_TRUE(blob_file_cache.GetBlobFileReader(blob_file_number, &reader)
-                  .IsMemoryLimit());
+                  .IsIncomplete());
  ASSERT_EQ(reader.GetValue(), nullptr);
  ASSERT_EQ(options.statistics->getTickerCount(NO_FILE_OPENS), 1);
  ASSERT_EQ(options.statistics->getTickerCount(NO_FILE_ERRORS), 1);
@@ -263,7 +263,6 @@ TEST_F(BlobFileCacheTest, GetBlobFileReader_CacheFull) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -168,7 +168,6 @@ TEST_F(BlobFileGarbageTest, ForwardIncompatibleCustomField) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -8,7 +8,6 @@
 #include <cassert>
 #include <string>

-#include "db/blob/blob_contents.h"
 #include "db/blob/blob_log_format.h"
 #include "file/file_prefetch_buffer.h"
 #include "file/filename.h"
@@ -17,7 +16,6 @@
 #include "rocksdb/file_system.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"
-#include "table/multiget_context.h"
 #include "test_util/sync_point.h"
 #include "util/compression.h"
 #include "util/crc32c.h"
@@ -284,12 +282,14 @@ BlobFileReader::BlobFileReader(

 BlobFileReader::~BlobFileReader() = default;

-Status BlobFileReader::GetBlob(
-    const ReadOptions& read_options, const Slice& user_key, uint64_t offset,
-    uint64_t value_size, CompressionType compression_type,
-    FilePrefetchBuffer* prefetch_buffer, MemoryAllocator* allocator,
-    std::unique_ptr<BlobContents>* result, uint64_t* bytes_read) const {
-  assert(result);
+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);

  const uint64_t key_size = user_key.size();

@@ -335,9 +335,7 @@ Status BlobFileReader::GetBlob(

  if (!prefetched) {
    TEST_SYNC_POINT("BlobFileReader::GetBlob:ReadFromFile");
-    PERF_COUNTER_ADD(blob_read_count, 1);
-    PERF_COUNTER_ADD(blob_read_byte, record_size);
-    PERF_TIMER_GUARD(blob_read_time);
+
    const Status s = ReadFromFile(file_reader_.get(), record_offset,
                                  static_cast<size_t>(record_size), statistics_,
                                  &record_slice, &buf, &aligned_buf,
@@ -360,8 +358,8 @@ Status BlobFileReader::GetBlob(
  const Slice value_slice(record_slice.data() + adjustment, value_size);

  {
-    const Status s = UncompressBlobIfNeeded(
-        value_slice, compression_type, allocator, clock_, statistics_, result);
+    const Status s = UncompressBlobIfNeeded(value_slice, compression_type,
+                                            clock_, statistics_, value);
    if (!s.ok()) {
      return s;
    }
@@ -375,56 +373,39 @@ Status BlobFileReader::GetBlob(
 }

 void BlobFileReader::MultiGetBlob(
-    const ReadOptions& read_options, MemoryAllocator* allocator,
-    autovector<std::pair<BlobReadRequest*, std::unique_ptr<BlobContents>>>&
-        blob_reqs,
-    uint64_t* bytes_read) const {
-  const size_t num_blobs = blob_reqs.size();
+    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 <= MultiGetContext::MAX_BATCH_SIZE);
+  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 < num_blobs - 1; ++i) {
-    assert(blob_reqs[i].first->offset <= blob_reqs[i + 1].first->offset);
+  for (size_t i = 0; i < offsets.size() - 1; ++i) {
+    assert(offsets[i] <= offsets[i + 1]);
  }
 #endif  // !NDEBUG

-  std::vector<FSReadRequest> read_reqs;
+  std::vector<FSReadRequest> read_reqs(num_blobs);
  autovector<uint64_t> adjustments;
  uint64_t total_len = 0;
-  read_reqs.reserve(num_blobs);
  for (size_t i = 0; i < num_blobs; ++i) {
-    BlobReadRequest* const req = blob_reqs[i].first;
-    assert(req);
-    assert(req->user_key);
-    assert(req->status);
-
-    const size_t key_size = req->user_key->size();
-    const uint64_t offset = req->offset;
-    const uint64_t value_size = req->len;
-
-    if (!IsValidBlobOffset(offset, key_size, value_size, file_size_)) {
-      *req->status = Status::Corruption("Invalid blob offset");
-      continue;
-    }
-    if (req->compression != compression_type_) {
-      *req->status =
-          Status::Corruption("Compression type mismatch when reading a blob");
-      continue;
-    }
-
+    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(req->offset >= adjustment);
+    assert(offsets[i] >= adjustment);
    adjustments.push_back(adjustment);
-
-    FSReadRequest read_req = {};
-    read_req.offset = req->offset - adjustment;
-    read_req.len = req->len + adjustment;
-    read_reqs.emplace_back(read_req);
-    total_len += read_req.len;
+    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);
@@ -447,8 +428,6 @@ void BlobFileReader::MultiGetBlob(
    }
  }
  TEST_SYNC_POINT("BlobFileReader::MultiGetBlob:ReadFromFile");
-  PERF_COUNTER_ADD(blob_read_count, num_blobs);
-  PERF_COUNTER_ADD(blob_read_byte, total_len);
  s = file_reader_->MultiRead(IOOptions(), read_reqs.data(), read_reqs.size(),
                              direct_io ? &aligned_buf : nullptr,
                              read_options.rate_limiter_priority);
@@ -456,72 +435,64 @@ void BlobFileReader::MultiGetBlob(
    for (auto& req : read_reqs) {
      req.status.PermitUncheckedError();
    }
-    for (auto& blob_req : blob_reqs) {
-      BlobReadRequest* const req = blob_req.first;
-      assert(req);
-      assert(req->status);
-
-      if (!req->status->IsCorruption()) {
-        // Avoid overwriting corruption status.
-        *req->status = s;
-      }
+    for (size_t i = 0; i < num_blobs; ++i) {
+      assert(statuses[i]);
+      *statuses[i] = s;
    }
    return;
  }

  assert(s.ok());
-
-  uint64_t total_bytes = 0;
-  for (size_t i = 0, j = 0; i < num_blobs; ++i) {
-    BlobReadRequest* const req = blob_reqs[i].first;
-    assert(req);
-    assert(req->user_key);
-    assert(req->status);
-
-    if (!req->status->ok()) {
-      continue;
+  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;
+  }

-    assert(j < read_reqs.size());
-    auto& read_req = read_reqs[j++];
-    const auto& record_slice = read_req.result;
-    if (read_req.status.ok() && record_slice.size() != read_req.len) {
-      read_req.status =
-          IOStatus::Corruption("Failed to read data from blob file");
-    }
-
-    *req->status = read_req.status;
-    if (!req->status->ok()) {
-      continue;
-    }
-
-    // Verify checksums if enabled
-    if (read_options.verify_checksums) {
-      *req->status = VerifyBlob(record_slice, *req->user_key, req->len);
-      if (!req->status->ok()) {
+  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;
+      }
    }
+  }

-    // Uncompress blob if needed
-    Slice value_slice(record_slice.data() + adjustments[i], req->len);
-    *req->status =
-        UncompressBlobIfNeeded(value_slice, compression_type_, allocator,
-                               clock_, statistics_, &blob_reqs[i].second);
-    if (req->status->ok()) {
-      total_bytes += record_slice.size();
+  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) {
-  PERF_TIMER_GUARD(blob_checksum_time);
-
  BlobLogRecord record;

  const Slice header_slice(record_slice.data(), BlobLogRecord::kHeaderSize);
@@ -562,18 +533,15 @@ Status BlobFileReader::VerifyBlob(const Slice& record_slice,
  return Status::OK();
 }

-Status BlobFileReader::UncompressBlobIfNeeded(
-    const Slice& value_slice, CompressionType compression_type,
-    MemoryAllocator* allocator, SystemClock* clock, Statistics* statistics,
-    std::unique_ptr<BlobContents>* result) {
-  assert(result);
+Status BlobFileReader::UncompressBlobIfNeeded(const Slice& value_slice,
+                                              CompressionType compression_type,
+                                              SystemClock* clock,
+                                              Statistics* statistics,
+                                              PinnableSlice* value) {
+  assert(value);

  if (compression_type == kNoCompression) {
-    CacheAllocationPtr allocation =
-        AllocateBlock(value_slice.size(), allocator);
-    memcpy(allocation.get(), value_slice.data(), value_slice.size());
-
-    *result = BlobContents::Create(std::move(allocation), value_slice.size());
+    SaveValue(value_slice, value);

    return Status::OK();
  }
@@ -584,11 +552,11 @@ Status BlobFileReader::UncompressBlobIfNeeded(

  size_t uncompressed_size = 0;
  constexpr uint32_t compression_format_version = 2;
+  constexpr MemoryAllocator* allocator = nullptr;

  CacheAllocationPtr output;

  {
-    PERF_TIMER_GUARD(blob_decompress_time);
    StopWatch stop_watch(clock, statistics, BLOB_DB_DECOMPRESSION_MICROS);
    output = UncompressData(info, value_slice.data(), value_slice.size(),
                            &uncompressed_size, compression_format_version,
@@ -602,9 +570,19 @@ Status BlobFileReader::UncompressBlobIfNeeded(
    return Status::Corruption("Unable to uncompress blob");
  }

-  *result = BlobContents::Create(std::move(output), uncompressed_size);
+  SaveValue(Slice(output.get(), uncompressed_size), value);

  return Status::OK();
 }

+void BlobFileReader::SaveValue(const Slice& src, PinnableSlice* dst) {
+  assert(dst);
+
+  if (dst->IsPinned()) {
+    dst->Reset();
+  }
+
+  dst->PinSelf(src);
+}
+
 }  // namespace ROCKSDB_NAMESPACE
@@ -8,7 +8,6 @@
 #include <cinttypes>
 #include <memory>

-#include "db/blob/blob_read_request.h"
 #include "file/random_access_file_reader.h"
 #include "rocksdb/compression_type.h"
 #include "rocksdb/rocksdb_namespace.h"
@@ -23,7 +22,7 @@ class HistogramImpl;
 struct ReadOptions;
 class Slice;
 class FilePrefetchBuffer;
-class BlobContents;
+class PinnableSlice;
 class Statistics;

 class BlobFileReader {
@@ -44,17 +43,16 @@ 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,
-                 MemoryAllocator* allocator,
-                 std::unique_ptr<BlobContents>* result,
+                 FilePrefetchBuffer* prefetch_buffer, PinnableSlice* value,
                 uint64_t* bytes_read) const;

  // offsets must be sorted in ascending order by caller.
  void MultiGetBlob(
-      const ReadOptions& read_options, MemoryAllocator* allocator,
-      autovector<std::pair<BlobReadRequest*, std::unique_ptr<BlobContents>>>&
-          blob_reqs,
-      uint64_t* bytes_read) const;
+      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_; }

@@ -93,10 +91,11 @@ class BlobFileReader {

  static Status UncompressBlobIfNeeded(const Slice& value_slice,
                                       CompressionType compression_type,
-                                       MemoryAllocator* allocator,
                                       SystemClock* clock,
                                       Statistics* statistics,
-                                       std::unique_ptr<BlobContents>* result);
+                                       PinnableSlice* value);
+
+  static void SaveValue(const Slice& src, PinnableSlice* dst);

  std::unique_ptr<RandomAccessFileReader> file_reader_;
  uint64_t file_size_;
@@ -8,7 +8,6 @@
 #include <cassert>
 #include <string>

-#include "db/blob/blob_contents.h"
 #include "db/blob/blob_log_format.h"
 #include "db/blob/blob_log_writer.h"
 #include "env/mock_env.h"
@@ -181,43 +180,38 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
  read_options.verify_checksums = false;

  constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
-  constexpr MemoryAllocator* allocator = nullptr;

  {
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_OK(reader->GetBlob(read_options, keys[0], blob_offsets[0],
                              blob_sizes[0], kNoCompression, prefetch_buffer,
-                              allocator, &value, &bytes_read));
-    ASSERT_NE(value, nullptr);
-    ASSERT_EQ(value->data(), blobs[0]);
+                              &value, &bytes_read));
+    ASSERT_EQ(value, blobs[0]);
    ASSERT_EQ(bytes_read, blob_sizes[0]);

    // MultiGetBlob
    bytes_read = 0;
    size_t total_size = 0;
-
-    std::array<Status, num_blobs> statuses_buf;
-    std::array<BlobReadRequest, num_blobs> requests_buf;
-    autovector<std::pair<BlobReadRequest*, std::unique_ptr<BlobContents>>>
-        blob_reqs;
-
-    for (size_t i = 0; i < num_blobs; ++i) {
-      requests_buf[i] =
-          BlobReadRequest(keys[i], blob_offsets[i], blob_sizes[i],
-                          kNoCompression, nullptr, &statuses_buf[i]);
-      blob_reqs.emplace_back(&requests_buf[i], std::unique_ptr<BlobContents>());
+    autovector<std::reference_wrapper<const Slice>> key_refs;
+    for (const auto& key_ref : keys) {
+      key_refs.emplace_back(std::cref(key_ref));
    }
-
-    reader->MultiGetBlob(read_options, allocator, blob_reqs, &bytes_read);
-
+    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) {
-      const auto& result = blob_reqs[i].second;
-
      ASSERT_OK(statuses_buf[i]);
-      ASSERT_NE(result, nullptr);
-      ASSERT_EQ(result->data(), blobs[i]);
+      ASSERT_EQ(value_buf[i], blobs[i]);
      total_size += blob_sizes[i];
    }
    ASSERT_EQ(bytes_read, total_size);
@@ -226,14 +220,13 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
  read_options.verify_checksums = true;

  {
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_OK(reader->GetBlob(read_options, keys[1], blob_offsets[1],
                              blob_sizes[1], kNoCompression, prefetch_buffer,
-                              allocator, &value, &bytes_read));
-    ASSERT_NE(value, nullptr);
-    ASSERT_EQ(value->data(), blobs[1]);
+                              &value, &bytes_read));
+    ASSERT_EQ(value, blobs[1]);

    const uint64_t key_size = keys[1].size();
    ASSERT_EQ(bytes_read,
@@ -243,50 +236,47 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {

  // Invalid offset (too close to start of file)
  {
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
                    ->GetBlob(read_options, keys[0], blob_offsets[0] - 1,
                              blob_sizes[0], kNoCompression, prefetch_buffer,
-                              allocator, &value, &bytes_read)
+                              &value, &bytes_read)
                    .IsCorruption());
-    ASSERT_EQ(value, nullptr);
    ASSERT_EQ(bytes_read, 0);
  }

  // Invalid offset (too close to end of file)
  {
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
                    ->GetBlob(read_options, keys[2], blob_offsets[2] + 1,
                              blob_sizes[2], kNoCompression, prefetch_buffer,
-                              allocator, &value, &bytes_read)
+                              &value, &bytes_read)
                    .IsCorruption());
-    ASSERT_EQ(value, nullptr);
    ASSERT_EQ(bytes_read, 0);
  }

  // Incorrect compression type
  {
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
                    ->GetBlob(read_options, keys[0], blob_offsets[0],
-                              blob_sizes[0], kZSTD, prefetch_buffer, allocator,
-                              &value, &bytes_read)
+                              blob_sizes[0], kZSTD, prefetch_buffer, &value,
+                              &bytes_read)
                    .IsCorruption());
-    ASSERT_EQ(value, nullptr);
    ASSERT_EQ(bytes_read, 0);
  }

  // Incorrect key size
  {
    constexpr char shorter_key[] = "k";
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
@@ -294,9 +284,8 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
                              blob_offsets[0] -
                                  (keys[0].size() - sizeof(shorter_key) + 1),
                              blob_sizes[0], kNoCompression, prefetch_buffer,
-                              allocator, &value, &bytes_read)
+                              &value, &bytes_read)
                    .IsCorruption());
-    ASSERT_EQ(value, nullptr);
    ASSERT_EQ(bytes_read, 0);

    // MultiGetBlob
@@ -311,21 +300,15 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
        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;
-    std::array<BlobReadRequest, num_blobs> requests_buf;
-    autovector<std::pair<BlobReadRequest*, std::unique_ptr<BlobContents>>>
-        blob_reqs;
-
-    for (size_t i = 0; i < num_blobs; ++i) {
-      requests_buf[i] =
-          BlobReadRequest(key_refs[i], offsets[i], blob_sizes[i],
-                          kNoCompression, nullptr, &statuses_buf[i]);
-      blob_reqs.emplace_back(&requests_buf[i], std::unique_ptr<BlobContents>());
-    }
-
-    reader->MultiGetBlob(read_options, allocator, blob_reqs, &bytes_read);
-
+    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());
@@ -338,15 +321,14 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
  // Incorrect key
  {
    constexpr char incorrect_key[] = "foo1";
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
                    ->GetBlob(read_options, incorrect_key, blob_offsets[0],
                              blob_sizes[0], kNoCompression, prefetch_buffer,
-                              allocator, &value, &bytes_read)
+                              &value, &bytes_read)
                    .IsCorruption());
-    ASSERT_EQ(value, nullptr);
    ASSERT_EQ(bytes_read, 0);

    // MultiGetBlob
@@ -357,20 +339,17 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
    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;
-    std::array<BlobReadRequest, num_blobs> requests_buf;
-    autovector<std::pair<BlobReadRequest*, std::unique_ptr<BlobContents>>>
-        blob_reqs;
-
-    for (size_t i = 0; i < num_blobs; ++i) {
-      requests_buf[i] =
-          BlobReadRequest(key_refs[i], blob_offsets[i], blob_sizes[i],
-                          kNoCompression, nullptr, &statuses_buf[i]);
-      blob_reqs.emplace_back(&requests_buf[i], std::unique_ptr<BlobContents>());
-    }
-
-    reader->MultiGetBlob(read_options, allocator, blob_reqs, &bytes_read);
-
+    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());
@@ -382,15 +361,14 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {

  // Incorrect value size
  {
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

    ASSERT_TRUE(reader
                    ->GetBlob(read_options, keys[1], blob_offsets[1],
                              blob_sizes[1] + 1, kNoCompression,
-                              prefetch_buffer, allocator, &value, &bytes_read)
+                              prefetch_buffer, &value, &bytes_read)
                    .IsCorruption());
-    ASSERT_EQ(value, nullptr);
    ASSERT_EQ(bytes_read, 0);

    // MultiGetBlob
@@ -398,29 +376,17 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
    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;
-    std::array<BlobReadRequest, num_blobs> requests_buf;
-
-    requests_buf[0] =
-        BlobReadRequest(key_refs[0], blob_offsets[0], blob_sizes[0],
-                        kNoCompression, nullptr, &statuses_buf[0]);
-    requests_buf[1] =
-        BlobReadRequest(key_refs[1], blob_offsets[1], blob_sizes[1] + 1,
-                        kNoCompression, nullptr, &statuses_buf[1]);
-    requests_buf[2] =
-        BlobReadRequest(key_refs[2], blob_offsets[2], blob_sizes[2],
-                        kNoCompression, nullptr, &statuses_buf[2]);
-
-    autovector<std::pair<BlobReadRequest*, std::unique_ptr<BlobContents>>>
-        blob_reqs;
-
-    for (size_t i = 0; i < num_blobs; ++i) {
-      blob_reqs.emplace_back(&requests_buf[i], std::unique_ptr<BlobContents>());
-    }
-
-    reader->MultiGetBlob(read_options, allocator, blob_reqs, &bytes_read);
-
+    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]);
@@ -680,17 +646,14 @@ TEST_F(BlobFileReaderTest, BlobCRCError) {
  SyncPoint::GetInstance()->EnableProcessing();

  constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
-  constexpr MemoryAllocator* allocator = nullptr;
-
-  std::unique_ptr<BlobContents> value;
+  PinnableSlice value;
  uint64_t bytes_read = 0;

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

  SyncPoint::GetInstance()->DisableProcessing();
@@ -738,31 +701,28 @@ TEST_F(BlobFileReaderTest, Compression) {
  read_options.verify_checksums = false;

  constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
-  constexpr MemoryAllocator* allocator = nullptr;

  {
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

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

  read_options.verify_checksums = true;

  {
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

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

    constexpr uint64_t key_size = sizeof(key) - 1;
    ASSERT_EQ(bytes_read,
@@ -820,17 +780,14 @@ TEST_F(BlobFileReaderTest, UncompressionError) {
  SyncPoint::GetInstance()->EnableProcessing();

  constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
-  constexpr MemoryAllocator* allocator = nullptr;
-
-  std::unique_ptr<BlobContents> value;
+  PinnableSlice value;
  uint64_t bytes_read = 0;

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

  SyncPoint::GetInstance()->DisableProcessing();
@@ -909,17 +866,14 @@ TEST_P(BlobFileReaderIOErrorTest, IOError) {
    ASSERT_OK(s);

    constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
-    constexpr MemoryAllocator* allocator = nullptr;
-
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

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

@@ -997,17 +951,14 @@ TEST_P(BlobFileReaderDecodingErrorTest, DecodingError) {
    ASSERT_OK(s);

    constexpr FilePrefetchBuffer* prefetch_buffer = nullptr;
-    constexpr MemoryAllocator* allocator = nullptr;
-
-    std::unique_ptr<BlobContents> value;
+    PinnableSlice value;
    uint64_t bytes_read = 0;

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

@@ -1018,7 +969,6 @@ TEST_P(BlobFileReaderDecodingErrorTest, DecodingError) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -191,7 +191,6 @@ TEST(BlobGarbageMeterTest, InlinedTTLBlobIndex) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -92,13 +92,13 @@ class BlobIndex {
  }

  Status DecodeFrom(Slice slice) {
-    const char* kErrorMessage = "Error while decoding blob index";
+    static const std::string kErrorMessage = "Error while decoding blob index";
    assert(slice.size() > 0);
    type_ = static_cast<Type>(*slice.data());
    if (type_ >= Type::kUnknown) {
-      return Status::Corruption(kErrorMessage,
-                                "Unknown blob index type: " +
-                                    std::to_string(static_cast<char>(type_)));
+      return Status::Corruption(
+          kErrorMessage,
+          "Unknown blob index type: " + ToString(static_cast<char>(type_)));
    }
    slice = Slice(slice.data() + 1, slice.size() - 1);
    if (HasTTL()) {
@@ -26,7 +26,8 @@ void BlobLogHeader::EncodeTo(std::string* dst) {
 }

 Status BlobLogHeader::DecodeFrom(Slice src) {
-  const char* kErrorMessage = "Error while decoding blob log header";
+  static const std::string kErrorMessage =
+      "Error while decoding blob log header";
  if (src.size() != BlobLogHeader::kSize) {
    return Status::Corruption(kErrorMessage,
                              "Unexpected blob file header size");
@@ -70,7 +71,8 @@ void BlobLogFooter::EncodeTo(std::string* dst) {
 }

 Status BlobLogFooter::DecodeFrom(Slice src) {
-  const char* kErrorMessage = "Error while decoding blob log footer";
+  static const std::string kErrorMessage =
+      "Error while decoding blob log footer";
  if (src.size() != BlobLogFooter::kSize) {
    return Status::Corruption(kErrorMessage,
                              "Unexpected blob file footer size");
@@ -110,7 +112,7 @@ void BlobLogRecord::EncodeHeaderTo(std::string* dst) {
 }

 Status BlobLogRecord::DecodeHeaderFrom(Slice src) {
-  const char* kErrorMessage = "Error while decoding blob record";
+  static const std::string kErrorMessage = "Error while decoding blob record";
  if (src.size() != BlobLogRecord::kHeaderSize) {
    return Status::Corruption(kErrorMessage,
                              "Unexpected blob record header size");
@@ -70,38 +70,32 @@ Status BlobLogWriter::AppendFooter(BlobLogFooter& footer,
  std::string str;
  footer.EncodeTo(&str);

-  Status s;
-  if (dest_->seen_error()) {
-    s.PermitUncheckedError();
-    return Status::IOError("Seen Error. Skip closing.");
-  } else {
-    s = dest_->Append(Slice(str));
-    if (s.ok()) {
-      block_offset_ += str.size();
+  Status s = dest_->Append(Slice(str));
+  if (s.ok()) {
+    block_offset_ += str.size();

-      s = Sync();
+    s = Sync();
+
+    if (s.ok()) {
+      s = dest_->Close();

      if (s.ok()) {
-        s = dest_->Close();
+        assert(!!checksum_method == !!checksum_value);

-        if (s.ok()) {
-          assert(!!checksum_method == !!checksum_value);
+        if (checksum_method) {
+          assert(checksum_method->empty());

-          if (checksum_method) {
-            assert(checksum_method->empty());
-
-            std::string method = dest_->GetFileChecksumFuncName();
-            if (method != kUnknownFileChecksumFuncName) {
-              *checksum_method = std::move(method);
-            }
+          std::string method = dest_->GetFileChecksumFuncName();
+          if (method != kUnknownFileChecksumFuncName) {
+            *checksum_method = std::move(method);
          }
-          if (checksum_value) {
-            assert(checksum_value->empty());
+        }
+        if (checksum_value) {
+          assert(checksum_value->empty());

-            std::string value = dest_->GetFileChecksum();
-            if (value != kUnknownFileChecksum) {
-              *checksum_value = std::move(value);
-            }
+          std::string value = dest_->GetFileChecksum();
+          if (value != kUnknownFileChecksum) {
+            *checksum_value = std::move(value);
          }
        }
      }
@@ -1,58 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  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 <cinttypes>
-
-#include "rocksdb/compression_type.h"
-#include "rocksdb/slice.h"
-#include "rocksdb/status.h"
-#include "util/autovector.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-// A read Blob request structure for use in BlobSource::MultiGetBlob and
-// BlobFileReader::MultiGetBlob.
-struct BlobReadRequest {
-  // User key to lookup the paired blob
-  const Slice* user_key = nullptr;
-
-  // File offset in bytes
-  uint64_t offset = 0;
-
-  // Length to read in bytes
-  size_t len = 0;
-
-  // Blob compression type
-  CompressionType compression = kNoCompression;
-
-  // Output parameter set by MultiGetBlob() to point to the data buffer, and
-  // the number of valid bytes
-  PinnableSlice* result = nullptr;
-
-  // Status of read
-  Status* status = nullptr;
-
-  BlobReadRequest(const Slice& _user_key, uint64_t _offset, size_t _len,
-                  CompressionType _compression, PinnableSlice* _result,
-                  Status* _status)
-      : user_key(&_user_key),
-        offset(_offset),
-        len(_len),
-        compression(_compression),
-        result(_result),
-        status(_status) {}
-
-  BlobReadRequest() = default;
-  BlobReadRequest(const BlobReadRequest& other) = default;
-  BlobReadRequest& operator=(const BlobReadRequest& other) = default;
-};
-
-using BlobFileReadRequests =
-    std::tuple<uint64_t /* file_number */, uint64_t /* file_size */,
-               autovector<BlobReadRequest>>;
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,488 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  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/blob_source.h"
-
-#include <cassert>
-#include <string>
-
-#include "cache/cache_reservation_manager.h"
-#include "cache/charged_cache.h"
-#include "db/blob/blob_contents.h"
-#include "db/blob/blob_file_reader.h"
-#include "db/blob/blob_log_format.h"
-#include "monitoring/statistics.h"
-#include "options/cf_options.h"
-#include "table/get_context.h"
-#include "table/multiget_context.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-BlobSource::BlobSource(const ImmutableOptions* immutable_options,
-                       const std::string& db_id,
-                       const std::string& db_session_id,
-                       BlobFileCache* blob_file_cache)
-    : db_id_(db_id),
-      db_session_id_(db_session_id),
-      statistics_(immutable_options->statistics.get()),
-      blob_file_cache_(blob_file_cache),
-      blob_cache_(immutable_options->blob_cache),
-      lowest_used_cache_tier_(immutable_options->lowest_used_cache_tier) {
-#ifndef ROCKSDB_LITE
-  auto bbto =
-      immutable_options->table_factory->GetOptions<BlockBasedTableOptions>();
-  if (bbto &&
-      bbto->cache_usage_options.options_overrides.at(CacheEntryRole::kBlobCache)
-              .charged == CacheEntryRoleOptions::Decision::kEnabled) {
-    blob_cache_ = std::make_shared<ChargedCache>(immutable_options->blob_cache,
-                                                 bbto->block_cache);
-  }
-#endif  // ROCKSDB_LITE
-}
-
-BlobSource::~BlobSource() = default;
-
-Status BlobSource::GetBlobFromCache(
-    const Slice& cache_key, CacheHandleGuard<BlobContents>* cached_blob) const {
-  assert(blob_cache_);
-  assert(!cache_key.empty());
-  assert(cached_blob);
-  assert(cached_blob->IsEmpty());
-
-  Cache::Handle* cache_handle = nullptr;
-  cache_handle = GetEntryFromCache(cache_key);
-  if (cache_handle != nullptr) {
-    *cached_blob =
-        CacheHandleGuard<BlobContents>(blob_cache_.get(), cache_handle);
-
-    assert(cached_blob->GetValue());
-
-    PERF_COUNTER_ADD(blob_cache_hit_count, 1);
-    RecordTick(statistics_, BLOB_DB_CACHE_HIT);
-    RecordTick(statistics_, BLOB_DB_CACHE_BYTES_READ,
-               cached_blob->GetValue()->size());
-
-    return Status::OK();
-  }
-
-  RecordTick(statistics_, BLOB_DB_CACHE_MISS);
-
-  return Status::NotFound("Blob not found in cache");
-}
-
-Status BlobSource::PutBlobIntoCache(
-    const Slice& cache_key, std::unique_ptr<BlobContents>* blob,
-    CacheHandleGuard<BlobContents>* cached_blob) const {
-  assert(blob_cache_);
-  assert(!cache_key.empty());
-  assert(blob);
-  assert(*blob);
-  assert(cached_blob);
-  assert(cached_blob->IsEmpty());
-
-  Cache::Handle* cache_handle = nullptr;
-  const Status s = InsertEntryIntoCache(cache_key, blob->get(),
-                                        (*blob)->ApproximateMemoryUsage(),
-                                        &cache_handle, Cache::Priority::BOTTOM);
-  if (s.ok()) {
-    blob->release();
-
-    assert(cache_handle != nullptr);
-    *cached_blob =
-        CacheHandleGuard<BlobContents>(blob_cache_.get(), cache_handle);
-
-    assert(cached_blob->GetValue());
-
-    RecordTick(statistics_, BLOB_DB_CACHE_ADD);
-    RecordTick(statistics_, BLOB_DB_CACHE_BYTES_WRITE,
-               cached_blob->GetValue()->size());
-
-  } else {
-    RecordTick(statistics_, BLOB_DB_CACHE_ADD_FAILURES);
-  }
-
-  return s;
-}
-
-Cache::Handle* BlobSource::GetEntryFromCache(const Slice& key) const {
-  Cache::Handle* cache_handle = nullptr;
-
-  if (lowest_used_cache_tier_ == CacheTier::kNonVolatileBlockTier) {
-    Cache::CreateCallback create_cb =
-        [allocator = blob_cache_->memory_allocator()](
-            const void* buf, size_t size, void** out_obj,
-            size_t* charge) -> Status {
-      return BlobContents::CreateCallback(AllocateBlock(size, allocator), buf,
-                                          size, out_obj, charge);
-    };
-
-    cache_handle = blob_cache_->Lookup(key, BlobContents::GetCacheItemHelper(),
-                                       create_cb, Cache::Priority::BOTTOM,
-                                       true /* wait_for_cache */, statistics_);
-  } else {
-    cache_handle = blob_cache_->Lookup(key, statistics_);
-  }
-
-  return cache_handle;
-}
-
-void BlobSource::PinCachedBlob(CacheHandleGuard<BlobContents>* cached_blob,
-                               PinnableSlice* value) {
-  assert(cached_blob);
-  assert(cached_blob->GetValue());
-  assert(value);
-
-  // To avoid copying the cached blob into the buffer provided by the
-  // application, we can simply transfer ownership of the cache handle to
-  // the target PinnableSlice. This has the potential to save a lot of
-  // CPU, especially with large blob values.
-
-  value->Reset();
-
-  constexpr Cleanable* cleanable = nullptr;
-  value->PinSlice(cached_blob->GetValue()->data(), cleanable);
-
-  cached_blob->TransferTo(value);
-}
-
-void BlobSource::PinOwnedBlob(std::unique_ptr<BlobContents>* owned_blob,
-                              PinnableSlice* value) {
-  assert(owned_blob);
-  assert(*owned_blob);
-  assert(value);
-
-  BlobContents* const blob = owned_blob->release();
-  assert(blob);
-
-  value->Reset();
-  value->PinSlice(
-      blob->data(),
-      [](void* arg1, void* /* arg2 */) {
-        delete static_cast<BlobContents*>(arg1);
-      },
-      blob, nullptr);
-}
-
-Status BlobSource::InsertEntryIntoCache(const Slice& key, BlobContents* value,
-                                        size_t charge,
-                                        Cache::Handle** cache_handle,
-                                        Cache::Priority priority) const {
-  Status s;
-
-  Cache::CacheItemHelper* const cache_item_helper =
-      BlobContents::GetCacheItemHelper();
-  assert(cache_item_helper);
-
-  if (lowest_used_cache_tier_ == CacheTier::kNonVolatileBlockTier) {
-    s = blob_cache_->Insert(key, value, cache_item_helper, charge, cache_handle,
-                            priority);
-  } else {
-    s = blob_cache_->Insert(key, value, charge, cache_item_helper->del_cb,
-                            cache_handle, priority);
-  }
-
-  return s;
-}
-
-Status BlobSource::GetBlob(const ReadOptions& read_options,
-                           const Slice& user_key, uint64_t file_number,
-                           uint64_t offset, uint64_t file_size,
-                           uint64_t value_size,
-                           CompressionType compression_type,
-                           FilePrefetchBuffer* prefetch_buffer,
-                           PinnableSlice* value, uint64_t* bytes_read) {
-  assert(value);
-
-  Status s;
-
-  const CacheKey cache_key = GetCacheKey(file_number, file_size, offset);
-
-  CacheHandleGuard<BlobContents> blob_handle;
-
-  // First, try to get the blob from the cache
-  //
-  // If blob cache is enabled, we'll try to read from it.
-  if (blob_cache_) {
-    Slice key = cache_key.AsSlice();
-    s = GetBlobFromCache(key, &blob_handle);
-    if (s.ok()) {
-      PinCachedBlob(&blob_handle, value);
-
-      // For consistency, the size of on-disk (possibly compressed) blob record
-      // is assigned to bytes_read.
-      uint64_t adjustment =
-          read_options.verify_checksums
-              ? BlobLogRecord::CalculateAdjustmentForRecordHeader(
-                    user_key.size())
-              : 0;
-      assert(offset >= adjustment);
-
-      uint64_t record_size = value_size + adjustment;
-      if (bytes_read) {
-        *bytes_read = record_size;
-      }
-      return s;
-    }
-  }
-
-  assert(blob_handle.IsEmpty());
-
-  const bool no_io = read_options.read_tier == kBlockCacheTier;
-  if (no_io) {
-    s = Status::Incomplete("Cannot read blob(s): no disk I/O allowed");
-    return s;
-  }
-
-  // Can't find the blob from the cache. Since I/O is allowed, read from the
-  // file.
-  std::unique_ptr<BlobContents> blob_contents;
-
-  {
-    CacheHandleGuard<BlobFileReader> blob_file_reader;
-    s = blob_file_cache_->GetBlobFileReader(file_number, &blob_file_reader);
-    if (!s.ok()) {
-      return s;
-    }
-
-    assert(blob_file_reader.GetValue());
-
-    if (compression_type != blob_file_reader.GetValue()->GetCompressionType()) {
-      return Status::Corruption("Compression type mismatch when reading blob");
-    }
-
-    MemoryAllocator* const allocator = (blob_cache_ && read_options.fill_cache)
-                                           ? blob_cache_->memory_allocator()
-                                           : nullptr;
-
-    uint64_t read_size = 0;
-    s = blob_file_reader.GetValue()->GetBlob(
-        read_options, user_key, offset, value_size, compression_type,
-        prefetch_buffer, allocator, &blob_contents, &read_size);
-    if (!s.ok()) {
-      return s;
-    }
-    if (bytes_read) {
-      *bytes_read = read_size;
-    }
-  }
-
-  if (blob_cache_ && read_options.fill_cache) {
-    // If filling cache is allowed and a cache is configured, try to put the
-    // blob to the cache.
-    Slice key = cache_key.AsSlice();
-    s = PutBlobIntoCache(key, &blob_contents, &blob_handle);
-    if (!s.ok()) {
-      return s;
-    }
-
-    PinCachedBlob(&blob_handle, value);
-  } else {
-    PinOwnedBlob(&blob_contents, value);
-  }
-
-  assert(s.ok());
-  return s;
-}
-
-void BlobSource::MultiGetBlob(const ReadOptions& read_options,
-                              autovector<BlobFileReadRequests>& blob_reqs,
-                              uint64_t* bytes_read) {
-  assert(blob_reqs.size() > 0);
-
-  uint64_t total_bytes_read = 0;
-  uint64_t bytes_read_in_file = 0;
-
-  for (auto& [file_number, file_size, blob_reqs_in_file] : blob_reqs) {
-    // sort blob_reqs_in_file by file offset.
-    std::sort(
-        blob_reqs_in_file.begin(), blob_reqs_in_file.end(),
-        [](const BlobReadRequest& lhs, const BlobReadRequest& rhs) -> bool {
-          return lhs.offset < rhs.offset;
-        });
-
-    MultiGetBlobFromOneFile(read_options, file_number, file_size,
-                            blob_reqs_in_file, &bytes_read_in_file);
-
-    total_bytes_read += bytes_read_in_file;
-  }
-
-  if (bytes_read) {
-    *bytes_read = total_bytes_read;
-  }
-}
-
-void BlobSource::MultiGetBlobFromOneFile(const ReadOptions& read_options,
-                                         uint64_t file_number,
-                                         uint64_t /*file_size*/,
-                                         autovector<BlobReadRequest>& blob_reqs,
-                                         uint64_t* bytes_read) {
-  const size_t num_blobs = blob_reqs.size();
-  assert(num_blobs > 0);
-  assert(num_blobs <= MultiGetContext::MAX_BATCH_SIZE);
-
-#ifndef NDEBUG
-  for (size_t i = 0; i < num_blobs - 1; ++i) {
-    assert(blob_reqs[i].offset <= blob_reqs[i + 1].offset);
-  }
-#endif  // !NDEBUG
-
-  using Mask = uint64_t;
-  Mask cache_hit_mask = 0;
-
-  uint64_t total_bytes = 0;
-  const OffsetableCacheKey base_cache_key(db_id_, db_session_id_, file_number);
-
-  if (blob_cache_) {
-    size_t cached_blob_count = 0;
-    for (size_t i = 0; i < num_blobs; ++i) {
-      auto& req = blob_reqs[i];
-
-      CacheHandleGuard<BlobContents> blob_handle;
-      const CacheKey cache_key = base_cache_key.WithOffset(req.offset);
-      const Slice key = cache_key.AsSlice();
-
-      const Status s = GetBlobFromCache(key, &blob_handle);
-
-      if (s.ok()) {
-        assert(req.status);
-        *req.status = s;
-
-        PinCachedBlob(&blob_handle, req.result);
-
-        // Update the counter for the number of valid blobs read from the cache.
-        ++cached_blob_count;
-
-        // For consistency, the size of each on-disk (possibly compressed) blob
-        // record is accumulated to total_bytes.
-        uint64_t adjustment =
-            read_options.verify_checksums
-                ? BlobLogRecord::CalculateAdjustmentForRecordHeader(
-                      req.user_key->size())
-                : 0;
-        assert(req.offset >= adjustment);
-        total_bytes += req.len + adjustment;
-        cache_hit_mask |= (Mask{1} << i);  // cache hit
-      }
-    }
-
-    // All blobs were read from the cache.
-    if (cached_blob_count == num_blobs) {
-      if (bytes_read) {
-        *bytes_read = total_bytes;
-      }
-      return;
-    }
-  }
-
-  const bool no_io = read_options.read_tier == kBlockCacheTier;
-  if (no_io) {
-    for (size_t i = 0; i < num_blobs; ++i) {
-      if (!(cache_hit_mask & (Mask{1} << i))) {
-        BlobReadRequest& req = blob_reqs[i];
-        assert(req.status);
-
-        *req.status =
-            Status::Incomplete("Cannot read blob(s): no disk I/O allowed");
-      }
-    }
-    return;
-  }
-
-  {
-    // Find the rest of blobs from the file since I/O is allowed.
-    autovector<std::pair<BlobReadRequest*, std::unique_ptr<BlobContents>>>
-        _blob_reqs;
-    uint64_t _bytes_read = 0;
-
-    for (size_t i = 0; i < num_blobs; ++i) {
-      if (!(cache_hit_mask & (Mask{1} << i))) {
-        _blob_reqs.emplace_back(&blob_reqs[i], std::unique_ptr<BlobContents>());
-      }
-    }
-
-    CacheHandleGuard<BlobFileReader> blob_file_reader;
-    Status s =
-        blob_file_cache_->GetBlobFileReader(file_number, &blob_file_reader);
-    if (!s.ok()) {
-      for (size_t i = 0; i < _blob_reqs.size(); ++i) {
-        BlobReadRequest* const req = _blob_reqs[i].first;
-        assert(req);
-        assert(req->status);
-
-        *req->status = s;
-      }
-      return;
-    }
-
-    assert(blob_file_reader.GetValue());
-
-    MemoryAllocator* const allocator = (blob_cache_ && read_options.fill_cache)
-                                           ? blob_cache_->memory_allocator()
-                                           : nullptr;
-
-    blob_file_reader.GetValue()->MultiGetBlob(read_options, allocator,
-                                              _blob_reqs, &_bytes_read);
-
-    if (blob_cache_ && read_options.fill_cache) {
-      // If filling cache is allowed and a cache is configured, try to put
-      // the blob(s) to the cache.
-      for (auto& [req, blob_contents] : _blob_reqs) {
-        assert(req);
-
-        if (req->status->ok()) {
-          CacheHandleGuard<BlobContents> blob_handle;
-          const CacheKey cache_key = base_cache_key.WithOffset(req->offset);
-          const Slice key = cache_key.AsSlice();
-          s = PutBlobIntoCache(key, &blob_contents, &blob_handle);
-          if (!s.ok()) {
-            *req->status = s;
-          } else {
-            PinCachedBlob(&blob_handle, req->result);
-          }
-        }
-      }
-    } else {
-      for (auto& [req, blob_contents] : _blob_reqs) {
-        assert(req);
-
-        if (req->status->ok()) {
-          PinOwnedBlob(&blob_contents, req->result);
-        }
-      }
-    }
-
-    total_bytes += _bytes_read;
-    if (bytes_read) {
-      *bytes_read = total_bytes;
-    }
-  }
-}
-
-bool BlobSource::TEST_BlobInCache(uint64_t file_number, uint64_t file_size,
-                                  uint64_t offset, size_t* charge) const {
-  const CacheKey cache_key = GetCacheKey(file_number, file_size, offset);
-  const Slice key = cache_key.AsSlice();
-
-  CacheHandleGuard<BlobContents> blob_handle;
-  const Status s = GetBlobFromCache(key, &blob_handle);
-
-  if (s.ok() && blob_handle.GetValue() != nullptr) {
-    if (charge) {
-      const Cache* const cache = blob_handle.GetCache();
-      assert(cache);
-
-      Cache::Handle* const handle = blob_handle.GetCacheHandle();
-      assert(handle);
-
-      *charge = cache->GetUsage(handle);
-    }
-
-    return true;
-  }
-
-  return false;
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,153 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  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 <cinttypes>
-#include <memory>
-
-#include "cache/cache_helpers.h"
-#include "cache/cache_key.h"
-#include "db/blob/blob_file_cache.h"
-#include "db/blob/blob_read_request.h"
-#include "rocksdb/cache.h"
-#include "rocksdb/rocksdb_namespace.h"
-#include "table/block_based/cachable_entry.h"
-#include "util/autovector.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-struct ImmutableOptions;
-class Status;
-class FilePrefetchBuffer;
-class Slice;
-class BlobContents;
-
-// BlobSource is a class that provides universal access to blobs, regardless of
-// whether they are in the blob cache, secondary cache, or (remote) storage.
-// Depending on user settings, it always fetch blobs from multi-tier cache and
-// storage with minimal cost.
-class BlobSource {
- public:
-  BlobSource(const ImmutableOptions* immutable_options,
-             const std::string& db_id, const std::string& db_session_id,
-             BlobFileCache* blob_file_cache);
-
-  BlobSource(const BlobSource&) = delete;
-  BlobSource& operator=(const BlobSource&) = delete;
-
-  ~BlobSource();
-
-  // Read a blob from the underlying cache or one blob file.
-  //
-  // If successful, returns ok and sets "*value" to the newly retrieved
-  // uncompressed blob. If there was an error while fetching the blob, sets
-  // "*value" to empty and returns a non-ok status.
-  //
-  // Note: For consistency, whether the blob is found in the cache or on disk,
-  // sets "*bytes_read" to the size of on-disk (possibly compressed) blob
-  // record.
-  Status GetBlob(const ReadOptions& read_options, const Slice& user_key,
-                 uint64_t file_number, uint64_t offset, uint64_t file_size,
-                 uint64_t value_size, CompressionType compression_type,
-                 FilePrefetchBuffer* prefetch_buffer, PinnableSlice* value,
-                 uint64_t* bytes_read);
-
-  // Read multiple blobs from the underlying cache or blob file(s).
-  //
-  // If successful, returns ok and sets "result" in the elements of "blob_reqs"
-  // to the newly retrieved uncompressed blobs. If there was an error while
-  // fetching one of blobs, sets its "result" to empty and sets its
-  // corresponding "status" to a non-ok status.
-  //
-  // Note:
-  //  - The main difference between this function and MultiGetBlobFromOneFile is
-  //    that this function can read multiple blobs from multiple blob files.
-  //
-  //  - For consistency, whether the blob is found in the cache or on disk, sets
-  //  "*bytes_read" to the total size of on-disk (possibly compressed) blob
-  //  records.
-  void MultiGetBlob(const ReadOptions& read_options,
-                    autovector<BlobFileReadRequests>& blob_reqs,
-                    uint64_t* bytes_read);
-
-  // Read multiple blobs from the underlying cache or one blob file.
-  //
-  // If successful, returns ok and sets "result" in the elements of "blob_reqs"
-  // to the newly retrieved uncompressed blobs. If there was an error while
-  // fetching one of blobs, sets its "result" to empty and sets its
-  // corresponding "status" to a non-ok status.
-  //
-  // Note:
-  //  - The main difference between this function and MultiGetBlob is that this
-  //  function is only used for the case where the demanded blobs are stored in
-  //  one blob file. MultiGetBlob will call this function multiple times if the
-  //  demanded blobs are stored in multiple blob files.
-  //
-  //  - For consistency, whether the blob is found in the cache or on disk, sets
-  //  "*bytes_read" to the total size of on-disk (possibly compressed) blob
-  //  records.
-  void MultiGetBlobFromOneFile(const ReadOptions& read_options,
-                               uint64_t file_number, uint64_t file_size,
-                               autovector<BlobReadRequest>& blob_reqs,
-                               uint64_t* bytes_read);
-
-  inline Status GetBlobFileReader(
-      uint64_t blob_file_number,
-      CacheHandleGuard<BlobFileReader>* blob_file_reader) {
-    return blob_file_cache_->GetBlobFileReader(blob_file_number,
-                                               blob_file_reader);
-  }
-
-  inline Cache* GetBlobCache() const { return blob_cache_.get(); }
-
-  bool TEST_BlobInCache(uint64_t file_number, uint64_t file_size,
-                        uint64_t offset, size_t* charge = nullptr) const;
-
- private:
-  Status GetBlobFromCache(const Slice& cache_key,
-                          CacheHandleGuard<BlobContents>* cached_blob) const;
-
-  Status PutBlobIntoCache(const Slice& cache_key,
-                          std::unique_ptr<BlobContents>* blob,
-                          CacheHandleGuard<BlobContents>* cached_blob) const;
-
-  static void PinCachedBlob(CacheHandleGuard<BlobContents>* cached_blob,
-                            PinnableSlice* value);
-
-  static void PinOwnedBlob(std::unique_ptr<BlobContents>* owned_blob,
-                           PinnableSlice* value);
-
-  Cache::Handle* GetEntryFromCache(const Slice& key) const;
-
-  Status InsertEntryIntoCache(const Slice& key, BlobContents* value,
-                              size_t charge, Cache::Handle** cache_handle,
-                              Cache::Priority priority) const;
-
-  inline CacheKey GetCacheKey(uint64_t file_number, uint64_t /*file_size*/,
-                              uint64_t offset) const {
-    OffsetableCacheKey base_cache_key(db_id_, db_session_id_, file_number);
-    return base_cache_key.WithOffset(offset);
-  }
-
-  const std::string& db_id_;
-  const std::string& db_session_id_;
-
-  Statistics* statistics_;
-
-  // A cache to store blob file reader.
-  BlobFileCache* blob_file_cache_;
-
-  // A cache to store uncompressed blobs.
-  std::shared_ptr<Cache> blob_cache_;
-
-  // The control option of how the cache tiers will be used. Currently rocksdb
-  // support block/blob cache (volatile tier) and secondary cache (this tier
-  // isn't strictly speaking a non-volatile tier since the compressed cache in
-  // this tier is in volatile memory).
-  const CacheTier lowest_used_cache_tier_;
-};
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -5,9 +5,7 @@

 #include <array>
 #include <sstream>
-#include <string>

-#include "cache/compressed_secondary_cache.h"
 #include "db/blob/blob_index.h"
 #include "db/blob/blob_log_format.h"
 #include "db/db_test_util.h"
@@ -50,326 +48,6 @@ TEST_F(DBBlobBasicTest, GetBlob) {
                  .IsIncomplete());
 }

-TEST_F(DBBlobBasicTest, GetBlobFromCache) {
-  Options options = GetDefaultOptions();
-
-  LRUCacheOptions co;
-  co.capacity = 2 << 20;  // 2MB
-  co.num_shard_bits = 2;
-  co.metadata_charge_policy = kDontChargeCacheMetadata;
-  auto backing_cache = NewLRUCache(co);
-
-  options.enable_blob_files = true;
-  options.blob_cache = backing_cache;
-
-  BlockBasedTableOptions block_based_options;
-  block_based_options.no_block_cache = false;
-  block_based_options.block_cache = backing_cache;
-  block_based_options.cache_index_and_filter_blocks = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(block_based_options));
-
-  Reopen(options);
-
-  constexpr char key[] = "key";
-  constexpr char blob_value[] = "blob_value";
-
-  ASSERT_OK(Put(key, blob_value));
-
-  ASSERT_OK(Flush());
-
-  ReadOptions read_options;
-
-  read_options.fill_cache = false;
-
-  {
-    PinnableSlice result;
-
-    read_options.read_tier = kReadAllTier;
-    ASSERT_OK(db_->Get(read_options, db_->DefaultColumnFamily(), key, &result));
-    ASSERT_EQ(result, blob_value);
-
-    result.Reset();
-    read_options.read_tier = kBlockCacheTier;
-
-    // Try again with no I/O allowed. Since we didn't re-fill the cache, the
-    // blob itself can only be read from the blob file, so the read should
-    // return Incomplete.
-    ASSERT_TRUE(db_->Get(read_options, db_->DefaultColumnFamily(), key, &result)
-                    .IsIncomplete());
-    ASSERT_TRUE(result.empty());
-  }
-
-  read_options.fill_cache = true;
-
-  {
-    PinnableSlice result;
-
-    read_options.read_tier = kReadAllTier;
-    ASSERT_OK(db_->Get(read_options, db_->DefaultColumnFamily(), key, &result));
-    ASSERT_EQ(result, blob_value);
-
-    result.Reset();
-    read_options.read_tier = kBlockCacheTier;
-
-    // Try again with no I/O allowed. The table and the necessary blocks/blobs
-    // should already be in their respective caches.
-    ASSERT_OK(db_->Get(read_options, db_->DefaultColumnFamily(), key, &result));
-    ASSERT_EQ(result, blob_value);
-  }
-}
-
-TEST_F(DBBlobBasicTest, IterateBlobsFromCache) {
-  Options options = GetDefaultOptions();
-
-  LRUCacheOptions co;
-  co.capacity = 2 << 20;  // 2MB
-  co.num_shard_bits = 2;
-  co.metadata_charge_policy = kDontChargeCacheMetadata;
-  auto backing_cache = NewLRUCache(co);
-
-  options.enable_blob_files = true;
-  options.blob_cache = backing_cache;
-
-  BlockBasedTableOptions block_based_options;
-  block_based_options.no_block_cache = false;
-  block_based_options.block_cache = backing_cache;
-  block_based_options.cache_index_and_filter_blocks = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(block_based_options));
-
-  options.statistics = CreateDBStatistics();
-
-  Reopen(options);
-
-  int num_blobs = 5;
-  std::vector<std::string> keys;
-  std::vector<std::string> blobs;
-
-  for (int i = 0; i < num_blobs; ++i) {
-    keys.push_back("key" + std::to_string(i));
-    blobs.push_back("blob" + std::to_string(i));
-    ASSERT_OK(Put(keys[i], blobs[i]));
-  }
-  ASSERT_OK(Flush());
-
-  ReadOptions read_options;
-
-  {
-    read_options.fill_cache = false;
-    read_options.read_tier = kReadAllTier;
-
-    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-    ASSERT_OK(iter->status());
-
-    int i = 0;
-    for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
-      ASSERT_OK(iter->status());
-      ASSERT_EQ(iter->key().ToString(), keys[i]);
-      ASSERT_EQ(iter->value().ToString(), blobs[i]);
-      ++i;
-    }
-    ASSERT_EQ(i, num_blobs);
-    ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD), 0);
-  }
-
-  {
-    read_options.fill_cache = false;
-    read_options.read_tier = kBlockCacheTier;
-
-    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-    ASSERT_OK(iter->status());
-
-    // Try again with no I/O allowed. Since we didn't re-fill the cache,
-    // the blob itself can only be read from the blob file, so iter->Valid()
-    // should be false.
-    iter->SeekToFirst();
-    ASSERT_NOK(iter->status());
-    ASSERT_FALSE(iter->Valid());
-    ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD), 0);
-  }
-
-  {
-    read_options.fill_cache = true;
-    read_options.read_tier = kReadAllTier;
-
-    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-    ASSERT_OK(iter->status());
-
-    // Read blobs from the file and refill the cache.
-    int i = 0;
-    for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
-      ASSERT_OK(iter->status());
-      ASSERT_EQ(iter->key().ToString(), keys[i]);
-      ASSERT_EQ(iter->value().ToString(), blobs[i]);
-      ++i;
-    }
-    ASSERT_EQ(i, num_blobs);
-    ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD),
-              num_blobs);
-  }
-
-  {
-    read_options.fill_cache = false;
-    read_options.read_tier = kBlockCacheTier;
-
-    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-    ASSERT_OK(iter->status());
-
-    // Try again with no I/O allowed. The table and the necessary blocks/blobs
-    // should already be in their respective caches.
-    int i = 0;
-    for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
-      ASSERT_OK(iter->status());
-      ASSERT_EQ(iter->key().ToString(), keys[i]);
-      ASSERT_EQ(iter->value().ToString(), blobs[i]);
-      ++i;
-    }
-    ASSERT_EQ(i, num_blobs);
-    ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD), 0);
-  }
-}
-
-TEST_F(DBBlobBasicTest, IterateBlobsFromCachePinning) {
-  constexpr size_t min_blob_size = 6;
-
-  Options options = GetDefaultOptions();
-
-  LRUCacheOptions cache_options;
-  cache_options.capacity = 2048;
-  cache_options.num_shard_bits = 0;
-  cache_options.metadata_charge_policy = kDontChargeCacheMetadata;
-
-  options.blob_cache = NewLRUCache(cache_options);
-  options.enable_blob_files = true;
-  options.min_blob_size = min_blob_size;
-
-  Reopen(options);
-
-  // Put then iterate over three key-values. The second value is below the size
-  // limit and is thus stored inline; the other two are stored separately as
-  // blobs. We expect to have something pinned in the cache iff we are
-  // positioned on a blob.
-
-  constexpr char first_key[] = "first_key";
-  constexpr char first_value[] = "long_value";
-  static_assert(sizeof(first_value) - 1 >= min_blob_size,
-                "first_value too short to be stored as blob");
-
-  ASSERT_OK(Put(first_key, first_value));
-
-  constexpr char second_key[] = "second_key";
-  constexpr char second_value[] = "short";
-  static_assert(sizeof(second_value) - 1 < min_blob_size,
-                "second_value too long to be inlined");
-
-  ASSERT_OK(Put(second_key, second_value));
-
-  constexpr char third_key[] = "third_key";
-  constexpr char third_value[] = "other_long_value";
-  static_assert(sizeof(third_value) - 1 >= min_blob_size,
-                "third_value too short to be stored as blob");
-
-  ASSERT_OK(Put(third_key, third_value));
-
-  ASSERT_OK(Flush());
-
-  {
-    ReadOptions read_options;
-    read_options.fill_cache = true;
-
-    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-
-    iter->SeekToFirst();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), first_key);
-    ASSERT_EQ(iter->value(), first_value);
-
-    iter->Next();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), second_key);
-    ASSERT_EQ(iter->value(), second_value);
-
-    iter->Next();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), third_key);
-    ASSERT_EQ(iter->value(), third_value);
-
-    iter->Next();
-    ASSERT_FALSE(iter->Valid());
-    ASSERT_OK(iter->status());
-  }
-
-  {
-    ReadOptions read_options;
-    read_options.fill_cache = false;
-    read_options.read_tier = kBlockCacheTier;
-
-    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-
-    iter->SeekToFirst();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), first_key);
-    ASSERT_EQ(iter->value(), first_value);
-    ASSERT_GT(options.blob_cache->GetPinnedUsage(), 0);
-
-    iter->Next();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), second_key);
-    ASSERT_EQ(iter->value(), second_value);
-    ASSERT_EQ(options.blob_cache->GetPinnedUsage(), 0);
-
-    iter->Next();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), third_key);
-    ASSERT_EQ(iter->value(), third_value);
-    ASSERT_GT(options.blob_cache->GetPinnedUsage(), 0);
-
-    iter->Next();
-    ASSERT_FALSE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(options.blob_cache->GetPinnedUsage(), 0);
-  }
-
-  {
-    ReadOptions read_options;
-    read_options.fill_cache = false;
-    read_options.read_tier = kBlockCacheTier;
-
-    std::unique_ptr<Iterator> iter(db_->NewIterator(read_options));
-
-    iter->SeekToLast();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), third_key);
-    ASSERT_EQ(iter->value(), third_value);
-    ASSERT_GT(options.blob_cache->GetPinnedUsage(), 0);
-
-    iter->Prev();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), second_key);
-    ASSERT_EQ(iter->value(), second_value);
-    ASSERT_EQ(options.blob_cache->GetPinnedUsage(), 0);
-
-    iter->Prev();
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(iter->key(), first_key);
-    ASSERT_EQ(iter->value(), first_value);
-    ASSERT_GT(options.blob_cache->GetPinnedUsage(), 0);
-
-    iter->Prev();
-    ASSERT_FALSE(iter->Valid());
-    ASSERT_OK(iter->status());
-    ASSERT_EQ(options.blob_cache->GetPinnedUsage(), 0);
-  }
-}
-
 TEST_F(DBBlobBasicTest, MultiGetBlobs) {
  constexpr size_t min_blob_size = 6;

@@ -449,141 +127,6 @@ TEST_F(DBBlobBasicTest, MultiGetBlobs) {
  }
 }

-TEST_F(DBBlobBasicTest, MultiGetBlobsFromCache) {
-  Options options = GetDefaultOptions();
-
-  LRUCacheOptions co;
-  co.capacity = 2 << 20;  // 2MB
-  co.num_shard_bits = 2;
-  co.metadata_charge_policy = kDontChargeCacheMetadata;
-  auto backing_cache = NewLRUCache(co);
-
-  constexpr size_t min_blob_size = 6;
-  options.min_blob_size = min_blob_size;
-  options.create_if_missing = true;
-  options.enable_blob_files = true;
-  options.blob_cache = backing_cache;
-
-  BlockBasedTableOptions block_based_options;
-  block_based_options.no_block_cache = false;
-  block_based_options.block_cache = backing_cache;
-  block_based_options.cache_index_and_filter_blocks = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(block_based_options));
-
-  DestroyAndReopen(options);
-
-  // Put then retrieve three key-values. The first value is below the size limit
-  // and is thus stored inline; the other two are stored separately as blobs.
-  constexpr size_t num_keys = 3;
-
-  constexpr char first_key[] = "first_key";
-  constexpr char first_value[] = "short";
-  static_assert(sizeof(first_value) - 1 < min_blob_size,
-                "first_value too long to be inlined");
-
-  ASSERT_OK(Put(first_key, first_value));
-
-  constexpr char second_key[] = "second_key";
-  constexpr char second_value[] = "long_value";
-  static_assert(sizeof(second_value) - 1 >= min_blob_size,
-                "second_value too short to be stored as blob");
-
-  ASSERT_OK(Put(second_key, second_value));
-
-  constexpr char third_key[] = "third_key";
-  constexpr char third_value[] = "other_long_value";
-  static_assert(sizeof(third_value) - 1 >= min_blob_size,
-                "third_value too short to be stored as blob");
-
-  ASSERT_OK(Put(third_key, third_value));
-
-  ASSERT_OK(Flush());
-
-  ReadOptions read_options;
-  read_options.fill_cache = false;
-
-  std::array<Slice, num_keys> keys{{first_key, second_key, third_key}};
-
-  {
-    std::array<PinnableSlice, num_keys> values;
-    std::array<Status, num_keys> statuses;
-
-    db_->MultiGet(read_options, db_->DefaultColumnFamily(), num_keys, &keys[0],
-                  &values[0], &statuses[0]);
-
-    ASSERT_OK(statuses[0]);
-    ASSERT_EQ(values[0], first_value);
-
-    ASSERT_OK(statuses[1]);
-    ASSERT_EQ(values[1], second_value);
-
-    ASSERT_OK(statuses[2]);
-    ASSERT_EQ(values[2], third_value);
-  }
-
-  // Try again with no I/O allowed. The first (inlined) value should be
-  // successfully read; however, the two blob values could only be read from the
-  // blob file, so for those the read should return Incomplete.
-  read_options.read_tier = kBlockCacheTier;
-
-  {
-    std::array<PinnableSlice, num_keys> values;
-    std::array<Status, num_keys> statuses;
-
-    db_->MultiGet(read_options, db_->DefaultColumnFamily(), num_keys, &keys[0],
-                  &values[0], &statuses[0]);
-
-    ASSERT_OK(statuses[0]);
-    ASSERT_EQ(values[0], first_value);
-
-    ASSERT_TRUE(statuses[1].IsIncomplete());
-
-    ASSERT_TRUE(statuses[2].IsIncomplete());
-  }
-
-  // Fill the cache when reading blobs from the blob file.
-  read_options.read_tier = kReadAllTier;
-  read_options.fill_cache = true;
-
-  {
-    std::array<PinnableSlice, num_keys> values;
-    std::array<Status, num_keys> statuses;
-
-    db_->MultiGet(read_options, db_->DefaultColumnFamily(), num_keys, &keys[0],
-                  &values[0], &statuses[0]);
-
-    ASSERT_OK(statuses[0]);
-    ASSERT_EQ(values[0], first_value);
-
-    ASSERT_OK(statuses[1]);
-    ASSERT_EQ(values[1], second_value);
-
-    ASSERT_OK(statuses[2]);
-    ASSERT_EQ(values[2], third_value);
-  }
-
-  // Try again with no I/O allowed. All blobs should be successfully read from
-  // the cache.
-  read_options.read_tier = kBlockCacheTier;
-
-  {
-    std::array<PinnableSlice, num_keys> values;
-    std::array<Status, num_keys> statuses;
-
-    db_->MultiGet(read_options, db_->DefaultColumnFamily(), num_keys, &keys[0],
-                  &values[0], &statuses[0]);
-
-    ASSERT_OK(statuses[0]);
-    ASSERT_EQ(values[0], first_value);
-
-    ASSERT_OK(statuses[1]);
-    ASSERT_EQ(values[1], second_value);
-
-    ASSERT_OK(statuses[2]);
-    ASSERT_EQ(values[2], third_value);
-  }
-}
-
 #ifndef ROCKSDB_LITE
 TEST_F(DBBlobBasicTest, MultiGetWithDirectIO) {
  Options options = GetDefaultOptions();
@@ -777,23 +320,8 @@ TEST_F(DBBlobBasicTest, MultiGetWithDirectIO) {

 TEST_F(DBBlobBasicTest, MultiGetBlobsFromMultipleFiles) {
  Options options = GetDefaultOptions();
-
-  LRUCacheOptions co;
-  co.capacity = 2 << 20; // 2MB
-  co.num_shard_bits = 2;
-  co.metadata_charge_policy = kDontChargeCacheMetadata;
-  auto backing_cache = NewLRUCache(co);
-
-  options.min_blob_size = 0;
-  options.create_if_missing = true;
  options.enable_blob_files = true;
-  options.blob_cache = backing_cache;
-
-  BlockBasedTableOptions block_based_options;
-  block_based_options.no_block_cache = false;
-  block_based_options.block_cache = backing_cache;
-  block_based_options.cache_index_and_filter_blocks = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(block_based_options));
+  options.min_blob_size = 0;

  Reopen(options);

@@ -819,64 +347,14 @@ TEST_F(DBBlobBasicTest, MultiGetBlobsFromMultipleFiles) {
  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]);

-  ReadOptions read_options;
-  read_options.read_tier = kReadAllTier;
-  read_options.fill_cache = false;
-
-  {
-    std::array<PinnableSlice, kNumKeys> values;
-    std::array<Status, kNumKeys> statuses;
-    db_->MultiGet(read_options, 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]);
-    }
-  }
-
-  read_options.read_tier = kBlockCacheTier;
-
-  {
-    std::array<PinnableSlice, kNumKeys> values;
-    std::array<Status, kNumKeys> statuses;
-    db_->MultiGet(read_options, db_->DefaultColumnFamily(), kNumKeys, &keys[0],
-                  &values[0], &statuses[0]);
-
-    for (size_t i = 0; i < kNumKeys; ++i) {
-      ASSERT_TRUE(statuses[i].IsIncomplete());
-      ASSERT_TRUE(values[i].empty());
-    }
-  }
-
-  read_options.read_tier = kReadAllTier;
-  read_options.fill_cache = true;
-
-  {
-    std::array<PinnableSlice, kNumKeys> values;
-    std::array<Status, kNumKeys> statuses;
-    db_->MultiGet(read_options, 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]);
-    }
-  }
-
-  read_options.read_tier = kBlockCacheTier;
-
-  {
-    std::array<PinnableSlice, kNumKeys> values;
-    std::array<Status, kNumKeys> statuses;
-    db_->MultiGet(read_options, 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]);
-    }
+  for (size_t i = 0; i < kNumKeys; ++i) {
+    ASSERT_OK(statuses[i]);
+    ASSERT_EQ(value_strs[i], values[i]);
  }
 }

@@ -1582,203 +1060,6 @@ TEST_P(DBBlobBasicIOErrorTest, CompactionFilterReadBlob_IOError) {
  SyncPoint::GetInstance()->ClearAllCallBacks();
 }

-TEST_F(DBBlobBasicTest, WarmCacheWithBlobsDuringFlush) {
-  Options options = GetDefaultOptions();
-
-  LRUCacheOptions co;
-  co.capacity = 1 << 25;
-  co.num_shard_bits = 2;
-  co.metadata_charge_policy = kDontChargeCacheMetadata;
-  auto backing_cache = NewLRUCache(co);
-
-  options.blob_cache = backing_cache;
-
-  BlockBasedTableOptions block_based_options;
-  block_based_options.no_block_cache = false;
-  block_based_options.block_cache = backing_cache;
-  block_based_options.cache_index_and_filter_blocks = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(block_based_options));
-
-  options.enable_blob_files = true;
-  options.create_if_missing = true;
-  options.disable_auto_compactions = true;
-  options.enable_blob_garbage_collection = true;
-  options.blob_garbage_collection_age_cutoff = 1.0;
-  options.prepopulate_blob_cache = PrepopulateBlobCache::kFlushOnly;
-  options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
-
-  DestroyAndReopen(options);
-
-  constexpr size_t kNumBlobs = 10;
-  constexpr size_t kValueSize = 100;
-
-  std::string value(kValueSize, 'a');
-
-  for (size_t i = 1; i <= kNumBlobs; i++) {
-    ASSERT_OK(Put(std::to_string(i), value));
-    ASSERT_OK(Put(std::to_string(i + kNumBlobs), value));  // Add some overlap
-    ASSERT_OK(Flush());
-    ASSERT_EQ(i * 2, options.statistics->getTickerCount(BLOB_DB_CACHE_ADD));
-    ASSERT_EQ(value, Get(std::to_string(i)));
-    ASSERT_EQ(value, Get(std::to_string(i + kNumBlobs)));
-    ASSERT_EQ(0, options.statistics->getTickerCount(BLOB_DB_CACHE_MISS));
-    ASSERT_EQ(i * 2, options.statistics->getTickerCount(BLOB_DB_CACHE_HIT));
-  }
-
-  // Verify compaction not counted
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), /*begin=*/nullptr,
-                              /*end=*/nullptr));
-  EXPECT_EQ(kNumBlobs * 2,
-            options.statistics->getTickerCount(BLOB_DB_CACHE_ADD));
-}
-
-#ifndef ROCKSDB_LITE
-TEST_F(DBBlobBasicTest, DynamicallyWarmCacheDuringFlush) {
-  Options options = GetDefaultOptions();
-
-  LRUCacheOptions co;
-  co.capacity = 1 << 25;
-  co.num_shard_bits = 2;
-  co.metadata_charge_policy = kDontChargeCacheMetadata;
-  auto backing_cache = NewLRUCache(co);
-
-  options.blob_cache = backing_cache;
-
-  BlockBasedTableOptions block_based_options;
-  block_based_options.no_block_cache = false;
-  block_based_options.block_cache = backing_cache;
-  block_based_options.cache_index_and_filter_blocks = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(block_based_options));
-
-  options.enable_blob_files = true;
-  options.create_if_missing = true;
-  options.disable_auto_compactions = true;
-  options.enable_blob_garbage_collection = true;
-  options.blob_garbage_collection_age_cutoff = 1.0;
-  options.prepopulate_blob_cache = PrepopulateBlobCache::kFlushOnly;
-  options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
-
-  DestroyAndReopen(options);
-
-  constexpr size_t kNumBlobs = 10;
-  constexpr size_t kValueSize = 100;
-
-  std::string value(kValueSize, 'a');
-
-  for (size_t i = 1; i <= 5; i++) {
-    ASSERT_OK(Put(std::to_string(i), value));
-    ASSERT_OK(Put(std::to_string(i + kNumBlobs), value));  // Add some overlap
-    ASSERT_OK(Flush());
-    ASSERT_EQ(2, options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD));
-
-    ASSERT_EQ(value, Get(std::to_string(i)));
-    ASSERT_EQ(value, Get(std::to_string(i + kNumBlobs)));
-    ASSERT_EQ(0, options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD));
-    ASSERT_EQ(0,
-              options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_MISS));
-    ASSERT_EQ(2, options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_HIT));
-  }
-
-  ASSERT_OK(dbfull()->SetOptions({{"prepopulate_blob_cache", "kDisable"}}));
-
-  for (size_t i = 6; i <= kNumBlobs; i++) {
-    ASSERT_OK(Put(std::to_string(i), value));
-    ASSERT_OK(Put(std::to_string(i + kNumBlobs), value));  // Add some overlap
-    ASSERT_OK(Flush());
-    ASSERT_EQ(0, options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD));
-
-    ASSERT_EQ(value, Get(std::to_string(i)));
-    ASSERT_EQ(value, Get(std::to_string(i + kNumBlobs)));
-    ASSERT_EQ(2, options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD));
-    ASSERT_EQ(2,
-              options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_MISS));
-    ASSERT_EQ(0, options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_HIT));
-  }
-
-  // Verify compaction not counted
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), /*begin=*/nullptr,
-                              /*end=*/nullptr));
-  EXPECT_EQ(0, options.statistics->getTickerCount(BLOB_DB_CACHE_ADD));
-}
-#endif  // !ROCKSDB_LITE
-
-TEST_F(DBBlobBasicTest, WarmCacheWithBlobsSecondary) {
-  CompressedSecondaryCacheOptions secondary_cache_opts;
-  secondary_cache_opts.capacity = 1 << 20;
-  secondary_cache_opts.num_shard_bits = 0;
-  secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
-  secondary_cache_opts.compression_type = kNoCompression;
-
-  LRUCacheOptions primary_cache_opts;
-  primary_cache_opts.capacity = 1024;
-  primary_cache_opts.num_shard_bits = 0;
-  primary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
-  primary_cache_opts.secondary_cache =
-      NewCompressedSecondaryCache(secondary_cache_opts);
-
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.statistics = CreateDBStatistics();
-  options.enable_blob_files = true;
-  options.blob_cache = NewLRUCache(primary_cache_opts);
-  options.prepopulate_blob_cache = PrepopulateBlobCache::kFlushOnly;
-
-  DestroyAndReopen(options);
-
-  // Note: only one of the two blobs fit in the primary cache at any given time.
-  constexpr char first_key[] = "foo";
-  constexpr size_t first_blob_size = 512;
-  const std::string first_blob(first_blob_size, 'a');
-
-  constexpr char second_key[] = "bar";
-  constexpr size_t second_blob_size = 768;
-  const std::string second_blob(second_blob_size, 'b');
-
-  // First blob is inserted into primary cache during flush.
-  ASSERT_OK(Put(first_key, first_blob));
-  ASSERT_OK(Flush());
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD), 1);
-
-  // Second blob is inserted into primary cache during flush,
-  // First blob is evicted but only a dummy handle is inserted into secondary
-  // cache.
-  ASSERT_OK(Put(second_key, second_blob));
-  ASSERT_OK(Flush());
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_ADD), 1);
-
-  // First blob is inserted into primary cache.
-  // Second blob is evicted but only a dummy handle is inserted into secondary
-  // cache.
-  ASSERT_EQ(Get(first_key), first_blob);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_MISS), 1);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_HIT), 0);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(SECONDARY_CACHE_HITS),
-            0);
-  // Second blob is inserted into primary cache,
-  // First blob is evicted and is inserted into secondary cache.
-  ASSERT_EQ(Get(second_key), second_blob);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_MISS), 1);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_HIT), 0);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(SECONDARY_CACHE_HITS),
-            0);
-
-  // First blob's dummy item is inserted into primary cache b/c of lookup.
-  // Second blob is still in primary cache.
-  ASSERT_EQ(Get(first_key), first_blob);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_MISS), 0);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_HIT), 1);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(SECONDARY_CACHE_HITS),
-            1);
-
-  // First blob's item is inserted into primary cache b/c of lookup.
-  // Second blob is evicted and inserted into secondary cache.
-  ASSERT_EQ(Get(first_key), first_blob);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_MISS), 0);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(BLOB_DB_CACHE_HIT), 1);
-  ASSERT_EQ(options.statistics->getAndResetTickerCount(SECONDARY_CACHE_HITS),
-            1);
-}
-
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
@@ -54,26 +54,6 @@ class FilterByKeyLength : public CompactionFilter {
  size_t length_threshold_;
 };

-class FilterByValueLength : public CompactionFilter {
- public:
-  explicit FilterByValueLength(size_t len) : length_threshold_(len) {}
-  const char* Name() const override {
-    return "rocksdb.compaction.filter.by.value.length";
-  }
-  CompactionFilter::Decision FilterV2(
-      int /*level*/, const Slice& /*key*/, ValueType /*value_type*/,
-      const Slice& existing_value, std::string* /*new_value*/,
-      std::string* /*skip_until*/) const override {
-    if (existing_value.size() < length_threshold_) {
-      return CompactionFilter::Decision::kRemove;
-    }
-    return CompactionFilter::Decision::kKeep;
-  }
-
- private:
-  size_t length_threshold_;
-};
-
 class BadBlobCompactionFilter : public CompactionFilter {
 public:
  explicit BadBlobCompactionFilter(std::string prefix,
@@ -263,133 +243,6 @@ TEST_F(DBBlobCompactionTest, FilterByKeyLength) {
  Close();
 }

-TEST_F(DBBlobCompactionTest, FilterByValueLength) {
-  Options options = GetDefaultOptions();
-  options.enable_blob_files = true;
-  options.min_blob_size = 5;
-  options.create_if_missing = true;
-  constexpr size_t kValueLength = 5;
-  std::unique_ptr<CompactionFilter> compaction_filter_guard(
-      new FilterByValueLength(kValueLength));
-  options.compaction_filter = compaction_filter_guard.get();
-
-  const std::vector<std::string> short_value_keys = {"a", "e", "j"};
-  constexpr char short_value[] = "val";
-  const std::vector<std::string> long_value_keys = {"b", "f", "k"};
-  constexpr char long_value[] = "valuevalue";
-
-  DestroyAndReopen(options);
-  for (size_t i = 0; i < short_value_keys.size(); ++i) {
-    ASSERT_OK(Put(short_value_keys[i], short_value));
-  }
-  for (size_t i = 0; i < short_value_keys.size(); ++i) {
-    ASSERT_OK(Put(long_value_keys[i], long_value));
-  }
-  ASSERT_OK(Flush());
-  CompactRangeOptions cro;
-  ASSERT_OK(db_->CompactRange(cro, /*begin=*/nullptr, /*end=*/nullptr));
-  std::string value;
-  for (size_t i = 0; i < short_value_keys.size(); ++i) {
-    ASSERT_TRUE(
-        db_->Get(ReadOptions(), short_value_keys[i], &value).IsNotFound());
-    value.clear();
-  }
-  for (size_t i = 0; i < long_value_keys.size(); ++i) {
-    ASSERT_OK(db_->Get(ReadOptions(), long_value_keys[i], &value));
-    ASSERT_EQ(long_value, value);
-  }
-
-#ifndef ROCKSDB_LITE
-  const auto& compaction_stats = GetCompactionStats();
-  ASSERT_GE(compaction_stats.size(), 2);
-
-  // Filter decides between kKeep and kRemove based on value;
-  // this involves reading but not writing blobs
-  ASSERT_GT(compaction_stats[1].bytes_read_blob, 0);
-  ASSERT_EQ(compaction_stats[1].bytes_written_blob, 0);
-#endif  // ROCKSDB_LITE
-
-  Close();
-}
-
-#ifndef ROCKSDB_LITE
-TEST_F(DBBlobCompactionTest, BlobCompactWithStartingLevel) {
-  Options options = GetDefaultOptions();
-
-  options.enable_blob_files = true;
-  options.min_blob_size = 1000;
-  options.blob_file_starting_level = 5;
-  options.create_if_missing = 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);
-
-  ASSERT_OK(TryReopen(options));
-
-  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));
-
-  ASSERT_OK(Flush());
-
-  constexpr char fourth_key[] = "c";
-  const std::string fourth_blob(blob_size, 'c');
-  ASSERT_OK(Put(fourth_key, fourth_blob));
-
-  ASSERT_OK(Flush());
-
-  ASSERT_EQ(0, GetBlobFileNumbers().size());
-  ASSERT_EQ(2, NumTableFilesAtLevel(/*level=*/0));
-  ASSERT_EQ(0, NumTableFilesAtLevel(/*level=*/1));
-
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), /*begin=*/nullptr,
-                              /*end=*/nullptr));
-
-  // No blob file should be created since blob_file_starting_level is 5.
-  ASSERT_EQ(0, GetBlobFileNumbers().size());
-  ASSERT_EQ(0, NumTableFilesAtLevel(/*level=*/0));
-  ASSERT_EQ(4, NumTableFilesAtLevel(/*level=*/1));
-
-  {
-    options.blob_file_starting_level = 1;
-    DestroyAndReopen(options);
-
-    ASSERT_OK(Put(first_key, first_blob));
-    ASSERT_OK(Put(second_key, second_blob));
-    ASSERT_OK(Put(third_key, third_blob));
-    ASSERT_OK(Flush());
-    ASSERT_OK(Put(fourth_key, fourth_blob));
-    ASSERT_OK(Flush());
-
-    ASSERT_EQ(0, GetBlobFileNumbers().size());
-    ASSERT_EQ(2, NumTableFilesAtLevel(/*level=*/0));
-    ASSERT_EQ(0, NumTableFilesAtLevel(/*level=*/1));
-
-    ASSERT_OK(db_->CompactRange(CompactRangeOptions(), /*begin=*/nullptr,
-                                /*end=*/nullptr));
-    // The compaction's output level equals to blob_file_starting_level.
-    ASSERT_EQ(1, GetBlobFileNumbers().size());
-    ASSERT_EQ(0, NumTableFilesAtLevel(/*level=*/0));
-    ASSERT_EQ(4, NumTableFilesAtLevel(/*level=*/1));
-  }
-
-  Close();
-}
-#endif
-
 TEST_F(DBBlobCompactionTest, BlindWriteFilter) {
  Options options = GetDefaultOptions();
  options.enable_blob_files = true;
@@ -867,42 +720,6 @@ TEST_F(DBBlobCompactionTest, CompactionReadaheadMerge) {
  Close();
 }

-TEST_F(DBBlobCompactionTest, CompactionDoNotFillCache) {
-  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.disable_auto_compactions = true;
-  options.statistics = CreateDBStatistics();
-
-  LRUCacheOptions cache_options;
-  cache_options.capacity = 1 << 20;
-  cache_options.metadata_charge_policy = kDontChargeCacheMetadata;
-
-  options.blob_cache = NewLRUCache(cache_options);
-
-  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());
-
-  constexpr Slice* begin = nullptr;
-  constexpr Slice* end = nullptr;
-
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), begin, end));
-
-  ASSERT_EQ(options.statistics->getTickerCount(BLOB_DB_CACHE_ADD), 0);
-
-  Close();
-}
-
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
@@ -153,11 +153,11 @@ TEST_F(DBBlobIndexTest, Write) {
    key_values.reserve(num_key_values);

    for (size_t i = 1; i <= num_key_values; ++i) {
-      std::string key = "key" + std::to_string(i);
+      std::string key = "key" + ToString(i);

      std::string blob_index;
      BlobIndex::EncodeInlinedTTL(&blob_index, /* expiration */ 9876543210,
-                                  "blob" + std::to_string(i));
+                                  "blob" + ToString(i));

      key_values.emplace_back(std::move(key), std::move(blob_index));
    }
@@ -230,7 +230,7 @@ TEST_F(DBBlobIndexTest, Updated) {
    DestroyAndReopen(GetTestOptions());
    WriteBatch batch;
    for (int i = 0; i < 10; i++) {
-      ASSERT_OK(PutBlobIndex(&batch, "key" + std::to_string(i), blob_index));
+      ASSERT_OK(PutBlobIndex(&batch, "key" + ToString(i), blob_index));
    }
    ASSERT_OK(Write(&batch));
    // Avoid blob values from being purged.
@@ -248,7 +248,7 @@ TEST_F(DBBlobIndexTest, Updated) {
    ASSERT_OK(dbfull()->DeleteRange(WriteOptions(), cfh(), "key6", "key9"));
    MoveDataTo(tier);
    for (int i = 0; i < 10; i++) {
-      ASSERT_EQ(blob_index, GetBlobIndex("key" + std::to_string(i), snapshot));
+      ASSERT_EQ(blob_index, GetBlobIndex("key" + ToString(i), snapshot));
    }
    ASSERT_EQ("new_value", Get("key1"));
    if (tier <= kImmutableMemtables) {
@@ -260,7 +260,7 @@ TEST_F(DBBlobIndexTest, Updated) {
    ASSERT_EQ("NOT_FOUND", Get("key4"));
    ASSERT_EQ("a,b,c", GetImpl("key5"));
    for (int i = 6; i < 9; i++) {
-      ASSERT_EQ("NOT_FOUND", Get("key" + std::to_string(i)));
+      ASSERT_EQ("NOT_FOUND", Get("key" + ToString(i)));
    }
    ASSERT_EQ(blob_index, GetBlobIndex("key9"));
    dbfull()->ReleaseSnapshot(snapshot);
@@ -301,7 +301,7 @@ TEST_F(DBBlobIndexTest, Iterate) {
  };

  auto get_value = [&](int index, int version) {
-    return get_key(index) + "_value" + std::to_string(version);
+    return get_key(index) + "_value" + ToString(version);
  };

  auto check_iterator = [&](Iterator* iterator, Status::Code expected_status,
@@ -501,7 +501,7 @@ TEST_F(DBBlobIndexTest, IntegratedBlobIterate) {
  auto get_key = [](size_t index) { return ("key" + std::to_string(index)); };

  auto get_value = [&](size_t index, size_t version) {
-    return get_key(index) + "_value" + std::to_string(version);
+    return get_key(index) + "_value" + ToString(version);
  };

  auto check_iterator = [&](Iterator* iterator, Status expected_status,
@@ -37,7 +37,6 @@
 #include "table/block_based/block_based_table_builder.h"
 #include "table/format.h"
 #include "table/internal_iterator.h"
-#include "table/unique_id_impl.h"
 #include "test_util/sync_point.h"
 #include "util/stop_watch.h"

@@ -66,8 +65,7 @@ Status BuildTable(
    SequenceNumber job_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,
-    const SeqnoToTimeMapping& seqno_to_time_mapping, EventLogger* event_logger,
+    BlobFileCreationReason blob_creation_reason, 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,
@@ -90,7 +88,7 @@ Status BuildTable(
  iter->SeekToFirst();
  std::unique_ptr<CompactionRangeDelAggregator> range_del_agg(
      new CompactionRangeDelAggregator(&tboptions.internal_comparator,
-                                       snapshots, full_history_ts_low));
+                                       snapshots));
  uint64_t num_unfragmented_tombstones = 0;
  uint64_t total_tombstone_payload_bytes = 0;
  for (auto& range_del_iter : range_del_iters) {
@@ -117,7 +115,6 @@ Status BuildTable(
  assert(fs);

  TableProperties tp;
-  bool table_file_created = false;
  if (iter->Valid() || !range_del_agg->IsEmpty()) {
    std::unique_ptr<CompactionFilter> compaction_filter;
    if (ioptions.compaction_filter_factory != nullptr &&
@@ -161,8 +158,6 @@ Status BuildTable(
            file_checksum_func_name);
        return s;
      }
-
-      table_file_created = true;
      FileTypeSet tmp_set = ioptions.checksum_handoff_file_types;
      file->SetIOPriority(io_priority);
      file->SetWriteLifeTimeHint(write_hint);
@@ -182,19 +177,15 @@ Status BuildTable(
        snapshots.empty() ? 0 : snapshots.back(), snapshot_checker);

    std::unique_ptr<BlobFileBuilder> blob_file_builder(
-        (mutable_cf_options.enable_blob_files &&
-         tboptions.level_at_creation >=
-             mutable_cf_options.blob_file_starting_level &&
-         blob_file_additions)
+        (mutable_cf_options.enable_blob_files && blob_file_additions)
            ? new BlobFileBuilder(
                  versions, fs, &ioptions, &mutable_cf_options, &file_options,
-                  tboptions.db_id, tboptions.db_session_id, 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)
+                  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)
            : nullptr);

-    const std::atomic<bool> kManualCompactionCanceledFalse{false};
    CompactionIterator c_iter(
        iter, tboptions.internal_comparator.user_comparator(), &merge,
        kMaxSequenceNumber, &snapshots, earliest_write_conflict_snapshot,
@@ -202,10 +193,11 @@ Status BuildTable(
        ShouldReportDetailedTime(env, ioptions.stats),
        true /* internal key corruption is not ok */, range_del_agg.get(),
        blob_file_builder.get(), ioptions.allow_data_in_errors,
-        ioptions.enforce_single_del_contracts,
-        /*manual_compaction_canceled=*/kManualCompactionCanceledFalse,
        /*compaction=*/nullptr, compaction_filter.get(),
-        /*shutting_down=*/nullptr, db_options.info_log, full_history_ts_low);
+        /*shutting_down=*/nullptr,
+        /*manual_compaction_paused=*/nullptr,
+        /*manual_compaction_canceled=*/nullptr, db_options.info_log,
+        full_history_ts_low);

    c_iter.SeekToFirst();
    for (; c_iter.Valid(); c_iter.Next()) {
@@ -261,15 +253,6 @@ Status BuildTable(
    if (!s.ok() || empty) {
      builder->Abandon();
    } else {
-      std::string seqno_time_mapping_str;
-      seqno_to_time_mapping.Encode(
-          seqno_time_mapping_str, meta->fd.smallest_seqno,
-          meta->fd.largest_seqno, meta->file_creation_time);
-      builder->SetSeqnoTimeTableProperties(
-          seqno_time_mapping_str,
-          ioptions.compaction_style == CompactionStyle::kCompactionStyleFIFO
-              ? meta->file_creation_time
-              : meta->oldest_ancester_time);
      s = builder->Finish();
    }
    if (io_status->ok()) {
@@ -323,15 +306,6 @@ Status BuildTable(
      meta->file_checksum_func_name = file_writer->GetFileChecksumFuncName();
      file_checksum = meta->file_checksum;
      file_checksum_func_name = meta->file_checksum_func_name;
-      // Set unique_id only if db_id and db_session_id exist
-      if (!tboptions.db_id.empty() && !tboptions.db_session_id.empty()) {
-        if (!GetSstInternalUniqueId(tboptions.db_id, tboptions.db_session_id,
-                                    meta->fd.GetNumber(), &(meta->unique_id))
-                 .ok()) {
-          // if failed to get unique id, just set it Null
-          meta->unique_id = kNullUniqueId64x2;
-        }
-      }
    }

    if (s.ok()) {
@@ -353,9 +327,10 @@ Status BuildTable(
    if (s.ok() && !empty) {
      // Verify that the table is usable
      // We set for_compaction to false and don't OptimizeForCompactionTableRead
-      // here because this is a special case after we finish the table building.
+      // here because this is a special case after we finish the table building
      // No matter whether use_direct_io_for_flush_and_compaction is true,
-      // the goal is to cache it here for further user reads.
+      // we will regrad this verification as user reads since the goal is
+      // to cache it here for further user reads
      ReadOptions read_options;
      std::unique_ptr<InternalIterator> it(table_cache->NewIterator(
          read_options, file_options, tboptions.internal_comparator, *meta,
@@ -396,17 +371,15 @@ Status BuildTable(

    constexpr IODebugContext* dbg = nullptr;

-    if (table_file_created) {
-      Status ignored = fs->DeleteFile(fname, IOOptions(), dbg);
-      ignored.PermitUncheckedError();
-    }
+    Status ignored = fs->DeleteFile(fname, IOOptions(), dbg);
+    ignored.PermitUncheckedError();

    assert(blob_file_additions || blob_file_paths.empty());

    if (blob_file_additions) {
      for (const std::string& blob_file_path : blob_file_paths) {
-        Status ignored = DeleteDBFile(&db_options, blob_file_path, dbname,
-                                      /*force_bg=*/false, /*force_fg=*/false);
+        ignored = DeleteDBFile(&db_options, blob_file_path, dbname,
+                               /*force_bg=*/false, /*force_fg=*/false);
        ignored.PermitUncheckedError();
        TEST_SYNC_POINT("BuildTable::AfterDeleteFile");
      }
@@ -9,9 +9,7 @@
 #include <string>
 #include <utility>
 #include <vector>
-
 #include "db/range_tombstone_fragmenter.h"
-#include "db/seqno_to_time_mapping.h"
 #include "db/table_properties_collector.h"
 #include "logging/event_logger.h"
 #include "options/cf_options.h"
@@ -63,7 +61,6 @@ extern Status BuildTable(
    bool paranoid_file_checks, InternalStats* internal_stats,
    IOStatus* io_status, const std::shared_ptr<IOTracer>& io_tracer,
    BlobFileCreationReason blob_creation_reason,
-    const SeqnoToTimeMapping& seqno_to_time_mapping,
    EventLogger* event_logger = nullptr, int job_id = 0,
    const Env::IOPriority io_priority = Env::IO_HIGH,
    TableProperties* table_properties = nullptr,
@@ -33,6 +33,11 @@ int geteuid() {
  return result;
 }

+// VS < 2015
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+#define snprintf _snprintf
+#endif
+
 #endif

 const char* phase = "";
@@ -164,16 +169,6 @@ static void CheckPinGetCF(rocksdb_t* db, const rocksdb_readoptions_t* options,
  rocksdb_pinnableslice_destroy(p);
 }

-static void CheckMultiGetValues(size_t num_keys, char** values,
-                                size_t* values_sizes, char** errs,
-                                const char** expected) {
-  for (size_t i = 0; i < num_keys; i++) {
-    CheckNoError(errs[i]);
-    CheckEqual(expected[i], values[i], values_sizes[i]);
-    Free(&values[i]);
-  }
-}
-
 static void CheckIter(rocksdb_iterator_t* iter,
                      const char* key, const char* val) {
  size_t len;
@@ -272,92 +267,6 @@ static rocksdb_compactionfilter_t* CFilterCreate(
                                         CFilterName);
 }

-void CheckMetaData(rocksdb_column_family_metadata_t* cf_meta,
-                   const char* expected_cf_name) {
-  char* cf_name = rocksdb_column_family_metadata_get_name(cf_meta);
-  assert(strcmp(cf_name, expected_cf_name) == 0);
-  rocksdb_free(cf_name);
-
-  size_t cf_size = rocksdb_column_family_metadata_get_size(cf_meta);
-  assert(cf_size > 0);
-  size_t cf_file_count = rocksdb_column_family_metadata_get_size(cf_meta);
-  assert(cf_file_count > 0);
-
-  uint64_t total_level_size = 0;
-  size_t total_file_count = 0;
-  size_t level_count = rocksdb_column_family_metadata_get_level_count(cf_meta);
-  assert(level_count > 0);
-  for (size_t l = 0; l < level_count; ++l) {
-    rocksdb_level_metadata_t* level_meta =
-        rocksdb_column_family_metadata_get_level_metadata(cf_meta, l);
-    assert(level_meta);
-    assert(rocksdb_level_metadata_get_level(level_meta) >= (int)l);
-    uint64_t level_size = rocksdb_level_metadata_get_size(level_meta);
-    uint64_t file_size_in_level = 0;
-
-    size_t file_count = rocksdb_level_metadata_get_file_count(level_meta);
-    total_file_count += file_count;
-    for (size_t f = 0; f < file_count; ++f) {
-      rocksdb_sst_file_metadata_t* file_meta =
-          rocksdb_level_metadata_get_sst_file_metadata(level_meta, f);
-      assert(file_meta);
-
-      uint64_t file_size = rocksdb_sst_file_metadata_get_size(file_meta);
-      assert(file_size > 0);
-      file_size_in_level += file_size;
-
-      char* file_name =
-          rocksdb_sst_file_metadata_get_relative_filename(file_meta);
-      assert(file_name);
-      assert(strlen(file_name) > 0);
-      rocksdb_free(file_name);
-
-      size_t smallest_key_len;
-      char* smallest_key = rocksdb_sst_file_metadata_get_smallestkey(
-          file_meta, &smallest_key_len);
-      assert(smallest_key);
-      assert(smallest_key_len > 0);
-      size_t largest_key_len;
-      char* largest_key =
-          rocksdb_sst_file_metadata_get_largestkey(file_meta, &largest_key_len);
-      assert(largest_key);
-      assert(largest_key_len > 0);
-      rocksdb_free(smallest_key);
-      rocksdb_free(largest_key);
-
-      rocksdb_sst_file_metadata_destroy(file_meta);
-    }
-    assert(level_size == file_size_in_level);
-    total_level_size += level_size;
-    rocksdb_level_metadata_destroy(level_meta);
-  }
-  assert(total_file_count > 0);
-  assert(cf_size == total_level_size);
-}
-
-void GetAndCheckMetaData(rocksdb_t* db) {
-  rocksdb_column_family_metadata_t* cf_meta =
-      rocksdb_get_column_family_metadata(db);
-
-  CheckMetaData(cf_meta, "default");
-
-  rocksdb_column_family_metadata_destroy(cf_meta);
-}
-
-void GetAndCheckMetaDataCf(rocksdb_t* db,
-                           rocksdb_column_family_handle_t* handle,
-                           const char* cf_name) {
-  // Compact to make sure we have at least one sst file to obtain datadata.
-  rocksdb_compact_range_cf(db, handle, NULL, 0, NULL, 0);
-
-  rocksdb_column_family_metadata_t* cf_meta =
-      rocksdb_get_column_family_metadata_cf(db, handle);
-
-  CheckMetaData(cf_meta, cf_name);
-
-  rocksdb_column_family_metadata_destroy(cf_meta);
-}
-
 static rocksdb_t* CheckCompaction(rocksdb_t* db, rocksdb_options_t* options,
                                  rocksdb_readoptions_t* roptions,
                                  rocksdb_writeoptions_t* woptions) {
@@ -374,27 +283,12 @@ static rocksdb_t* CheckCompaction(rocksdb_t* db, rocksdb_options_t* options,
  CheckNoError(err);
  CheckGet(db, roptions, "baz", "bazvalue");

-  // Disable compaction
-  rocksdb_disable_manual_compaction(db);
-  rocksdb_compact_range(db, NULL, 0, NULL, 0);
-  // should not filter anything when disabled
-  CheckGet(db, roptions, "foo", "foovalue");
-  CheckGet(db, roptions, "bar", "barvalue");
-  CheckGet(db, roptions, "baz", "bazvalue");
-  // Reenable compaction
-  rocksdb_enable_manual_compaction(db);
-
  // Force compaction
  rocksdb_compact_range(db, NULL, 0, NULL, 0);
  // should have filtered bar, but not foo
  CheckGet(db, roptions, "foo", "foovalue");
  CheckGet(db, roptions, "bar", NULL);
  CheckGet(db, roptions, "baz", "newbazvalue");
-
-  rocksdb_suggest_compact_range(db, "bar", 3, "foo", 3, &err);
-  GetAndCheckMetaData(db);
-  CheckNoError(err);
-
  return db;
 }

@@ -472,49 +366,18 @@ static void CheckTxnGetCF(rocksdb_transaction_t* txn,
  Free(&val);
 }

-static void CheckTxnPinGet(rocksdb_transaction_t* txn,
-                           const rocksdb_readoptions_t* options,
-                           const char* key, const char* expected) {
-  rocksdb_pinnableslice_t* p = NULL;
-  const char* val = NULL;
-  char* err = NULL;
-  size_t val_len;
-  p = rocksdb_transaction_get_pinned(txn, options, key, strlen(key), &err);
-  CheckNoError(err);
-  val = rocksdb_pinnableslice_value(p, &val_len);
-  CheckEqual(expected, val, val_len);
-  rocksdb_pinnableslice_destroy(p);
-}
-
-static void CheckTxnPinGetCF(rocksdb_transaction_t* txn,
-                             const rocksdb_readoptions_t* options,
-                             rocksdb_column_family_handle_t* column_family,
-                             const char* key, const char* expected) {
-  rocksdb_pinnableslice_t* p = NULL;
-  const char* val = NULL;
-  char* err = NULL;
-  size_t val_len;
-  p = rocksdb_transaction_get_pinned_cf(txn, options, column_family, key,
-                                        strlen(key), &err);
-  CheckNoError(err);
-  val = rocksdb_pinnableslice_value(p, &val_len);
-  CheckEqual(expected, val, val_len);
-  rocksdb_pinnableslice_destroy(p);
-}
-
 static void CheckTxnDBGet(
        rocksdb_transactiondb_t* txn_db,
        const rocksdb_readoptions_t* options,
        const char* key,
        const char* expected) {
-  char* err = NULL;
-  size_t val_len;
-  char* val;
-  val = rocksdb_transactiondb_get(txn_db, options, key, strlen(key), &val_len,
-                                  &err);
-  CheckNoError(err);
-  CheckEqual(expected, val, val_len);
-  Free(&val);
+        char* err = NULL;
+        size_t val_len;
+        char* val;
+        val = rocksdb_transactiondb_get(txn_db, options, key, strlen(key), &val_len, &err);
+        CheckNoError(err);
+        CheckEqual(expected, val, val_len);
+        Free(&val);
 }

 static void CheckTxnDBGetCF(rocksdb_transactiondb_t* txn_db,
@@ -531,101 +394,6 @@ static void CheckTxnDBGetCF(rocksdb_transactiondb_t* txn_db,
  Free(&val);
 }

-static void CheckTxnDBPinGet(rocksdb_transactiondb_t* txn_db,
-                             const rocksdb_readoptions_t* options,
-                             const char* key, const char* expected) {
-  rocksdb_pinnableslice_t* p = NULL;
-  const char* val = NULL;
-  char* err = NULL;
-  size_t val_len;
-  p = rocksdb_transactiondb_get_pinned(txn_db, options, key, strlen(key), &err);
-  CheckNoError(err);
-  val = rocksdb_pinnableslice_value(p, &val_len);
-  CheckEqual(expected, val, val_len);
-  rocksdb_pinnableslice_destroy(p);
-}
-
-static void CheckTxnDBPinGetCF(rocksdb_transactiondb_t* txn_db,
-                               const rocksdb_readoptions_t* options,
-                               rocksdb_column_family_handle_t* column_family,
-                               const char* key, const char* expected) {
-  rocksdb_pinnableslice_t* p = NULL;
-  const char* val = NULL;
-  char* err = NULL;
-  size_t val_len;
-  p = rocksdb_transactiondb_get_pinned_cf(txn_db, options, column_family, key,
-                                          strlen(key), &err);
-  CheckNoError(err);
-  val = rocksdb_pinnableslice_value(p, &val_len);
-  CheckEqual(expected, val, val_len);
-  rocksdb_pinnableslice_destroy(p);
-}
-
-static void LoadAndCheckLatestOptions(const char* db_name, rocksdb_env_t* env,
-                                      bool ignore_unknown_options,
-                                      rocksdb_cache_t* cache,
-                                      rocksdb_comparator_t* cmp,
-                                      const size_t expected_num_column_families,
-                                      const char** expected_cf_names,
-                                      const char* expected_open_err) {
-  rocksdb_options_t* db_options;
-  size_t num_column_families;
-  char** list_column_family_names;
-  rocksdb_options_t** list_column_family_options;
-  char* err = 0;
-
-  // load the latest rocksdb option
-  rocksdb_load_latest_options(db_name, env, ignore_unknown_options, cache,
-                              &db_options, &num_column_families,
-                              &list_column_family_names,
-                              &list_column_family_options, &err);
-  assert(num_column_families == expected_num_column_families);
-  CheckNoError(err);
-
-  // verify the loaded options by opening the db.
-  rocksdb_options_set_error_if_exists(db_options, 0);
-
-  char** list_const_cf_names =
-      (char**)malloc(num_column_families * sizeof(char*));
-  rocksdb_options_t** list_const_cf_options = (rocksdb_options_t**)malloc(
-      num_column_families * sizeof(rocksdb_options_t*));
-  for (size_t i = 0; i < num_column_families; ++i) {
-    assert(strcmp(list_column_family_names[i], expected_cf_names[i]) == 0);
-    list_const_cf_names[i] = list_column_family_names[i];
-    if (cmp) {
-      rocksdb_options_set_comparator(list_column_family_options[i], cmp);
-    }
-    list_const_cf_options[i] = list_column_family_options[i];
-  }
-  rocksdb_column_family_handle_t** handles =
-      (rocksdb_column_family_handle_t**)malloc(
-          num_column_families * sizeof(rocksdb_column_family_handle_t*));
-
-  rocksdb_t* db = rocksdb_open_column_families(
-      db_options, db_name, (int)num_column_families,
-      (const char* const*)list_const_cf_names,
-      (const rocksdb_options_t* const*)list_const_cf_options, handles, &err);
-  if (expected_open_err == NULL) {
-    CheckNoError(err);
-    for (size_t i = 0; i < num_column_families; ++i) {
-      rocksdb_column_family_handle_destroy(handles[i]);
-    }
-    free(handles);
-    rocksdb_close(db);
-  } else {
-    assert(err != NULL);
-    assert(strcmp(err, expected_open_err) == 0);
-    free(handles);
-    free(err);
-  }
-
-  free(list_const_cf_names);
-  free(list_const_cf_options);
-  rocksdb_load_latest_options_destroy(db_options, list_column_family_names,
-                                      list_column_family_options,
-                                      num_column_families);
-}
-
 int main(int argc, char** argv) {
  (void)argc;
  (void)argv;
@@ -905,21 +673,6 @@ int main(int argc, char** argv) {
    CheckGet(db, roptions, "sstk22", "v5");
    CheckGet(db, roptions, "sstk3", "v6");

-    rocksdb_sstfilewriter_open(writer, sstfilename, &err);
-    CheckNoError(err);
-    rocksdb_sstfilewriter_put(writer, "abc1", 4, "v7", 2, &err);
-    CheckNoError(err);
-    rocksdb_sstfilewriter_put(writer, "abc2", 4, "v8", 2, &err);
-    CheckNoError(err);
-    rocksdb_sstfilewriter_put(writer, "abc3", 4, "v9", 2, &err);
-    CheckNoError(err);
-    rocksdb_sstfilewriter_put(writer, "abc4", 4, "v10", 3, &err);
-    CheckNoError(err);
-    rocksdb_sstfilewriter_delete_range(writer, "abc1", 4, "abc4", 4, &err);
-    CheckNoError(err);
-    rocksdb_sstfilewriter_finish(writer, &err);
-    CheckNoError(err);
-
    rocksdb_ingestexternalfileoptions_destroy(ing_opt);
    rocksdb_sstfilewriter_destroy(writer);
    rocksdb_options_destroy(io_options);
@@ -1161,9 +914,24 @@ int main(int argc, char** argv) {
    char* vals[3];
    size_t vals_sizes[3];
    char* errs[3];
-    const char* expected[3] = {"c", "hello", NULL};
    rocksdb_multi_get(db, roptions, 3, keys, keys_sizes, vals, vals_sizes, errs);
-    CheckMultiGetValues(3, vals, vals_sizes, errs, expected);
+
+    int i;
+    for (i = 0; i < 3; i++) {
+      CheckEqual(NULL, errs[i], 0);
+      switch (i) {
+      case 0:
+        CheckEqual("c", vals[i], vals_sizes[i]);
+        break;
+      case 1:
+        CheckEqual("hello", vals[i], vals_sizes[i]);
+        break;
+      case 2:
+        CheckEqual(NULL, vals[i], vals_sizes[i]);
+        break;
+      }
+      Free(&vals[i]);
+    }
  }

  StartPhase("pin_get");
@@ -1421,6 +1189,7 @@ int main(int argc, char** argv) {
    rocksdb_merge(db, woptions, "bar", 3, "barvalue", 8, &err);
    CheckNoError(err);
    CheckGet(db, roptions, "bar", "fake");
+
  }

  StartPhase("columnfamilies");
@@ -1432,16 +1201,7 @@ int main(int argc, char** argv) {
    rocksdb_options_t* db_options = rocksdb_options_create();
    rocksdb_options_set_create_if_missing(db_options, 1);
    db = rocksdb_open(db_options, dbname, &err);
-    CheckNoError(err);
-    rocksdb_close(db);
-    {
-      const char* expected_cf_names[1] = {"default"};
-      LoadAndCheckLatestOptions(dbname, env, false, cache, NULL, 1,
-                                expected_cf_names, NULL);
-    }
-
-    rocksdb_options_set_create_if_missing(db_options, 0);
-    db = rocksdb_open(db_options, dbname, &err);
+    CheckNoError(err)
    rocksdb_column_family_handle_t* cfh;
    cfh = rocksdb_create_column_family(db, db_options, "cf1", &err);
    rocksdb_column_family_handle_destroy(cfh);
@@ -1461,10 +1221,6 @@ int main(int argc, char** argv) {
    const char* cf_names[2] = {"default", "cf1"};
    const rocksdb_options_t* cf_opts[2] = {cf_options, cf_options};
    rocksdb_column_family_handle_t* handles[2];
-
-    LoadAndCheckLatestOptions(dbname, env, false, cache, NULL, 2, cf_names,
-                              NULL);
-
    db = rocksdb_open_column_families(db_options, dbname, 2, cf_names, cf_opts, handles, &err);
    CheckNoError(err);

@@ -1479,9 +1235,6 @@ int main(int argc, char** argv) {
    CheckNoError(err);
    rocksdb_put_cf(db, woptions, handles[1], "foobar4", 7, "hello4", 6, &err);
    CheckNoError(err);
-    rocksdb_suggest_compact_range_cf(db, handles[1], "foo", 3, "foobar9", 7,
-                                     &err);
-    CheckNoError(err);

    rocksdb_flushoptions_t *flush_options = rocksdb_flushoptions_create();
    rocksdb_flushoptions_set_wait(flush_options, 1);
@@ -1507,18 +1260,15 @@ int main(int argc, char** argv) {
    rocksdb_writebatch_clear(wb);
    rocksdb_writebatch_put_cf(wb, handles[1], "bar", 3, "b", 1);
    rocksdb_writebatch_put_cf(wb, handles[1], "box", 3, "c", 1);
-    rocksdb_writebatch_put_cf(wb, handles[1], "buff", 4, "rocksdb", 7);
    rocksdb_writebatch_delete_cf(wb, handles[1], "bar", 3);
    rocksdb_write(db, woptions, wb, &err);
    CheckNoError(err);
    CheckGetCF(db, roptions, handles[1], "baz", NULL);
    CheckGetCF(db, roptions, handles[1], "bar", NULL);
    CheckGetCF(db, roptions, handles[1], "box", "c");
-    CheckGetCF(db, roptions, handles[1], "buff", "rocksdb");
    CheckPinGetCF(db, roptions, handles[1], "baz", NULL);
    CheckPinGetCF(db, roptions, handles[1], "bar", NULL);
    CheckPinGetCF(db, roptions, handles[1], "box", "c");
-    CheckPinGetCF(db, roptions, handles[1], "buff", "rocksdb");
    rocksdb_writebatch_destroy(wb);

    rocksdb_flush_wal(db, 1, &err);
@@ -1549,26 +1299,6 @@ int main(int argc, char** argv) {
      Free(&vals[i]);
    }

-    {
-      const char* batched_keys[4] = {"box", "buff", "barfooxx", "box"};
-      const size_t batched_keys_sizes[4] = {3, 4, 8, 3};
-      const char* expected_value[4] = {"c", "rocksdb", NULL, "c"};
-      char* batched_errs[4];
-
-      rocksdb_pinnableslice_t* pvals[4];
-      rocksdb_batched_multi_get_cf(db, roptions, handles[1], 4, batched_keys,
-                                   batched_keys_sizes, pvals, batched_errs,
-                                   false);
-      const char* val;
-      size_t val_len;
-      for (i = 0; i < 4; ++i) {
-        val = rocksdb_pinnableslice_value(pvals[i], &val_len);
-        CheckNoError(batched_errs[i]);
-        CheckEqual(expected_value[i], val, val_len);
-        rocksdb_pinnableslice_destroy(pvals[i]);
-      }
-    }
-
    {
      unsigned char value_found = 0;

@@ -1600,7 +1330,7 @@ int main(int argc, char** argv) {
    for (i = 0; rocksdb_iter_valid(iter) != 0; rocksdb_iter_next(iter)) {
      i++;
    }
-    CheckCondition(i == 4);
+    CheckCondition(i == 3);
    rocksdb_iter_get_error(iter, &err);
    CheckNoError(err);
    rocksdb_iter_destroy(iter);
@@ -1624,25 +1354,17 @@ int main(int argc, char** argv) {
    for (i = 0; rocksdb_iter_valid(iter) != 0; rocksdb_iter_next(iter)) {
      i++;
    }
-    CheckCondition(i == 4);
+    CheckCondition(i == 3);
    rocksdb_iter_get_error(iter, &err);
    CheckNoError(err);
    rocksdb_iter_destroy(iter);

-    GetAndCheckMetaDataCf(db, handles[1], cf_names[1]);
-
    rocksdb_drop_column_family(db, handles[1], &err);
    CheckNoError(err);
    for (i = 0; i < 2; i++) {
      rocksdb_column_family_handle_destroy(handles[i]);
    }
    rocksdb_close(db);
-    {
-      // As column family has been dropped, we expect only one column family.
-      const char* expected_cf_names[1] = {"default"};
-      LoadAndCheckLatestOptions(dbname, env, false, cache, NULL, 1,
-                                expected_cf_names, NULL);
-    }
    rocksdb_destroy_db(options, dbname, &err);
    rocksdb_options_destroy(db_options);
    rocksdb_options_destroy(cf_options);
@@ -1704,16 +1426,6 @@ int main(int argc, char** argv) {
    rocksdb_readoptions_set_total_order_seek(roptions, 0);

    rocksdb_close(db);
-
-    {
-      const char* expected_cf_names[1] = {"default"};
-      LoadAndCheckLatestOptions(dbname, env, false, cache, NULL, 1,
-                                expected_cf_names,
-                                "Invalid argument: leveldb.BytewiseComparator: "
-                                "does not match existing comparator foo");
-      LoadAndCheckLatestOptions(dbname, env, false, cache, cmp, 1,
-                                expected_cf_names, NULL);
-    }
    rocksdb_destroy_db(options, dbname, &err);
  }

@@ -2035,10 +1747,6 @@ int main(int argc, char** argv) {
    rocksdb_options_set_wal_compression(o, 1);
    CheckCondition(1 == rocksdb_options_get_wal_compression(o));

-    rocksdb_options_set_experimental_mempurge_threshold(o, 29.0);
-    CheckCondition(29.0 ==
-                   rocksdb_options_get_experimental_mempurge_threshold(o));
-
    /* Blob Options */
    rocksdb_options_set_enable_blob_files(o, 1);
    CheckCondition(1 == rocksdb_options_get_enable_blob_files(o));
@@ -2065,12 +1773,6 @@ int main(int argc, char** argv) {
    CheckCondition(262144 ==
                   rocksdb_options_get_blob_compaction_readahead_size(o));

-    rocksdb_options_set_blob_file_starting_level(o, 5);
-    CheckCondition(5 == rocksdb_options_get_blob_file_starting_level(o));
-
-    rocksdb_options_set_prepopulate_blob_cache(o, 1 /* flush only */);
-    CheckCondition(1 == rocksdb_options_get_prepopulate_blob_cache(o));
-
    // Create a copy that should be equal to the original.
    rocksdb_options_t* copy;
    copy = rocksdb_options_create_copy(o);
@@ -2172,8 +1874,6 @@ int main(int argc, char** argv) {
    CheckCondition(4 == rocksdb_options_get_bottommost_compression(copy));
    CheckCondition(2 == rocksdb_options_get_compaction_style(copy));
    CheckCondition(1 == rocksdb_options_get_atomic_flush(copy));
-    CheckCondition(29.0 ==
-                   rocksdb_options_get_experimental_mempurge_threshold(copy));

    // Copies should be independent.
    rocksdb_options_set_allow_ingest_behind(copy, 0);
@@ -2522,12 +2222,6 @@ int main(int argc, char** argv) {
    CheckCondition(0 == rocksdb_options_get_atomic_flush(copy));
    CheckCondition(1 == rocksdb_options_get_atomic_flush(o));

-    rocksdb_options_set_experimental_mempurge_threshold(copy, 229.0);
-    CheckCondition(229.0 ==
-                   rocksdb_options_get_experimental_mempurge_threshold(copy));
-    CheckCondition(29.0 ==
-                   rocksdb_options_get_experimental_mempurge_threshold(o));
-
    rocksdb_options_destroy(copy);
    rocksdb_options_destroy(o);
  }
@@ -2822,9 +2516,6 @@ int main(int argc, char** argv) {
        200 ==
        rocksdb_options_get_compression_options_max_dict_buffer_bytes(co));

-    rocksdb_options_set_compression_options_use_zstd_dict_trainer(co, 0);
-    CheckCondition(
-        0 == rocksdb_options_get_compression_options_use_zstd_dict_trainer(co));
    rocksdb_options_destroy(co);
  }

@@ -2906,13 +2597,11 @@ int main(int argc, char** argv) {
    rocksdb_transactiondb_put(txn_db, woptions, "foo", 3, "hello", 5, &err);
    CheckNoError(err);
    CheckTxnDBGet(txn_db, roptions, "foo", "hello");
-    CheckTxnDBPinGet(txn_db, roptions, "foo", "hello");

    // delete from outside transaction
    rocksdb_transactiondb_delete(txn_db, woptions, "foo", 3, &err);
    CheckNoError(err);
    CheckTxnDBGet(txn_db, roptions, "foo", NULL);
-    CheckTxnDBPinGet(txn_db, roptions, "foo", NULL);

    // write batch into TransactionDB
    rocksdb_writebatch_t* wb = rocksdb_writebatch_create();
@@ -2924,63 +2613,24 @@ int main(int argc, char** argv) {
    rocksdb_transactiondb_write(txn_db, woptions, wb, &err);
    rocksdb_writebatch_destroy(wb);
    CheckTxnDBGet(txn_db, roptions, "box", "c");
-    CheckTxnDBPinGet(txn_db, roptions, "box", "c");
    CheckNoError(err);

-    // multi get
-    {
-      const char* keys[3] = {"box", "foo", "notfound"};
-      const size_t keys_sizes[3] = {3, 3, 8};
-      char* vals[3];
-      size_t vals_sizes[3];
-      char* errs[3];
-      const char* expected[3] = {"c", NULL, NULL};
-      rocksdb_transactiondb_multi_get(txn_db, roptions, 3, keys, keys_sizes,
-                                      vals, vals_sizes, errs);
-      CheckMultiGetValues(3, vals, vals_sizes, errs, expected);
-    }
-
    // begin a transaction
    txn = rocksdb_transaction_begin(txn_db, woptions, txn_options, NULL);
    // put
    rocksdb_transaction_put(txn, "foo", 3, "hello", 5, &err);
    CheckNoError(err);
    CheckTxnGet(txn, roptions, "foo", "hello");
-    CheckTxnPinGet(txn, roptions, "foo", "hello");
-    {
-      const char* keys[3] = {"box", "foo", "notfound"};
-      const size_t keys_sizes[3] = {3, 3, 8};
-      char* vals[3];
-      size_t vals_sizes[3];
-      char* errs[3];
-      const char* expected[3] = {"c", "hello", NULL};
-      rocksdb_transaction_multi_get(txn, roptions, 3, keys, keys_sizes, vals,
-                                    vals_sizes, errs);
-      CheckMultiGetValues(3, vals, vals_sizes, errs, expected);
-    }
    // delete
    rocksdb_transaction_delete(txn, "foo", 3, &err);
    CheckNoError(err);
    CheckTxnGet(txn, roptions, "foo", NULL);
-    CheckTxnPinGet(txn, roptions, "foo", NULL);

    rocksdb_transaction_put(txn, "foo", 3, "hello", 5, &err);
    CheckNoError(err);

    // read from outside transaction, before commit
    CheckTxnDBGet(txn_db, roptions, "foo", NULL);
-    CheckTxnDBPinGet(txn_db, roptions, "foo", NULL);
-    {
-      const char* keys[3] = {"box", "foo", "notfound"};
-      const size_t keys_sizes[3] = {3, 3, 8};
-      char* vals[3];
-      size_t vals_sizes[3];
-      char* errs[3];
-      const char* expected[3] = {"c", NULL, NULL};
-      rocksdb_transactiondb_multi_get(txn_db, roptions, 3, keys, keys_sizes,
-                                      vals, vals_sizes, errs);
-      CheckMultiGetValues(3, vals, vals_sizes, errs, expected);
-    }

    // commit
    rocksdb_transaction_commit(txn, &err);
@@ -2988,18 +2638,6 @@ int main(int argc, char** argv) {

    // read from outside transaction, after commit
    CheckTxnDBGet(txn_db, roptions, "foo", "hello");
-    CheckTxnDBPinGet(txn_db, roptions, "foo", "hello");
-    {
-      const char* keys[3] = {"box", "foo", "notfound"};
-      const size_t keys_sizes[3] = {3, 3, 8};
-      char* vals[3];
-      size_t vals_sizes[3];
-      char* errs[3];
-      const char* expected[3] = {"c", "hello", NULL};
-      rocksdb_transactiondb_multi_get(txn_db, roptions, 3, keys, keys_sizes,
-                                      vals, vals_sizes, errs);
-      CheckMultiGetValues(3, vals, vals_sizes, errs, expected);
-    }

    // reuse old transaction
    txn = rocksdb_transaction_begin(txn_db, woptions, txn_options, txn);
@@ -3013,11 +2651,9 @@ int main(int argc, char** argv) {
    CheckNoError(err);

    CheckTxnDBGet(txn_db, roptions, "foo", "hello");
-    CheckTxnDBPinGet(txn_db, roptions, "foo", "hello");
    rocksdb_readoptions_set_snapshot(roptions, NULL);
    rocksdb_transactiondb_release_snapshot(txn_db, snapshot);
    CheckTxnDBGet(txn_db, roptions, "foo", "hey");
-    CheckTxnDBPinGet(txn_db, roptions, "foo", "hey");

    // iterate
    rocksdb_transaction_put(txn, "bar", 3, "hi", 2, &err);
@@ -3034,34 +2670,25 @@ int main(int argc, char** argv) {
    rocksdb_transaction_rollback(txn, &err);
    CheckNoError(err);
    CheckTxnDBGet(txn_db, roptions, "bar", NULL);
-    CheckTxnDBPinGet(txn_db, roptions, "bar", NULL);

    // save point
    rocksdb_transaction_put(txn, "foo1", 4, "hi1", 3, &err);
    rocksdb_transaction_set_savepoint(txn);
    CheckTxnGet(txn, roptions, "foo1", "hi1");
-    CheckTxnPinGet(txn, roptions, "foo1", "hi1");
    rocksdb_transaction_put(txn, "foo2", 4, "hi2", 3, &err);
    CheckTxnGet(txn, roptions, "foo2", "hi2");
-    CheckTxnPinGet(txn, roptions, "foo2", "hi2");

    // rollback to savepoint
    rocksdb_transaction_rollback_to_savepoint(txn, &err);
    CheckNoError(err);
    CheckTxnGet(txn, roptions, "foo2", NULL);
    CheckTxnGet(txn, roptions, "foo1", "hi1");
-    CheckTxnPinGet(txn, roptions, "foo2", NULL);
-    CheckTxnPinGet(txn, roptions, "foo1", "hi1");
    CheckTxnDBGet(txn_db, roptions, "foo1", NULL);
    CheckTxnDBGet(txn_db, roptions, "foo2", NULL);
-    CheckTxnDBPinGet(txn_db, roptions, "foo1", NULL);
-    CheckTxnDBPinGet(txn_db, roptions, "foo2", NULL);
    rocksdb_transaction_commit(txn, &err);
    CheckNoError(err);
    CheckTxnDBGet(txn_db, roptions, "foo1", "hi1");
    CheckTxnDBGet(txn_db, roptions, "foo2", NULL);
-    CheckTxnDBPinGet(txn_db, roptions, "foo1", "hi1");
-    CheckTxnDBPinGet(txn_db, roptions, "foo2", NULL);

    // Column families.
    rocksdb_column_family_handle_t* cfh;
@@ -3073,130 +2700,15 @@ int main(int argc, char** argv) {
                                 8, &err);
    CheckNoError(err);
    CheckTxnDBGetCF(txn_db, roptions, cfh, "cf_foo", "cf_hello");
-    CheckTxnDBPinGetCF(txn_db, roptions, cfh, "cf_foo", "cf_hello");
-    {
-      const rocksdb_column_family_handle_t* get_handles[2] = {cfh, cfh};
-      const char* keys[2] = {"cf_foo", "notfound"};
-      const size_t keys_sizes[2] = {6, 8};
-      char* vals[2];
-      size_t vals_sizes[2];
-      char* errs[2];
-      const char* expected[2] = {"cf_hello", NULL};
-      rocksdb_transactiondb_multi_get_cf(txn_db, roptions, get_handles, 2, keys,
-                                         keys_sizes, vals, vals_sizes, errs);
-      CheckMultiGetValues(2, vals, vals_sizes, errs, expected);
-    }

    rocksdb_transactiondb_delete_cf(txn_db, woptions, cfh, "cf_foo", 6, &err);
    CheckNoError(err);
    CheckTxnDBGetCF(txn_db, roptions, cfh, "cf_foo", NULL);
-    CheckTxnDBPinGetCF(txn_db, roptions, cfh, "cf_foo", NULL);

-    // flush
-    rocksdb_flushoptions_t* flush_options = rocksdb_flushoptions_create();
-    rocksdb_flushoptions_set_wait(flush_options, 1);
-    rocksdb_transactiondb_flush_wal(txn_db, 1, &err);
-    CheckNoError(err);
-    rocksdb_transactiondb_flush_cf(txn_db, flush_options, cfh, &err);
-    CheckNoError(err);
-    rocksdb_transactiondb_flush(txn_db, flush_options, &err);
-    CheckNoError(err);
-    rocksdb_flushoptions_destroy(flush_options);
-
-    // close and destroy
    rocksdb_column_family_handle_destroy(cfh);
-    rocksdb_transaction_destroy(txn);
-    rocksdb_transactiondb_close(txn_db);
-    rocksdb_destroy_db(options, dbname, &err);
-    CheckNoError(err);
-    rocksdb_transaction_options_destroy(txn_options);
-    rocksdb_transactiondb_options_destroy(txn_db_options);
-  }
-
-  StartPhase("two-phase commit");
-  {
-    // open a TransactionDB
-    txn_db_options = rocksdb_transactiondb_options_create();
-    txn_options = rocksdb_transaction_options_create();
-    rocksdb_options_set_create_if_missing(options, 1);
-    txn_db = rocksdb_transactiondb_open(options, txn_db_options, dbname, &err);
-    CheckNoError(err);
-
-    rocksdb_transaction_options_set_skip_prepare(txn_options, 0);
-    txn = rocksdb_transaction_begin(txn_db, woptions, txn_options, NULL);
-    rocksdb_transaction_commit(txn, &err);
-    CheckCondition(err != NULL);
-    Free(&err);
-    err = NULL;
-    rocksdb_transaction_prepare(txn, &err);
-    CheckCondition(err != NULL);
-    Free(&err);
-    err = NULL;
-    rocksdb_transaction_set_name(txn, "txn1", 4, &err);
-    CheckNoError(err);
-    rocksdb_transaction_prepare(txn, &err);
-    CheckNoError(err);
-    rocksdb_transaction_commit(txn, &err);
-    CheckNoError(err);
-    rocksdb_transaction_destroy(txn);
-
-    // prepare 2 transactions and close db.
-    rocksdb_transaction_t* txn1 =
-        rocksdb_transaction_begin(txn_db, woptions, txn_options, NULL);
-    rocksdb_transaction_put(txn1, "bar1", 4, "1", 1, &err);
-    CheckNoError(err);
-    rocksdb_transaction_set_name(txn1, "txn1", 4, &err);
-    CheckNoError(err);
-    rocksdb_transaction_prepare(txn1, &err);
-    CheckNoError(err);
-    rocksdb_transaction_t* txn2 =
-        rocksdb_transaction_begin(txn_db, woptions, txn_options, NULL);
-    rocksdb_transaction_put(txn2, "bar2", 4, "2", 1, &err);
-    CheckNoError(err);
-    rocksdb_transaction_set_name(txn2, "txn2", 4, &err);
-    CheckNoError(err);
-    rocksdb_transaction_prepare(txn2, &err);
-    CheckNoError(err);
-    rocksdb_transaction_destroy(txn1);
-    rocksdb_transaction_destroy(txn2);
-    rocksdb_transactiondb_close(txn_db);
-    rocksdb_transaction_options_destroy(txn_options);
-    rocksdb_transactiondb_options_destroy(txn_db_options);
-
-    // reopen db and get all prepared.
-    txn_db_options = rocksdb_transactiondb_options_create();
-    txn_options = rocksdb_transaction_options_create();
-    rocksdb_options_set_error_if_exists(options, 0);
-    txn_db = rocksdb_transactiondb_open(options, txn_db_options, dbname, &err);
-    CheckNoError(err);
-    CheckTxnDBPinGet(txn_db, roptions, "bar1", NULL);
-    CheckTxnDBPinGet(txn_db, roptions, "bar2", NULL);
-    size_t cnt;
-    rocksdb_transaction_t** txns =
-        rocksdb_transactiondb_get_prepared_transactions(txn_db, &cnt);
-    CheckCondition(cnt == 2);
-    size_t i;
-    for (i = 0; i < cnt; i++) {
-      txn = txns[i];
-      size_t name_len = 0;
-      char* name = rocksdb_transaction_get_name(txn, &name_len);
-      CheckCondition(name_len == 4);
-      if (strncmp(name, "txn1", name_len) == 0) {
-        rocksdb_transaction_commit(txn, &err);
-      } else if (strncmp(name, "txn2", name_len) == 0) {
-        rocksdb_transaction_rollback(txn, &err);
-      }
-      rocksdb_free(name);
-      CheckNoError(err);
-      rocksdb_transaction_destroy(txn);
-    }
-    rocksdb_free(txns);
-    CheckTxnDBGet(txn_db, roptions, "bar1", "1");
-    CheckTxnDBGet(txn_db, roptions, "bar2", NULL);
-    rocksdb_transactiondb_put(txn_db, woptions, "bar2", 4, "2", 1, &err);
-    CheckNoError(err);

    // close and destroy
+    rocksdb_transaction_destroy(txn);
    rocksdb_transactiondb_close(txn_db);
    rocksdb_destroy_db(options, dbname, &err);
    CheckNoError(err);
@@ -3220,7 +2732,6 @@ int main(int argc, char** argv) {
    rocksdb_transaction_put(txn2, "key1", 4, "value1", 6, &err);
    CheckNoError(err);
    CheckTxnGet(txn1, roptions, "key", "value");
-    CheckTxnPinGet(txn1, roptions, "key", "value");
    rocksdb_transaction_commit(txn1, &err);
    CheckNoError(err);
    rocksdb_transaction_commit(txn2, &err);
@@ -3247,19 +2758,6 @@ int main(int argc, char** argv) {
                                              txn);
    CheckGetCF(db, roptions, cfh1, "key_cf1", "val_cf1");
    CheckTxnGetCF(txn, roptions, cfh1, "key_cf1", "val_cf1");
-    CheckTxnPinGetCF(txn, roptions, cfh1, "key_cf1", "val_cf1");
-    {
-      const rocksdb_column_family_handle_t* get_handles[3] = {cfh1, cfh2, cfh2};
-      const char* keys[3] = {"key_cf1", "key_cf2", "notfound"};
-      const size_t keys_sizes[3] = {7, 7, 8};
-      char* vals[3];
-      size_t vals_sizes[3];
-      char* errs[3];
-      const char* expected[3] = {"val_cf1", "val_cf2", NULL};
-      rocksdb_transaction_multi_get_cf(txn, roptions, get_handles, 3, keys,
-                                       keys_sizes, vals, vals_sizes, errs);
-      CheckMultiGetValues(3, vals, vals_sizes, errs, expected);
-    }

    // Check iterator with column family
    rocksdb_transaction_put_cf(txn, cfh1, "key1_cf", 7, "val1_cf", 7, &err);
@@ -3305,9 +2803,6 @@ int main(int argc, char** argv) {
    CheckTxnGetCF(txn_cf, roptions, cf_handles[0], "key", "value");
    CheckTxnGetCF(txn_cf, roptions, cf_handles[1], "key_cf1", "val_cf1");
    CheckTxnGetCF(txn_cf, roptions, cf_handles[2], "key_cf2", "val_cf2");
-    CheckTxnPinGetCF(txn_cf, roptions, cf_handles[0], "key", "value");
-    CheckTxnPinGetCF(txn_cf, roptions, cf_handles[1], "key_cf1", "val_cf1");
-    CheckTxnPinGetCF(txn_cf, roptions, cf_handles[2], "key_cf2", "val_cf2");
    rocksdb_transaction_destroy(txn_cf);
    rocksdb_options_destroy(cf_options);
    rocksdb_column_family_handle_destroy(cf_handles[0]);
@@ -17,7 +17,6 @@
 #include <vector>

 #include "db/blob/blob_file_cache.h"
-#include "db/blob/blob_source.h"
 #include "db/compaction/compaction_picker.h"
 #include "db/compaction/compaction_picker_fifo.h"
 #include "db/compaction/compaction_picker_level.h"
@@ -137,15 +136,9 @@ Status CheckCompressionSupported(const ColumnFamilyOptions& cf_options) {
    }
  }
  if (cf_options.compression_opts.zstd_max_train_bytes > 0) {
-    if (cf_options.compression_opts.use_zstd_dict_trainer) {
-      if (!ZSTD_TrainDictionarySupported()) {
-        return Status::InvalidArgument(
-            "zstd dictionary trainer cannot be used because ZSTD 1.1.3+ "
-            "is not linked with the binary.");
-      }
-    } else if (!ZSTD_FinalizeDictionarySupported()) {
+    if (!ZSTD_TrainDictionarySupported()) {
      return Status::InvalidArgument(
-          "zstd finalizeDictionary cannot be used because ZSTD 1.4.5+ "
+          "zstd dictionary trainer cannot be used because ZSTD 1.1.3+ "
          "is not linked with the binary.");
    }
    if (cf_options.compression_opts.max_dict_bytes == 0) {
@@ -233,21 +226,6 @@ ColumnFamilyOptions SanitizeOptions(const ImmutableDBOptions& db_options,
    result.min_write_buffer_number_to_merge = 1;
  }

-  if (db_options.atomic_flush && result.min_write_buffer_number_to_merge > 1) {
-    ROCKS_LOG_WARN(
-        db_options.logger,
-        "Currently, if atomic_flush is true, then triggering flush for any "
-        "column family internally (non-manual flush) will trigger flushing "
-        "all column families even if the number of memtables is smaller "
-        "min_write_buffer_number_to_merge. Therefore, configuring "
-        "min_write_buffer_number_to_merge > 1 is not compatible and should "
-        "be satinized to 1. Not doing so will lead to data loss and "
-        "inconsistent state across multiple column families when WAL is "
-        "disabled, which is a common setting for atomic flush");
-
-    result.min_write_buffer_number_to_merge = 1;
-  }
-
  if (result.num_levels < 1) {
    result.num_levels = 1;
  }
@@ -291,6 +269,7 @@ ColumnFamilyOptions SanitizeOptions(const ImmutableDBOptions& db_options,
  }

  if (result.compaction_style == kCompactionStyleFIFO) {
+    result.num_levels = 1;
    // since we delete level0 files in FIFO compaction when there are too many
    // of them, these options don't really mean anything
    result.level0_slowdown_writes_trigger = std::numeric_limits<int>::max();
@@ -522,8 +501,7 @@ std::vector<std::string> ColumnFamilyData::GetDbPaths() const {
  return paths;
 }

-const uint32_t ColumnFamilyData::kDummyColumnFamilyDataId =
-    std::numeric_limits<uint32_t>::max();
+const uint32_t ColumnFamilyData::kDummyColumnFamilyDataId = port::kMaxUint32;

 ColumnFamilyData::ColumnFamilyData(
    uint32_t id, const std::string& name, Version* _dummy_versions,
@@ -531,7 +509,7 @@ ColumnFamilyData::ColumnFamilyData(
    const ColumnFamilyOptions& cf_options, const ImmutableDBOptions& db_options,
    const FileOptions* file_options, ColumnFamilySet* column_family_set,
    BlockCacheTracer* const block_cache_tracer,
-    const std::shared_ptr<IOTracer>& io_tracer, const std::string& db_id,
+    const std::shared_ptr<IOTracer>& io_tracer,
    const std::string& db_session_id)
    : id_(id),
      name_(name),
@@ -564,8 +542,7 @@ ColumnFamilyData::ColumnFamilyData(
      prev_compaction_needed_bytes_(0),
      allow_2pc_(db_options.allow_2pc),
      last_memtable_id_(0),
-      db_paths_registered_(false),
-      mempurge_used_(false) {
+      db_paths_registered_(false) {
  if (id_ != kDummyColumnFamilyDataId) {
    // TODO(cc): RegisterDbPaths can be expensive, considering moving it
    // outside of this constructor which might be called with db mutex held.
@@ -596,8 +573,6 @@ ColumnFamilyData::ColumnFamilyData(
    blob_file_cache_.reset(
        new BlobFileCache(_table_cache, ioptions(), soptions(), id_,
                          internal_stats_->GetBlobFileReadHist(), io_tracer));
-    blob_source_.reset(new BlobSource(ioptions(), db_id, db_session_id,
-                                      blob_file_cache_.get()));

    if (ioptions_.compaction_style == kCompactionStyleLevel) {
      compaction_picker_.reset(
@@ -637,26 +612,6 @@ ColumnFamilyData::ColumnFamilyData(
  }

  RecalculateWriteStallConditions(mutable_cf_options_);
-
-  if (cf_options.table_factory->IsInstanceOf(
-          TableFactory::kBlockBasedTableName()) &&
-      cf_options.table_factory->GetOptions<BlockBasedTableOptions>()) {
-    const BlockBasedTableOptions* bbto =
-        cf_options.table_factory->GetOptions<BlockBasedTableOptions>();
-    const auto& options_overrides = bbto->cache_usage_options.options_overrides;
-    const auto file_metadata_charged =
-        options_overrides.at(CacheEntryRole::kFileMetadata).charged;
-    if (bbto->block_cache &&
-        file_metadata_charged == CacheEntryRoleOptions::Decision::kEnabled) {
-      // TODO(hx235): Add a `ConcurrentCacheReservationManager` at DB scope
-      // responsible for reservation of `ObsoleteFileInfo` so that we can keep
-      // this `file_metadata_cache_res_mgr_` nonconcurrent
-      file_metadata_cache_res_mgr_.reset(new ConcurrentCacheReservationManager(
-          std::make_shared<
-              CacheReservationManagerImpl<CacheEntryRole::kFileMetadata>>(
-              bbto->block_cache)));
-    }
-  }
 }

 // DB mutex held
@@ -787,13 +742,13 @@ namespace {
 std::unique_ptr<WriteControllerToken> SetupDelay(
    WriteController* write_controller, uint64_t compaction_needed_bytes,
    uint64_t prev_compaction_need_bytes, bool penalize_stop,
-    bool auto_compactions_disabled) {
+    bool auto_comapctions_disabled) {
  const uint64_t kMinWriteRate = 16 * 1024u;  // Minimum write rate 16KB/s.

  uint64_t max_write_rate = write_controller->max_delayed_write_rate();
  uint64_t write_rate = write_controller->delayed_write_rate();

-  if (auto_compactions_disabled) {
+  if (auto_comapctions_disabled) {
    // When auto compaction is disabled, always use the value user gave.
    write_rate = max_write_rate;
  } else if (write_controller->NeedsDelay() && max_write_rate > kMinWriteRate) {
@@ -871,8 +826,8 @@ int GetL0ThresholdSpeedupCompaction(int level0_file_num_compaction_trigger,
  // condition.
  // Or twice as compaction trigger, if it is smaller.
  int64_t res = std::min(twice_level0_trigger, one_fourth_trigger_slowdown);
-  if (res >= std::numeric_limits<int32_t>::max()) {
-    return std::numeric_limits<int32_t>::max();
+  if (res >= port::kMaxInt32) {
+    return port::kMaxInt32;
  } else {
    // res fits in int
    return static_cast<int>(res);
@@ -1158,14 +1113,13 @@ Status ColumnFamilyData::RangesOverlapWithMemtables(
  MergeIteratorBuilder merge_iter_builder(&internal_comparator_, &arena);
  merge_iter_builder.AddIterator(
      super_version->mem->NewIterator(read_opts, &arena));
-  super_version->imm->AddIterators(read_opts, &merge_iter_builder,
-                                   false /* add_range_tombstone_iter */);
+  super_version->imm->AddIterators(read_opts, &merge_iter_builder);
  ScopedArenaIterator memtable_iter(merge_iter_builder.Finish());

  auto read_seq = super_version->current->version_set()->LastSequence();
  ReadRangeDelAggregator range_del_agg(&internal_comparator_, read_seq);
-  auto* active_range_del_iter = super_version->mem->NewRangeTombstoneIterator(
-      read_opts, read_seq, false /* immutable_memtable */);
+  auto* active_range_del_iter =
+      super_version->mem->NewRangeTombstoneIterator(read_opts, read_seq);
  range_del_agg.AddTombstones(
      std::unique_ptr<FragmentedRangeTombstoneIterator>(active_range_del_iter));
  Status status;
@@ -1318,18 +1272,9 @@ void ColumnFamilyData::InstallSuperVersion(
  super_version_ = new_superversion;
  ++super_version_number_;
  super_version_->version_number = super_version_number_;
-  if (old_superversion == nullptr || old_superversion->current != current() ||
-      old_superversion->mem != mem_ ||
-      old_superversion->imm != imm_.current()) {
-    // Should not recalculate slow down condition if nothing has changed, since
-    // currently RecalculateWriteStallConditions() treats it as further slowing
-    // down is needed.
-    super_version_->write_stall_condition =
-        RecalculateWriteStallConditions(mutable_cf_options);
-  } else {
-    super_version_->write_stall_condition =
-        old_superversion->write_stall_condition;
-  }
+  super_version_->write_stall_condition =
+      RecalculateWriteStallConditions(mutable_cf_options);
+
  if (old_superversion != nullptr) {
    // Reset SuperVersions cached in thread local storage.
    // This should be done before old_superversion->Unref(). That's to ensure
@@ -1430,14 +1375,6 @@ Status ColumnFamilyData::ValidateOptions(
        "FIFO compaction only supported with max_open_files = -1.");
  }

-  std::vector<uint32_t> supported{0, 1, 2, 4, 8};
-  if (std::find(supported.begin(), supported.end(),
-                cf_options.memtable_protection_bytes_per_key) ==
-      supported.end()) {
-    return Status::NotSupported(
-        "Memtable per key-value checksum protection only supports 0, 1, 2, 4 "
-        "or 8 bytes per key.");
-  }
  return s;
 }

@@ -1527,14 +1464,13 @@ ColumnFamilySet::ColumnFamilySet(const std::string& dbname,
                                 WriteController* _write_controller,
                                 BlockCacheTracer* const block_cache_tracer,
                                 const std::shared_ptr<IOTracer>& io_tracer,
-                                 const std::string& db_id,
                                 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,
-          block_cache_tracer, io_tracer, db_id, db_session_id)),
+          block_cache_tracer, io_tracer, db_session_id)),
      default_cfd_cache_(nullptr),
      db_name_(dbname),
      db_options_(db_options),
@@ -1543,7 +1479,6 @@ ColumnFamilySet::ColumnFamilySet(const std::string& dbname,
      write_controller_(_write_controller),
      block_cache_tracer_(block_cache_tracer),
      io_tracer_(io_tracer),
-      db_id_(db_id),
      db_session_id_(db_session_id) {
  // initialize linked list
  dummy_cfd_->prev_ = dummy_cfd_;
@@ -1611,7 +1546,7 @@ ColumnFamilyData* ColumnFamilySet::CreateColumnFamily(
  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_id_, db_session_id_);
+      db_session_id_);
  column_families_.insert({name, id});
  column_family_data_.insert({id, new_cfd});
  max_column_family_ = std::max(max_column_family_, id);
@@ -14,7 +14,6 @@
 #include <unordered_map>
 #include <vector>

-#include "cache/cache_reservation_manager.h"
 #include "db/memtable_list.h"
 #include "db/table_cache.h"
 #include "db/table_properties_collector.h"
@@ -47,7 +46,6 @@ class InstrumentedMutex;
 class InstrumentedMutexLock;
 struct SuperVersionContext;
 class BlobFileCache;
-class BlobSource;

 extern const double kIncSlowdownRatio;
 // This file contains a list of data structures for managing column family
@@ -377,7 +375,7 @@ class ColumnFamilyData {
                         SequenceNumber earliest_seq);

  TableCache* table_cache() const { return table_cache_.get(); }
-  BlobSource* blob_source() const { return blob_source_.get(); }
+  BlobFileCache* blob_file_cache() const { return blob_file_cache_.get(); }

  // See documentation in compaction_picker.h
  // REQUIRES: DB mutex held
@@ -480,8 +478,11 @@ class ColumnFamilyData {
      const MutableCFOptions& mutable_cf_options,
      const ImmutableCFOptions& immutable_cf_options);

-  // Recalculate some stall conditions, which are changed only during
-  // compaction, adding new memtable and/or recalculation of compaction score.
+  // Recalculate some small conditions, which are changed only during
+  // compaction, adding new memtable and/or
+  // recalculation of compaction score. These values are used in
+  // DBImpl::MakeRoomForWrite function to decide, if it need to make
+  // a write stall
  WriteStallCondition RecalculateWriteStallConditions(
      const MutableCFOptions& mutable_cf_options);

@@ -519,19 +520,9 @@ class ColumnFamilyData {

  ThreadLocalPtr* TEST_GetLocalSV() { return local_sv_.get(); }
  WriteBufferManager* write_buffer_mgr() { return write_buffer_manager_; }
-  std::shared_ptr<CacheReservationManager>
-  GetFileMetadataCacheReservationManager() {
-    return file_metadata_cache_res_mgr_;
-  }
-
-  SequenceNumber GetFirstMemtableSequenceNumber() const;

  static const uint32_t kDummyColumnFamilyDataId;

-  // Keep track of whether the mempurge feature was ever used.
-  void SetMempurgeUsed() { mempurge_used_ = true; }
-  bool GetMempurgeUsed() { return mempurge_used_; }
-
 private:
  friend class ColumnFamilySet;
  ColumnFamilyData(uint32_t id, const std::string& name,
@@ -543,7 +534,7 @@ class ColumnFamilyData {
                   ColumnFamilySet* column_family_set,
                   BlockCacheTracer* const block_cache_tracer,
                   const std::shared_ptr<IOTracer>& io_tracer,
-                   const std::string& db_id, const std::string& db_session_id);
+                   const std::string& db_session_id);

  std::vector<std::string> GetDbPaths() const;

@@ -567,7 +558,6 @@ class ColumnFamilyData {

  std::unique_ptr<TableCache> table_cache_;
  std::unique_ptr<BlobFileCache> blob_file_cache_;
-  std::unique_ptr<BlobSource> blob_source_;

  std::unique_ptr<InternalStats> internal_stats_;

@@ -628,11 +618,6 @@ class ColumnFamilyData {
  bool db_paths_registered_;

  std::string full_history_ts_low_;
-
-  // For charging memory usage of file metadata created for newly added files to
-  // a Version associated with this CFD
-  std::shared_ptr<CacheReservationManager> file_metadata_cache_res_mgr_;
-  bool mempurge_used_;
 };

 // ColumnFamilySet has interesting thread-safety requirements
@@ -679,7 +664,7 @@ class ColumnFamilySet {
                  WriteController* _write_controller,
                  BlockCacheTracer* const block_cache_tracer,
                  const std::shared_ptr<IOTracer>& io_tracer,
-                  const std::string& db_id, const std::string& db_session_id);
+                  const std::string& db_session_id);
  ~ColumnFamilySet();

  ColumnFamilyData* GetDefault() const;
@@ -741,7 +726,6 @@ class ColumnFamilySet {
  WriteController* write_controller_;
  BlockCacheTracer* const block_cache_tracer_;
  std::shared_ptr<IOTracer> io_tracer_;
-  const std::string& db_id_;
  std::string db_session_id_;
 };

@@ -383,7 +383,7 @@ class ColumnFamilyTestBase : public testing::Test {

  int NumTableFilesAtLevel(int level, int cf) {
    return GetProperty(cf,
-                       "rocksdb.num-files-at-level" + std::to_string(level));
+                       "rocksdb.num-files-at-level" + ToString(level));
  }

 #ifndef ROCKSDB_LITE
@@ -783,7 +783,7 @@ TEST_P(ColumnFamilyTest, BulkAddDrop) {
  std::vector<std::string> cf_names;
  std::vector<ColumnFamilyHandle*> cf_handles;
  for (int i = 1; i <= kNumCF; i++) {
-    cf_names.push_back("cf1-" + std::to_string(i));
+    cf_names.push_back("cf1-" + ToString(i));
  }
  ASSERT_OK(db_->CreateColumnFamilies(cf_options, cf_names, &cf_handles));
  for (int i = 1; i <= kNumCF; i++) {
@@ -796,8 +796,7 @@ TEST_P(ColumnFamilyTest, BulkAddDrop) {
  }
  cf_handles.clear();
  for (int i = 1; i <= kNumCF; i++) {
-    cf_descriptors.emplace_back("cf2-" + std::to_string(i),
-                                ColumnFamilyOptions());
+    cf_descriptors.emplace_back("cf2-" + ToString(i), ColumnFamilyOptions());
  }
  ASSERT_OK(db_->CreateColumnFamilies(cf_descriptors, &cf_handles));
  for (int i = 1; i <= kNumCF; i++) {
@@ -821,7 +820,7 @@ TEST_P(ColumnFamilyTest, DropTest) {
    Open({"default"});
    CreateColumnFamiliesAndReopen({"pikachu"});
    for (int i = 0; i < 100; ++i) {
-      ASSERT_OK(Put(1, std::to_string(i), "bar" + std::to_string(i)));
+      ASSERT_OK(Put(1, ToString(i), "bar" + ToString(i)));
    }
    ASSERT_OK(Flush(1));

@@ -1116,7 +1115,7 @@ TEST_P(ColumnFamilyTest, DifferentWriteBufferSizes) {
  CreateColumnFamilies({"one", "two", "three"});
  ColumnFamilyOptions default_cf, one, two, three;
  // setup options. all column families have max_write_buffer_number setup to 10
-  // "default" -> 100KB memtable, start flushing immediately
+  // "default" -> 100KB memtable, start flushing immediatelly
  // "one" -> 200KB memtable, start flushing with two immutable memtables
  // "two" -> 1MB memtable, start flushing with three immutable memtables
  // "three" -> 90KB memtable, start flushing with four immutable memtables
@@ -1345,7 +1344,7 @@ TEST_P(ColumnFamilyTest, DifferentCompactionStyles) {
    PutRandomData(1, 10, 12000);
    PutRandomData(1, 1, 10);
    WaitForFlush(1);
-    AssertFilesPerLevel(std::to_string(i + 1), 1);
+    AssertFilesPerLevel(ToString(i + 1), 1);
  }

  // SETUP column family "two" -- level style with 4 levels
@@ -1353,7 +1352,7 @@ TEST_P(ColumnFamilyTest, DifferentCompactionStyles) {
    PutRandomData(2, 10, 12000);
    PutRandomData(2, 1, 10);
    WaitForFlush(2);
-    AssertFilesPerLevel(std::to_string(i + 1), 2);
+    AssertFilesPerLevel(ToString(i + 1), 2);
  }

  // TRIGGER compaction "one"
@@ -1417,17 +1416,18 @@ TEST_P(ColumnFamilyTest, MultipleManualCompactions) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(std::to_string(i + 1), 1);
+    AssertFilesPerLevel(ToString(i + 1), 1);
  }
-  std::atomic_bool cf_1_1{true};
+  bool cf_1_1 = true;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"ColumnFamilyTest::MultiManual:4", "ColumnFamilyTest::MultiManual:1"},
       {"ColumnFamilyTest::MultiManual:2", "ColumnFamilyTest::MultiManual:5"},
       {"ColumnFamilyTest::MultiManual:2", "ColumnFamilyTest::MultiManual:3"}});
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* /*arg*/) {
-        if (cf_1_1.exchange(false)) {
+        if (cf_1_1) {
          TEST_SYNC_POINT("ColumnFamilyTest::MultiManual:4");
+          cf_1_1 = false;
          TEST_SYNC_POINT("ColumnFamilyTest::MultiManual:3");
        }
      });
@@ -1446,7 +1446,7 @@ TEST_P(ColumnFamilyTest, MultipleManualCompactions) {
    PutRandomData(2, 10, 12000);
    PutRandomData(2, 1, 10);
    WaitForFlush(2);
-    AssertFilesPerLevel(std::to_string(i + 1), 2);
+    AssertFilesPerLevel(ToString(i + 1), 2);
  }
  threads.emplace_back([&] {
    TEST_SYNC_POINT("ColumnFamilyTest::MultiManual:1");
@@ -1514,14 +1514,15 @@ TEST_P(ColumnFamilyTest, AutomaticAndManualCompactions) {
  auto stop_token =
      dbfull()->TEST_write_controler().GetCompactionPressureToken();

-  std::atomic_bool cf_1_1{true};
+  bool cf_1_1 = true;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"ColumnFamilyTest::AutoManual:4", "ColumnFamilyTest::AutoManual:1"},
       {"ColumnFamilyTest::AutoManual:2", "ColumnFamilyTest::AutoManual:5"},
       {"ColumnFamilyTest::AutoManual:2", "ColumnFamilyTest::AutoManual:3"}});
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* /*arg*/) {
-        if (cf_1_1.exchange(false)) {
+        if (cf_1_1) {
+          cf_1_1 = false;
          TEST_SYNC_POINT("ColumnFamilyTest::AutoManual:4");
          TEST_SYNC_POINT("ColumnFamilyTest::AutoManual:3");
        }
@@ -1532,7 +1533,7 @@ TEST_P(ColumnFamilyTest, AutomaticAndManualCompactions) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(std::to_string(i + 1), 1);
+    AssertFilesPerLevel(ToString(i + 1), 1);
  }

  TEST_SYNC_POINT("ColumnFamilyTest::AutoManual:1");
@@ -1542,7 +1543,7 @@ TEST_P(ColumnFamilyTest, AutomaticAndManualCompactions) {
    PutRandomData(2, 10, 12000);
    PutRandomData(2, 1, 10);
    WaitForFlush(2);
-    AssertFilesPerLevel(std::to_string(i + 1), 2);
+    AssertFilesPerLevel(ToString(i + 1), 2);
  }
  ROCKSDB_NAMESPACE::port::Thread threads([&] {
    CompactRangeOptions compact_options;
@@ -1614,21 +1615,23 @@ TEST_P(ColumnFamilyTest, ManualAndAutomaticCompactions) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(std::to_string(i + 1), 1);
+    AssertFilesPerLevel(ToString(i + 1), 1);
  }
-  std::atomic_bool cf_1_1{true};
-  std::atomic_bool cf_1_2{true};
+  bool cf_1_1 = true;
+  bool cf_1_2 = true;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"ColumnFamilyTest::ManualAuto:4", "ColumnFamilyTest::ManualAuto:1"},
       {"ColumnFamilyTest::ManualAuto:5", "ColumnFamilyTest::ManualAuto:2"},
       {"ColumnFamilyTest::ManualAuto:2", "ColumnFamilyTest::ManualAuto:3"}});
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* /*arg*/) {
-        if (cf_1_1.exchange(false)) {
+        if (cf_1_1) {
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:4");
+          cf_1_1 = false;
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:3");
-        } else if (cf_1_2.exchange(false)) {
+        } else if (cf_1_2) {
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:2");
+          cf_1_2 = false;
        }
      });

@@ -1647,7 +1650,7 @@ TEST_P(ColumnFamilyTest, ManualAndAutomaticCompactions) {
    PutRandomData(2, 10, 12000);
    PutRandomData(2, 1, 10);
    WaitForFlush(2);
-    AssertFilesPerLevel(std::to_string(i + 1), 2);
+    AssertFilesPerLevel(ToString(i + 1), 2);
  }
  TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:5");
  threads.join();
@@ -1706,10 +1709,10 @@ TEST_P(ColumnFamilyTest, SameCFManualManualCompactions) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(std::to_string(i + 1), 1);
+    AssertFilesPerLevel(ToString(i + 1), 1);
  }
-  std::atomic_bool cf_1_1{true};
-  std::atomic_bool cf_1_2{true};
+  bool cf_1_1 = true;
+  bool cf_1_2 = true;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"ColumnFamilyTest::ManualManual:4", "ColumnFamilyTest::ManualManual:2"},
       {"ColumnFamilyTest::ManualManual:4", "ColumnFamilyTest::ManualManual:5"},
@@ -1718,11 +1721,13 @@ TEST_P(ColumnFamilyTest, SameCFManualManualCompactions) {
        "ColumnFamilyTest::ManualManual:3"}});
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* /*arg*/) {
-        if (cf_1_1.exchange(false)) {
+        if (cf_1_1) {
          TEST_SYNC_POINT("ColumnFamilyTest::ManualManual:4");
+          cf_1_1 = false;
          TEST_SYNC_POINT("ColumnFamilyTest::ManualManual:3");
-        } else if (cf_1_2.exchange(false)) {
+        } else if (cf_1_2) {
          TEST_SYNC_POINT("ColumnFamilyTest::ManualManual:2");
+          cf_1_2 = false;
        }
      });

@@ -1743,8 +1748,8 @@ TEST_P(ColumnFamilyTest, SameCFManualManualCompactions) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(
-        std::to_string(one.level0_file_num_compaction_trigger + i), 1);
+    AssertFilesPerLevel(ToString(one.level0_file_num_compaction_trigger + i),
+                        1);
  }

  ROCKSDB_NAMESPACE::port::Thread threads1([&] {
@@ -1806,10 +1811,10 @@ TEST_P(ColumnFamilyTest, SameCFManualAutomaticCompactions) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(std::to_string(i + 1), 1);
+    AssertFilesPerLevel(ToString(i + 1), 1);
  }
-  std::atomic_bool cf_1_1{true};
-  std::atomic_bool cf_1_2{true};
+  bool cf_1_1 = true;
+  bool cf_1_2 = true;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"ColumnFamilyTest::ManualAuto:4", "ColumnFamilyTest::ManualAuto:2"},
       {"ColumnFamilyTest::ManualAuto:4", "ColumnFamilyTest::ManualAuto:5"},
@@ -1817,11 +1822,13 @@ TEST_P(ColumnFamilyTest, SameCFManualAutomaticCompactions) {
       {"ColumnFamilyTest::ManualAuto:1", "ColumnFamilyTest::ManualAuto:3"}});
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* /*arg*/) {
-        if (cf_1_1.exchange(false)) {
+        if (cf_1_1) {
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:4");
+          cf_1_1 = false;
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:3");
-        } else if (cf_1_2.exchange(false)) {
+        } else if (cf_1_2) {
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:2");
+          cf_1_2 = false;
        }
      });

@@ -1842,8 +1849,8 @@ TEST_P(ColumnFamilyTest, SameCFManualAutomaticCompactions) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(
-        std::to_string(one.level0_file_num_compaction_trigger + i), 1);
+    AssertFilesPerLevel(ToString(one.level0_file_num_compaction_trigger + i),
+                        1);
  }

  TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:1");
@@ -1897,10 +1904,10 @@ TEST_P(ColumnFamilyTest, SameCFManualAutomaticCompactionsLevel) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(std::to_string(i + 1), 1);
+    AssertFilesPerLevel(ToString(i + 1), 1);
  }
-  std::atomic_bool cf_1_1{true};
-  std::atomic_bool cf_1_2{true};
+  bool cf_1_1 = true;
+  bool cf_1_2 = true;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"ColumnFamilyTest::ManualAuto:4", "ColumnFamilyTest::ManualAuto:2"},
       {"ColumnFamilyTest::ManualAuto:4", "ColumnFamilyTest::ManualAuto:5"},
@@ -1910,11 +1917,13 @@ TEST_P(ColumnFamilyTest, SameCFManualAutomaticCompactionsLevel) {
       {"ColumnFamilyTest::ManualAuto:1", "ColumnFamilyTest::ManualAuto:3"}});
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* /*arg*/) {
-        if (cf_1_1.exchange(false)) {
+        if (cf_1_1) {
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:4");
+          cf_1_1 = false;
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:3");
-        } else if (cf_1_2.exchange(false)) {
+        } else if (cf_1_2) {
          TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:2");
+          cf_1_2 = false;
        }
      });

@@ -1933,8 +1942,8 @@ TEST_P(ColumnFamilyTest, SameCFManualAutomaticCompactionsLevel) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(
-        std::to_string(one.level0_file_num_compaction_trigger + i), 1);
+    AssertFilesPerLevel(ToString(one.level0_file_num_compaction_trigger + i),
+                        1);
  }

  TEST_SYNC_POINT("ColumnFamilyTest::ManualAuto:1");
@@ -1989,8 +1998,8 @@ TEST_P(ColumnFamilyTest, SameCFAutomaticManualCompactions) {
  auto stop_token =
      dbfull()->TEST_write_controler().GetCompactionPressureToken();

-  std::atomic_bool cf_1_1{true};
-  std::atomic_bool cf_1_2{true};
+  bool cf_1_1 = true;
+  bool cf_1_2 = true;
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"ColumnFamilyTest::AutoManual:4", "ColumnFamilyTest::AutoManual:2"},
       {"ColumnFamilyTest::AutoManual:4", "ColumnFamilyTest::AutoManual:5"},
@@ -1998,11 +2007,13 @@ TEST_P(ColumnFamilyTest, SameCFAutomaticManualCompactions) {
        "ColumnFamilyTest::AutoManual:3"}});
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
      "DBImpl::BackgroundCompaction:NonTrivial:AfterRun", [&](void* /*arg*/) {
-        if (cf_1_1.exchange(false)) {
+        if (cf_1_1) {
          TEST_SYNC_POINT("ColumnFamilyTest::AutoManual:4");
+          cf_1_1 = false;
          TEST_SYNC_POINT("ColumnFamilyTest::AutoManual:3");
-        } else if (cf_1_2.exchange(false)) {
+        } else if (cf_1_2) {
          TEST_SYNC_POINT("ColumnFamilyTest::AutoManual:2");
+          cf_1_2 = false;
        }
      });

@@ -2013,7 +2024,7 @@ TEST_P(ColumnFamilyTest, SameCFAutomaticManualCompactions) {
    PutRandomData(1, 10, 12000, true);
    PutRandomData(1, 1, 10, true);
    WaitForFlush(1);
-    AssertFilesPerLevel(std::to_string(i + 1), 1);
+    AssertFilesPerLevel(ToString(i + 1), 1);
  }

  TEST_SYNC_POINT("ColumnFamilyTest::AutoManual:5");
@@ -2207,22 +2218,9 @@ TEST_P(ColumnFamilyTest, FlushStaleColumnFamilies) {
  PutRandomData(0, 100, 1000);  // flush
  WaitForFlush(0);
  WaitForFlush(2);
-  // at least 3 files for default column families, 1 file for column family
-  // [two], zero files for column family [one], because it's empty
-  std::vector<LiveFileMetaData> metadata;
-  db_->GetLiveFilesMetaData(&metadata);
-  ASSERT_GE(metadata.size(), 4);
-  bool has_cf1_sst = false;
-  bool has_cf2_sst = false;
-  for (const auto& file : metadata) {
-    if (file.column_family_name == "one") {
-      has_cf1_sst = true;
-    } else if (file.column_family_name == "two") {
-      has_cf2_sst = true;
-    }
-  }
-  ASSERT_FALSE(has_cf1_sst);
-  ASSERT_TRUE(has_cf2_sst);
+  // 3 files for default column families, 1 file for column family [two], zero
+  // files for column family [one], because it's empty
+  AssertCountLiveFiles(4);

  ASSERT_OK(Flush(0));
  ASSERT_EQ(0, dbfull()->TEST_total_log_size());
@@ -2939,7 +2937,7 @@ TEST_P(ColumnFamilyTest, CompactionSpeedupTwoColumnFamilies) {
  ASSERT_EQ(1, dbfull()->TEST_BGCompactionsAllowed());
 }

-TEST_P(ColumnFamilyTest, CreateAndDestroyOptions) {
+TEST_P(ColumnFamilyTest, CreateAndDestoryOptions) {
  std::unique_ptr<ColumnFamilyOptions> cfo(new ColumnFamilyOptions());
  ColumnFamilyHandle* cfh;
  Open();
@@ -3433,27 +3431,6 @@ TEST(ColumnFamilyTest, ValidateBlobGCForceThreshold) {
                  .IsInvalidArgument());
 }

-TEST(ColumnFamilyTest, ValidateMemtableKVChecksumOption) {
-  DBOptions db_options;
-
-  ColumnFamilyOptions cf_options;
-  ASSERT_OK(ColumnFamilyData::ValidateOptions(db_options, cf_options));
-
-  cf_options.memtable_protection_bytes_per_key = 5;
-  ASSERT_TRUE(ColumnFamilyData::ValidateOptions(db_options, cf_options)
-                  .IsNotSupported());
-
-  cf_options.memtable_protection_bytes_per_key = 1;
-  ASSERT_OK(ColumnFamilyData::ValidateOptions(db_options, cf_options));
-
-  cf_options.memtable_protection_bytes_per_key = 16;
-  ASSERT_TRUE(ColumnFamilyData::ValidateOptions(db_options, cf_options)
-                  .IsNotSupported());
-
-  cf_options.memtable_protection_bytes_per_key = 0;
-  ASSERT_OK(ColumnFamilyData::ValidateOptions(db_options, cf_options));
-}
-
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
@@ -77,7 +77,7 @@ TEST_F(CompactFilesTest, L0ConflictsFiles) {
  options.compression = kNoCompression;

  DB* db = nullptr;
-  ASSERT_OK(DestroyDB(db_name_, options));
+  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
  assert(s.ok());
  assert(db);
@@ -91,8 +91,8 @@ TEST_F(CompactFilesTest, L0ConflictsFiles) {
  // create couple files
  // Background compaction starts and waits in BackgroundCallCompaction:0
  for (int i = 0; i < kLevel0Trigger * 4; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), std::to_string(i), ""));
-    ASSERT_OK(db->Put(WriteOptions(), std::to_string(100 - i), ""));
+    ASSERT_OK(db->Put(WriteOptions(), ToString(i), ""));
+    ASSERT_OK(db->Put(WriteOptions(), ToString(100 - i), ""));
    ASSERT_OK(db->Flush(FlushOptions()));
  }

@@ -128,7 +128,7 @@ TEST_F(CompactFilesTest, MultipleLevel) {
  options.listeners.emplace_back(collector);

  DB* db = nullptr;
-  ASSERT_OK(DestroyDB(db_name_, options));
+  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
  ASSERT_OK(s);
  ASSERT_NE(db, nullptr);
@@ -136,7 +136,7 @@ TEST_F(CompactFilesTest, MultipleLevel) {
  // create couple files in L0, L3, L4 and L5
  for (int i = 5; i > 2; --i) {
    collector->ClearFlushedFiles();
-    ASSERT_OK(db->Put(WriteOptions(), std::to_string(i), ""));
+    ASSERT_OK(db->Put(WriteOptions(), ToString(i), ""));
    ASSERT_OK(db->Flush(FlushOptions()));
    // Ensure background work is fully finished including listener callbacks
    // before accessing listener state.
@@ -145,11 +145,11 @@ TEST_F(CompactFilesTest, MultipleLevel) {
    ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files, i));

    std::string prop;
-    ASSERT_TRUE(db->GetProperty(
-        "rocksdb.num-files-at-level" + std::to_string(i), &prop));
+    ASSERT_TRUE(
+        db->GetProperty("rocksdb.num-files-at-level" + ToString(i), &prop));
    ASSERT_EQ("1", prop);
  }
-  ASSERT_OK(db->Put(WriteOptions(), std::to_string(0), ""));
+  ASSERT_OK(db->Put(WriteOptions(), ToString(0), ""));
  ASSERT_OK(db->Flush(FlushOptions()));

  ColumnFamilyMetaData meta;
@@ -211,14 +211,14 @@ TEST_F(CompactFilesTest, ObsoleteFiles) {
  options.listeners.emplace_back(collector);

  DB* db = nullptr;
-  ASSERT_OK(DestroyDB(db_name_, options));
+  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
  ASSERT_OK(s);
  ASSERT_NE(db, nullptr);

  // create couple files
  for (int i = 1000; i < 2000; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), std::to_string(i),
+    ASSERT_OK(db->Put(WriteOptions(), ToString(i),
                      std::string(kWriteBufferSize / 10, 'a' + (i % 26))));
  }

@@ -250,21 +250,21 @@ TEST_F(CompactFilesTest, NotCutOutputOnLevel0) {
  options.listeners.emplace_back(collector);

  DB* db = nullptr;
-  ASSERT_OK(DestroyDB(db_name_, options));
+  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
  assert(s.ok());
  assert(db);

  // create couple files
  for (int i = 0; i < 500; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), std::to_string(i),
+    ASSERT_OK(db->Put(WriteOptions(), ToString(i),
                      std::string(1000, 'a' + (i % 26))));
  }
  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
  auto l0_files_1 = collector->GetFlushedFiles();
  collector->ClearFlushedFiles();
  for (int i = 0; i < 500; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), std::to_string(i),
+    ASSERT_OK(db->Put(WriteOptions(), ToString(i),
                      std::string(1000, 'a' + (i % 26))));
  }
  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
@@ -288,14 +288,14 @@ TEST_F(CompactFilesTest, CapturingPendingFiles) {
  options.listeners.emplace_back(collector);

  DB* db = nullptr;
-  ASSERT_OK(DestroyDB(db_name_, options));
+  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
  ASSERT_OK(s);
  assert(db);

  // Create 5 files.
  for (int i = 0; i < 5; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), "key" + std::to_string(i), "value"));
+    ASSERT_OK(db->Put(WriteOptions(), "key" + ToString(i), "value"));
    ASSERT_OK(db->Flush(FlushOptions()));
  }

@@ -366,7 +366,7 @@ TEST_F(CompactFilesTest, CompactionFilterWithGetSv) {
  options.compaction_filter = cf.get();

  DB* db = nullptr;
-  ASSERT_OK(DestroyDB(db_name_, options));
+  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
  ASSERT_OK(s);

@@ -404,7 +404,7 @@ TEST_F(CompactFilesTest, SentinelCompressionType) {
       {CompactionStyle::kCompactionStyleLevel,
        CompactionStyle::kCompactionStyleUniversal,
        CompactionStyle::kCompactionStyleNone}) {
-    ASSERT_OK(DestroyDB(db_name_, Options()));
+    DestroyDB(db_name_, Options());
    Options options;
    options.compaction_style = compaction_style;
    // L0: Snappy, L1: ZSTD, L2: Snappy
@@ -458,14 +458,14 @@ TEST_F(CompactFilesTest, GetCompactionJobInfo) {
  options.listeners.emplace_back(collector);

  DB* db = nullptr;
-  ASSERT_OK(DestroyDB(db_name_, options));
+  DestroyDB(db_name_, options);
  Status s = DB::Open(options, db_name_, &db);
  ASSERT_OK(s);
  assert(db);

  // create couple files
  for (int i = 0; i < 500; ++i) {
-    ASSERT_OK(db->Put(WriteOptions(), std::to_string(i),
+    ASSERT_OK(db->Put(WriteOptions(), ToString(i),
                      std::string(1000, 'a' + (i % 26))));
  }
  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
@@ -490,7 +490,6 @@ TEST_F(CompactFilesTest, GetCompactionJobInfo) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -7,7 +7,6 @@

 #include <cassert>

-#include "rocksdb/comparator.h"
 #include "table/internal_iterator.h"

 namespace ROCKSDB_NAMESPACE {
@@ -20,7 +19,7 @@ namespace ROCKSDB_NAMESPACE {
 class ClippingIterator : public InternalIterator {
 public:
  ClippingIterator(InternalIterator* iter, const Slice* start, const Slice* end,
-                   const CompareInterface* cmp)
+                   const Comparator* cmp)
      : iter_(iter), start_(start), end_(end), cmp_(cmp), valid_(false) {
    assert(iter_);
    assert(cmp_);
@@ -269,7 +268,7 @@ class ClippingIterator : public InternalIterator {
  InternalIterator* iter_;
  const Slice* start_;
  const Slice* end_;
-  const CompareInterface* cmp_;
+  const Comparator* cmp_;
  bool valid_;
 };

@@ -253,7 +253,6 @@ INSTANTIATE_TEST_CASE_P(
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -77,11 +77,11 @@ void Compaction::SetInputVersion(Version* _input_version) {
 void Compaction::GetBoundaryKeys(
    VersionStorageInfo* vstorage,
    const std::vector<CompactionInputFiles>& inputs, Slice* smallest_user_key,
-    Slice* largest_user_key, int exclude_level) {
+    Slice* largest_user_key) {
  bool initialized = false;
  const Comparator* ucmp = vstorage->InternalComparator()->user_comparator();
  for (size_t i = 0; i < inputs.size(); ++i) {
-    if (inputs[i].files.empty() || inputs[i].level == exclude_level) {
+    if (inputs[i].files.empty()) {
      continue;
    }
    if (inputs[i].level == 0) {
@@ -214,14 +214,11 @@ Compaction::Compaction(
    CompressionOptions _compression_opts, Temperature _output_temperature,
    uint32_t _max_subcompactions, std::vector<FileMetaData*> _grandparents,
    bool _manual_compaction, const std::string& _trim_ts, double _score,
-    bool _deletion_compaction, bool l0_files_might_overlap,
-    CompactionReason _compaction_reason,
-    BlobGarbageCollectionPolicy _blob_garbage_collection_policy,
-    double _blob_garbage_collection_age_cutoff)
+    bool _deletion_compaction, CompactionReason _compaction_reason)
    : input_vstorage_(vstorage),
      start_level_(_inputs[0].level),
      output_level_(_output_level),
-      target_output_file_size_(_target_file_size),
+      max_output_file_size_(_target_file_size),
      max_compaction_bytes_(_max_compaction_bytes),
      max_subcompactions_(_max_subcompactions),
      immutable_options_(_immutable_options),
@@ -234,7 +231,6 @@ Compaction::Compaction(
      output_compression_opts_(_compression_opts),
      output_temperature_(_output_temperature),
      deletion_compaction_(_deletion_compaction),
-      l0_files_might_overlap_(l0_files_might_overlap),
      inputs_(PopulateWithAtomicBoundaries(vstorage, std::move(_inputs))),
      grandparents_(std::move(_grandparents)),
      score_(_score),
@@ -243,23 +239,8 @@ Compaction::Compaction(
      is_manual_compaction_(_manual_compaction),
      trim_ts_(_trim_ts),
      is_trivial_move_(false),
-
      compaction_reason_(_compaction_reason),
-      notify_on_compaction_completion_(false),
-      enable_blob_garbage_collection_(
-          _blob_garbage_collection_policy == BlobGarbageCollectionPolicy::kForce
-              ? true
-              : (_blob_garbage_collection_policy ==
-                         BlobGarbageCollectionPolicy::kDisable
-                     ? false
-                     : mutable_cf_options()->enable_blob_garbage_collection)),
-      blob_garbage_collection_age_cutoff_(
-          _blob_garbage_collection_age_cutoff < 0 ||
-                  _blob_garbage_collection_age_cutoff > 1
-              ? mutable_cf_options()->blob_garbage_collection_age_cutoff
-              : _blob_garbage_collection_age_cutoff),
-      penultimate_level_(EvaluatePenultimateLevel(
-          vstorage, immutable_options_, start_level_, output_level_)) {
+      notify_on_compaction_completion_(false) {
  MarkFilesBeingCompacted(true);
  if (is_manual_compaction_) {
    compaction_reason_ = CompactionReason::kManualCompaction;
@@ -268,14 +249,6 @@ Compaction::Compaction(
    max_subcompactions_ = _mutable_db_options.max_subcompactions;
  }

-  // for the non-bottommost levels, it tries to build files match the target
-  // file size, but not guaranteed. It could be 2x the size of the target size.
-  max_output_file_size_ =
-      bottommost_level_ || grandparents_.empty() ||
-              !_immutable_options.level_compaction_dynamic_file_size
-          ? target_output_file_size_
-          : 2 * target_output_file_size_;
-
 #ifndef NDEBUG
  for (size_t i = 1; i < inputs_.size(); ++i) {
    assert(inputs_[i].level > inputs_[i - 1].level);
@@ -292,97 +265,6 @@ Compaction::Compaction(
  }

  GetBoundaryKeys(vstorage, inputs_, &smallest_user_key_, &largest_user_key_);
-
-  // Every compaction regardless of any compaction reason may respect the
-  // existing compact cursor in the output level to split output files
-  output_split_key_ = nullptr;
-  if (immutable_options_.compaction_style == kCompactionStyleLevel &&
-      immutable_options_.compaction_pri == kRoundRobin) {
-    const InternalKey* cursor =
-        &input_vstorage_->GetCompactCursors()[output_level_];
-    if (cursor->size() != 0) {
-      const Slice& cursor_user_key = ExtractUserKey(cursor->Encode());
-      auto ucmp = vstorage->InternalComparator()->user_comparator();
-      // May split output files according to the cursor if it in the user-key
-      // range
-      if (ucmp->CompareWithoutTimestamp(cursor_user_key, smallest_user_key_) >
-              0 &&
-          ucmp->CompareWithoutTimestamp(cursor_user_key, largest_user_key_) <=
-              0) {
-        output_split_key_ = cursor;
-      }
-    }
-  }
-
-  PopulatePenultimateLevelOutputRange();
-}
-
-void Compaction::PopulatePenultimateLevelOutputRange() {
-  if (!SupportsPerKeyPlacement()) {
-    return;
-  }
-
-  // exclude the last level, the range of all input levels is the safe range
-  // of keys that can be moved up.
-  int exclude_level = number_levels_ - 1;
-  penultimate_output_range_type_ = PenultimateOutputRangeType::kNonLastRange;
-
-  // For universal compaction, the penultimate_output_range could be extended if
-  // all penultimate level files are included in the compaction (which includes
-  // the case that the penultimate level is empty).
-  if (immutable_options_.compaction_style == kCompactionStyleUniversal) {
-    exclude_level = kInvalidLevel;
-    std::set<uint64_t> penultimate_inputs;
-    for (const auto& input_lvl : inputs_) {
-      if (input_lvl.level == penultimate_level_) {
-        for (const auto& file : input_lvl.files) {
-          penultimate_inputs.emplace(file->fd.GetNumber());
-        }
-      }
-    }
-    auto penultimate_files = input_vstorage_->LevelFiles(penultimate_level_);
-    for (const auto& file : penultimate_files) {
-      if (penultimate_inputs.find(file->fd.GetNumber()) ==
-          penultimate_inputs.end()) {
-        exclude_level = number_levels_ - 1;
-        penultimate_output_range_type_ = PenultimateOutputRangeType::kFullRange;
-        break;
-      }
-    }
-  }
-
-  GetBoundaryKeys(input_vstorage_, inputs_,
-                  &penultimate_level_smallest_user_key_,
-                  &penultimate_level_largest_user_key_, exclude_level);
-
-  // If there's a case that the penultimate level output range is overlapping
-  // with the existing files, disable the penultimate level output by setting
-  // the range to empty. One example is the range delete could have overlap
-  // boundary with the next file. (which is actually a false overlap)
-  // TODO: Exclude such false overlap, so it won't disable the penultimate
-  //  output.
-  std::set<uint64_t> penultimate_inputs;
-  for (const auto& input_lvl : inputs_) {
-    if (input_lvl.level == penultimate_level_) {
-      for (const auto& file : input_lvl.files) {
-        penultimate_inputs.emplace(file->fd.GetNumber());
-      }
-    }
-  }
-
-  auto penultimate_files = input_vstorage_->LevelFiles(penultimate_level_);
-  for (const auto& file : penultimate_files) {
-    if (penultimate_inputs.find(file->fd.GetNumber()) ==
-            penultimate_inputs.end() &&
-        OverlapPenultimateLevelOutputRange(file->smallest.user_key(),
-                                           file->largest.user_key())) {
-      // basically disable the penultimate range output. which should be rare
-      // or a false overlap caused by range del
-      penultimate_level_smallest_user_key_ = "";
-      penultimate_level_largest_user_key_ = "";
-      penultimate_output_range_type_ = PenultimateOutputRangeType::kDisabled;
-    }
-  }
 }

 Compaction::~Compaction() {
@@ -394,48 +276,6 @@ Compaction::~Compaction() {
  }
 }

-bool Compaction::SupportsPerKeyPlacement() const {
-  return penultimate_level_ != kInvalidLevel;
-}
-
-int Compaction::GetPenultimateLevel() const { return penultimate_level_; }
-
-// smallest_key and largest_key include timestamps if user-defined timestamp is
-// enabled.
-bool Compaction::OverlapPenultimateLevelOutputRange(
-    const Slice& smallest_key, const Slice& largest_key) const {
-  if (!SupportsPerKeyPlacement()) {
-    return false;
-  }
-  const Comparator* ucmp =
-      input_vstorage_->InternalComparator()->user_comparator();
-
-  return ucmp->CompareWithoutTimestamp(
-             smallest_key, penultimate_level_largest_user_key_) <= 0 &&
-         ucmp->CompareWithoutTimestamp(
-             largest_key, penultimate_level_smallest_user_key_) >= 0;
-}
-
-// key includes timestamp if user-defined timestamp is enabled.
-bool Compaction::WithinPenultimateLevelOutputRange(const Slice& key) const {
-  if (!SupportsPerKeyPlacement()) {
-    return false;
-  }
-
-  if (penultimate_level_smallest_user_key_.empty() ||
-      penultimate_level_largest_user_key_.empty()) {
-    return false;
-  }
-
-  const Comparator* ucmp =
-      input_vstorage_->InternalComparator()->user_comparator();
-
-  return ucmp->CompareWithoutTimestamp(
-             key, penultimate_level_smallest_user_key_) >= 0 &&
-         ucmp->CompareWithoutTimestamp(
-             key, penultimate_level_largest_user_key_) <= 0;
-}
-
 bool Compaction::InputCompressionMatchesOutput() const {
  int base_level = input_vstorage_->base_level();
  bool matches =
@@ -457,10 +297,8 @@ bool Compaction::IsTrivialMove() const {
  // filter to be applied to that level, and thus cannot be a trivial move.

  // Check if start level have files with overlapping ranges
-  if (start_level_ == 0 && input_vstorage_->level0_non_overlapping() == false &&
-      l0_files_might_overlap_) {
-    // We cannot move files from L0 to L1 if the L0 files in the LSM-tree are
-    // overlapping, unless we are sure that files picked in L0 don't overlap.
+  if (start_level_ == 0 && input_vstorage_->level0_non_overlapping() == false) {
+    // We cannot move files from L0 to L1 if the files are overlapping
    return false;
  }

@@ -487,8 +325,8 @@ bool Compaction::IsTrivialMove() const {
  }

  if (!(start_level_ != output_level_ && num_input_levels() == 1 &&
-        input(0, 0)->fd.GetPathId() == output_path_id() &&
-        InputCompressionMatchesOutput())) {
+          input(0, 0)->fd.GetPathId() == output_path_id() &&
+          InputCompressionMatchesOutput())) {
    return false;
  }

@@ -517,11 +355,6 @@ bool Compaction::IsTrivialMove() const {
    }
  }

-  // PerKeyPlacement compaction should never be trivial move.
-  if (SupportsPerKeyPlacement()) {
-    return false;
-  }
-
  return true;
 }

@@ -685,7 +518,7 @@ uint64_t Compaction::OutputFilePreallocationSize() const {
    }
  }

-  if (max_output_file_size_ != std::numeric_limits<uint64_t>::max() &&
+  if (max_output_file_size_ != port::kMaxUint64 &&
      (immutable_options_.compaction_style == kCompactionStyleLevel ||
       output_level() > 0)) {
    preallocation_size = std::min(max_output_file_size_, preallocation_size);
@@ -737,23 +570,20 @@ bool Compaction::IsOutputLevelEmpty() const {
 }

 bool Compaction::ShouldFormSubcompactions() const {
-  if (cfd_ == nullptr) {
+  if (max_subcompactions_ <= 1 || cfd_ == nullptr) {
    return false;
  }

-  // Round-Robin pri under leveled compaction allows subcompactions by default
-  // and the number of subcompactions can be larger than max_subcompactions_
-  if (cfd_->ioptions()->compaction_pri == kRoundRobin &&
-      cfd_->ioptions()->compaction_style == kCompactionStyleLevel) {
-    return output_level_ > 0;
-  }
-
-  if (max_subcompactions_ <= 1) {
+  // Note: the subcompaction boundary picking logic does not currently guarantee
+  // that all user keys that differ only by timestamp get processed by the same
+  // subcompaction.
+  if (cfd_->user_comparator()->timestamp_size() > 0) {
    return false;
  }

  if (cfd_->ioptions()->compaction_style == kCompactionStyleLevel) {
-    return (start_level_ == 0 || is_manual_compaction_) && output_level_ > 0;
+    return (start_level_ == 0 || is_manual_compaction_) && output_level_ > 0 &&
+           !IsOutputLevelEmpty();
  } else if (cfd_->ioptions()->compaction_style == kCompactionStyleUniversal) {
    return number_levels_ > 1 && output_level_ > 0;
  } else {
@@ -786,7 +616,7 @@ bool Compaction::DoesInputReferenceBlobFiles() const {

 uint64_t Compaction::MinInputFileOldestAncesterTime(
    const InternalKey* start, const InternalKey* end) const {
-  uint64_t min_oldest_ancester_time = std::numeric_limits<uint64_t>::max();
+  uint64_t min_oldest_ancester_time = port::kMaxUint64;
  const InternalKeyComparator& icmp =
      column_family_data()->internal_comparator();
  for (const auto& level_files : inputs_) {
@@ -807,49 +637,8 @@ uint64_t Compaction::MinInputFileOldestAncesterTime(
  return min_oldest_ancester_time;
 }

-int Compaction::EvaluatePenultimateLevel(
-    const VersionStorageInfo* vstorage,
-    const ImmutableOptions& immutable_options, const int start_level,
-    const int output_level) {
-  // TODO: currently per_key_placement feature only support level and universal
-  //  compaction
-  if (immutable_options.compaction_style != kCompactionStyleLevel &&
-      immutable_options.compaction_style != kCompactionStyleUniversal) {
-    return kInvalidLevel;
-  }
-  if (output_level != immutable_options.num_levels - 1) {
-    return kInvalidLevel;
-  }
-
-  int penultimate_level = output_level - 1;
-  assert(penultimate_level < immutable_options.num_levels);
-  if (penultimate_level <= 0) {
-    return kInvalidLevel;
-  }
-
-  // If the penultimate level is not within input level -> output level range
-  // check if the penultimate output level is empty, if it's empty, it could
-  // also be locked for the penultimate output.
-  // TODO: ideally, it only needs to check if there's a file within the
-  //  compaction output key range. For simplicity, it just check if there's any
-  //  file on the penultimate level.
-  if (start_level == immutable_options.num_levels - 1 &&
-      (immutable_options.compaction_style != kCompactionStyleUniversal ||
-       !vstorage->LevelFiles(penultimate_level).empty())) {
-    return kInvalidLevel;
-  }
-
-  bool supports_per_key_placement =
-      immutable_options.preclude_last_level_data_seconds > 0;
-
-  // it could be overridden by unittest
-  TEST_SYNC_POINT_CALLBACK("Compaction::SupportsPerKeyPlacement:Enabled",
-                           &supports_per_key_placement);
-  if (!supports_per_key_placement) {
-    return kInvalidLevel;
-  }
-
-  return penultimate_level;
+int Compaction::GetInputBaseLevel() const {
+  return input_vstorage_->base_level();
 }

 }  // namespace ROCKSDB_NAMESPACE
@@ -81,20 +81,7 @@ class Compaction {
             std::vector<FileMetaData*> grandparents,
             bool manual_compaction = false, const std::string& trim_ts = "",
             double score = -1, bool deletion_compaction = false,
-             bool l0_files_might_overlap = true,
-             CompactionReason compaction_reason = CompactionReason::kUnknown,
-             BlobGarbageCollectionPolicy blob_garbage_collection_policy =
-                 BlobGarbageCollectionPolicy::kUseDefault,
-             double blob_garbage_collection_age_cutoff = -1);
-
-  // The type of the penultimate level output range
-  enum class PenultimateOutputRangeType : int {
-    kNotSupported,  // it cannot output to the penultimate level
-    kFullRange,     // any data could be output to the penultimate level
-    kNonLastRange,  // only the keys within non_last_level compaction inputs can
-                    // be outputted to the penultimate level
-    kDisabled,      // no data can be outputted to the penultimate level
-  };
+             CompactionReason compaction_reason = CompactionReason::kUnknown);

  // No copying allowed
  Compaction(const Compaction&) = delete;
@@ -172,9 +159,6 @@ class Compaction {
  // Maximum size of files to build during this compaction.
  uint64_t max_output_file_size() const { return max_output_file_size_; }

-  // Target output file size for this compaction
-  uint64_t target_output_file_size() const { return target_output_file_size_; }
-
  // What compression for output
  CompressionType output_compression() const { return output_compression_; }

@@ -190,12 +174,6 @@ class Compaction {
  // moving a single input file to the next level (no merging or splitting)
  bool IsTrivialMove() const;

-  // The split user key in the output level if this compaction is required to
-  // split the output files according to the existing cursor in the output
-  // level under round-robin compaction policy. Empty indicates no required
-  // splitting key
-  const InternalKey* GetOutputSplitKey() const { return output_split_key_; }
-
  // If true, then the compaction can be done by simply deleting input files.
  bool deletion_compaction() const { return deletion_compaction_; }

@@ -224,11 +202,6 @@ class Compaction {
  // Is this compaction creating a file in the bottom most level?
  bool bottommost_level() const { return bottommost_level_; }

-  // Is the compaction compact to the last level
-  bool is_last_level() const {
-    return output_level_ == immutable_options_.num_levels - 1;
-  }
-
  // Does this compaction include all sst files?
  bool is_full_compaction() const { return is_full_compaction_; }

@@ -319,40 +292,7 @@ class Compaction {

  Slice GetLargestUserKey() const { return largest_user_key_; }

-  Slice GetPenultimateLevelSmallestUserKey() const {
-    return penultimate_level_smallest_user_key_;
-  }
-
-  Slice GetPenultimateLevelLargestUserKey() const {
-    return penultimate_level_largest_user_key_;
-  }
-
-  PenultimateOutputRangeType GetPenultimateOutputRangeType() const {
-    return penultimate_output_range_type_;
-  }
-
-  // Return true if the compaction supports per_key_placement
-  bool SupportsPerKeyPlacement() const;
-
-  // Get per_key_placement penultimate output level, which is `last_level - 1`
-  // if per_key_placement feature is supported. Otherwise, return -1.
-  int GetPenultimateLevel() const;
-
-  // Return true if the given range is overlap with penultimate level output
-  // range.
-  // Both smallest_key and largest_key include timestamps if user-defined
-  // timestamp is enabled.
-  bool OverlapPenultimateLevelOutputRange(const Slice& smallest_key,
-                                          const Slice& largest_key) const;
-
-  // Return true if the key is within penultimate level output range for
-  // per_key_placement feature, which is safe to place the key to the
-  // penultimate level. different compaction strategy has different rules.
-  // If per_key_placement is not supported, always return false.
-  // TODO: currently it doesn't support moving data from the last level to the
-  //  penultimate level
-  //  key includes timestamp if user-defined timestamp is enabled.
-  bool WithinPenultimateLevelOutputRange(const Slice& key) const;
+  int GetInputBaseLevel() const;

  CompactionReason compaction_reason() const { return compaction_reason_; }

@@ -366,14 +306,6 @@ class Compaction {

  uint32_t max_subcompactions() const { return max_subcompactions_; }

-  bool enable_blob_garbage_collection() const {
-    return enable_blob_garbage_collection_;
-  }
-
-  double blob_garbage_collection_age_cutoff() const {
-    return blob_garbage_collection_age_cutoff_;
-  }
-
  // 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,
@@ -389,22 +321,6 @@ class Compaction {
    return notify_on_compaction_completion_;
  }

-  static constexpr int kInvalidLevel = -1;
-
-  // Evaluate penultimate output level. If the compaction supports
-  // per_key_placement feature, it returns the penultimate level number.
-  // Otherwise, it's set to kInvalidLevel (-1), which means
-  // output_to_penultimate_level is not supported.
-  // Note: even the penultimate level output is supported (PenultimateLevel !=
-  // kInvalidLevel), some key range maybe unsafe to be outputted to the
-  // penultimate level. The safe key range is populated by
-  // `PopulatePenultimateLevelOutputRange()`.
-  // Which could potentially disable all penultimate level output.
-  static int EvaluatePenultimateLevel(const VersionStorageInfo* vstorage,
-                                      const ImmutableOptions& immutable_options,
-                                      const int start_level,
-                                      const int output_level);
-
 private:
  // mark (or clear) all files that are being compacted
  void MarkFilesBeingCompacted(bool mark_as_compacted);
@@ -412,19 +328,12 @@ class Compaction {
  // get the smallest and largest key present in files to be compacted
  static void GetBoundaryKeys(VersionStorageInfo* vstorage,
                              const std::vector<CompactionInputFiles>& inputs,
-                              Slice* smallest_key, Slice* largest_key,
-                              int exclude_level = -1);
-
-  // populate penultimate level output range, which will be used to determine if
-  // a key is safe to output to the penultimate level (details see
-  // `Compaction::WithinPenultimateLevelOutputRange()`.
-  void PopulatePenultimateLevelOutputRange();
+                              Slice* smallest_key, Slice* largest_key);

  // Get the atomic file boundaries for all files in the compaction. Necessary
  // in order to avoid the scenario described in
-  // https://github.com/facebook/rocksdb/pull/4432#discussion_r221072219 and
-  // plumb down appropriate key boundaries to RangeDelAggregator during
-  // compaction.
+  // https://github.com/facebook/rocksdb/pull/4432#discussion_r221072219 and plumb
+  // down appropriate key boundaries to RangeDelAggregator during compaction.
  static std::vector<CompactionInputFiles> PopulateWithAtomicBoundaries(
      VersionStorageInfo* vstorage, std::vector<CompactionInputFiles> inputs);

@@ -439,9 +348,8 @@ class Compaction {

  VersionStorageInfo* input_vstorage_;

-  const int start_level_;   // the lowest level to be compacted
+  const int start_level_;    // the lowest level to be compacted
  const int output_level_;  // levels to which output files are stored
-  uint64_t target_output_file_size_;
  uint64_t max_output_file_size_;
  uint64_t max_compaction_bytes_;
  uint32_t max_subcompactions_;
@@ -451,7 +359,7 @@ class Compaction {
  VersionEdit edit_;
  const int number_levels_;
  ColumnFamilyData* cfd_;
-  Arena arena_;  // Arena used to allocate space for file_levels_
+  Arena arena_;          // Arena used to allocate space for file_levels_

  const uint32_t output_path_id_;
  CompressionType output_compression_;
@@ -459,13 +367,6 @@ class Compaction {
  Temperature output_temperature_;
  // If true, then the compaction can be done by simply deleting input files.
  const bool deletion_compaction_;
-  // should it split the output file using the compact cursor?
-  const InternalKey* output_split_key_;
-
-  // L0 files in LSM-tree might be overlapping. But the compaction picking
-  // logic might pick a subset of the files that aren't overlapping. if
-  // that is the case, set the value to false. Otherwise, set it true.
-  bool l0_files_might_overlap_;

  // Compaction input files organized by level. Constant after construction
  const std::vector<CompactionInputFiles> inputs_;
@@ -476,7 +377,7 @@ class Compaction {
  // State used to check for number of overlapping grandparent files
  // (grandparent == "output_level_ + 1")
  std::vector<FileMetaData*> grandparents_;
-  const double score_;  // score that was used to pick this compaction.
+  const double score_;         // score that was used to pick this compaction.

  // Is this compaction creating a file in the bottom most level?
  const bool bottommost_level_;
@@ -500,11 +401,9 @@ class Compaction {
  TablePropertiesCollection output_table_properties_;

  // smallest user keys in compaction
-  // includes timestamp if user-defined timestamp is enabled.
  Slice smallest_user_key_;

  // largest user keys in compaction
-  // includes timestamp if user-defined timestamp is enabled.
  Slice largest_user_key_;

  // Reason for compaction
@@ -513,46 +412,8 @@ class Compaction {
  // Notify on compaction completion only if listener was notified on compaction
  // begin.
  bool notify_on_compaction_completion_;
-
-  // Enable/disable GC collection for blobs during compaction.
-  bool enable_blob_garbage_collection_;
-
-  // Blob garbage collection age cutoff.
-  double blob_garbage_collection_age_cutoff_;
-
-  // only set when per_key_placement feature is enabled, -1 (kInvalidLevel)
-  // means not supported.
-  const int penultimate_level_;
-
-  // Key range for penultimate level output
-  // includes timestamp if user-defined timestamp is enabled.
-  // penultimate_output_range_type_ shows the range type
-  Slice penultimate_level_smallest_user_key_;
-  Slice penultimate_level_largest_user_key_;
-  PenultimateOutputRangeType penultimate_output_range_type_ =
-      PenultimateOutputRangeType::kNotSupported;
 };

-#ifndef NDEBUG
-// Helper struct only for tests, which contains the data to decide if a key
-// should be output to the penultimate level.
-// TODO: remove this when the public feature knob is available
-struct PerKeyPlacementContext {
-  const int level;
-  const Slice key;
-  const Slice value;
-  const SequenceNumber seq_num;
-
-  bool output_to_penultimate_level;
-
-  PerKeyPlacementContext(int _level, Slice _key, Slice _value,
-                         SequenceNumber _seq_num)
-      : level(_level), key(_key), value(_value), seq_num(_seq_num) {
-    output_to_penultimate_level = false;
-  }
-};
-#endif /* !NDEBUG */
-
 // Return sum of sizes of all files in `files`.
 extern uint64_t TotalFileSize(const std::vector<FileMetaData*>& files);

@@ -28,24 +28,21 @@ CompactionIterator::CompactionIterator(
    Env* env, bool report_detailed_time, bool expect_valid_internal_key,
    CompactionRangeDelAggregator* range_del_agg,
    BlobFileBuilder* blob_file_builder, bool allow_data_in_errors,
-    bool enforce_single_del_contracts,
-    const std::atomic<bool>& manual_compaction_canceled,
    const Compaction* compaction, const CompactionFilter* compaction_filter,
    const std::atomic<bool>* shutting_down,
+    const std::atomic<int>* manual_compaction_paused,
+    const std::atomic<bool>* manual_compaction_canceled,
    const std::shared_ptr<Logger> info_log,
-    const std::string* full_history_ts_low,
-    const SequenceNumber preserve_time_min_seqno,
-    const SequenceNumber preclude_last_level_min_seqno)
+    const std::string* full_history_ts_low)
    : CompactionIterator(
          input, cmp, merge_helper, last_sequence, snapshots,
          earliest_write_conflict_snapshot, job_snapshot, snapshot_checker, env,
          report_detailed_time, expect_valid_internal_key, range_del_agg,
-          blob_file_builder, allow_data_in_errors, enforce_single_del_contracts,
-          manual_compaction_canceled,
+          blob_file_builder, allow_data_in_errors,
          std::unique_ptr<CompactionProxy>(
              compaction ? new RealCompaction(compaction) : nullptr),
-          compaction_filter, shutting_down, info_log, full_history_ts_low,
-          preserve_time_min_seqno, preclude_last_level_min_seqno) {}
+          compaction_filter, shutting_down, manual_compaction_paused,
+          manual_compaction_canceled, info_log, full_history_ts_low) {}

 CompactionIterator::CompactionIterator(
    InternalIterator* input, const Comparator* cmp, MergeHelper* merge_helper,
@@ -55,15 +52,13 @@ CompactionIterator::CompactionIterator(
    Env* env, bool report_detailed_time, bool expect_valid_internal_key,
    CompactionRangeDelAggregator* range_del_agg,
    BlobFileBuilder* blob_file_builder, bool allow_data_in_errors,
-    bool enforce_single_del_contracts,
-    const std::atomic<bool>& manual_compaction_canceled,
    std::unique_ptr<CompactionProxy> compaction,
    const CompactionFilter* compaction_filter,
    const std::atomic<bool>* shutting_down,
+    const std::atomic<int>* manual_compaction_paused,
+    const std::atomic<bool>* manual_compaction_canceled,
    const std::shared_ptr<Logger> info_log,
-    const std::string* full_history_ts_low,
-    const SequenceNumber preserve_time_min_seqno,
-    const SequenceNumber preclude_last_level_min_seqno)
+    const std::string* full_history_ts_low)
    : input_(input, cmp,
             !compaction || compaction->DoesInputReferenceBlobFiles()),
      cmp_(cmp),
@@ -81,19 +76,10 @@ CompactionIterator::CompactionIterator(
      compaction_(std::move(compaction)),
      compaction_filter_(compaction_filter),
      shutting_down_(shutting_down),
+      manual_compaction_paused_(manual_compaction_paused),
      manual_compaction_canceled_(manual_compaction_canceled),
-      bottommost_level_(!compaction_ ? false
-                                     : compaction_->bottommost_level() &&
-                                           !compaction_->allow_ingest_behind()),
-      // snapshots_ cannot be nullptr, but we will assert later in the body of
-      // the constructor.
-      visible_at_tip_(snapshots_ ? snapshots_->empty() : false),
-      earliest_snapshot_(!snapshots_ || snapshots_->empty()
-                             ? kMaxSequenceNumber
-                             : snapshots_->at(0)),
      info_log_(info_log),
      allow_data_in_errors_(allow_data_in_errors),
-      enforce_single_del_contracts_(enforce_single_del_contracts),
      timestamp_size_(cmp_ ? cmp_->timestamp_size() : 0),
      full_history_ts_low_(full_history_ts_low),
      current_user_key_sequence_(0),
@@ -106,15 +92,27 @@ CompactionIterator::CompactionIterator(
          CreatePrefetchBufferCollectionIfNeeded(compaction_.get())),
      current_key_committed_(false),
      cmp_with_history_ts_low_(0),
-      level_(compaction_ == nullptr ? 0 : compaction_->level()),
-      preserve_time_min_seqno_(preserve_time_min_seqno),
-      preclude_last_level_min_seqno_(preclude_last_level_min_seqno) {
+      level_(compaction_ == nullptr ? 0 : compaction_->level()) {
  assert(snapshots_ != nullptr);
-  assert(preserve_time_min_seqno_ <= preclude_last_level_min_seqno_);
-
+  bottommost_level_ = compaction_ == nullptr
+                          ? false
+                          : compaction_->bottommost_level() &&
+                                !compaction_->allow_ingest_behind();
  if (compaction_ != nullptr) {
    level_ptrs_ = std::vector<size_t>(compaction_->number_levels(), 0);
  }
+  if (snapshots_->size() == 0) {
+    // optimize for fast path if there are no snapshots
+    visible_at_tip_ = true;
+    earliest_snapshot_iter_ = snapshots_->end();
+    earliest_snapshot_ = kMaxSequenceNumber;
+    latest_snapshot_ = 0;
+  } else {
+    visible_at_tip_ = false;
+    earliest_snapshot_iter_ = snapshots_->begin();
+    earliest_snapshot_ = snapshots_->at(0);
+    latest_snapshot_ = snapshots_->back();
+  }
 #ifndef NDEBUG
  // findEarliestVisibleSnapshot assumes this ordering.
  for (size_t i = 1; i < snapshots_->size(); ++i) {
@@ -159,19 +157,17 @@ void CompactionIterator::Next() {
      Status s = ParseInternalKey(key_, &ikey_, allow_data_in_errors_);
      // MergeUntil stops when it encounters a corrupt key and does not
      // include them in the result, so we expect the keys here to be valid.
+      assert(s.ok());
      if (!s.ok()) {
-        ROCKS_LOG_FATAL(
-            info_log_, "Invalid ikey %s in compaction. %s",
-            allow_data_in_errors_ ? key_.ToString(true).c_str() : "hidden",
-            s.getState());
-        assert(false);
+        ROCKS_LOG_FATAL(info_log_, "Invalid key in compaction. %s",
+                        s.getState());
      }

      // Keep current_key_ in sync.
      current_key_.UpdateInternalKey(ikey_.sequence, ikey_.type);
      key_ = current_key_.GetInternalKey();
      ikey_.user_key = current_key_.GetUserKey();
-      validity_info_.SetValid(ValidContext::kMerge1);
+      valid_ = true;
    } else {
      // We consumed all pinned merge operands, release pinned iterators
      pinned_iters_mgr_.ReleasePinnedData();
@@ -189,7 +185,7 @@ void CompactionIterator::Next() {
    NextFromInput();
  }

-  if (Valid()) {
+  if (valid_) {
    // Record that we've outputted a record for the current key.
    has_outputted_key_ = true;
  }
@@ -199,7 +195,6 @@ void CompactionIterator::Next() {

 bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
                                              Slice* skip_until) {
-  // TODO: support compaction filter for wide-column entities
  if (!compaction_filter_ ||
      (ikey_.type != kTypeValue && ikey_.type != kTypeBlobIndex)) {
    return true;
@@ -226,6 +221,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
  {
    StopWatchNano timer(clock_, report_detailed_time_);
    if (kTypeBlobIndex == ikey_.type) {
+      blob_value_.Reset();
      filter = compaction_filter_->FilterBlobByKey(
          level_, filter_key, &compaction_filter_value_,
          compaction_filter_skip_until_.rep());
@@ -234,7 +230,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
        if (compaction_ == nullptr) {
          status_ =
              Status::Corruption("Unexpected blob index outside of compaction");
-          validity_info_.Invalidate();
+          valid_ = false;
          return false;
        }

@@ -249,7 +245,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
        Status s = blob_index.DecodeFrom(value_);
        if (!s.ok()) {
          status_ = s;
-          validity_info_.Invalidate();
+          valid_ = false;
          return false;
        }

@@ -267,7 +263,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
                                     &bytes_read);
        if (!s.ok()) {
          status_ = s;
-          validity_info_.Invalidate();
+          valid_ = false;
          return false;
        }

@@ -291,7 +287,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
    // Should not reach here, since FilterV2 should never return kUndetermined.
    status_ =
        Status::NotSupported("FilterV2() should never return kUndetermined");
-    validity_info_.Invalidate();
+    valid_ = false;
    return false;
  }

@@ -311,7 +307,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
    // no value associated with delete
    value_.clear();
    iter_stats_.num_record_drop_user++;
-  } else if (filter == CompactionFilter::Decision::kPurge) {
+  } else if (filter == CompactionFilter::Decision::kRemoveWithSingleDelete) {
    // convert the current key to a single delete; key_ is pointing into
    // current_key_ at this point, so updating current_key_ updates key()
    ikey_.type = kTypeSingleDeletion;
@@ -340,7 +336,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
      status_ = Status::NotSupported(
          "Only stacked BlobDB's internal compaction filter can return "
          "kChangeBlobIndex.");
-      validity_info_.Invalidate();
+      valid_ = false;
      return false;
    }
    if (ikey_.type == kTypeValue) {
@@ -353,7 +349,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
    if (!compaction_filter_->IsStackedBlobDbInternalCompactionFilter()) {
      status_ = Status::NotSupported(
          "CompactionFilter for integrated BlobDB should not return kIOError");
-      validity_info_.Invalidate();
+      valid_ = false;
      return false;
    }
    status_ = Status::IOError("Failed to access blob during compaction filter");
@@ -364,13 +360,12 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,

 void CompactionIterator::NextFromInput() {
  at_next_ = false;
-  validity_info_.Invalidate();
+  valid_ = false;

-  while (!Valid() && input_.Valid() && !IsPausingManualCompaction() &&
+  while (!valid_ && input_.Valid() && !IsPausingManualCompaction() &&
         !IsShuttingDown()) {
    key_ = input_.key();
    value_ = input_.value();
-    blob_value_.Reset();
    iter_stats_.num_input_records++;

    Status pik_status = ParseInternalKey(key_, &ikey_, allow_data_in_errors_);
@@ -387,7 +382,7 @@ void CompactionIterator::NextFromInput() {
      has_current_user_key_ = false;
      current_user_key_sequence_ = kMaxSequenceNumber;
      current_user_key_snapshot_ = 0;
-      validity_info_.SetValid(ValidContext::kParseKeyError);
+      valid_ = true;
      break;
    }
    TEST_SYNC_POINT_CALLBACK("CompactionIterator:ProcessKV", &ikey_);
@@ -500,7 +495,7 @@ void CompactionIterator::NextFromInput() {

    if (UNLIKELY(!current_key_committed_)) {
      assert(snapshot_checker_ != nullptr);
-      validity_info_.SetValid(ValidContext::kCurrentKeyUncommitted);
+      valid_ = true;
      break;
    }

@@ -522,28 +517,27 @@ void CompactionIterator::NextFromInput() {
      // In the previous iteration we encountered a single delete that we could
      // not compact out.  We will keep this Put, but can drop it's data.
      // (See Optimization 3, below.)
-      if (ikey_.type != kTypeValue && ikey_.type != kTypeBlobIndex &&
-          ikey_.type != kTypeWideColumnEntity) {
-        ROCKS_LOG_FATAL(info_log_, "Unexpected key %s for compaction output",
-                        ikey_.DebugString(allow_data_in_errors_, true).c_str());
-        assert(false);
+      assert(ikey_.type == kTypeValue || ikey_.type == kTypeBlobIndex);
+      if (ikey_.type != kTypeValue && ikey_.type != kTypeBlobIndex) {
+        ROCKS_LOG_FATAL(info_log_,
+                        "Unexpected key type %d for compaction output",
+                        ikey_.type);
      }
+      assert(current_user_key_snapshot_ >= last_snapshot);
      if (current_user_key_snapshot_ < last_snapshot) {
        ROCKS_LOG_FATAL(info_log_,
-                        "key %s, current_user_key_snapshot_ (%" PRIu64
+                        "current_user_key_snapshot_ (%" PRIu64
                        ") < last_snapshot (%" PRIu64 ")",
-                        ikey_.DebugString(allow_data_in_errors_, true).c_str(),
                        current_user_key_snapshot_, last_snapshot);
-        assert(false);
      }

-      if (ikey_.type == kTypeBlobIndex || ikey_.type == kTypeWideColumnEntity) {
+      if (ikey_.type == kTypeBlobIndex) {
        ikey_.type = kTypeValue;
        current_key_.UpdateInternalKey(ikey_.sequence, ikey_.type);
      }

      value_.clear();
-      validity_info_.SetValid(ValidContext::kKeepSDAndClearPut);
+      valid_ = true;
      clear_and_output_next_key_ = false;
    } else if (ikey_.type == kTypeSingleDeletion) {
      // We can compact out a SingleDelete if:
@@ -663,20 +657,15 @@ void CompactionIterator::NextFromInput() {
                   "TransactionDBOptions::rollback_deletion_type_callback is "
                   "configured properly. Mixing SD and DEL can lead to "
                   "undefined behaviors";
-            ++iter_stats_.num_record_drop_obsolete;
-            ++iter_stats_.num_single_del_mismatch;
-            if (enforce_single_del_contracts_) {
-              ROCKS_LOG_ERROR(info_log_, "%s", oss.str().c_str());
-              validity_info_.Invalidate();
-              status_ = Status::Corruption(oss.str());
-              return;
-            }
-            ROCKS_LOG_WARN(info_log_, "%s", oss.str().c_str());
+            ROCKS_LOG_ERROR(info_log_, "%s", oss.str().c_str());
+            valid_ = false;
+            status_ = Status::Corruption(oss.str());
+            return;
          } 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.
-            validity_info_.SetValid(ValidContext::kKeepTsHistory);
+            valid_ = true;
          } else if (has_outputted_key_ ||
                     DefinitelyInSnapshot(ikey_.sequence,
                                          earliest_write_conflict_snapshot_) ||
@@ -693,8 +682,7 @@ void CompactionIterator::NextFromInput() {
            // either way. We will maintain counts of how many mismatches
            // happened
            if (next_ikey.type != kTypeValue &&
-                next_ikey.type != kTypeBlobIndex &&
-                next_ikey.type != kTypeWideColumnEntity) {
+                next_ikey.type != kTypeBlobIndex) {
              ++iter_stats_.num_single_del_mismatch;
            }

@@ -711,7 +699,7 @@ void CompactionIterator::NextFromInput() {
            // outputted on the next iteration.)

            // Setting valid_ to true will output the current SingleDelete
-            validity_info_.SetValid(ValidContext::kKeepSDForConflictCheck);
+            valid_ = true;

            // Set up the Put to be outputted in the next iteration.
            // (Optimization 3).
@@ -723,7 +711,7 @@ void CompactionIterator::NextFromInput() {
        } else {
          // We hit the next snapshot without hitting a put, so the iterator
          // returns the single delete.
-          validity_info_.SetValid(ValidContext::kKeepSDForSnapshot);
+          valid_ = true;
          TEST_SYNC_POINT_CALLBACK(
              "CompactionIterator::NextFromInput:SingleDelete:3",
              const_cast<Compaction*>(c));
@@ -756,11 +744,11 @@ void CompactionIterator::NextFromInput() {
          assert(bottommost_level_);
        } else {
          // Output SingleDelete
-          validity_info_.SetValid(ValidContext::kKeepSD);
+          valid_ = true;
        }
      }

-      if (Valid()) {
+      if (valid_) {
        at_next_ = true;
      }
    } else if (last_snapshot == current_user_key_snapshot_ ||
@@ -774,13 +762,12 @@ void CompactionIterator::NextFromInput() {
      // Note: Dropping this key will not affect TransactionDB write-conflict
      // checking since there has already been a record returned for this key
      // in this snapshot.
+      assert(last_sequence >= current_user_key_sequence_);
      if (last_sequence < current_user_key_sequence_) {
        ROCKS_LOG_FATAL(info_log_,
-                        "key %s, last_sequence (%" PRIu64
+                        "last_sequence (%" PRIu64
                        ") < current_user_key_sequence_ (%" PRIu64 ")",
-                        ikey_.DebugString(allow_data_in_errors_, true).c_str(),
                        last_sequence, current_user_key_sequence_);
-        assert(false);
      }

      ++iter_stats_.num_record_drop_hidden;  // rule (A)
@@ -859,7 +846,7 @@ void CompactionIterator::NextFromInput() {
          (ParseInternalKey(input_.key(), &next_ikey, allow_data_in_errors_)
               .ok()) &&
          cmp_->EqualWithoutTimestamp(ikey_.user_key, next_ikey.user_key)) {
-        validity_info_.SetValid(ValidContext::kKeepDel);
+        valid_ = true;
        at_next_ = true;
      }
    } else if (ikey_.type == kTypeMerge) {
@@ -892,18 +879,16 @@ void CompactionIterator::NextFromInput() {
        pik_status = ParseInternalKey(key_, &ikey_, allow_data_in_errors_);
        // MergeUntil stops when it encounters a corrupt key and does not
        // include them in the result, so we expect the keys here to valid.
+        assert(pik_status.ok());
        if (!pik_status.ok()) {
-          ROCKS_LOG_FATAL(
-              info_log_, "Invalid key %s in compaction. %s",
-              allow_data_in_errors_ ? key_.ToString(true).c_str() : "hidden",
-              pik_status.getState());
-          assert(false);
+          ROCKS_LOG_FATAL(info_log_, "Invalid key in compaction. %s",
+                          pik_status.getState());
        }
        // Keep current_key_ in sync.
        current_key_.UpdateInternalKey(ikey_.sequence, ikey_.type);
        key_ = current_key_.GetInternalKey();
        ikey_.user_key = current_key_.GetUserKey();
-        validity_info_.SetValid(ValidContext::kMerge2);
+        valid_ = true;
      } else {
        // all merge operands were filtered out. reset the user key, since the
        // batch consumed by the merge operator should not shadow any keys
@@ -918,23 +903,14 @@ void CompactionIterator::NextFromInput() {
    } else {
      // 1. new user key -OR-
      // 2. different snapshot stripe
-      // If user-defined timestamp is enabled, we consider keys for GC if they
-      // are below history_ts_low_. CompactionRangeDelAggregator::ShouldDelete()
-      // only considers range deletions that are at or below history_ts_low_ and
-      // trim_ts_. We drop keys here that are below history_ts_low_ and are
-      // covered by a range tombstone that is at or below history_ts_low_ and
-      // trim_ts.
-      bool should_delete = false;
-      if (!timestamp_size_ || cmp_with_history_ts_low_ < 0) {
-        should_delete = range_del_agg_->ShouldDelete(
-            key_, RangeDelPositioningMode::kForwardTraversal);
-      }
+      bool should_delete = range_del_agg_->ShouldDelete(
+          key_, RangeDelPositioningMode::kForwardTraversal);
      if (should_delete) {
        ++iter_stats_.num_record_drop_hidden;
        ++iter_stats_.num_record_drop_range_del;
        AdvanceInputIter();
      } else {
-        validity_info_.SetValid(ValidContext::kNewUserKey);
+        valid_ = true;
      }
    }

@@ -943,18 +919,13 @@ void CompactionIterator::NextFromInput() {
    }
  }

-  if (!Valid() && IsShuttingDown()) {
+  if (!valid_ && IsShuttingDown()) {
    status_ = Status::ShutdownInProgress();
  }

  if (IsPausingManualCompaction()) {
    status_ = Status::Incomplete(Status::SubCode::kManualCompactionPaused);
  }
-
-  // Propagate corruption status from memtable itereator
-  if (!input_.Valid() && input_.status().IsCorruption()) {
-    status_ = input_.status();
-  }
 }

 bool CompactionIterator::ExtractLargeValueIfNeededImpl() {
@@ -967,7 +938,7 @@ bool CompactionIterator::ExtractLargeValueIfNeededImpl() {

  if (!s.ok()) {
    status_ = s;
-    validity_info_.Invalidate();
+    valid_ = false;

    return false;
  }
@@ -1012,7 +983,7 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {

      if (!s.ok()) {
        status_ = s;
-        validity_info_.Invalidate();
+        valid_ = false;

        return;
      }
@@ -1038,7 +1009,7 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {

      if (!s.ok()) {
        status_ = s;
-        validity_info_.Invalidate();
+        valid_ = false;

        return;
      }
@@ -1071,14 +1042,14 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {
    if (blob_decision == CompactionFilter::BlobDecision::kCorruption) {
      status_ =
          Status::Corruption("Corrupted blob reference encountered during GC");
-      validity_info_.Invalidate();
+      valid_ = false;

      return;
    }

    if (blob_decision == CompactionFilter::BlobDecision::kIOError) {
      status_ = Status::IOError("Could not relocate blob during GC");
-      validity_info_.Invalidate();
+      valid_ = false;

      return;
    }
@@ -1091,67 +1062,14 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {
  }
 }

-void CompactionIterator::DecideOutputLevel() {
-  assert(compaction_->SupportsPerKeyPlacement());
-#ifndef NDEBUG
-  // Could be overridden by unittest
-  PerKeyPlacementContext context(level_, ikey_.user_key, value_,
-                                 ikey_.sequence);
-  TEST_SYNC_POINT_CALLBACK("CompactionIterator::PrepareOutput.context",
-                           &context);
-  output_to_penultimate_level_ = context.output_to_penultimate_level;
-#else
-  output_to_penultimate_level_ = false;
-#endif  // NDEBUG
-
-  // if the key is newer than the cutoff sequence or within the earliest
-  // snapshot, it should output to the penultimate level.
-  if (ikey_.sequence > preclude_last_level_min_seqno_ ||
-      ikey_.sequence > earliest_snapshot_) {
-    output_to_penultimate_level_ = true;
-  }
-
-  if (output_to_penultimate_level_) {
-    // If it's decided to output to the penultimate level, but unsafe to do so,
-    // still output to the last level. For example, moving the data from a lower
-    // level to a higher level outside of the higher-level input key range is
-    // considered unsafe, because the key may conflict with higher-level SSTs
-    // not from this compaction.
-    // TODO: add statistic for declined output_to_penultimate_level
-    bool safe_to_penultimate_level =
-        compaction_->WithinPenultimateLevelOutputRange(ikey_.user_key);
-    if (!safe_to_penultimate_level) {
-      output_to_penultimate_level_ = false;
-      // It could happen when disable/enable `last_level_temperature` while
-      // holding a snapshot. When `last_level_temperature` is not set
-      // (==kUnknown), the data newer than any snapshot is pushed to the last
-      // level, but when the per_key_placement feature is enabled on the fly,
-      // the data later than the snapshot has to be moved to the penultimate
-      // level, which may or may not be safe. So the user needs to make sure all
-      // snapshot is released before enabling `last_level_temperature` feature
-      // We will migrate the feature to `last_level_temperature` and maybe make
-      // it not dynamically changeable.
-      if (ikey_.sequence > earliest_snapshot_) {
-        status_ = Status::Corruption(
-            "Unsafe to store Seq later than snapshot in the last level if "
-            "per_key_placement is enabled");
-      }
-    }
-  }
-}
-
 void CompactionIterator::PrepareOutput() {
-  if (Valid()) {
+  if (valid_) {
    if (ikey_.type == kTypeValue) {
      ExtractLargeValueIfNeeded();
    } else if (ikey_.type == kTypeBlobIndex) {
      GarbageCollectBlobIfNeeded();
    }

-    if (compaction_ != nullptr && compaction_->SupportsPerKeyPlacement()) {
-      DecideOutputLevel();
-    }
-
    // Zeroing out the sequence number leads to better compression.
    // If this is the bottommost level (no files in lower levels)
    // and the earliest snapshot is larger than this seqno
@@ -1163,29 +1081,19 @@ void CompactionIterator::PrepareOutput() {
    //
    // Can we do the same for levels above bottom level as long as
    // KeyNotExistsBeyondOutputLevel() return true?
-    if (Valid() && compaction_ != nullptr &&
+    if (valid_ && compaction_ != nullptr &&
        !compaction_->allow_ingest_behind() && bottommost_level_ &&
        DefinitelyInSnapshot(ikey_.sequence, earliest_snapshot_) &&
-        ikey_.type != kTypeMerge && current_key_committed_ &&
-        !output_to_penultimate_level_ &&
-        ikey_.sequence < preserve_time_min_seqno_) {
+        ikey_.type != kTypeMerge && current_key_committed_) {
+      assert(ikey_.type != kTypeDeletion);
+      assert(ikey_.type != kTypeSingleDeletion ||
+             (timestamp_size_ || full_history_ts_low_));
      if (ikey_.type == kTypeDeletion ||
-          (ikey_.type == kTypeSingleDeletion && timestamp_size_ == 0)) {
-        ROCKS_LOG_FATAL(
-            info_log_,
-            "Unexpected key %s for seq-zero optimization. "
-            "earliest_snapshot %" PRIu64
-            ", earliest_write_conflict_snapshot %" PRIu64
-            " job_snapshot %" PRIu64
-            ". timestamp_size: %d full_history_ts_low_ %s. validity %x",
-            ikey_.DebugString(allow_data_in_errors_, true).c_str(),
-            earliest_snapshot_, earliest_write_conflict_snapshot_,
-            job_snapshot_, static_cast<int>(timestamp_size_),
-            full_history_ts_low_ != nullptr
-                ? Slice(*full_history_ts_low_).ToString(true).c_str()
-                : "null",
-            validity_info_.rep);
-        assert(false);
+          (ikey_.type == kTypeSingleDeletion &&
+           (!timestamp_size_ || !full_history_ts_low_))) {
+        ROCKS_LOG_FATAL(info_log_,
+                        "Unexpected key type %d for seq-zero optimization",
+                        ikey_.type);
      }
      ikey_.sequence = 0;
      last_key_seq_zeroed_ = true;
@@ -1216,17 +1124,14 @@ inline SequenceNumber CompactionIterator::findEarliestVisibleSnapshot(
  }
  auto snapshots_iter = std::lower_bound(
      snapshots_->begin(), snapshots_->end(), in);
-  assert(prev_snapshot != nullptr);
  if (snapshots_iter == snapshots_->begin()) {
    *prev_snapshot = 0;
  } else {
    *prev_snapshot = *std::prev(snapshots_iter);
+    assert(*prev_snapshot < in);
    if (*prev_snapshot >= in) {
      ROCKS_LOG_FATAL(info_log_,
-                      "*prev_snapshot (%" PRIu64 ") >= in (%" PRIu64
-                      ") in findEarliestVisibleSnapshot",
-                      *prev_snapshot, in);
-      assert(false);
+                      "*prev_snapshot >= in in findEarliestVisibleSnapshot");
    }
  }
  if (snapshot_checker_ == nullptr) {
@@ -1236,12 +1141,9 @@ inline SequenceNumber CompactionIterator::findEarliestVisibleSnapshot(
  bool has_released_snapshot = !released_snapshots_.empty();
  for (; snapshots_iter != snapshots_->end(); ++snapshots_iter) {
    auto cur = *snapshots_iter;
+    assert(in <= cur);
    if (in > cur) {
-      ROCKS_LOG_FATAL(info_log_,
-                      "in (%" PRIu64 ") > cur (%" PRIu64
-                      ") in findEarliestVisibleSnapshot",
-                      in, cur);
-      assert(false);
+      ROCKS_LOG_FATAL(info_log_, "in > cur in findEarliestVisibleSnapshot");
    }
    // Skip if cur is in released_snapshots.
    if (has_released_snapshot && released_snapshots_.count(cur) > 0) {
@@ -1300,10 +1202,7 @@ std::unique_ptr<BlobFetcher> CompactionIterator::CreateBlobFetcherIfNeeded(
    return nullptr;
  }

-  ReadOptions read_options;
-  read_options.fill_cache = false;
-
-  return std::unique_ptr<BlobFetcher>(new BlobFetcher(version, read_options));
+  return std::unique_ptr<BlobFetcher>(new BlobFetcher(version, ReadOptions()));
 }

 std::unique_ptr<PrefetchBufferCollection>
@@ -32,7 +32,7 @@ class SequenceIterWrapper : public InternalIterator {
 public:
  SequenceIterWrapper(InternalIterator* iter, const Comparator* cmp,
                      bool need_count_entries)
-      : icmp_(cmp),
+      : icmp_(cmp, /*named=*/false),
        inner_iter_(iter),
        need_count_entries_(need_count_entries) {}
  bool Valid() const override { return inner_iter_->Valid(); }
@@ -88,7 +88,6 @@ class CompactionIterator {

    virtual int number_levels() const = 0;

-    // Result includes timestamp if user-defined timestamp is enabled.
    virtual Slice GetLargestUserKey() const = 0;

    virtual bool allow_ingest_behind() const = 0;
@@ -106,11 +105,6 @@ class CompactionIterator {
    virtual bool DoesInputReferenceBlobFiles() const = 0;

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

  class RealCompaction : public CompactionProxy {
@@ -135,7 +129,6 @@ class CompactionIterator {

    int number_levels() const override { return compaction_->number_levels(); }

-    // Result includes timestamp if user-defined timestamp is enabled.
    Slice GetLargestUserKey() const override {
      return compaction_->GetLargestUserKey();
    }
@@ -149,11 +142,12 @@ class CompactionIterator {
    }

    bool enable_blob_garbage_collection() const override {
-      return compaction_->enable_blob_garbage_collection();
+      return compaction_->mutable_cf_options()->enable_blob_garbage_collection;
    }

    double blob_garbage_collection_age_cutoff() const override {
-      return compaction_->blob_garbage_collection_age_cutoff();
+      return compaction_->mutable_cf_options()
+          ->blob_garbage_collection_age_cutoff;
    }

    uint64_t blob_compaction_readahead_size() const override {
@@ -170,17 +164,6 @@ class CompactionIterator {

    const Compaction* real_compaction() const override { return compaction_; }

-    bool SupportsPerKeyPlacement() const override {
-      return compaction_->SupportsPerKeyPlacement();
-    }
-
-    // Check if key is within penultimate level output range, to see if it's
-    // safe to output to the penultimate level for per_key_placement feature.
-    // `key` includes timestamp if user-defined timestamp is enabled.
-    bool WithinPenultimateLevelOutputRange(const Slice& key) const override {
-      return compaction_->WithinPenultimateLevelOutputRange(key);
-    }
-
   private:
    const Compaction* compaction_;
  };
@@ -193,15 +176,13 @@ class CompactionIterator {
      Env* env, bool report_detailed_time, bool expect_valid_internal_key,
      CompactionRangeDelAggregator* range_del_agg,
      BlobFileBuilder* blob_file_builder, bool allow_data_in_errors,
-      bool enforce_single_del_contracts,
-      const std::atomic<bool>& manual_compaction_canceled,
      const Compaction* compaction = nullptr,
      const CompactionFilter* compaction_filter = nullptr,
      const std::atomic<bool>* shutting_down = nullptr,
+      const std::atomic<int>* manual_compaction_paused = nullptr,
+      const std::atomic<bool>* manual_compaction_canceled = nullptr,
      const std::shared_ptr<Logger> info_log = nullptr,
-      const std::string* full_history_ts_low = nullptr,
-      const SequenceNumber preserve_time_min_seqno = kMaxSequenceNumber,
-      const SequenceNumber preclude_last_level_min_seqno = kMaxSequenceNumber);
+      const std::string* full_history_ts_low = nullptr);

  // Constructor with custom CompactionProxy, used for tests.
  CompactionIterator(
@@ -212,15 +193,13 @@ class CompactionIterator {
      Env* env, bool report_detailed_time, bool expect_valid_internal_key,
      CompactionRangeDelAggregator* range_del_agg,
      BlobFileBuilder* blob_file_builder, bool allow_data_in_errors,
-      bool enforce_single_del_contracts,
-      const std::atomic<bool>& manual_compaction_canceled,
      std::unique_ptr<CompactionProxy> compaction,
      const CompactionFilter* compaction_filter = nullptr,
      const std::atomic<bool>* shutting_down = nullptr,
+      const std::atomic<int>* manual_compaction_paused = nullptr,
+      const std::atomic<bool>* manual_compaction_canceled = nullptr,
      const std::shared_ptr<Logger> info_log = nullptr,
-      const std::string* full_history_ts_low = nullptr,
-      const SequenceNumber preserve_time_min_seqno = kMaxSequenceNumber,
-      const SequenceNumber preclude_last_level_min_seqno = kMaxSequenceNumber);
+      const std::string* full_history_ts_low = nullptr);

  ~CompactionIterator();

@@ -241,16 +220,10 @@ class CompactionIterator {
  const Slice& value() const { return value_; }
  const Status& status() const { return status_; }
  const ParsedInternalKey& ikey() const { return ikey_; }
-  inline bool Valid() const { return validity_info_.IsValid(); }
+  bool Valid() const { return valid_; }
  const Slice& user_key() const { return current_user_key_; }
  const CompactionIterationStats& iter_stats() const { return iter_stats_; }
  uint64_t num_input_entry_scanned() const { return input_.num_itered(); }
-  // If the current key should be placed on penultimate level, only valid if
-  // per_key_placement is supported
-  bool output_to_penultimate_level() const {
-    return output_to_penultimate_level_;
-  }
-  Status InputStatus() const { return input_.status(); }

 private:
  // Processes the input stream to find the next output
@@ -259,10 +232,6 @@ class CompactionIterator {
  // Do final preparations before presenting the output to the callee.
  void PrepareOutput();

-  // Decide the current key should be output to the last level or penultimate
-  // level, only call for compaction supports per key placement
-  void DecideOutputLevel();
-
  // Passes the output value to the blob file builder (if any), and replaces it
  // with the corresponding blob reference if it has been actually written to a
  // blob file (i.e. if it passed the value size check). Returns true if the
@@ -338,28 +307,30 @@ class CompactionIterator {
  // earliest visible snapshot of an older value.
  // See WritePreparedTransactionTest::ReleaseSnapshotDuringCompaction3.
  std::unordered_set<SequenceNumber> released_snapshots_;
+  std::vector<SequenceNumber>::const_iterator earliest_snapshot_iter_;
  const SequenceNumber earliest_write_conflict_snapshot_;
  const SequenceNumber job_snapshot_;
  const SnapshotChecker* const snapshot_checker_;
  Env* env_;
  SystemClock* clock_;
-  const bool report_detailed_time_;
-  const bool expect_valid_internal_key_;
+  bool report_detailed_time_;
+  bool expect_valid_internal_key_;
  CompactionRangeDelAggregator* range_del_agg_;
  BlobFileBuilder* blob_file_builder_;
  std::unique_ptr<CompactionProxy> compaction_;
  const CompactionFilter* compaction_filter_;
  const std::atomic<bool>* shutting_down_;
-  const std::atomic<bool>& manual_compaction_canceled_;
-  const bool bottommost_level_;
-  const bool visible_at_tip_;
-  const SequenceNumber earliest_snapshot_;
+  const std::atomic<int>* manual_compaction_paused_;
+  const std::atomic<bool>* manual_compaction_canceled_;
+  bool bottommost_level_;
+  bool valid_ = false;
+  bool visible_at_tip_;
+  SequenceNumber earliest_snapshot_;
+  SequenceNumber latest_snapshot_;

  std::shared_ptr<Logger> info_log_;

-  const bool allow_data_in_errors_;
-
-  const bool enforce_single_del_contracts_;
+  bool allow_data_in_errors_;

  // Comes from comparator.
  const size_t timestamp_size_;
@@ -373,33 +344,8 @@ class CompactionIterator {

  // State
  //
-  enum ValidContext : uint8_t {
-    kMerge1 = 0,
-    kMerge2 = 1,
-    kParseKeyError = 2,
-    kCurrentKeyUncommitted = 3,
-    kKeepSDAndClearPut = 4,
-    kKeepTsHistory = 5,
-    kKeepSDForConflictCheck = 6,
-    kKeepSDForSnapshot = 7,
-    kKeepSD = 8,
-    kKeepDel = 9,
-    kNewUserKey = 10,
-  };
-
-  struct ValidityInfo {
-    inline bool IsValid() const { return rep & 1; }
-    ValidContext GetContext() const {
-      return static_cast<ValidContext>(rep >> 1);
-    }
-    inline void SetValid(uint8_t ctx) { rep = (ctx << 1) | 1; }
-    inline void Invalidate() { rep = 0; }
-
-    uint8_t rep{0};
-  } validity_info_;
-
  // Points to a copy of the current compaction iterator output (current_key_)
-  // if valid.
+  // if valid_.
  Slice key_;
  // Points to the value in the underlying iterator that corresponds to the
  // current output.
@@ -467,18 +413,6 @@ class CompactionIterator {
  // just been zeroed out during bottommost compaction.
  bool last_key_seq_zeroed_{false};

-  // True if the current key should be output to the penultimate level if
-  // possible, compaction logic makes the final decision on which level to
-  // output to.
-  bool output_to_penultimate_level_{false};
-
-  // min seqno for preserving the time information.
-  const SequenceNumber preserve_time_min_seqno_ = kMaxSequenceNumber;
-
-  // min seqno to preclude the data from the last level, if the key seqno larger
-  // than this, it will be output to penultimate level
-  const SequenceNumber preclude_last_level_min_seqno_ = kMaxSequenceNumber;
-
  void AdvanceInputIter() { input_.Next(); }

  void SkipUntil(const Slice& skip_until) { input_.Seek(skip_until); }
@@ -490,7 +424,10 @@ class CompactionIterator {

  bool IsPausingManualCompaction() {
    // This is a best-effort facility, so memory_order_relaxed is sufficient.
-    return manual_compaction_canceled_.load(std::memory_order_relaxed);
+    return (manual_compaction_paused_ &&
+            manual_compaction_paused_->load(std::memory_order_relaxed) > 0) ||
+           (manual_compaction_canceled_ &&
+            manual_compaction_canceled_->load(std::memory_order_relaxed));
  }
 };

@@ -180,21 +180,11 @@ class FakeCompaction : public CompactionIterator::CompactionProxy {

  const Compaction* real_compaction() const override { return nullptr; }

-  bool SupportsPerKeyPlacement() const override {
-    return supports_per_key_placement;
-  }
-
-  bool WithinPenultimateLevelOutputRange(const Slice& key) const override {
-    return (!key.starts_with("unsafe_pb"));
-  }
-
  bool key_not_exists_beyond_output_level = false;

  bool is_bottommost_level = false;

  bool is_allow_ingest_behind = false;
-
-  bool supports_per_key_placement = false;
 };

 // A simplified snapshot checker which assumes each snapshot has a global
@@ -264,7 +254,6 @@ class CompactionIteratorTest : public testing::TestWithParam<bool> {
      compaction_proxy_->is_allow_ingest_behind = AllowIngestBehind();
      compaction_proxy_->key_not_exists_beyond_output_level =
          key_not_exists_beyond_output_level;
-      compaction_proxy_->supports_per_key_placement = SupportsPerKeyPlacement();
      compaction.reset(compaction_proxy_);
    }
    bool use_snapshot_checker = UseSnapshotChecker() || GetParam();
@@ -290,9 +279,9 @@ class CompactionIteratorTest : public testing::TestWithParam<bool> {
        snapshot_checker_.get(), Env::Default(),
        false /* report_detailed_time */, false, range_del_agg_.get(),
        nullptr /* blob_file_builder */, true /*allow_data_in_errors*/,
-        true /*enforce_single_del_contracts*/,
-        /*manual_compaction_canceled=*/kManualCompactionCanceledFalse_,
-        std::move(compaction), filter, &shutting_down_, /*info_log=*/nullptr,
+        std::move(compaction), filter, &shutting_down_,
+        /*manual_compaction_paused=*/nullptr,
+        /*manual_compaction_canceled=*/nullptr, /*info_log=*/nullptr,
        full_history_ts_low));
  }

@@ -306,8 +295,6 @@ class CompactionIteratorTest : public testing::TestWithParam<bool> {

  virtual bool AllowIngestBehind() const { return false; }

-  virtual bool SupportsPerKeyPlacement() const { return false; }
-
  void RunTest(
      const std::vector<std::string>& input_keys,
      const std::vector<std::string>& input_values,
@@ -326,7 +313,7 @@ class CompactionIteratorTest : public testing::TestWithParam<bool> {
                  key_not_exists_beyond_output_level, full_history_ts_low);
    c_iter_->SeekToFirst();
    for (size_t i = 0; i < expected_keys.size(); i++) {
-      std::string info = "i = " + std::to_string(i);
+      std::string info = "i = " + ToString(i);
      ASSERT_TRUE(c_iter_->Valid()) << info;
      ASSERT_OK(c_iter_->status()) << info;
      ASSERT_EQ(expected_keys[i], c_iter_->key().ToString()) << info;
@@ -353,7 +340,6 @@ class CompactionIteratorTest : public testing::TestWithParam<bool> {
  std::unique_ptr<CompactionRangeDelAggregator> range_del_agg_;
  std::unique_ptr<SnapshotChecker> snapshot_checker_;
  std::atomic<bool> shutting_down_{false};
-  const std::atomic<bool> kManualCompactionCanceledFalse_{false};
  FakeCompaction* compaction_proxy_;
 };

@@ -769,119 +755,6 @@ TEST_P(CompactionIteratorTest, ConvertToPutAtBottom) {
 INSTANTIATE_TEST_CASE_P(CompactionIteratorTestInstance, CompactionIteratorTest,
                        testing::Values(true, false));

-class PerKeyPlacementCompIteratorTest : public CompactionIteratorTest {
- public:
-  bool SupportsPerKeyPlacement() const override { return true; }
-};
-
-TEST_P(PerKeyPlacementCompIteratorTest, SplitLastLevelData) {
-  std::atomic_uint64_t latest_cold_seq = 0;
-
-  SyncPoint::GetInstance()->SetCallBack(
-      "CompactionIterator::PrepareOutput.context", [&](void* arg) {
-        auto context = static_cast<PerKeyPlacementContext*>(arg);
-        context->output_to_penultimate_level =
-            context->seq_num > latest_cold_seq;
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  latest_cold_seq = 5;
-
-  InitIterators(
-      {test::KeyStr("a", 7, kTypeValue), test::KeyStr("b", 6, kTypeValue),
-       test::KeyStr("c", 5, kTypeValue)},
-      {"vala", "valb", "valc"}, {}, {}, kMaxSequenceNumber, kMaxSequenceNumber,
-      nullptr, nullptr, true);
-  c_iter_->SeekToFirst();
-  ASSERT_TRUE(c_iter_->Valid());
-
-  // the first 2 keys are hot, which should has
-  // `output_to_penultimate_level()==true` and seq num not zeroed out
-  ASSERT_EQ(test::KeyStr("a", 7, kTypeValue), c_iter_->key().ToString());
-  ASSERT_TRUE(c_iter_->output_to_penultimate_level());
-  c_iter_->Next();
-  ASSERT_TRUE(c_iter_->Valid());
-  ASSERT_EQ(test::KeyStr("b", 6, kTypeValue), c_iter_->key().ToString());
-  ASSERT_TRUE(c_iter_->output_to_penultimate_level());
-  c_iter_->Next();
-  ASSERT_TRUE(c_iter_->Valid());
-  // `a` is cold data, which should be output to bottommost
-  ASSERT_EQ(test::KeyStr("c", 0, kTypeValue), c_iter_->key().ToString());
-  ASSERT_FALSE(c_iter_->output_to_penultimate_level());
-  c_iter_->Next();
-  ASSERT_OK(c_iter_->status());
-  ASSERT_FALSE(c_iter_->Valid());
-}
-
-TEST_P(PerKeyPlacementCompIteratorTest, SnapshotData) {
-  AddSnapshot(5);
-
-  InitIterators(
-      {test::KeyStr("a", 7, kTypeValue), test::KeyStr("b", 6, kTypeDeletion),
-       test::KeyStr("b", 5, kTypeValue)},
-      {"vala", "", "valb"}, {}, {}, kMaxSequenceNumber, kMaxSequenceNumber,
-      nullptr, nullptr, true);
-  c_iter_->SeekToFirst();
-  ASSERT_TRUE(c_iter_->Valid());
-
-  // The first key and the tombstone are within snapshot, which should output
-  // to the penultimate level (and seq num cannot be zeroed out).
-  ASSERT_EQ(test::KeyStr("a", 7, kTypeValue), c_iter_->key().ToString());
-  ASSERT_TRUE(c_iter_->output_to_penultimate_level());
-  c_iter_->Next();
-  ASSERT_TRUE(c_iter_->Valid());
-  ASSERT_EQ(test::KeyStr("b", 6, kTypeDeletion), c_iter_->key().ToString());
-  ASSERT_TRUE(c_iter_->output_to_penultimate_level());
-  c_iter_->Next();
-  ASSERT_TRUE(c_iter_->Valid());
-  // `a` is not protected by the snapshot, the sequence number is zero out and
-  // should output bottommost
-  ASSERT_EQ(test::KeyStr("b", 0, kTypeValue), c_iter_->key().ToString());
-  ASSERT_FALSE(c_iter_->output_to_penultimate_level());
-  c_iter_->Next();
-  ASSERT_OK(c_iter_->status());
-  ASSERT_FALSE(c_iter_->Valid());
-}
-
-TEST_P(PerKeyPlacementCompIteratorTest, ConflictWithSnapshot) {
-  std::atomic_uint64_t latest_cold_seq = 0;
-
-  SyncPoint::GetInstance()->SetCallBack(
-      "CompactionIterator::PrepareOutput.context", [&](void* arg) {
-        auto context = static_cast<PerKeyPlacementContext*>(arg);
-        context->output_to_penultimate_level =
-            context->seq_num > latest_cold_seq;
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  latest_cold_seq = 6;
-
-  AddSnapshot(5);
-
-  InitIterators({test::KeyStr("a", 7, kTypeValue),
-                 test::KeyStr("unsafe_pb", 6, kTypeValue),
-                 test::KeyStr("c", 5, kTypeValue)},
-                {"vala", "valb", "valc"}, {}, {}, kMaxSequenceNumber,
-                kMaxSequenceNumber, nullptr, nullptr, true);
-  c_iter_->SeekToFirst();
-  ASSERT_TRUE(c_iter_->Valid());
-
-  ASSERT_EQ(test::KeyStr("a", 7, kTypeValue), c_iter_->key().ToString());
-  ASSERT_TRUE(c_iter_->output_to_penultimate_level());
-  // the 2nd key is unsafe to output_to_penultimate_level, but it's within
-  // snapshot so for per_key_placement feature it has to be outputted to the
-  // penultimate level. which is a corruption. We should never see
-  // such case as the data with seq num (within snapshot) should always come
-  // from higher compaction input level, which makes it safe to
-  // output_to_penultimate_level.
-  c_iter_->Next();
-  ASSERT_TRUE(c_iter_->status().IsCorruption());
-}
-
-INSTANTIATE_TEST_CASE_P(PerKeyPlacementCompIteratorTest,
-                        PerKeyPlacementCompIteratorTest,
-                        testing::Values(true, false));
-
 // Tests how CompactionIterator work together with SnapshotChecker.
 class CompactionIteratorWithSnapshotCheckerTest
    : public CompactionIteratorTest {
@@ -1107,21 +980,6 @@ TEST_F(CompactionIteratorWithSnapshotCheckerTest,
          2 /*earliest_write_conflict_snapshot*/);
 }

-// Same as above but with a wide-column entity. In addition to the value getting
-// trimmed, the type of the KV is changed to kTypeValue.
-TEST_F(CompactionIteratorWithSnapshotCheckerTest,
-       KeepSingleDeletionForWriteConflictChecking_WideColumnEntity) {
-  AddSnapshot(2, 0);
-  RunTest({test::KeyStr("a", 2, kTypeSingleDeletion),
-           test::KeyStr("a", 1, kTypeWideColumnEntity)},
-          {"", "fake_entity"},
-          {test::KeyStr("a", 2, kTypeSingleDeletion),
-           test::KeyStr("a", 1, kTypeValue)},
-          {"", ""}, 2 /* last_committed_seq */, nullptr /* merge_operator */,
-          nullptr /* compaction_filter */, false /* bottommost_level */,
-          2 /* earliest_write_conflict_snapshot */);
-}
-
 // Compaction filter should keep uncommitted key as-is, and
 //   * Convert the latest value to deletion, and/or
 //   * if latest value is a merge, apply filter to all subsequent merges.
@@ -1497,7 +1355,6 @@ INSTANTIATE_TEST_CASE_P(CompactionIteratorTsGcTestInstance,
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
@@ -20,14 +20,12 @@
 #include "db/blob/blob_file_completion_callback.h"
 #include "db/column_family.h"
 #include "db/compaction/compaction_iterator.h"
-#include "db/compaction/compaction_outputs.h"
 #include "db/flush_scheduler.h"
 #include "db/internal_stats.h"
 #include "db/job_context.h"
 #include "db/log_writer.h"
 #include "db/memtable_list.h"
 #include "db/range_del_aggregator.h"
-#include "db/seqno_to_time_mapping.h"
 #include "db/version_edit.h"
 #include "db/write_controller.h"
 #include "db/write_thread.h"
@@ -49,7 +47,6 @@
 namespace ROCKSDB_NAMESPACE {

 class Arena;
-class CompactionState;
 class ErrorHandler;
 class MemTable;
 class SnapshotChecker;
@@ -59,91 +56,11 @@ class Version;
 class VersionEdit;
 class VersionSet;

-class SubcompactionState;
-
 // CompactionJob is responsible for executing the compaction. Each (manual or
 // automated) compaction corresponds to a CompactionJob object, and usually
 // goes through the stages of `Prepare()`->`Run()`->`Install()`. CompactionJob
 // will divide the compaction into subcompactions and execute them in parallel
 // if needed.
-//
-// CompactionJob has 2 main stats:
-// 1. CompactionJobStats compaction_job_stats_
-//    CompactionJobStats is a public data structure which is part of Compaction
-//    event listener that rocksdb share the job stats with the user.
-//    Internally it's an aggregation of all the compaction_job_stats from each
-//    `SubcompactionState`:
-//                                           +------------------------+
-//                                           | SubcompactionState     |
-//                                           |                        |
-//                                +--------->|   compaction_job_stats |
-//                                |          |                        |
-//                                |          +------------------------+
-// +------------------------+     |
-// | CompactionJob          |     |          +------------------------+
-// |                        |     |          | SubcompactionState     |
-// |   compaction_job_stats +-----+          |                        |
-// |                        |     +--------->|   compaction_job_stats |
-// |                        |     |          |                        |
-// +------------------------+     |          +------------------------+
-//                                |
-//                                |          +------------------------+
-//                                |          | SubcompactionState     |
-//                                |          |                        |
-//                                +--------->+   compaction_job_stats |
-//                                |          |                        |
-//                                |          +------------------------+
-//                                |
-//                                |          +------------------------+
-//                                |          |       ...              |
-//                                +--------->+                        |
-//                                           +------------------------+
-//
-// 2. CompactionStatsFull compaction_stats_
-//    `CompactionStatsFull` is an internal stats about the compaction, which
-//    is eventually sent to `ColumnFamilyData::internal_stats_` and used for
-//    logging and public metrics.
-//    Internally, it's an aggregation of stats_ from each `SubcompactionState`.
-//    It has 2 parts, normal stats about the main compaction information and
-//    the penultimate level output stats.
-//    `SubcompactionState` maintains the CompactionOutputs for normal output and
-//    the penultimate level output if exists, the per_level stats is
-//    stored with the outputs.
-//                                                +---------------------------+
-//                                                | SubcompactionState        |
-//                                                |                           |
-//                                                | +----------------------+  |
-//                                                | | CompactionOutputs    |  |
-//                                                | | (normal output)      |  |
-//                                            +---->|   stats_             |  |
-//                                            |   | +----------------------+  |
-//                                            |   |                           |
-//                                            |   | +----------------------+  |
-// +--------------------------------+         |   | | CompactionOutputs    |  |
-// | CompactionJob                  |         |   | | (penultimate_level)  |  |
-// |                                |    +--------->|   stats_             |  |
-// |   compaction_stats_            |    |    |   | +----------------------+  |
-// |    +-------------------------+ |    |    |   |                           |
-// |    |stats (normal)           |------|----+   +---------------------------+
-// |    +-------------------------+ |    |    |
-// |                                |    |    |
-// |    +-------------------------+ |    |    |   +---------------------------+
-// |    |penultimate_level_stats  +------+    |   | SubcompactionState        |
-// |    +-------------------------+ |    |    |   |                           |
-// |                                |    |    |   | +----------------------+  |
-// |                                |    |    |   | | CompactionOutputs    |  |
-// +--------------------------------+    |    |   | | (normal output)      |  |
-//                                       |    +---->|   stats_             |  |
-//                                       |        | +----------------------+  |
-//                                       |        |                           |
-//                                       |        | +----------------------+  |
-//                                       |        | | CompactionOutputs    |  |
-//                                       |        | | (penultimate_level)  |  |
-//                                       +--------->|   stats_             |  |
-//                                                | +----------------------+  |
-//                                                |                           |
-//                                                +---------------------------+
-
 class CompactionJob {
 public:
  CompactionJob(
@@ -161,12 +78,11 @@ class CompactionJob {
      bool paranoid_file_checks, bool measure_io_stats,
      const std::string& dbname, CompactionJobStats* compaction_job_stats,
      Env::Priority thread_pri, const std::shared_ptr<IOTracer>& io_tracer,
-      const std::atomic<bool>& manual_compaction_canceled,
+      const std::atomic<int>* manual_compaction_paused = nullptr,
+      const std::atomic<bool>* manual_compaction_canceled = nullptr,
      const std::string& db_id = "", const std::string& db_session_id = "",
      std::string full_history_ts_low = "", std::string trim_ts = "",
-      BlobFileCompletionCallback* blob_callback = nullptr,
-      int* bg_compaction_scheduled = nullptr,
-      int* bg_bottom_compaction_scheduled = nullptr);
+      BlobFileCompletionCallback* blob_callback = nullptr);

  virtual ~CompactionJob();

@@ -192,6 +108,11 @@ class CompactionJob {
  IOStatus io_status() const { return io_status_; }

 protected:
+  struct SubcompactionState;
+  // CompactionJob state
+  struct CompactionState;
+
+  void AggregateStatistics();
  void UpdateCompactionStats();
  void LogCompaction();
  virtual void RecordCompactionIOStats();
@@ -202,7 +123,7 @@ class CompactionJob {
  void ProcessKeyValueCompaction(SubcompactionState* sub_compact);

  CompactionState* compact_;
-  InternalStats::CompactionStatsFull compaction_stats_;
+  InternalStats::CompactionStats compaction_stats_;
  const ImmutableDBOptions& db_options_;
  const MutableDBOptions mutable_db_options_copy_;
  LogBuffer* log_buffer_;
@@ -215,11 +136,7 @@ class CompactionJob {

  IOStatus io_status_;

-  CompactionJobStats* compaction_job_stats_;
-
 private:
-  friend class CompactionJobTestBase;
-
  // Generates a histogram representing potential divisions of key ranges from
  // the input. It adds the starting and/or ending keys of certain input files
  // to the working set and then finds the approximate size of data in between
@@ -227,39 +144,20 @@ class CompactionJob {
  // consecutive groups such that each group has a similar size.
  void GenSubcompactionBoundaries();

-  // Get the number of planned subcompactions based on max_subcompactions and
-  // extra reserved resources
-  uint64_t GetSubcompactionsLimit();
-
-  // Additional reserved threads are reserved and the number is stored in
-  // extra_num_subcompaction_threads_reserved__. For now, this happens only if
-  // the compaction priority is round-robin and max_subcompactions is not
-  // sufficient (extra resources may be needed)
-  void AcquireSubcompactionResources(int num_extra_required_subcompactions);
-
-  // Additional threads may be reserved during IncreaseSubcompactionResources()
-  // if num_actual_subcompactions is less than num_planned_subcompactions.
-  // Additional threads will be released and the bg_compaction_scheduled_ or
-  // bg_bottom_compaction_scheduled_ will be updated if they are used.
-  // DB Mutex lock is required.
-  void ShrinkSubcompactionResources(uint64_t num_extra_resources);
-
-  // Release all reserved threads and update the compaction limits.
-  void ReleaseSubcompactionResources();
-
  CompactionServiceJobStatus ProcessKeyValueCompactionWithCompactionService(
      SubcompactionState* sub_compact);

  // update the thread status for starting a compaction.
  void ReportStartedCompaction(Compaction* compaction);
+  void AllocateCompactionOutputFileNumbers();

-  Status FinishCompactionOutputFile(const Status& input_status,
-                                    SubcompactionState* sub_compact,
-                                    CompactionOutputs& outputs,
-                                    const Slice& next_table_min_key);
+  Status FinishCompactionOutputFile(
+      const Status& input_status, SubcompactionState* sub_compact,
+      CompactionRangeDelAggregator* range_del_agg,
+      CompactionIterationStats* range_del_out_stats,
+      const Slice* next_table_min_key = nullptr);
  Status InstallCompactionResults(const MutableCFOptions& mutable_cf_options);
-  Status OpenCompactionOutputFile(SubcompactionState* sub_compact,
-                                  CompactionOutputs& outputs);
+  Status OpenCompactionOutputFile(SubcompactionState* sub_compact);
  void UpdateCompactionJobStats(
    const InternalStats::CompactionStats& stats) const;
  void RecordDroppedKeys(const CompactionIterationStats& c_iter_stats,
@@ -268,12 +166,20 @@ class CompactionJob {
  void UpdateCompactionInputStatsHelper(
      int* num_files, uint64_t* bytes_read, int input_level);

+#ifndef ROCKSDB_LITE
+  void BuildSubcompactionJobInfo(
+      SubcompactionState* sub_compact,
+      SubcompactionJobInfo* subcompaction_job_info) const;
+#endif  // ROCKSDB_LITE
+
  void NotifyOnSubcompactionBegin(SubcompactionState* sub_compact);

  void NotifyOnSubcompactionCompleted(SubcompactionState* sub_compact);

  uint32_t job_id_;

+  CompactionJobStats* compaction_job_stats_;
+
  // DBImpl state
  const std::string& dbname_;
  const std::string db_id_;
@@ -287,7 +193,8 @@ class CompactionJob {
  FileOptions file_options_for_read_;
  VersionSet* versions_;
  const std::atomic<bool>* shutting_down_;
-  const std::atomic<bool>& manual_compaction_canceled_;
+  const std::atomic<int>* manual_compaction_paused_;
+  const std::atomic<bool>* manual_compaction_canceled_;
  FSDirectory* db_directory_;
  FSDirectory* blob_output_directory_;
  InstrumentedMutex* db_mutex_;
@@ -314,44 +221,19 @@ class CompactionJob {
  bool paranoid_file_checks_;
  bool measure_io_stats_;
  // Stores the Slices that designate the boundaries for each subcompaction
-  std::vector<std::string> boundaries_;
+  std::vector<Slice> boundaries_;
+  // Stores the approx size of keys covered in the range of each subcompaction
+  std::vector<uint64_t> sizes_;
  Env::Priority thread_pri_;
  std::string full_history_ts_low_;
  std::string trim_ts_;
  BlobFileCompletionCallback* blob_callback_;

-  uint64_t GetCompactionId(SubcompactionState* sub_compact) const;
-  // Stores the number of reserved threads in shared env_ for the number of
-  // extra subcompaction in kRoundRobin compaction priority
-  int extra_num_subcompaction_threads_reserved_;
-
-  // Stores the pointer to bg_compaction_scheduled_,
-  // bg_bottom_compaction_scheduled_ in DBImpl. Mutex is required when accessing
-  // or updating it.
-  int* bg_compaction_scheduled_;
-  int* bg_bottom_compaction_scheduled_;
-
-  // Stores the sequence number to time mapping gathered from all input files
-  // it also collects the smallest_seqno -> oldest_ancester_time from the SST.
-  SeqnoToTimeMapping seqno_time_mapping_;
-
-  // Minimal sequence number for preserving the time information. The time info
-  // older than this sequence number won't be preserved after the compaction and
-  // if it's bottommost compaction, the seq num will be zeroed out.
-  SequenceNumber preserve_time_min_seqno_ = kMaxSequenceNumber;
-
-  // Minimal sequence number to preclude the data from the last level. If the
-  // key has bigger (newer) sequence number than this, it will be precluded from
-  // the last level (output to penultimate level).
-  SequenceNumber preclude_last_level_min_seqno_ = kMaxSequenceNumber;
+  uint64_t GetCompactionId(SubcompactionState* sub_compact);

  // Get table file name in where it's outputting to, which should also be in
  // `output_directory_`.
  virtual std::string GetTableFileName(uint64_t file_number);
-  // The rate limiter priority (io_priority) is determined dynamically here.
-  // The Compaction Read and Write priorities are the same for different
-  // scenarios, such as write stalled.
-  Env::IOPriority GetRateLimiterPriority();
 };

 // CompactionServiceInput is used the pass compaction information between two
@@ -371,14 +253,12 @@ struct CompactionServiceInput {
  std::vector<std::string> input_files;
  int output_level;

-  // db_id is used to generate unique id of sst on the remote compactor
-  std::string db_id;
-
  // information for subcompaction
  bool has_begin = false;
  std::string begin;
  bool has_end = false;
  std::string end;
+  uint64_t approx_size = 0;

  // serialization interface to read and write the object
  static Status Read(const std::string& data_str, CompactionServiceInput* obj);
@@ -404,15 +284,13 @@ struct CompactionServiceOutputFile {
  uint64_t file_creation_time;
  uint64_t paranoid_hash;
  bool marked_for_compaction;
-  UniqueId64x2 unique_id;

  CompactionServiceOutputFile() = default;
  CompactionServiceOutputFile(
      const std::string& name, SequenceNumber smallest, SequenceNumber largest,
      std::string _smallest_internal_key, std::string _largest_internal_key,
      uint64_t _oldest_ancester_time, uint64_t _file_creation_time,
-      uint64_t _paranoid_hash, bool _marked_for_compaction,
-      UniqueId64x2 _unique_id)
+      uint64_t _paranoid_hash, bool _marked_for_compaction)
      : file_name(name),
        smallest_seqno(smallest),
        largest_seqno(largest),
@@ -421,8 +299,7 @@ struct CompactionServiceOutputFile {
        oldest_ancester_time(_oldest_ancester_time),
        file_creation_time(_file_creation_time),
        paranoid_hash(_paranoid_hash),
-        marked_for_compaction(_marked_for_compaction),
-        unique_id(std::move(_unique_id)) {}
+        marked_for_compaction(_marked_for_compaction) {}
 };

 // CompactionServiceResult contains the compaction result from a different db
@@ -468,9 +345,9 @@ class CompactionServiceCompactionJob : private CompactionJob {
      std::vector<SequenceNumber> existing_snapshots,
      std::shared_ptr<Cache> table_cache, EventLogger* event_logger,
      const std::string& dbname, const std::shared_ptr<IOTracer>& io_tracer,
-      const std::atomic<bool>& manual_compaction_canceled,
+      const std::atomic<bool>* manual_compaction_canceled,
      const std::string& db_id, const std::string& db_session_id,
-      std::string output_path,
+      const std::string& output_path,
      const CompactionServiceInput& compaction_service_input,
      CompactionServiceResult* compaction_service_result);

@@ -268,10 +268,10 @@ class CompactionJobStatsTest : public testing::Test,
    if (cf == 0) {
      // default cfd
      EXPECT_TRUE(db_->GetProperty(
-          "rocksdb.num-files-at-level" + std::to_string(level), &property));
+          "rocksdb.num-files-at-level" + ToString(level), &property));
    } else {
      EXPECT_TRUE(db_->GetProperty(
-          handles_[cf], "rocksdb.num-files-at-level" + std::to_string(level),
+          handles_[cf], "rocksdb.num-files-at-level" + ToString(level),
          &property));
    }
    return atoi(property.c_str());
@@ -672,7 +672,7 @@ TEST_P(CompactionJobStatsTest, CompactionJobStatsTest) {
      snprintf(buf, kBufSize, "%d", ++num_L0_files);
      ASSERT_EQ(std::string(buf), FilesPerLevel(1));
    }
-    ASSERT_EQ(std::to_string(num_L0_files), FilesPerLevel(1));
+    ASSERT_EQ(ToString(num_L0_files), FilesPerLevel(1));

    // 2nd Phase: perform L0 -> L1 compaction.
    int L0_compaction_count = 6;
@@ -1,646 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//
-//  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 "db/compaction/compaction_outputs.h"
-
-#include "db/builder.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-void CompactionOutputs::NewBuilder(const TableBuilderOptions& tboptions) {
-  builder_.reset(NewTableBuilder(tboptions, file_writer_.get()));
-}
-
-Status CompactionOutputs::Finish(const Status& intput_status,
-                                 const SeqnoToTimeMapping& seqno_time_mapping) {
-  FileMetaData* meta = GetMetaData();
-  assert(meta != nullptr);
-  Status s = intput_status;
-  if (s.ok()) {
-    std::string seqno_time_mapping_str;
-    seqno_time_mapping.Encode(seqno_time_mapping_str, meta->fd.smallest_seqno,
-                              meta->fd.largest_seqno, meta->file_creation_time);
-    builder_->SetSeqnoTimeTableProperties(seqno_time_mapping_str,
-                                          meta->oldest_ancester_time);
-    s = builder_->Finish();
-
-  } else {
-    builder_->Abandon();
-  }
-  Status io_s = builder_->io_status();
-  if (s.ok()) {
-    s = io_s;
-  } else {
-    io_s.PermitUncheckedError();
-  }
-  const uint64_t current_bytes = builder_->FileSize();
-  if (s.ok()) {
-    meta->fd.file_size = current_bytes;
-    meta->marked_for_compaction = builder_->NeedCompact();
-  }
-  current_output().finished = true;
-  stats_.bytes_written += current_bytes;
-  stats_.num_output_files = outputs_.size();
-
-  return s;
-}
-
-IOStatus CompactionOutputs::WriterSyncClose(const Status& input_status,
-                                            SystemClock* clock,
-                                            Statistics* statistics,
-                                            bool use_fsync) {
-  IOStatus io_s;
-  if (input_status.ok()) {
-    StopWatch sw(clock, statistics, COMPACTION_OUTFILE_SYNC_MICROS);
-    io_s = file_writer_->Sync(use_fsync);
-  }
-  if (input_status.ok() && io_s.ok()) {
-    io_s = file_writer_->Close();
-  }
-
-  if (input_status.ok() && io_s.ok()) {
-    FileMetaData* meta = GetMetaData();
-    meta->file_checksum = file_writer_->GetFileChecksum();
-    meta->file_checksum_func_name = file_writer_->GetFileChecksumFuncName();
-  }
-
-  file_writer_.reset();
-
-  return io_s;
-}
-
-size_t CompactionOutputs::UpdateGrandparentBoundaryInfo(
-    const Slice& internal_key) {
-  size_t curr_key_boundary_switched_num = 0;
-  const std::vector<FileMetaData*>& grandparents = compaction_->grandparents();
-
-  if (grandparents.empty()) {
-    return curr_key_boundary_switched_num;
-  }
-  assert(!internal_key.empty());
-  InternalKey ikey;
-  ikey.DecodeFrom(internal_key);
-  assert(ikey.Valid());
-
-  const Comparator* ucmp = compaction_->column_family_data()->user_comparator();
-
-  // Move the grandparent_index_ to the file containing the current user_key.
-  // If there are multiple files containing the same user_key, make sure the
-  // index points to the last file containing the key.
-  while (grandparent_index_ < grandparents.size()) {
-    if (being_grandparent_gap_) {
-      if (sstableKeyCompare(ucmp, ikey,
-                            grandparents[grandparent_index_]->smallest) < 0) {
-        break;
-      }
-      if (seen_key_) {
-        curr_key_boundary_switched_num++;
-        grandparent_overlapped_bytes_ +=
-            grandparents[grandparent_index_]->fd.GetFileSize();
-        grandparent_boundary_switched_num_++;
-      }
-      being_grandparent_gap_ = false;
-    } else {
-      int cmp_result = sstableKeyCompare(
-          ucmp, ikey, grandparents[grandparent_index_]->largest);
-      // If it's same key, make sure grandparent_index_ is pointing to the last
-      // one.
-      if (cmp_result < 0 ||
-          (cmp_result == 0 &&
-           (grandparent_index_ == grandparents.size() - 1 ||
-            sstableKeyCompare(ucmp, ikey,
-                              grandparents[grandparent_index_ + 1]->smallest) <
-                0))) {
-        break;
-      }
-      if (seen_key_) {
-        curr_key_boundary_switched_num++;
-        grandparent_boundary_switched_num_++;
-      }
-      being_grandparent_gap_ = true;
-      grandparent_index_++;
-    }
-  }
-
-  // If the first key is in the middle of a grandparent file, adding it to the
-  // overlap
-  if (!seen_key_ && !being_grandparent_gap_) {
-    assert(grandparent_overlapped_bytes_ == 0);
-    grandparent_overlapped_bytes_ =
-        GetCurrentKeyGrandparentOverlappedBytes(internal_key);
-  }
-
-  seen_key_ = true;
-  return curr_key_boundary_switched_num;
-}
-
-uint64_t CompactionOutputs::GetCurrentKeyGrandparentOverlappedBytes(
-    const Slice& internal_key) const {
-  // no overlap with any grandparent file
-  if (being_grandparent_gap_) {
-    return 0;
-  }
-  uint64_t overlapped_bytes = 0;
-
-  const std::vector<FileMetaData*>& grandparents = compaction_->grandparents();
-  const Comparator* ucmp = compaction_->column_family_data()->user_comparator();
-  InternalKey ikey;
-  ikey.DecodeFrom(internal_key);
-#ifndef NDEBUG
-  // make sure the grandparent_index_ is pointing to the last files containing
-  // the current key.
-  int cmp_result =
-      sstableKeyCompare(ucmp, ikey, grandparents[grandparent_index_]->largest);
-  assert(
-      cmp_result < 0 ||
-      (cmp_result == 0 &&
-       (grandparent_index_ == grandparents.size() - 1 ||
-        sstableKeyCompare(
-            ucmp, ikey, grandparents[grandparent_index_ + 1]->smallest) < 0)));
-  assert(sstableKeyCompare(ucmp, ikey,
-                           grandparents[grandparent_index_]->smallest) >= 0);
-#endif
-  overlapped_bytes += grandparents[grandparent_index_]->fd.GetFileSize();
-
-  // go backwards to find all overlapped files, one key can overlap multiple
-  // files. In the following example, if the current output key is `c`, and one
-  // compaction file was cut before `c`, current `c` can overlap with 3 files:
-  //  [a b]               [c...
-  // [b, b] [c, c] [c, c] [c, d]
-  for (int64_t i = static_cast<int64_t>(grandparent_index_) - 1;
-       i >= 0 && sstableKeyCompare(ucmp, ikey, grandparents[i]->largest) == 0;
-       i--) {
-    overlapped_bytes += grandparents[i]->fd.GetFileSize();
-  }
-
-  return overlapped_bytes;
-}
-
-bool CompactionOutputs::ShouldStopBefore(const CompactionIterator& c_iter) {
-  assert(c_iter.Valid());
-
-  // always update grandparent information like overlapped file number, size
-  // etc.
-  const Slice& internal_key = c_iter.key();
-  const uint64_t previous_overlapped_bytes = grandparent_overlapped_bytes_;
-  size_t num_grandparent_boundaries_crossed =
-      UpdateGrandparentBoundaryInfo(internal_key);
-
-  if (!HasBuilder()) {
-    return false;
-  }
-
-  // If there's user defined partitioner, check that first
-  if (partitioner_ && partitioner_->ShouldPartition(PartitionerRequest(
-                          last_key_for_partitioner_, c_iter.user_key(),
-                          current_output_file_size_)) == kRequired) {
-    return true;
-  }
-
-  // files output to Level 0 won't be split
-  if (compaction_->output_level() == 0) {
-    return false;
-  }
-
-  // reach the max file size
-  if (current_output_file_size_ >= compaction_->max_output_file_size()) {
-    return true;
-  }
-
-  const InternalKeyComparator* icmp =
-      &compaction_->column_family_data()->internal_comparator();
-
-  // Check if it needs to split for RoundRobin
-  // Invalid local_output_split_key indicates that we do not need to split
-  if (local_output_split_key_ != nullptr && !is_split_) {
-    // Split occurs when the next key is larger than/equal to the cursor
-    if (icmp->Compare(internal_key, local_output_split_key_->Encode()) >= 0) {
-      is_split_ = true;
-      return true;
-    }
-  }
-
-  // only check if the current key is going to cross the grandparents file
-  // boundary (either the file beginning or ending).
-  if (num_grandparent_boundaries_crossed > 0) {
-    // Cut the file before the current key if the size of the current output
-    // file + its overlapped grandparent files is bigger than
-    // max_compaction_bytes. Which is to prevent future bigger than
-    // max_compaction_bytes compaction from the current output level.
-    if (grandparent_overlapped_bytes_ + current_output_file_size_ >
-        compaction_->max_compaction_bytes()) {
-      return true;
-    }
-
-    // Cut the file if including the key is going to add a skippable file on
-    // the grandparent level AND its size is reasonably big (1/8 of target file
-    // size). For example, if it's compacting the files L0 + L1:
-    //  L0:  [1,   21]
-    //  L1:    [3,   23]
-    //  L2: [2, 4] [11, 15] [22, 24]
-    // Without this break, it will output as:
-    //  L1: [1,3, 21,23]
-    // With this break, it will output as (assuming [11, 15] at L2 is bigger
-    // than 1/8 of target size):
-    //  L1: [1,3] [21,23]
-    // Then for the future compactions, [11,15] won't be included.
-    // For random datasets (either evenly distributed or skewed), it rarely
-    // triggers this condition, but if the user is adding 2 different datasets
-    // without any overlap, it may likely happen.
-    // More details, check PR #1963
-    const size_t num_skippable_boundaries_crossed =
-        being_grandparent_gap_ ? 2 : 3;
-    if (compaction_->immutable_options()->compaction_style ==
-            kCompactionStyleLevel &&
-        compaction_->immutable_options()->level_compaction_dynamic_file_size &&
-        num_grandparent_boundaries_crossed >=
-            num_skippable_boundaries_crossed &&
-        grandparent_overlapped_bytes_ - previous_overlapped_bytes >
-            compaction_->target_output_file_size() / 8) {
-      return true;
-    }
-
-    // Pre-cut the output file if it's reaching a certain size AND it's at the
-    // boundary of a grandparent file. It can reduce the future compaction size,
-    // the cost is having smaller files.
-    // The pre-cut size threshold is based on how many grandparent boundaries
-    // it has seen before. Basically, if it has seen no boundary at all, then it
-    // will pre-cut at 50% target file size. Every boundary it has seen
-    // increases the threshold by 5%, max at 90%, which it will always cut.
-    // The idea is based on if it has seen more boundaries before, it will more
-    // likely to see another boundary (file cutting opportunity) before the
-    // target file size. The test shows it can generate larger files than a
-    // static threshold like 75% and has a similar write amplification
-    // improvement.
-    if (compaction_->immutable_options()->compaction_style ==
-            kCompactionStyleLevel &&
-        compaction_->immutable_options()->level_compaction_dynamic_file_size &&
-        current_output_file_size_ >=
-            ((compaction_->target_output_file_size() + 99) / 100) *
-                (50 + std::min(grandparent_boundary_switched_num_ * 5,
-                               size_t{40}))) {
-      return true;
-    }
-  }
-
-  // check ttl file boundaries if there's any
-  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;
-}
-
-Status CompactionOutputs::AddToOutput(
-    const CompactionIterator& c_iter,
-    const CompactionFileOpenFunc& open_file_func,
-    const CompactionFileCloseFunc& close_file_func) {
-  Status s;
-  const Slice& key = c_iter.key();
-
-  if (ShouldStopBefore(c_iter) && HasBuilder()) {
-    s = close_file_func(*this, c_iter.InputStatus(), key);
-    if (!s.ok()) {
-      return s;
-    }
-    // reset grandparent information
-    grandparent_boundary_switched_num_ = 0;
-    grandparent_overlapped_bytes_ =
-        GetCurrentKeyGrandparentOverlappedBytes(key);
-  }
-
-  // Open output file if necessary
-  if (!HasBuilder()) {
-    s = open_file_func(*this);
-    if (!s.ok()) {
-      return s;
-    }
-  }
-
-  assert(builder_ != nullptr);
-  const Slice& value = c_iter.value();
-  s = current_output().validator.Add(key, value);
-  if (!s.ok()) {
-    return s;
-  }
-  builder_->Add(key, value);
-
-  stats_.num_output_records++;
-  current_output_file_size_ = builder_->EstimatedFileSize();
-
-  if (blob_garbage_meter_) {
-    s = blob_garbage_meter_->ProcessOutFlow(key, value);
-  }
-
-  if (!s.ok()) {
-    return s;
-  }
-
-  const ParsedInternalKey& ikey = c_iter.ikey();
-  s = current_output().meta.UpdateBoundaries(key, value, ikey.sequence,
-                                             ikey.type);
-
-  if (partitioner_) {
-    last_key_for_partitioner_.assign(c_iter.user_key().data_,
-                                     c_iter.user_key().size_);
-  }
-
-  return s;
-}
-
-Status CompactionOutputs::AddRangeDels(
-    const Slice* comp_start_user_key, const Slice* comp_end_user_key,
-    CompactionIterationStats& range_del_out_stats, bool bottommost_level,
-    const InternalKeyComparator& icmp, SequenceNumber earliest_snapshot,
-    const Slice& next_table_min_key, const std::string& full_history_ts_low) {
-  assert(HasRangeDel());
-  FileMetaData& meta = current_output().meta;
-  const Comparator* ucmp = icmp.user_comparator();
-
-  Slice lower_bound_guard, upper_bound_guard;
-  std::string smallest_user_key;
-  const Slice *lower_bound, *upper_bound;
-  bool lower_bound_from_sub_compact = false;
-
-  size_t output_size = outputs_.size();
-  if (output_size == 1) {
-    // For the first output table, include range tombstones before the min
-    // key but after the subcompaction boundary.
-    lower_bound = comp_start_user_key;
-    lower_bound_from_sub_compact = true;
-  } else if (meta.smallest.size() > 0) {
-    // For subsequent output tables, only include range tombstones from min
-    // key onwards since the previous file was extended to contain range
-    // tombstones falling before min key.
-    smallest_user_key = meta.smallest.user_key().ToString(false /*hex*/);
-    lower_bound_guard = Slice(smallest_user_key);
-    lower_bound = &lower_bound_guard;
-  } else {
-    lower_bound = nullptr;
-  }
-  if (!next_table_min_key.empty()) {
-    // This may be the last file in the subcompaction in some cases, so we
-    // need to compare the end key of subcompaction with the next file start
-    // key. When the end key is chosen by the subcompaction, we know that
-    // it must be the biggest key in output file. Therefore, it is safe to
-    // use the smaller key as the upper bound of the output file, to ensure
-    // that there is no overlapping between different output files.
-    upper_bound_guard = ExtractUserKey(next_table_min_key);
-    if (comp_end_user_key != nullptr &&
-        ucmp->CompareWithoutTimestamp(upper_bound_guard, *comp_end_user_key) >=
-            0) {
-      upper_bound = comp_end_user_key;
-    } else {
-      upper_bound = &upper_bound_guard;
-    }
-  } else {
-    // This is the last file in the subcompaction, so extend until the
-    // subcompaction ends.
-    upper_bound = comp_end_user_key;
-  }
-  bool has_overlapping_endpoints;
-  if (upper_bound != nullptr && meta.largest.size() > 0) {
-    has_overlapping_endpoints = ucmp->CompareWithoutTimestamp(
-                                    meta.largest.user_key(), *upper_bound) == 0;
-  } else {
-    has_overlapping_endpoints = false;
-  }
-
-  // The end key of the subcompaction must be bigger or equal to the upper
-  // bound. If the end of subcompaction is null or the upper bound is null,
-  // it means that this file is the last file in the compaction. So there
-  // will be no overlapping between this file and others.
-  assert(comp_end_user_key == nullptr || upper_bound == nullptr ||
-         ucmp->CompareWithoutTimestamp(*upper_bound, *comp_end_user_key) <= 0);
-  auto it = range_del_agg_->NewIterator(lower_bound, upper_bound,
-                                        has_overlapping_endpoints);
-  // Position the range tombstone output iterator. There may be tombstone
-  // fragments that are entirely out of range, so make sure that we do not
-  // include those.
-  if (lower_bound != nullptr) {
-    it->Seek(*lower_bound);
-  } else {
-    it->SeekToFirst();
-  }
-  for (; it->Valid(); it->Next()) {
-    auto tombstone = it->Tombstone();
-    if (upper_bound != nullptr) {
-      int cmp =
-          ucmp->CompareWithoutTimestamp(*upper_bound, tombstone.start_key_);
-      if ((has_overlapping_endpoints && cmp < 0) ||
-          (!has_overlapping_endpoints && cmp <= 0)) {
-        // Tombstones starting after upper_bound only need to be included in
-        // the next table. If the current SST ends before upper_bound, i.e.,
-        // `has_overlapping_endpoints == false`, we can also skip over range
-        // tombstones that start exactly at upper_bound. Such range
-        // tombstones will be included in the next file and are not relevant
-        // to the point keys or endpoints of the current file.
-        break;
-      }
-    }
-
-    const size_t ts_sz = ucmp->timestamp_size();
-    // Garbage collection for range tombstones.
-    // If user-defined timestamp is enabled, range tombstones are dropped if
-    // they are at bottommost_level, below full_history_ts_low and not visible
-    // in any snapshot. trim_ts_ is passed to the constructor for
-    // range_del_agg_, and range_del_agg_ internally drops tombstones above
-    // trim_ts_.
-    if (bottommost_level && tombstone.seq_ <= earliest_snapshot &&
-        (ts_sz == 0 ||
-         (!full_history_ts_low.empty() &&
-          ucmp->CompareTimestamp(tombstone.ts_, full_history_ts_low) < 0))) {
-      // TODO(andrewkr): tombstones that span multiple output files are
-      // counted for each compaction output file, so lots of double
-      // counting.
-      range_del_out_stats.num_range_del_drop_obsolete++;
-      range_del_out_stats.num_record_drop_obsolete++;
-      continue;
-    }
-
-    auto kv = tombstone.Serialize();
-    assert(lower_bound == nullptr ||
-           ucmp->CompareWithoutTimestamp(*lower_bound, kv.second) < 0);
-    // Range tombstone is not supported by output validator yet.
-    builder_->Add(kv.first.Encode(), kv.second);
-    InternalKey smallest_candidate = std::move(kv.first);
-    if (lower_bound != nullptr &&
-        ucmp->CompareWithoutTimestamp(smallest_candidate.user_key(),
-                                      *lower_bound) <= 0) {
-      // Pretend the smallest key has the same user key as lower_bound
-      // (the max key in the previous table or subcompaction) in order for
-      // files to appear key-space partitioned.
-      //
-      // When lower_bound is chosen by a subcompaction, we know that
-      // subcompactions over smaller keys cannot contain any keys at
-      // lower_bound. We also know that smaller subcompactions exist,
-      // because otherwise the subcompaction woud be unbounded on the left.
-      // As a result, we know that no other files on the output level will
-      // contain actual keys at lower_bound (an output file may have a
-      // largest key of lower_bound@kMaxSequenceNumber, but this only
-      // indicates a large range tombstone was truncated). Therefore, it is
-      // safe to use the tombstone's sequence number, to ensure that keys at
-      // lower_bound at lower levels are covered by truncated tombstones.
-      //
-      // If lower_bound was chosen by the smallest data key in the file,
-      // choose lowest seqnum so this file's smallest internal key comes
-      // after the previous file's largest. The fake seqnum is OK because
-      // the read path's file-picking code only considers user key.
-      if (lower_bound_from_sub_compact) {
-        if (ts_sz) {
-          assert(tombstone.ts_.size() == ts_sz);
-          smallest_candidate = InternalKey(*lower_bound, tombstone.seq_,
-                                           kTypeRangeDeletion, tombstone.ts_);
-        } else {
-          smallest_candidate =
-              InternalKey(*lower_bound, tombstone.seq_, kTypeRangeDeletion);
-        }
-      } else {
-        smallest_candidate = InternalKey(*lower_bound, 0, kTypeRangeDeletion);
-      }
-    }
-    InternalKey largest_candidate = tombstone.SerializeEndKey();
-    if (upper_bound != nullptr &&
-        ucmp->CompareWithoutTimestamp(*upper_bound,
-                                      largest_candidate.user_key()) <= 0) {
-      // Pretend the largest key has the same user key as upper_bound (the
-      // min key in the following table or subcompaction) in order for files
-      // to appear key-space partitioned.
-      //
-      // Choose highest seqnum so this file's largest internal key comes
-      // before the next file's/subcompaction's smallest. The fake seqnum is
-      // OK because the read path's file-picking code only considers the
-      // user key portion.
-      //
-      // Note Seek() also creates InternalKey with (user_key,
-      // kMaxSequenceNumber), but with kTypeDeletion (0x7) instead of
-      // kTypeRangeDeletion (0xF), so the range tombstone comes before the
-      // Seek() key in InternalKey's ordering. So Seek() will look in the
-      // next file for the user key
-      if (ts_sz) {
-        static constexpr char kTsMax[] = "\xff\xff\xff\xff\xff\xff\xff\xff\xff";
-        if (ts_sz <= strlen(kTsMax)) {
-          largest_candidate =
-              InternalKey(*upper_bound, kMaxSequenceNumber, kTypeRangeDeletion,
-                          Slice(kTsMax, ts_sz));
-        } else {
-          largest_candidate =
-              InternalKey(*upper_bound, kMaxSequenceNumber, kTypeRangeDeletion,
-                          std::string(ts_sz, '\xff'));
-        }
-      } else {
-        largest_candidate =
-            InternalKey(*upper_bound, kMaxSequenceNumber, kTypeRangeDeletion);
-      }
-    }
-#ifndef NDEBUG
-    SequenceNumber smallest_ikey_seqnum = kMaxSequenceNumber;
-    if (meta.smallest.size() > 0) {
-      smallest_ikey_seqnum = GetInternalKeySeqno(meta.smallest.Encode());
-    }
-#endif
-    meta.UpdateBoundariesForRange(smallest_candidate, largest_candidate,
-                                  tombstone.seq_, icmp);
-    // 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
-    // deleted keys at lower levels.
-    assert(smallest_ikey_seqnum == 0 ||
-           ExtractInternalKeyFooter(meta.smallest.Encode()) !=
-               PackSequenceAndType(0, kTypeRangeDeletion));
-  }
-  return Status::OK();
-}
-
-void CompactionOutputs::FillFilesToCutForTtl() {
-  if (compaction_->immutable_options()->compaction_style !=
-          kCompactionStyleLevel ||
-      compaction_->immutable_options()->compaction_pri !=
-          kMinOverlappingRatio ||
-      compaction_->mutable_cf_options()->ttl == 0 ||
-      compaction_->num_input_levels() < 2 || compaction_->bottommost_level()) {
-    return;
-  }
-
-  // We define new file with the 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;
-  }
-
-  auto 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);
-    }
-  }
-}
-
-CompactionOutputs::CompactionOutputs(const Compaction* compaction,
-                                     const bool is_penultimate_level)
-    : compaction_(compaction), is_penultimate_level_(is_penultimate_level) {
-  partitioner_ = compaction->output_level() == 0
-                     ? nullptr
-                     : compaction->CreateSstPartitioner();
-
-  if (compaction->output_level() != 0) {
-    FillFilesToCutForTtl();
-  }
-}
-
-}  // namespace ROCKSDB_NAMESPACE
Author	SHA1	Message	Date
Siying Dong	ae2168838e	Update options.h	2022-05-03 11:18:15 -07:00
Siying Dong	f78e7672d1	Update options.h	2022-05-03 11:07:29 -07:00