Minimum macOS version needed to build v7.2.2 and up is 10.13 (#9976)

Summary:
Some C++ code changes between version 7.1.2 and 7.2.2 now seem to require at least macOS 10.13 (2017) to build successfully, previously we needed 10.12 (2016). I haven't been able to identify the exact commit.

**NOTE**: This needs to be merged to both `main` and `7.2.fb` branches.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/9976

Reviewed By: jay-zhuang

Differential Revision: D36303226

Pulled By: ajkr

fbshipit-source-id: 589ce3ecf821db3402b0876e76d37b407896c945

.circleci/config.yml

@@ -3,6 +3,11 @@ version: 2.1
 orbs:
   win: circleci/windows@2.4.0
 
+aliases:
+  - &notify-on-main-failure
+    fail_only: true
+    only_for_branches: main
+
 commands:
   install-cmake-on-macos:
     steps:
@@ -56,21 +61,35 @@ commands:
       - 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:
@@ -79,6 +98,27 @@ commands:
           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
+
+  upgrade-cmake:
+    steps:
+      - run:
+          name: Upgrade cmake
+          command: |
+            sudo apt remove --purge cmake
+            sudo snap install cmake --classic
+
   install-gflags-on-macos:
     steps:
       - run:
@@ -86,48 +126,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-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-compression-libs:
     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: 450
-            DURATION_RW: 450
-            # The benchmark host has 32GB memory
-            # The folllowing 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 compression 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
+            sudo apt-get update -y && sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
+
+  install-libprotobuf-mutator:
+    steps:
+      - run:
+          name: Install libprotobuf-mutator libs
+          command: |
+            git clone --single-branch --branch master --depth 1 git@github.com:google/libprotobuf-mutator.git ~/libprotobuf-mutator
+            cd ~/libprotobuf-mutator && mkdir build && cd build
+            cmake .. -GNinja -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang++-13 -DCMAKE_BUILD_TYPE=Release -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON
+            ninja && sudo ninja install
+      - run:
+          name: Setup environment variables
+          command: |
+            echo "export PKG_CONFIG_PATH=/usr/local/OFF/:~/libprotobuf-mutator/build/external.protobuf/lib/pkgconfig/" >> $BASH_ENV
+            echo "export PROTOC_BIN=~/libprotobuf-mutator/build/external.protobuf/bin/protoc" >> $BASH_ENV
 
 executors:
   windows-2xlarge:
@@ -135,21 +162,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.5
 
 jobs:
   build-macos:
@@ -162,7 +174,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:
@@ -181,7 +193,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
@@ -190,274 +202,277 @@ 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
+  build-linux-encrypted-env:
+    machine:
+      image: ubuntu-2004:202111-02
     resource_class: 2xlarge
     steps:
       - pre-steps
-      - 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 | egrep -q 'Supported compression types: kNoCompression$' # Verify no compiled in compression
+      - install-gflags
+      - run: ENCRYPTED_ENV=1 make V=1 J=32 -j32 check
       - 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
-      - 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
+      - install-gflags
+      - install-clang-10
+      - run: ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check # aligned new doesn't work for reason we haven't figured out
       - 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
-    resource_class: 2xlarge
-    steps:
-      - pre-steps
-      - 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
+      - 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
+      - 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-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
+      - 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
-      - post-steps
-
-  # Ensure ASAN+UBSAN with folly, and full testsuite with clang 13
-  build-linux-clang-13-asan-ubsan-with-folly:
-    executor: linux-docker
-    resource_class: 2xlarge
-    steps:
-      - pre-steps
-      - setup-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
+      - install-clang-13
+      - install-benchmark
+      - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j16 all microbench
       - 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 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:
@@ -529,10 +544,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: |
@@ -546,10 +565,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: |
@@ -635,25 +658,34 @@ jobs:
       - 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
@@ -662,12 +694,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
 
@@ -725,10 +759,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: |
@@ -739,10 +776,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
@@ -751,94 +792,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-gcc-7-with-folly
-      - 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:
+    jobs:
+      - build-linux-encrypted-env
+  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:
@@ -848,5 +905,3 @@ workflows:
       - build-linux-arm-test-full
       - build-linux-run-microbench
       - build-linux-non-shm
-      - build-linux-clang-13-asan-ubsan-with-folly
-      - build-linux-valgrind

.gitignore

@@ -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,6 +52,7 @@ rocksdb_dump
 rocksdb_undump
 db_test2
 trace_analyzer
+trace_analyzer_test
 block_cache_trace_analyzer
 io_tracer_parser
 .DS_Store

.travis.yml

@@ -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

CMakeLists.txt

@@ -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)
@@ -89,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
@@ -194,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")
@@ -341,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)
@@ -587,7 +584,6 @@ include_directories(${PROJECT_SOURCE_DIR}/include)
 if(USE_FOLLY)
   include_directories(${PROJECT_SOURCE_DIR}/third-party/folly)
   add_definitions(-DUSE_FOLLY -DFOLLY_NO_CONFIG)
-  list(APPEND THIRDPARTY_LIBS glog)
 endif()
 find_package(Threads REQUIRED)
 
@@ -598,10 +594,8 @@ 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
@@ -616,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
@@ -628,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
@@ -671,7 +660,6 @@ set(SOURCES
         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
@@ -683,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
@@ -747,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
@@ -809,8 +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
         util/comparator.cc
@@ -984,13 +969,9 @@ endif()
 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)
+    third-party/folly/folly/ScopeGuard.cpp)
 endif()
 
 set(ROCKSDB_STATIC_LIB rocksdb${ARTIFACT_SUFFIX})
@@ -1010,7 +991,7 @@ 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}/")
+  set(PLUGIN_ROOT "${CMAKE_SOURCE_DIR}/plugin/${PLUGIN}/")
   message("including rocksb plugin ${PLUGIN_ROOT}")
   set(PLUGINMKFILE "${PLUGIN_ROOT}${PLUGIN}.mk")
   if (NOT EXISTS ${PLUGINMKFILE})
@@ -1138,20 +1119,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(
@@ -1188,13 +1157,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)
@@ -1225,7 +1187,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
@@ -1238,11 +1199,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
@@ -1299,7 +1258,6 @@ if(WITH_TESTS)
         db/perf_context_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
@@ -1310,8 +1268,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
@@ -1337,6 +1293,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
@@ -1405,7 +1362,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
@@ -1414,7 +1370,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
@@ -1510,20 +1465,6 @@ if(WITH_BENCHMARK_TOOLS)
     ${ROCKSDB_LIB} ${GFLAGS_LIB})
 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})
-
-  add_executable(trace_analyzer${ARTIFACT_SUFFIX}
-    tools/trace_analyzer.cc)
-  target_link_libraries(trace_analyzer${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB})
-
-endif()
-
 if(WITH_CORE_TOOLS OR WITH_TOOLS)
   add_subdirectory(tools)
   add_custom_target(core_tools

HISTORY.md

@@ -1,192 +1,12 @@
 # Rocksdb Change Log
-## 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.
-
+## 7.2.2 (04/28/2022)
 ### 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)
-### 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.
 
+## 7.2.1 (04/26/2022)
 ### Bug Fixes
+* 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.
 * 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.
-* Fixed unnecessary block cache contention when queries within a MultiGet batch and across parallel batches access the same data block, which previously could cause severely degraded performance in this unusual case. (In more typical MultiGet cases, this fix is expected to yield a small or negligible performance improvement.)
-
-### 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

Makefile

@@ -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,14 +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
-	OPT += -DUSE_COROUTINES
-	ROCKSDB_CXX_STANDARD = c++2a
-	USE_RTTI = 1
-endif
-
 # if we're compiling for release, compile without debug code (-DNDEBUG)
 ifeq ($(DEBUG_LEVEL),0)
 OPT += -DNDEBUG
@@ -234,7 +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)"; \
                   "$(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
@@ -349,8 +340,6 @@ endif
 # ASAN doesn't work well with jemalloc. If we're compiling with ASAN, we should use regular malloc.
 ifdef COMPILE_WITH_ASAN
 	DISABLE_JEMALLOC=1
-	ASAN_OPTIONS?=detect_stack_use_after_return=1
-	export ASAN_OPTIONS
 	EXEC_LDFLAGS += -fsanitize=address
 	PLATFORM_CCFLAGS += -fsanitize=address
 	PLATFORM_CXXFLAGS += -fsanitize=address
@@ -462,8 +451,6 @@ ifeq ($(USE_FOLLY),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
@@ -609,6 +596,9 @@ am__v_CCH_1 =
 check-headers: $(HEADER_OK_FILES)
 
 # options_settable_test doesn't pass with UBSAN as we use hack in the test
+ifdef COMPILE_WITH_UBSAN
+TESTS := $(shell echo $(TESTS) | sed 's/\boptions_settable_test\b//g')
+endif
 ifdef ASSERT_STATUS_CHECKED
 # TODO: finish fixing all tests to pass this check
 TESTS_FAILING_ASC = \
@@ -643,6 +633,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 \
@@ -664,6 +655,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)
@@ -804,10 +796,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)
 
@@ -844,6 +843,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
@@ -883,7 +894,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; \
@@ -943,6 +954,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' '';		\
@@ -953,8 +965,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=$$?; \
@@ -965,6 +976,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' '';		\
@@ -976,11 +988,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.
@@ -1003,12 +1014,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)),)
@@ -1035,31 +1046,31 @@ ldb_tests: ldb
 include crash_test.mk
 
 asan_check: clean
-	COMPILE_WITH_ASAN=1 $(MAKE) check -j32
+	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) check -j32
 	$(MAKE) clean
 
 asan_crash_test: clean
-	COMPILE_WITH_ASAN=1 $(MAKE) crash_test
+	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) crash_test
 	$(MAKE) clean
 
 whitebox_asan_crash_test: clean
-	COMPILE_WITH_ASAN=1 $(MAKE) whitebox_crash_test
+	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) whitebox_crash_test
 	$(MAKE) clean
 
 blackbox_asan_crash_test: clean
-	COMPILE_WITH_ASAN=1 $(MAKE) blackbox_crash_test
+	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) blackbox_crash_test
 	$(MAKE) clean
 
 asan_crash_test_with_atomic_flush: clean
-	COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_atomic_flush
+	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_atomic_flush
 	$(MAKE) clean
 
 asan_crash_test_with_txn: clean
-	COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_txn
+	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_txn
 	$(MAKE) clean
 
 asan_crash_test_with_best_efforts_recovery: clean
-	COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_best_efforts_recovery
+	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_best_efforts_recovery
 	$(MAKE) clean
 
 ubsan_check: clean
@@ -1105,11 +1116,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; \
@@ -1129,6 +1140,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								\
@@ -1136,6 +1168,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
 
@@ -1381,12 +1431,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)
 
@@ -1504,9 +1548,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)
 
@@ -1603,6 +1644,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)
 
@@ -1783,12 +1827,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)
 
@@ -1873,9 +1911,6 @@ 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)
 
@@ -1891,7 +1926,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)
@@ -1917,10 +1952,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
@@ -2083,7 +2114,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
@@ -2216,7 +2246,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) \
@@ -2330,7 +2360,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
@@ -2342,13 +2372,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;
@@ -2363,52 +2394,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 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 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

PLUGINS.md

@@ -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.

README.md

@@ -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)
 

TARGETS

@@ -13,10 +13,8 @@ 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",
@@ -31,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",
@@ -39,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",
@@ -86,7 +79,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
         "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",
@@ -98,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",
@@ -173,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",
@@ -232,9 +223,7 @@ 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",
         "util/compaction_job_stats_impl.cc",
         "util/comparator.cc",
@@ -336,24 +325,15 @@ 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",
@@ -368,7 +348,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",
@@ -376,15 +355,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",
@@ -423,7 +398,6 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
         "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",
@@ -435,8 +409,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",
@@ -510,6 +482,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",
@@ -569,9 +542,7 @@ 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",
         "util/compaction_job_stats_impl.cc",
         "util/comparator.cc",
@@ -673,18 +644,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",
@@ -4816,8 +4779,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=[])
 
@@ -5194,12 +5157,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"],
@@ -5254,12 +5211,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"],
@@ -5694,12 +5645,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"],
@@ -5784,12 +5729,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"],
@@ -5802,12 +5741,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"],
@@ -5856,12 +5789,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"],

buckifier/buckify_rocksdb.py

@@ -145,13 +145,7 @@ def generate_targets(repo_path, deps_map):
         # 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"])
+        deps=["//folly/container:f14_hash"])
     # rocksdb_whole_archive_lib
     TARGETS.add_library(
         "rocksdb_whole_archive_lib",
@@ -159,13 +153,7 @@ def generate_targets(repo_path, deps_map):
         # 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"],
+        deps=["//folly/container:f14_hash"],
         headers=None,
         extra_external_deps="",
         link_whole=True)

build_tools/benchmark_log_tool.py

@@ -1,187 +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 os
-import re
-import sys
-import requests
-from dateutil import parser
-import logging
-
-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 not 'test' in row:
-            logging.debug(f"not 'test' in row: {row}")
-            return False
-        if row['test'] == '':
-            logging.debug(f"row['test'] == '': {row}")
-            return False
-        if not 'date' in row:
-            logging.debug(f"not 'date' in row: {row}")
-            return False
-        if not 'ops_sec' in row:
-            logging.debug(f"not 'ops_sec' in row: {row}")
-            return False
-        try:
-            v = 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 dict((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, l_in: str):
-        '''Parse a line into items
-        Being clever about separators
-        '''
-        l = l_in
-        row = []
-        while l != '':
-            match_item = self.field.match(l)
-            if match_item:
-                item = match_item.group(0)
-                row.append(item)
-                l = l[len(item):]
-            else:
-                match_intra = self.intra.match(l)
-                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 i in range(sep_count-1):
-                        row.append('')
-                    l = l[len(intra):]
-                else:
-                    raise BenchmarkResultException(
-                        'Invalid TSV line', f"{l_in} at {l}")
-        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())

build_tools/build_detect_platform

@@ -469,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);
@@ -800,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() {}

build_tools/check-sources.sh

@@ -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

build_tools/dependencies_platform009.sh

@@ -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
@@ -20,7 +20,3 @@ VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/6ae525939ad02e5e676855082fbbc7828d
 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
 BOOST_BASE=/mnt/gvfs/third-party2/boost/201b7d74941e54b436dfa364a063aa6d2cd7de4c/1.69.0/platform009/8a7ffdf
-GLOG_BASE=/mnt/gvfs/third-party2/glog/32d751bd5673375b438158717ab6a57c1cc57e3d/0.3.2_fb/platform009/10a364d/
-FMT_BASE=/mnt/gvfs/third-party2/fmt/ce0c25f67165f4d2c22a29b8ef50f5600d7873ca/6.1.1/platform009/7f3b187/
-DBL_CONV_BASE=/mnt/gvfs/third-party2/double_conversion/109b3d9696d71f1048678cd7da1e22505470543d/20141126/platform009/7f3b187/
-LIBEVENT_BASE=/mnt/gvfs/third-party2/libevent/4a4d3a79a76c2439b6bd471bf3586b3481dde75e/1.4.14b_hphp/platform009/7f3b187/

build_tools/fbcode_config.sh

@@ -21,48 +21,38 @@ LIBGCC_LIBS=" -L $LIBGCC_BASE/lib"
 GLIBC_INCLUDE="$GLIBC_BASE/include"
 GLIBC_LIBS=" -L $GLIBC_BASE/lib"
 
-if ! test $ROCKSDB_DISABLE_SNAPPY; then
-  # snappy
-  SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include/"
-  if test -z $PIC_BUILD; then
-    SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy.a"
-  else
-    SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy_pic.a"
-  fi
-  CFLAGS+=" -DSNAPPY"
+# snappy
+SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include/"
+if test -z $PIC_BUILD; then
+  SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy.a"
+else
+  SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy_pic.a"
 fi
+CFLAGS+=" -DSNAPPY"
 
 if test -z $PIC_BUILD; then
-  if ! test $ROCKSDB_DISABLE_ZLIB; then
-    # location of zlib headers and libraries
-    ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
-    ZLIB_LIBS=" $ZLIB_BASE/lib/libz.a"
-    CFLAGS+=" -DZLIB"
-  fi
+  # location of zlib headers and libraries
+  ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
+  ZLIB_LIBS=" $ZLIB_BASE/lib/libz.a"
+  CFLAGS+=" -DZLIB"
 
-  if ! test $ROCKSDB_DISABLE_BZIP; then
-    # location of bzip headers and libraries
-    BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
-    BZIP_LIBS=" $BZIP2_BASE/lib/libbz2.a"
-    CFLAGS+=" -DBZIP2"
-  fi
+  # location of bzip headers and libraries
+  BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
+  BZIP_LIBS=" $BZIP2_BASE/lib/libbz2.a"
+  CFLAGS+=" -DBZIP2"
 
-  if ! test $ROCKSDB_DISABLE_LZ4; then
-    LZ4_INCLUDE=" -I $LZ4_BASE/include/"
-    LZ4_LIBS=" $LZ4_BASE/lib/liblz4.a"
-    CFLAGS+=" -DLZ4"
-  fi
+  LZ4_INCLUDE=" -I $LZ4_BASE/include/"
+  LZ4_LIBS=" $LZ4_BASE/lib/liblz4.a"
+  CFLAGS+=" -DLZ4"
 fi
 
-if ! test $ROCKSDB_DISABLE_ZSTD; then
-  ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
-  if test -z $PIC_BUILD; then
-    ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd.a"
-  else
-    ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd_pic.a"
-  fi
-  CFLAGS+=" -DZSTD -DZSTD_STATIC_LINKING_ONLY"
+ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
+if test -z $PIC_BUILD; then
+  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd.a"
+else
+  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd_pic.a"
 fi
+CFLAGS+=" -DZSTD -DZSTD_STATIC_LINKING_ONLY"
 
 # location of gflags headers and libraries
 GFLAGS_INCLUDE=" -I $GFLAGS_BASE/include/"
@@ -147,7 +137,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"

build_tools/fbcode_config_platform009.sh

@@ -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
@@ -27,38 +27,28 @@ else
   MAYBE_PIC=_pic
 fi
 
-if ! test $ROCKSDB_DISABLE_SNAPPY; then
-  # snappy
-  SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include/"
-  SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy${MAYBE_PIC}.a"
-  CFLAGS+=" -DSNAPPY"
-fi
+# snappy
+SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include/"
+SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy${MAYBE_PIC}.a"
+CFLAGS+=" -DSNAPPY"
 
-if ! test $ROCKSDB_DISABLE_ZLIB; then
-  # location of zlib headers and libraries
-  ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
-  ZLIB_LIBS=" $ZLIB_BASE/lib/libz${MAYBE_PIC}.a"
-  CFLAGS+=" -DZLIB"
-fi
+# location of zlib headers and libraries
+ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
+ZLIB_LIBS=" $ZLIB_BASE/lib/libz${MAYBE_PIC}.a"
+CFLAGS+=" -DZLIB"
 
-if ! test $ROCKSDB_DISABLE_BZIP; then
-  # location of bzip headers and libraries
-  BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
-  BZIP_LIBS=" $BZIP2_BASE/lib/libbz2${MAYBE_PIC}.a"
-  CFLAGS+=" -DBZIP2"
-fi
+# location of bzip headers and libraries
+BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
+BZIP_LIBS=" $BZIP2_BASE/lib/libbz2${MAYBE_PIC}.a"
+CFLAGS+=" -DBZIP2"
 
-if ! test $ROCKSDB_DISABLE_LZ4; then
-  LZ4_INCLUDE=" -I $LZ4_BASE/include/"
-  LZ4_LIBS=" $LZ4_BASE/lib/liblz4${MAYBE_PIC}.a"
-  CFLAGS+=" -DLZ4"
-fi
+LZ4_INCLUDE=" -I $LZ4_BASE/include/"
+LZ4_LIBS=" $LZ4_BASE/lib/liblz4${MAYBE_PIC}.a"
+CFLAGS+=" -DLZ4"
 
-if ! test $ROCKSDB_DISABLE_ZSTD; then
-  ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
-  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd${MAYBE_PIC}.a"
-  CFLAGS+=" -DZSTD"
-fi
+ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
+ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd${MAYBE_PIC}.a"
+CFLAGS+=" -DZSTD"
 
 # location of gflags headers and libraries
 GFLAGS_INCLUDE=" -I $GFLAGS_BASE/include/"
@@ -70,18 +60,6 @@ BENCHMARK_LIBS=" $BENCHMARK_BASE/lib/libbenchmark${MAYBE_PIC}.a"
 
 BOOST_INCLUDE=" -I $BOOST_BASE/include/"
 
-GLOG_INCLUDE=" -I $GLOG_BASE/include/"
-GLOG_LIBS=" $GLOG_BASE/lib/libglog${MAYBE_PIC}.a"
-
-FMT_INCLUDE=" -I $FMT_BASE/include/"
-FMT_LIBS=" $FMT_BASE/lib/libfmt${MAYBE_PIC}.a"
-
-DBL_CONV_INCLUDE=" -I $DBL_CONV_BASE/include/"
-DBL_CONV_LIBS=" $DBL_CONV_BASE/lib/libdouble-conversion${MAYBE_PIC}.a"
-
-LIBEVENT_INCLUDE=" -I $LIBEVENT_BASE/include/"
-LIBEVENT_LIBS=" $LIBEVENT_BASE/lib/libevent${MAYBE_PIC}.a"
-
 # location of jemalloc
 JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/"
 JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc${MAYBE_PIC}.a"
@@ -113,7 +91,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 $BOOST_INCLUDE $GLOG_INCLUDE $FMT_INCLUDE $DBL_CONV_INCLUDE $LIBEVENT_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"
 
@@ -156,7 +134,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"

build_tools/fbcode_config_platform010.sh

@@ -29,38 +29,28 @@ else
   MAYBE_PIC=_pic
 fi
 
-if ! test $ROCKSDB_DISABLE_SNAPPY; then
-  # snappy
-  SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include/"
-  SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy${MAYBE_PIC}.a"
-  CFLAGS+=" -DSNAPPY"
-fi
+# snappy
+SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include/"
+SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy${MAYBE_PIC}.a"
+CFLAGS+=" -DSNAPPY"
 
-if ! test $ROCKSDB_DISABLE_ZLIB; then
-  # location of zlib headers and libraries
-  ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
-  ZLIB_LIBS=" $ZLIB_BASE/lib/libz${MAYBE_PIC}.a"
-  CFLAGS+=" -DZLIB"
-fi
+# location of zlib headers and libraries
+ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
+ZLIB_LIBS=" $ZLIB_BASE/lib/libz${MAYBE_PIC}.a"
+CFLAGS+=" -DZLIB"
 
-if ! test $ROCKSDB_DISABLE_BZIP; then
-  # location of bzip headers and libraries
-  BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
-  BZIP_LIBS=" $BZIP2_BASE/lib/libbz2${MAYBE_PIC}.a"
-  CFLAGS+=" -DBZIP2"
-fi
+# location of bzip headers and libraries
+BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
+BZIP_LIBS=" $BZIP2_BASE/lib/libbz2${MAYBE_PIC}.a"
+CFLAGS+=" -DBZIP2"
 
-if ! test $ROCKSDB_DISABLE_LZ4; then
-  LZ4_INCLUDE=" -I $LZ4_BASE/include/"
-  LZ4_LIBS=" $LZ4_BASE/lib/liblz4${MAYBE_PIC}.a"
-  CFLAGS+=" -DLZ4"
-fi
+LZ4_INCLUDE=" -I $LZ4_BASE/include/"
+LZ4_LIBS=" $LZ4_BASE/lib/liblz4${MAYBE_PIC}.a"
+CFLAGS+=" -DLZ4"
 
-if ! test $ROCKSDB_DISABLE_ZSTD; then
-  ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
-  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd${MAYBE_PIC}.a"
-  CFLAGS+=" -DZSTD"
-fi
+ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
+ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd${MAYBE_PIC}.a"
+CFLAGS+=" -DZSTD"
 
 # location of gflags headers and libraries
 GFLAGS_INCLUDE=" -I $GFLAGS_BASE/include/"
@@ -118,19 +108,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 +135,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"

build_tools/format-diff.sh

@@ -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.

build_tools/ubuntu20_image/Dockerfile

@@ -1,56 +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
-# 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

cache/cache.cc

@@ -33,66 +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}},
 };
 #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,

cache/cache_bench_tool.cc

@@ -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,8 +12,6 @@
 #include <set>
 #include <sstream>
 
-#include "cache/clock_cache.h"
-#include "cache/fast_lru_cache.h"
 #include "db/db_impl/db_impl.h"
 #include "monitoring/histogram.h"
 #include "port/port.h"
@@ -28,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"
@@ -74,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.
@@ -114,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)");
@@ -223,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);
   }
 };
 
@@ -291,22 +279,14 @@ class CacheBench {
       if (max_key > (static_cast<uint64_t>(1) << max_log_)) max_log_++;
     }
 
-    if (FLAGS_cache_type == "clock_cache") {
-      cache_ = ExperimentalNewClockCache(
-          FLAGS_cache_size, FLAGS_value_bytes, FLAGS_num_shard_bits,
-          false /*strict_capacity_limit*/, kDefaultCacheMetadataChargePolicy);
+    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 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 */);
+    } 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(
@@ -323,9 +303,6 @@ class CacheBench {
 #endif  // ROCKSDB_LITE
 
       cache_ = NewLRUCache(opts);
-    } else {
-      fprintf(stderr, "Cache type not supported.");
-      exit(1);
     }
   }
 
@@ -335,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);
     }
   }
 
@@ -531,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,
@@ -542,8 +519,6 @@ class CacheBench {
         return Status::OK();
       };
 
-      timer.Start();
-
       if (random_op < lookup_insert_threshold_) {
         if (handle) {
           cache_->Release(handle);
@@ -553,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) {
@@ -570,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);
@@ -582,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
@@ -610,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",
@@ -784,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]{});
@@ -801,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;
@@ -820,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;
@@ -835,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.
@@ -845,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) {
@@ -871,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;
@@ -889,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);
       }
@@ -901,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
@@ -936,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;

cache/cache_entry_roles.cc

@@ -22,8 +22,6 @@ std::array<std::string, kNumCacheEntryRoles> kCacheEntryRoleToCamelString{{
     "CompressionDictionaryBuildingBuffer",
     "FilterConstruction",
     "BlockBasedTableReader",
-    "FileMetadata",
-    "BlobCache",
     "Misc",
 }};
 
@@ -38,8 +36,6 @@ std::array<std::string, kNumCacheEntryRoles> kCacheEntryRoleToHyphenString{{
     "compression-dictionary-building-buffer",
     "filter-construction",
     "block-based-table-reader",
-    "file-metadata",
-    "blob-cache",
     "misc",
 }};
 

cache/cache_helpers.h

@@ -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;

cache/cache_key.cc

@@ -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

cache/cache_key.h

@@ -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

cache/cache_reservation_manager.cc

@@ -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

cache/cache_reservation_manager.h

@@ -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)

cache/cache_reservation_manager_test.cc

@@ -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(),

cache/cache_test.cc

@@ -14,84 +14,45 @@
 #include <iostream>
 #include <string>
 #include <vector>
-
 #include "cache/clock_cache.h"
-#include "cache/fast_lru_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 ClockCache 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*/) {}
-
-void EraseDeleter1(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 kClock = "clock";
-const std::string kFast = "fast";
 
-}  // anonymous namespace
+void dumbDeleter(const Slice& /*key*/, void* /*value*/) {}
+
+void eraseDeleter(const Slice& /*key*/, void* value) {
+  Cache* cache = reinterpret_cast<Cache*>(value);
+  cache->Erase("foo");
+}
 
 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_ == kClock) {
-      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));
   }
 
@@ -110,7 +71,6 @@ class CacheTest : public testing::TestWithParam<std::string> {
       : cache_(NewCache(kCacheSize, kNumShardBits, false)),
         cache2_(NewCache(kCacheSize2, kNumShardBits2, false)) {
     current_ = this;
-    type_ = GetParam();
   }
 
   ~CacheTest() override {}
@@ -121,14 +81,7 @@ class CacheTest : public testing::TestWithParam<std::string> {
       return NewLRUCache(capacity);
     }
     if (type == kClock) {
-      return ExperimentalNewClockCache(
-          capacity, 1 /*estimated_value_size*/, -1 /*num_shard_bits*/,
-          false /*strict_capacity_limit*/, kDefaultCacheMetadataChargePolicy);
-    }
-    if (type == kFast) {
-      return NewFastLRUCache(
-          capacity, 1 /*estimated_value_size*/, -1 /*num_shard_bits*/,
-          false /*strict_capacity_limit*/, kDefaultCacheMetadataChargePolicy);
+      return NewClockCache(capacity);
     }
     return nullptr;
   }
@@ -147,41 +100,12 @@ class CacheTest : public testing::TestWithParam<std::string> {
       return NewLRUCache(co);
     }
     if (type == kClock) {
-      return ExperimentalNewClockCache(capacity, 1 /*estimated_value_size*/,
-                                       num_shard_bits, strict_capacity_limit,
-                                       charge_policy);
-    }
-    if (type == kFast) {
-      return NewFastLRUCache(capacity, 1 /*estimated_value_size*/,
-                             num_shard_bits, strict_capacity_limit,
-                             charge_policy);
+      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, FastLRUCache requires keys to be 16B long, whereas
-  // LRUCache and ClockCache don't, so the encoding depends on
-  // the cache type.
-  std::string EncodeKey(int k) {
-    auto type = GetParam();
-    if (type == kFast || type == kClock) {
-      return EncodeKey16Bytes(k);
-    } else {
-      return EncodeKey32Bits(k);
-    }
-  }
-
-  int DecodeKey(const Slice& k) {
-    auto type = GetParam();
-    if (type == kFast || type == kClock) {
-      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));
@@ -225,17 +149,13 @@ 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());
@@ -245,17 +165,12 @@ TEST_P(CacheTest, UsageTest) {
   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());
     ASSERT_LT(usage, precise_cache->GetUsage());
@@ -267,17 +182,12 @@ TEST_P(CacheTest, UsageTest) {
   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
@@ -287,18 +197,9 @@ TEST_P(CacheTest, UsageTest) {
   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);
 
@@ -311,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;
@@ -358,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());
@@ -476,7 +367,7 @@ TEST_P(CacheTest, EvictionPolicy) {
   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));
   }
@@ -528,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);
   }
 
@@ -559,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) {
@@ -626,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++;
   }
@@ -639,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);
@@ -651,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 {
@@ -696,13 +567,6 @@ TEST_P(CacheTest, ReleaseWithoutErase) {
 }
 
 TEST_P(CacheTest, SetCapacity) {
-  auto type = GetParam();
-  if (type == kFast || type == kClock) {
-    ROCKSDB_GTEST_BYPASS(
-        "FastLRUCache and ClockCache don't support arbitrary capacity "
-        "adjustments.");
-    return;
-  }
   // test1: increase capacity
   // lets create a cache with capacity 5,
   // then, insert 5 elements, then increase capacity
@@ -710,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());
   }
@@ -725,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());
@@ -742,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]);
   }
 
@@ -751,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]);
@@ -773,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);
@@ -804,17 +660,12 @@ 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]);
   }
 }
 
 TEST_P(CacheTest, OverCapacity) {
-  auto type = GetParam();
-  if (type == kClock) {
-    ROCKSDB_GTEST_BYPASS("Requires LRU eviction policy.");
-    return;
-  }
   size_t n = 10;
 
   // a LRUCache with n entries and one shard only
@@ -823,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);
@@ -839,7 +690,7 @@ 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.
@@ -851,14 +702,14 @@ TEST_P(CacheTest, OverCapacity) {
   // 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);
+  for (size_t i = 0; i < n + 1; i++) {
+    std::string key = ToString(i+1);
     auto h = cache->Lookup(key);
     if (h) {
-      ASSERT_NE(static_cast<size_t>(i), 0U);
+      ASSERT_NE(i, 0U);
       cache->Release(h);
     } else {
-      ASSERT_EQ(static_cast<size_t>(i), 0U);
+      ASSERT_EQ(i, 0U);
     }
   }
 }
@@ -884,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]);
   }
 }
@@ -893,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);
   };
 
@@ -904,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]);
   }
 }
@@ -927,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
@@ -951,17 +800,12 @@ 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);
 }
 
@@ -990,18 +834,19 @@ TEST_P(CacheTest, GetChargeAndDeleter) {
   cache_->Release(h1);
 }
 
-std::shared_ptr<Cache> (*new_clock_cache_func)(size_t, size_t, int, bool,
-                                               CacheMetadataChargePolicy) =
-    ExperimentalNewClockCache;
+#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, kClock, 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();
 }

cache/charged_cache.cc

@@ -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

cache/charged_cache.h

@@ -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

cache/clock_cache.h

@@ -9,829 +9,8 @@
 
 #pragma once
 
-#include <sys/types.h>
-
-#include <array>
-#include <atomic>
-#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 clock_cache {
-
-// Forward declaration of friend class.
-class ClockCacheTest;
-
-// An experimental alternative to LRUCache, using a lock-free, open-addressed
-// hash table and clock eviction.
-
-// ----------------------------------------------------------------------------
-// 1. INTRODUCTION
-//
-// In RocksDB, a Cache is a concurrent unordered dictionary that supports
-// external references (a.k.a. user references). A ClockCache is a type of Cache
-// that uses the clock algorithm as its eviction policy. Internally, a
-// ClockCache is an open-addressed hash table that stores all KV pairs in a
-// large array. Every slot in the hash table is a ClockHandle, which holds a KV
-// pair plus some additional metadata that controls the different aspects of the
-// cache: external references, the hashing mechanism, concurrent access and the
-// clock algorithm.
-//
-//
-// 2. EXTERNAL REFERENCES
-//
-// An externally referenced handle can't be deleted (either evicted by the clock
-// algorithm, or explicitly deleted) or replaced by a new version (via an insert
-// of the same key) until all external references to it have been released by
-// the users. ClockHandles have two members to support external references:
-// - EXTERNAL_REFS counter: The number of external refs. When EXTERNAL_REFS > 0,
-//    the handle is externally referenced. Updates that intend to modify the
-//    handle will refrain from doing so. Eventually, when all references are
-//    released, we have EXTERNAL_REFS == 0, and updates can operate normally on
-//    the handle.
-// - WILL_BE_DELETED flag: An handle is marked for deletion when an operation
-//    decides the handle should be deleted. This happens either when the last
-//    reference to a handle is released (and the release operation is instructed
-//    to delete on last reference) or on when a delete operation is called on
-//    the item. This flag is needed because an externally referenced handle
-//    can't be immediately deleted. In these cases, the flag will be later read
-//    and acted upon by the eviction algorithm. Importantly, WILL_BE_DELETED is
-//    used not only to defer deletions, but also as a barrier for external
-//    references: once WILL_BE_DELETED is set, lookups (which are the most
-//    common way to acquire new external references) will ignore the handle.
-//    For this reason, when WILL_BE_DELETED is set, we say the handle is
-//    invisible (and, otherwise, that it's visible).
-//
-//
-// 3. HASHING AND COLLISION RESOLUTION
-//
-// ClockCache uses an open-addressed hash table to store the handles.
-// We use a variant of tombstones to manage collisions: every slot keeps a
-// count of how many KV pairs that are currently in the cache have probed the
-// slot in an attempt to insert. Probes are generated with double-hashing
-// (although the code can be easily modified to use other probing schemes, like
-// linear probing).
-//
-// A slot in the hash table can be in a few different states:
-// - Element: The slot contains an element. This is indicated with the
-//    IS_ELEMENT flag. Element can be sub-classified depending on the
-//    value of WILL_BE_DELETED:
-//    * Visible element.
-//    * Invisible element.
-// - Tombstone: The slot doesn't contain an element, but there is some other
-//    element that probed this slot during its insertion.
-// - Empty: The slot is unused---it's neither an element nor a tombstone.
-//
-// A slot cycles through the following sequence of states:
-// empty or tombstone --> visible element --> invisible element -->
-// empty or tombstone. Initially a slot is available---it's either
-// empty or a tombstone. As soon as a KV pair is written into the slot, it
-// becomes a visible element. At some point, the handle will be deleted
-// by an explicit delete operation, the eviction algorithm, or an overwriting
-// insert. In either case, the handle is marked for deletion. When the an
-// attempt to delete the element finally succeeds, the slot is freed up
-// and becomes available again.
-//
-//
-// 4. CONCURRENCY
-//
-// ClockCache is lock-free. At a high level, we synchronize the operations
-// using a read-prioritized, non-blocking variant of RW locks on every slot of
-// the hash table. To do this we generalize the concept of reference:
-// - Internal reference: Taken by a thread that is attempting to read a slot
-//    or do a very precise type of update.
-// - Exclusive reference: Taken by a thread that is attempting to write a
-//    a slot extensively.
-//
-// We defer the precise definitions to the comments in the code below.
-// A crucial feature of our references is that attempting to take one never
-// blocks the thread. Another important feature is that readers are
-// prioritized, as they use extremely fast synchronization primitives---they
-// use atomic arithmetic/bit operations, but no compare-and-swaps (which are
-// much slower).
-//
-// Internal references are used by threads to read slots during a probing
-// sequence, making them the most common references (probing is performed
-// in almost every operation, not just lookups). During a lookup, once
-// the target element is found, and just before the handle is handed over
-// to the user, an internal reference is converted into an external reference.
-// During an update operation, once the target slot is found, an internal
-// reference is converted into an exclusive reference. Interestingly, we
-// can't atomically upgrade from internal to exclusive, or we may run into a
-// deadlock. Releasing the internal reference and then taking an exclusive
-// reference avoids the deadlock, but then the handle may change inbetween.
-// One of the key observations we use in our implementation is that we can
-// make up for this lack of atomicity using IS_ELEMENT and WILL_BE_DELETED.
-//
-// Distinguishing internal from external references is useful for two reasons:
-// - Internal references are short lived, but external references are typically
-//    not. This is helpful when acquiring an exclusive ref: if there are any
-//    external references to the item, it's probably not worth waiting until
-//    they go away.
-// - We can precisely determine when there are no more external references to a
-//    handle, and proceed to mark it for deletion. This is useful when users
-//    release external references.
-//
-//
-// 5. CLOCK ALGORITHM
-//
-// The clock algorithm circularly sweeps through the hash table to find the next
-// victim. Recall that handles that are referenced are not evictable; the clock
-// algorithm never picks those. We use different clock priorities: NONE, LOW,
-// MEDIUM and HIGH. Priorities LOW, MEDIUM and HIGH represent how close an
-// element is from being evicted, LOW being the closest to evicted. NONE means
-// the slot is not evictable. NONE priority is used in one of the following
-// cases:
-// (a) the slot doesn't contain an element, or
-// (b) the slot contains an externally referenced element, or
-// (c) the slot contains an element that used to be externally referenced,
-//      and the clock pointer has not swept through the slot since the element
-//      stopped being externally referenced.
-// ----------------------------------------------------------------------------
-
-// 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 a performance drop, we set a strict upper bound on the load factor.
-constexpr double kStrictLoadFactor = 0.7;
-
-// Maximum number of spins when trying to acquire a ref.
-// TODO(Guido) This value was set arbitrarily. Is it appropriate?
-// What's the best way to bound the spinning?
-constexpr uint32_t kSpinsPerTry = 100000;
-
-// Arbitrary seeds.
-constexpr uint32_t kProbingSeed1 = 0xbc9f1d34;
-constexpr uint32_t kProbingSeed2 = 0x7a2bb9d5;
-
-struct ClockHandle {
-  void* value;
-  Cache::DeleterFn deleter;
-  uint32_t hash;
-  size_t total_charge;
-  std::array<char, kCacheKeySize> key_data;
-
-  static constexpr uint8_t kIsElementOffset = 0;
-  static constexpr uint8_t kClockPriorityOffset = 1;
-  static constexpr uint8_t kIsHitOffset = 3;
-  static constexpr uint8_t kCachePriorityOffset = 4;
-
-  enum Flags : uint8_t {
-    // Whether the slot is in use by an element.
-    IS_ELEMENT = 1 << kIsElementOffset,
-    // Clock priorities. Represents how close a handle is from being evictable.
-    CLOCK_PRIORITY = 3 << kClockPriorityOffset,
-    // Whether the handle has been looked up after its insertion.
-    HAS_HIT = 1 << kIsHitOffset,
-    // The value of Cache::Priority of the handle.
-    CACHE_PRIORITY = 1 << kCachePriorityOffset,
-  };
-
-  std::atomic<uint8_t> flags;
-
-  enum ClockPriority : uint8_t {
-    NONE = (0 << kClockPriorityOffset),
-    LOW = (1 << kClockPriorityOffset),
-    MEDIUM = (2 << kClockPriorityOffset),
-    HIGH = (3 << kClockPriorityOffset)
-  };
-
-  // 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;
-
-  static constexpr uint8_t kExternalRefsOffset = 0;
-  static constexpr uint8_t kSharedRefsOffset = 15;
-  static constexpr uint8_t kExclusiveRefOffset = 30;
-  static constexpr uint8_t kWillBeDeletedOffset = 31;
-
-  enum Refs : uint32_t {
-    // Synchronization model:
-    // - An external reference guarantees that hash, value, key_data
-    //    and the IS_ELEMENT flag are not modified. Doesn't allow
-    //    any writes.
-    // - An internal reference has the same guarantees as an
-    //    external reference, and additionally allows the following
-    //    idempotent updates on the handle:
-    //      * set CLOCK_PRIORITY to NONE;
-    //      * set the HAS_HIT bit;
-    //      * set the WILL_BE_DELETED bit.
-    // - A shared reference is either an external reference or an
-    //    internal reference.
-    // - An exclusive reference guarantees that no other thread has a shared
-    //    or exclusive reference to the handle, and allows writes
-    //    on the handle.
-
-    // Number of external references to the slot.
-    EXTERNAL_REFS = ((uint32_t{1} << 15) - 1)
-                    << kExternalRefsOffset,  // Bits 0, ..., 14
-    // Number of internal references plus external references to the slot.
-    SHARED_REFS = ((uint32_t{1} << 15) - 1)
-                  << kSharedRefsOffset,  // Bits 15, ..., 29
-    // Whether a thread has an exclusive reference to the slot.
-    EXCLUSIVE_REF = uint32_t{1} << kExclusiveRefOffset,  // Bit 30
-    // Whether the handle will be deleted soon. When this bit is set, new
-    // internal references to this handle stop being accepted.
-    // External references may still be granted---they can be created from
-    // existing external references, or converting from existing internal
-    // references.
-    WILL_BE_DELETED = uint32_t{1} << kWillBeDeletedOffset  // Bit 31
-
-    // Having these 4 fields in a single variable allows us to support the
-    // following operations efficiently:
-    // - Convert an internal reference into an external reference in a single
-    //    atomic arithmetic operation.
-    // - Attempt to take a shared reference using a single atomic arithmetic
-    //    operation. This is because we can increment the internal ref count
-    //    as well as checking whether the entry is marked for deletion using a
-    //    single atomic arithmetic operation (and one non-atomic comparison).
-  };
-
-  static constexpr uint32_t kOneInternalRef = 0x8000;
-  static constexpr uint32_t kOneExternalRef = 0x8001;
-
-  std::atomic<uint32_t> refs;
-
-  // True iff the handle is allocated separately from hash table.
-  bool detached;
-
-  ClockHandle()
-      : value(nullptr),
-        deleter(nullptr),
-        hash(0),
-        total_charge(0),
-        flags(0),
-        displacements(0),
-        refs(0),
-        detached(false) {
-    SetWillBeDeleted(false);
-    SetIsElement(false);
-    SetClockPriority(ClockPriority::NONE);
-    SetCachePriority(Cache::Priority::LOW);
-    key_data.fill(0);
-  }
-
-  // The copy ctor and assignment operator are only used to copy a handle
-  // for immediate deletion. (We need to copy because the slot may become
-  // re-used before the deletion is completed.) We only copy the necessary
-  // members to carry out the deletion. In particular, we don't need
-  // the atomic members.
-  ClockHandle(const ClockHandle& other) { *this = other; }
-
-  void operator=(const ClockHandle& other) {
-    value = other.value;
-    deleter = other.deleter;
-    key_data = other.key_data;
-    hash = other.hash;
-    total_charge = other.total_charge;
-  }
-
-  Slice key() const { return Slice(key_data.data(), kCacheKeySize); }
-
-  void FreeData() {
-    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(ClockHandle);
-      // #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;
-  }
-
-  // flags functions.
-
-  bool IsElement() const { return flags & Flags::IS_ELEMENT; }
-
-  void SetIsElement(bool is_element) {
-    if (is_element) {
-      flags |= Flags::IS_ELEMENT;
-    } else {
-      flags &= static_cast<uint8_t>(~Flags::IS_ELEMENT);
-    }
-  }
-
-  bool HasHit() const { return flags & HAS_HIT; }
-
-  void SetHit() { flags |= HAS_HIT; }
-
-  Cache::Priority GetCachePriority() const {
-    return static_cast<Cache::Priority>(flags & CACHE_PRIORITY);
-  }
-
-  void SetCachePriority(Cache::Priority priority) {
-    if (priority == Cache::Priority::HIGH) {
-      flags |= Flags::CACHE_PRIORITY;
-    } else {
-      flags &= static_cast<uint8_t>(~Flags::CACHE_PRIORITY);
-    }
-  }
-
-  bool IsInClock() const {
-    return GetClockPriority() != ClockHandle::ClockPriority::NONE;
-  }
-
-  ClockPriority GetClockPriority() const {
-    return static_cast<ClockPriority>(flags & Flags::CLOCK_PRIORITY);
-  }
-
-  void SetClockPriority(ClockPriority priority) {
-    flags &= static_cast<uint8_t>(~Flags::CLOCK_PRIORITY);
-    flags |= priority;
-  }
-
-  void DecreaseClockPriority() {
-    uint8_t p = static_cast<uint8_t>(flags & Flags::CLOCK_PRIORITY) >>
-                kClockPriorityOffset;
-    assert(p > 0);
-    p--;
-    flags &= static_cast<uint8_t>(~Flags::CLOCK_PRIORITY);
-    ClockPriority new_priority =
-        static_cast<ClockPriority>(p << kClockPriorityOffset);
-    flags |= new_priority;
-  }
-
-  bool IsDetached() { return detached; }
-
-  void SetDetached() { detached = true; }
-
-  inline bool IsEmpty() const {
-    return !this->IsElement() && this->displacements == 0;
-  }
-
-  inline bool IsTombstone() const {
-    return !this->IsElement() && this->displacements > 0;
-  }
-
-  inline bool Matches(const Slice& some_key, uint32_t some_hash) const {
-    return this->hash == some_hash && this->key() == some_key;
-  }
-
-  // refs functions.
-
-  inline bool WillBeDeleted() const { return refs & WILL_BE_DELETED; }
-
-  void SetWillBeDeleted(bool will_be_deleted) {
-    if (will_be_deleted) {
-      refs |= WILL_BE_DELETED;
-    } else {
-      refs &= ~WILL_BE_DELETED;
-    }
-  }
-
-  uint32_t ExternalRefs() const {
-    return (refs & EXTERNAL_REFS) >> kExternalRefsOffset;
-  }
-
-  // Tries to take an internal ref. Returns true iff it succeeds.
-  inline bool TryInternalRef() {
-    if (!((refs += kOneInternalRef) & (EXCLUSIVE_REF | WILL_BE_DELETED))) {
-      return true;
-    }
-    refs -= kOneInternalRef;
-    return false;
-  }
-
-  // Tries to take an external ref. Returns true iff it succeeds.
-  inline bool TryExternalRef() {
-    if (!((refs += kOneExternalRef) & EXCLUSIVE_REF)) {
-      return true;
-    }
-    refs -= kOneExternalRef;
-    return false;
-  }
-
-  // Tries to take an exclusive ref. Returns true iff it succeeds.
-  // TODO(Guido) After every TryExclusiveRef call, we always call
-  // WillBeDeleted(). We could save an atomic read by having an output parameter
-  // with the last value of refs.
-  inline bool TryExclusiveRef() {
-    uint32_t will_be_deleted = refs & WILL_BE_DELETED;
-    uint32_t expected = will_be_deleted;
-    return refs.compare_exchange_strong(expected,
-                                        EXCLUSIVE_REF | will_be_deleted);
-  }
-
-  // Repeatedly tries to take an exclusive reference, but aborts as soon
-  // as an external or exclusive reference is detected (since the wait
-  // would presumably be too long).
-  inline bool SpinTryExclusiveRef() {
-    uint32_t expected = 0;
-    uint32_t will_be_deleted = 0;
-    uint32_t spins = kSpinsPerTry;
-    while (!refs.compare_exchange_strong(expected,
-                                         EXCLUSIVE_REF | will_be_deleted) &&
-           spins--) {
-      std::this_thread::yield();
-      if (expected & (EXTERNAL_REFS | EXCLUSIVE_REF)) {
-        return false;
-      }
-      will_be_deleted = expected & WILL_BE_DELETED;
-      expected = will_be_deleted;
-    }
-    return true;
-  }
-
-  // Take an external ref, assuming there is already one external ref
-  // to the handle.
-  void Ref() {
-    // TODO(Guido) Is it okay to assume that the existing external reference
-    // survives until this function returns?
-    refs += kOneExternalRef;
-  }
-
-  inline void ReleaseExternalRef() { refs -= kOneExternalRef; }
-
-  inline void ReleaseInternalRef() { refs -= kOneInternalRef; }
-
-  inline void ReleaseExclusiveRef() { refs.fetch_and(~EXCLUSIVE_REF); }
-
-  // Downgrade an exclusive ref to external.
-  inline void ExclusiveToExternalRef() {
-    refs += kOneExternalRef;
-    ReleaseExclusiveRef();
-  }
-
-  // Convert an internal ref into external.
-  inline void InternalToExternalRef() {
-    refs += kOneExternalRef - kOneInternalRef;
-  }
-
-};  // struct ClockHandle
-
-class ClockHandleTable {
- public:
-  explicit ClockHandleTable(size_t capacity, int hash_bits);
-  ~ClockHandleTable();
-
-  // Returns a pointer to a visible handle matching the key/hash, or
-  // nullptr if not present. When an actual handle is produced, an
-  // internal reference is handed over.
-  ClockHandle* 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 available slot was found. Every
-  // existing visible handle matching the key is already present in the
-  // hash table is marked as WILL_BE_DELETED. The deletion is also attempted,
-  // and, if the attempt is successful, the handle is inserted into the
-  // autovector deleted. When take_reference is true, the function hands
-  // over an external reference on the handle, and otherwise no reference is
-  // produced.
-  ClockHandle* Insert(ClockHandle* h, autovector<ClockHandle>* deleted,
-                      bool take_reference);
-
-  // Assigns h the appropriate clock priority, making it evictable.
-  void ClockOn(ClockHandle* h);
-
-  // Makes h non-evictable.
-  void ClockOff(ClockHandle* h);
-
-  // Runs the clock eviction algorithm until usage_ + charge is at most
-  // capacity_.
-  void ClockRun(size_t charge);
-
-  // Remove h from the hash table. Requires an exclusive ref to h.
-  void Remove(ClockHandle* h, autovector<ClockHandle>* deleted);
-
-  // Remove from the hash table all handles with matching key/hash along a
-  // probe sequence, starting from the given probe number. Doesn't
-  // require any references.
-  void RemoveAll(const Slice& key, uint32_t hash, uint32_t& probe,
-                 autovector<ClockHandle>* deleted);
-
-  void RemoveAll(const Slice& key, uint32_t hash,
-                 autovector<ClockHandle>* deleted) {
-    uint32_t probe = 0;
-    RemoveAll(key, hash, probe, deleted);
-  }
-
-  // Tries to remove h from the hash table. If the attempt is successful,
-  // the function hands over an exclusive ref to h.
-  bool TryRemove(ClockHandle* h, autovector<ClockHandle>* deleted);
-
-  // Similar to TryRemove, except that it spins, increasing the chances of
-  // success. Requires that the caller thread has no shared ref to h.
-  bool SpinTryRemove(ClockHandle* h, autovector<ClockHandle>* deleted);
-
-  // Call this function after an Insert, Remove, RemoveAll, TryRemove
-  // or SpinTryRemove. It frees the deleted values and updates the hash table
-  // metadata.
-  void Free(autovector<ClockHandle>* deleted);
-
-  void ApplyToEntriesRange(std::function<void(ClockHandle*)> func,
-                           uint32_t index_begin, uint32_t index_end,
-                           bool apply_if_will_be_deleted) {
-    for (uint32_t i = index_begin; i < index_end; i++) {
-      ClockHandle* h = &array_[i];
-      if (h->TryExclusiveRef()) {
-        if (h->IsElement() &&
-            (apply_if_will_be_deleted || !h->WillBeDeleted())) {
-          func(h);
-        }
-        h->ReleaseExclusiveRef();
-      }
-    }
-  }
-
-  void ConstApplyToEntriesRange(std::function<void(const ClockHandle*)> func,
-                                uint32_t index_begin, uint32_t index_end,
-                                bool apply_if_will_be_deleted) const {
-    for (uint32_t i = index_begin; i < index_end; i++) {
-      ClockHandle* h = &array_[i];
-      // We take an external ref because we are handing over control
-      // to a user-defined function, and because the handle will not be
-      // modified.
-      if (h->TryExternalRef()) {
-        if (h->IsElement() &&
-            (apply_if_will_be_deleted || !h->WillBeDeleted())) {
-          func(h);
-        }
-        h->ReleaseExternalRef();
-      }
-    }
-  }
-
-  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_; }
-
-  size_t GetUsage() const { return usage_; }
-
-  size_t GetCapacity() const { return capacity_; }
-
-  void SetCapacity(size_t capacity) { capacity_ = capacity; }
-
-  // Returns x mod 2^{length_bits_}.
-  uint32_t ModTableSize(uint32_t x) { return x & length_bits_mask_; }
-
- private:
-  // Extracts the element information from a handle (src), and assigns it
-  // to a hash table slot (dst). Doesn't touch displacements and refs,
-  // which are maintained by the hash table algorithm.
-  void Assign(ClockHandle* dst, ClockHandle* src);
-
-  // 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 Slice& key,
-                               std::function<bool(ClockHandle*)> match,
-                               std::function<bool(ClockHandle*)> stop,
-                               std::function<void(ClockHandle*)> update,
-                               uint32_t& probe);
-
-  // Returns an available slot for the given key. All copies of the
-  // key found along the probing sequence until an available slot is
-  // found are marked for deletion. On each of them, a deletion is
-  // attempted, and when the attempt succeeds the slot is assigned to
-  // the new copy of the element.
-  ClockHandle* FindAvailableSlot(const Slice& key, uint32_t hash,
-                                 uint32_t& probe,
-                                 autovector<ClockHandle>* deleted);
-
-  // After a failed FindSlot call (i.e., with answer -1) in
-  // FindAvailableSlot, this function fixes all displacements's
-  // starting from the 0-th probe, until the given probe.
-  void Rollback(const Slice& key, uint32_t probe);
-
-  // 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 uint32_t length_bits_mask_;
-
-  // Maximum number of elements the user can store in the table.
-  const uint32_t occupancy_limit_;
-
-  // Maximum total charge of all elements stored in the table.
-  size_t capacity_;
-
-  // 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)
-  // Array of slots comprising the hash table.
-  std::unique_ptr<ClockHandle[]> array_;
-
-  ALIGN_AS(CACHE_LINE_SIZE)
-  // Clock algorithm sweep pointer.
-  std::atomic<uint32_t> clock_pointer_;
-
-  ALIGN_AS(CACHE_LINE_SIZE)
-  // Number of elements in the table.
-  std::atomic<uint32_t> occupancy_;
-
-  // Memory size for entries residing in the cache.
-  std::atomic<size_t> usage_;
-};  // class ClockHandleTable
-
-// A single shard of sharded cache.
-class ALIGN_AS(CACHE_LINE_SIZE) ClockCacheShard final : public CacheShard {
- public:
-  ClockCacheShard(size_t capacity, size_t estimated_value_size,
-                  bool strict_capacity_limit,
-                  CacheMetadataChargePolicy metadata_charge_policy);
-  ~ClockCacheShard() override = default;
-
-  // Separate from constructor so caller can easily make an array of ClockCache
-  // if current usage is more than new capacity, the function will attempt to
-  // free the needed space.
-  void SetCapacity(size_t capacity) override;
-
-  // Set the flag to reject insertion if cache if full.
-  void SetStrictCapacityLimit(bool strict_capacity_limit) override;
-
-  // Like Cache methods, but with an extra "hash" parameter.
-  // Insert an item into the hash table and, if handle is null, make it
-  // evictable by the clock algorithm. 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, Cache::Handle** handle,
-                Cache::Priority priority) override;
-
-  Status Insert(const Slice& key, uint32_t hash, void* value,
-                const Cache::CacheItemHelper* helper, size_t charge,
-                Cache::Handle** handle, Cache::Priority priority) override {
-    return Insert(key, hash, value, charge, helper->del_cb, handle, priority);
-  }
-
-  Cache::Handle* Lookup(const Slice& key, uint32_t hash,
-                        const Cache::CacheItemHelper* /*helper*/,
-                        const Cache::CreateCallback& /*create_cb*/,
-                        Cache::Priority /*priority*/, bool /*wait*/,
-                        Statistics* /*stats*/) override {
-    return Lookup(key, hash);
-  }
-
-  Cache::Handle* Lookup(const Slice& key, uint32_t hash) override;
-
-  bool Release(Cache::Handle* handle, bool /*useful*/,
-               bool erase_if_last_ref) override {
-    return Release(handle, erase_if_last_ref);
-  }
-
-  bool IsReady(Cache::Handle* /*handle*/) override { return true; }
-
-  void Wait(Cache::Handle* /*handle*/) override {}
-
-  bool Ref(Cache::Handle* handle) override;
-
-  bool Release(Cache::Handle* handle, bool erase_if_last_ref = false) override;
-
-  void Erase(const Slice& key, uint32_t hash) override;
-
-  size_t GetUsage() const override;
-
-  size_t GetPinnedUsage() const override;
-
-  void ApplyToSomeEntries(
-      const std::function<void(const Slice& key, void* value, size_t charge,
-                               DeleterFn deleter)>& callback,
-      uint32_t average_entries_per_lock, uint32_t* state) override;
-
-  void EraseUnRefEntries() override;
-
-  std::string GetPrintableOptions() const override { return std::string{}; }
-
- private:
-  friend class ClockCache;
-  friend class ClockCacheTest;
-
-  ClockHandle* DetachedInsert(ClockHandle* h);
-
-  // 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);
-
-  // Whether to reject insertion if cache reaches its full capacity.
-  std::atomic<bool> strict_capacity_limit_;
-
-  // Handles allocated separately from the table.
-  std::atomic<size_t> detached_usage_;
-
-  ClockHandleTable table_;
-};  // class ClockCacheShard
-
-class ClockCache
-#ifdef NDEBUG
-    final
+#if defined(TBB) && !defined(ROCKSDB_LITE)
+#define SUPPORT_CLOCK_CACHE
 #endif
-    : public ShardedCache {
- public:
-  ClockCache(size_t capacity, size_t estimated_value_size, int num_shard_bits,
-             bool strict_capacity_limit,
-             CacheMetadataChargePolicy metadata_charge_policy =
-                 kDontChargeCacheMetadata);
-
-  ~ClockCache() override;
-
-  const char* Name() const override { return "ClockCache"; }
-
-  CacheShard* GetShard(uint32_t shard) override;
-
-  const CacheShard* GetShard(uint32_t shard) const override;
-
-  void* Value(Handle* handle) override;
-
-  size_t GetCharge(Handle* handle) const override;
-
-  uint32_t GetHash(Handle* handle) const override;
-
-  DeleterFn GetDeleter(Handle* handle) const override;
-
-  void DisownData() override;
-
- private:
-  ClockCacheShard* shards_ = nullptr;
-
-  int num_shards_;
-};  // class ClockCache
-
-}  // namespace clock_cache
-
-// Only for internal testing, temporarily replacing NewClockCache.
-// TODO(Guido) Remove once NewClockCache constructs a ClockCache again.
-extern std::shared_ptr<Cache> ExperimentalNewClockCache(
-    size_t capacity, size_t estimated_value_size, int num_shard_bits,
-    bool strict_capacity_limit,
-    CacheMetadataChargePolicy metadata_charge_policy);
-
-}  // namespace ROCKSDB_NAMESPACE

cache/compressed_secondary_cache.cc

@@ -5,8 +5,6 @@
 
 #include "cache/compressed_secondary_cache.h"
 
-#include <algorithm>
-#include <cstdint>
 #include <memory>
 
 #include "memory/memory_allocator.h"
@@ -15,20 +13,28 @@
 
 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)
     : cache_options_(capacity, num_shard_bits, strict_capacity_limit,
                      high_pri_pool_ratio, memory_allocator, use_adaptive_mutex,
                      metadata_charge_policy, compression_type,
-                     compress_format_version, low_pri_pool_ratio) {
-  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);
+                     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(); }
@@ -43,29 +49,26 @@ std::unique_ptr<SecondaryCacheResultHandle> CompressedSecondaryCache::Lookup(
     return handle;
   }
 
-  CacheValueChunk* handle_value =
-      reinterpret_cast<CacheValueChunk*>(cache_->Value(lru_handle));
-  size_t handle_value_charge{0};
-  CacheAllocationPtr merged_value =
-      MergeChunksIntoValue(handle_value, handle_value_charge);
-
+  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(merged_value.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};
+    size_t uncompressed_size = 0;
     CacheAllocationPtr uncompressed;
-    uncompressed = UncompressData(uncompression_info, (char*)merged_value.get(),
-                                  handle_value_charge, &uncompressed_size,
-                                  cache_options_.compress_format_version,
-                                  cache_options_.memory_allocator.get());
+    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);
@@ -101,7 +104,7 @@ Status CompressedSecondaryCache::Insert(const Slice& key, void* value,
   if (cache_options_.compression_type != kNoCompression) {
     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);
@@ -115,12 +118,14 @@ Status CompressedSecondaryCache::Insert(const Slice& key, void* value,
     }
 
     val = Slice(compressed_val);
+    size = compressed_val.size();
+    ptr = AllocateBlock(size, cache_options_.memory_allocator.get());
+    memcpy(ptr.get(), compressed_val.data(), size);
   }
 
-  size_t charge{0};
-  CacheValueChunk* value_chunks_head =
-      SplitValueIntoChunks(val, cache_options_.compression_type, charge);
-  return cache_->Insert(key, value_chunks_head, charge, DeletionCallback);
+  CacheAllocationPtr* buf = new CacheAllocationPtr(std::move(ptr));
+
+  return cache_->Insert(key, buf, size, DeletionCallback);
 }
 
 void CompressedSecondaryCache::Erase(const Slice& key) { cache_->Erase(key); }
@@ -128,110 +133,28 @@ void CompressedSecondaryCache::Erase(const Slice& key) { cache_->Erase(key); }
 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, const 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;
-}
-
-void CompressedSecondaryCache::DeletionCallback(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;
-}
-
 std::shared_ptr<SecondaryCache> NewCompressedSecondaryCache(
     size_t capacity, int num_shard_bits, bool strict_capacity_limit,
     double high_pri_pool_ratio,
     std::shared_ptr<MemoryAllocator> memory_allocator, bool use_adaptive_mutex,
     CacheMetadataChargePolicy metadata_charge_policy,
-    CompressionType compression_type, uint32_t compress_format_version,
-    double low_pri_pool_ratio) {
+    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);
+      memory_allocator, use_adaptive_mutex, metadata_charge_policy,
+      compression_type, compress_format_version);
 }
 
 std::shared_ptr<SecondaryCache> NewCompressedSecondaryCache(
@@ -242,7 +165,7 @@ std::shared_ptr<SecondaryCache> NewCompressedSecondaryCache(
       opts.capacity, opts.num_shard_bits, opts.strict_capacity_limit,
       opts.high_pri_pool_ratio, opts.memory_allocator, opts.use_adaptive_mutex,
       opts.metadata_charge_policy, opts.compression_type,
-      opts.compress_format_version, opts.low_pri_pool_ratio);
+      opts.compress_format_version);
 }
 
 }  // namespace ROCKSDB_NAMESPACE

cache/compressed_secondary_cache.h

@@ -5,8 +5,6 @@
 
 #pragma once
 
-#include <array>
-#include <cstddef>
 #include <memory>
 
 #include "cache/lru_cache.h"
@@ -56,11 +54,11 @@ 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);
   virtual ~CompressedSecondaryCache() override;
@@ -81,36 +79,6 @@ class CompressedSecondaryCache : public SecondaryCache {
   std::string GetPrintableOptions() const override;
 
  private:
-  friend class CompressedSecondaryCacheTest;
-  static constexpr std::array<uint16_t, 33> malloc_bin_sizes_{
-      32,   64,   96,   128,  160,  192,  224,   256,   320,   384,   448,
-      512,  640,  768,  896,  1024, 1280, 1536,  1792,  2048,  2560,  3072,
-      3584, 4096, 5120, 6144, 7168, 8192, 10240, 12288, 14336, 16384, 32768};
-
-  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,
-                                        const 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 void DeletionCallback(const Slice& /*key*/, void* obj);
   std::shared_ptr<Cache> cache_;
   CompressedSecondaryCacheOptions cache_options_;
 };

cache/compressed_secondary_cache_test.cc

@@ -7,14 +7,9 @@
 
 #include <algorithm>
 #include <cstdint>
-#include <iterator>
 
-#include "cache/lru_cache.h"
 #include "memory/jemalloc_nodump_allocator.h"
 #include "memory/memory_allocator.h"
-#include "rocksdb/compression_type.h"
-#include "rocksdb/convenience.h"
-#include "rocksdb/secondary_cache.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/compression.h"
@@ -84,7 +79,37 @@ class CompressedSecondaryCacheTest : public testing::Test {
 
   void SetFailCreate(bool fail) { fail_create_ = fail; }
 
-  void BasicTestHelper(std::shared_ptr<SecondaryCache> sec_cache) {
+  void BasicTest(bool sec_cache_is_compressed, bool use_jemalloc) {
+    CompressedSecondaryCacheOptions opts;
+    opts.capacity = 2048;
+    opts.num_shard_bits = 0;
+    opts.metadata_charge_policy = kDontChargeCacheMetadata;
+
+    if (sec_cache_is_compressed) {
+      if (!LZ4_Supported()) {
+        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
+        opts.compression_type = CompressionType::kNoCompression;
+      }
+    } else {
+      opts.compression_type = CompressionType::kNoCompression;
+    }
+
+    if (use_jemalloc) {
+      JemallocAllocatorOptions jopts;
+      std::shared_ptr<MemoryAllocator> allocator;
+      std::string msg;
+      if (JemallocNodumpAllocator::IsSupported(&msg)) {
+        Status s = NewJemallocNodumpAllocator(jopts, &allocator);
+        if (s.ok()) {
+          opts.memory_allocator = allocator;
+        }
+      } else {
+        ROCKSDB_GTEST_BYPASS("JEMALLOC not supported");
+      }
+    }
+    std::shared_ptr<SecondaryCache> sec_cache =
+        NewCompressedSecondaryCache(opts);
+
     bool is_in_sec_cache{true};
     // Lookup an non-existent key.
     std::unique_ptr<SecondaryCacheResultHandle> handle0 =
@@ -135,39 +160,6 @@ class CompressedSecondaryCacheTest : public testing::Test {
     sec_cache.reset();
   }
 
-  void BasicTest(bool sec_cache_is_compressed, bool use_jemalloc) {
-    CompressedSecondaryCacheOptions opts;
-    opts.capacity = 2048;
-    opts.num_shard_bits = 0;
-
-    if (sec_cache_is_compressed) {
-      if (!LZ4_Supported()) {
-        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-        opts.compression_type = CompressionType::kNoCompression;
-      }
-    } else {
-      opts.compression_type = CompressionType::kNoCompression;
-    }
-
-    if (use_jemalloc) {
-      JemallocAllocatorOptions jopts;
-      std::shared_ptr<MemoryAllocator> allocator;
-      std::string msg;
-      if (JemallocNodumpAllocator::IsSupported(&msg)) {
-        Status s = NewJemallocNodumpAllocator(jopts, &allocator);
-        if (s.ok()) {
-          opts.memory_allocator = allocator;
-        }
-      } else {
-        ROCKSDB_GTEST_BYPASS("JEMALLOC not supported");
-      }
-    }
-    std::shared_ptr<SecondaryCache> sec_cache =
-        NewCompressedSecondaryCache(opts);
-
-    BasicTestHelper(sec_cache);
-  }
-
   void FailsTest(bool sec_cache_is_compressed) {
     CompressedSecondaryCacheOptions secondary_cache_opts;
     if (sec_cache_is_compressed) {
@@ -181,6 +173,7 @@ class CompressedSecondaryCacheTest : public testing::Test {
 
     secondary_cache_opts.capacity = 1100;
     secondary_cache_opts.num_shard_bits = 0;
+    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
     std::shared_ptr<SecondaryCache> sec_cache =
         NewCompressedSecondaryCache(secondary_cache_opts);
 
@@ -238,37 +231,34 @@ class CompressedSecondaryCacheTest : public testing::Test {
 
     secondary_cache_opts.capacity = 2300;
     secondary_cache_opts.num_shard_bits = 0;
+    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
     std::shared_ptr<SecondaryCache> secondary_cache =
         NewCompressedSecondaryCache(secondary_cache_opts);
-    LRUCacheOptions lru_cache_opts(
-        1300 /* capacity */, 0 /* num_shard_bits */,
-        false /* strict_capacity_limit */, 0.5 /* high_pri_pool_ratio */,
-        nullptr /* memory_allocator */, kDefaultToAdaptiveMutex,
-        kDefaultCacheMetadataChargePolicy);
+    LRUCacheOptions lru_cache_opts(1024, 0, false, 0.5, nullptr,
+                                   kDefaultToAdaptiveMutex,
+                                   kDontChargeCacheMetadata);
     lru_cache_opts.secondary_cache = secondary_cache;
     std::shared_ptr<Cache> cache = NewLRUCache(lru_cache_opts);
     std::shared_ptr<Statistics> stats = CreateDBStatistics();
 
     Random rnd(301);
 
-    std::string str1;
-    test::CompressibleString(&rnd, 0.5, 1001, &str1);
+    std::string str1 = rnd.RandomString(1010);
     std::string str1_clone{str1};
     TestItem* item1 = new TestItem(str1.data(), str1.length());
     ASSERT_OK(cache->Insert("k1", item1, &CompressedSecondaryCacheTest::helper_,
                             str1.length()));
 
-    std::string str2;
-    test::CompressibleString(&rnd, 0.5, 1012, &str2);
+    std::string str2 = rnd.RandomString(1020);
     TestItem* item2 = new TestItem(str2.data(), str2.length());
-    // After Insert, cache contains k2 and secondary cache contains k1.
+    // After Insert, lru cache contains k2 and secondary cache contains k1.
     ASSERT_OK(cache->Insert("k2", item2, &CompressedSecondaryCacheTest::helper_,
                             str2.length()));
 
-    std::string str3;
-    test::CompressibleString(&rnd, 0.5, 1024, &str3);
+    std::string str3 = rnd.RandomString(1020);
     TestItem* item3 = new TestItem(str3.data(), str3.length());
-    // After Insert, cache contains k3 and secondary cache contains k1 and k2.
+    // After Insert, lru cache contains k3 and secondary cache contains k1 and
+    // k2
     ASSERT_OK(cache->Insert("k3", item3, &CompressedSecondaryCacheTest::helper_,
                             str3.length()));
 
@@ -293,6 +283,7 @@ class CompressedSecondaryCacheTest : public testing::Test {
     handle = cache->Lookup("k1", &CompressedSecondaryCacheTest::helper_,
                            test_item_creator, Cache::Priority::LOW, true,
                            stats.get());
+
     ASSERT_NE(handle, nullptr);
     TestItem* val1_1 = static_cast<TestItem*>(cache->Value(handle));
     ASSERT_NE(val1_1, nullptr);
@@ -321,22 +312,19 @@ class CompressedSecondaryCacheTest : public testing::Test {
       secondary_cache_opts.compression_type = CompressionType::kNoCompression;
     }
 
-    secondary_cache_opts.capacity = 2300;
+    secondary_cache_opts.capacity = 2048;
     secondary_cache_opts.num_shard_bits = 0;
+    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
     std::shared_ptr<SecondaryCache> secondary_cache =
         NewCompressedSecondaryCache(secondary_cache_opts);
 
-    LRUCacheOptions opts(
-        1024 /* capacity */, 0 /* num_shard_bits */,
-        false /* strict_capacity_limit */, 0.5 /* high_pri_pool_ratio */,
-        nullptr /* memory_allocator */, kDefaultToAdaptiveMutex,
-        kDefaultCacheMetadataChargePolicy);
+    LRUCacheOptions opts(1024, 0, false, 0.5, nullptr, kDefaultToAdaptiveMutex,
+                         kDontChargeCacheMetadata);
     opts.secondary_cache = secondary_cache;
     std::shared_ptr<Cache> cache = NewLRUCache(opts);
 
     Random rnd(301);
-    std::string str1;
-    test::CompressibleString(&rnd, 0.5, 1001, &str1);
+    std::string str1 = rnd.RandomString(1020);
     auto item1 =
         std::unique_ptr<TestItem>(new TestItem(str1.data(), str1.length()));
     ASSERT_NOK(cache->Insert("k1", item1.get(), nullptr, str1.length()));
@@ -369,30 +357,25 @@ class CompressedSecondaryCacheTest : public testing::Test {
       secondary_cache_opts.compression_type = CompressionType::kNoCompression;
     }
 
-    secondary_cache_opts.capacity = 2300;
+    secondary_cache_opts.capacity = 2048;
     secondary_cache_opts.num_shard_bits = 0;
+    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
 
     std::shared_ptr<SecondaryCache> secondary_cache =
         NewCompressedSecondaryCache(secondary_cache_opts);
 
-    LRUCacheOptions opts(
-        1200 /* capacity */, 0 /* num_shard_bits */,
-        false /* strict_capacity_limit */, 0.5 /* high_pri_pool_ratio */,
-        nullptr /* memory_allocator */, kDefaultToAdaptiveMutex,
-        kDefaultCacheMetadataChargePolicy);
+    LRUCacheOptions opts(1024, 0, false, 0.5, nullptr, kDefaultToAdaptiveMutex,
+                         kDontChargeCacheMetadata);
     opts.secondary_cache = secondary_cache;
     std::shared_ptr<Cache> cache = NewLRUCache(opts);
 
     Random rnd(301);
-    std::string str1;
-    test::CompressibleString(&rnd, 0.5, 1001, &str1);
+    std::string str1 = rnd.RandomString(1020);
     TestItem* item1 = new TestItem(str1.data(), str1.length());
     ASSERT_OK(cache->Insert("k1", item1,
                             &CompressedSecondaryCacheTest::helper_fail_,
                             str1.length()));
-
-    std::string str2;
-    test::CompressibleString(&rnd, 0.5, 1002, &str2);
+    std::string str2 = rnd.RandomString(1020);
     TestItem* item2 = new TestItem(str2.data(), str2.length());
     // k1 should be demoted to the secondary cache.
     ASSERT_OK(cache->Insert("k2", item2,
@@ -430,29 +413,25 @@ class CompressedSecondaryCacheTest : public testing::Test {
       secondary_cache_opts.compression_type = CompressionType::kNoCompression;
     }
 
-    secondary_cache_opts.capacity = 2300;
+    secondary_cache_opts.capacity = 2048;
     secondary_cache_opts.num_shard_bits = 0;
+    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
 
     std::shared_ptr<SecondaryCache> secondary_cache =
         NewCompressedSecondaryCache(secondary_cache_opts);
 
-    LRUCacheOptions opts(
-        1200 /* capacity */, 0 /* num_shard_bits */,
-        false /* strict_capacity_limit */, 0.5 /* high_pri_pool_ratio */,
-        nullptr /* memory_allocator */, kDefaultToAdaptiveMutex,
-        kDefaultCacheMetadataChargePolicy);
+    LRUCacheOptions opts(1024, 0, false, 0.5, nullptr, kDefaultToAdaptiveMutex,
+                         kDontChargeCacheMetadata);
     opts.secondary_cache = secondary_cache;
     std::shared_ptr<Cache> cache = NewLRUCache(opts);
 
     Random rnd(301);
-    std::string str1;
-    test::CompressibleString(&rnd, 0.5, 1001, &str1);
+    std::string str1 = rnd.RandomString(1020);
     TestItem* item1 = new TestItem(str1.data(), str1.length());
     ASSERT_OK(cache->Insert("k1", item1, &CompressedSecondaryCacheTest::helper_,
                             str1.length()));
 
-    std::string str2;
-    test::CompressibleString(&rnd, 0.5, 1002, &str2);
+    std::string str2 = rnd.RandomString(1020);
     TestItem* item2 = new TestItem(str2.data(), str2.length());
     // k1 should be demoted to the secondary cache.
     ASSERT_OK(cache->Insert("k2", item2, &CompressedSecondaryCacheTest::helper_,
@@ -490,30 +469,24 @@ class CompressedSecondaryCacheTest : public testing::Test {
       secondary_cache_opts.compression_type = CompressionType::kNoCompression;
     }
 
-    secondary_cache_opts.capacity = 2300;
+    secondary_cache_opts.capacity = 2048;
     secondary_cache_opts.num_shard_bits = 0;
+    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
 
     std::shared_ptr<SecondaryCache> secondary_cache =
         NewCompressedSecondaryCache(secondary_cache_opts);
 
-    LRUCacheOptions opts(
-        1200 /* capacity */, 0 /* num_shard_bits */,
-        true /* strict_capacity_limit */, 0.5 /* high_pri_pool_ratio */,
-        nullptr /* memory_allocator */, kDefaultToAdaptiveMutex,
-        kDefaultCacheMetadataChargePolicy);
+    LRUCacheOptions opts(1024, 0, /*_strict_capacity_limit=*/true, 0.5, nullptr,
+                         kDefaultToAdaptiveMutex, kDontChargeCacheMetadata);
     opts.secondary_cache = secondary_cache;
     std::shared_ptr<Cache> cache = NewLRUCache(opts);
 
     Random rnd(301);
-    std::string str1;
-    test::CompressibleString(&rnd, 0.5, 1001, &str1);
+    std::string str1 = rnd.RandomString(1020);
     TestItem* item1 = new TestItem(str1.data(), str1.length());
     ASSERT_OK(cache->Insert("k1", item1, &CompressedSecondaryCacheTest::helper_,
                             str1.length()));
-
-    std::string str2;
-    test::CompressibleString(&rnd, 0.5, 1002, &str2);
-    std::string str2_clone{str2};
+    std::string str2 = rnd.RandomString(1020);
     TestItem* item2 = new TestItem(str2.data(), str2.length());
     // k1 should be demoted to the secondary cache.
     ASSERT_OK(cache->Insert("k2", item2, &CompressedSecondaryCacheTest::helper_,
@@ -524,9 +497,8 @@ class CompressedSecondaryCacheTest : public testing::Test {
                             test_item_creator, Cache::Priority::LOW, true);
     ASSERT_NE(handle2, nullptr);
     cache->Release(handle2);
-
-    // k1 promotion should fail because cache is at capacity and
-    // strict_capacity_limit is true, but the lookup should still succeed.
+    // k1 promotion should fail due to the block cache being at capacity,
+    // but the lookup should still succeed
     Cache::Handle* handle1;
     handle1 = cache->Lookup("k1", &CompressedSecondaryCacheTest::helper_,
                             test_item_creator, Cache::Priority::LOW, true);
@@ -543,119 +515,6 @@ class CompressedSecondaryCacheTest : public testing::Test {
     secondary_cache.reset();
   }
 
-  void SplitValueIntoChunksTest() {
-    JemallocAllocatorOptions jopts;
-    std::shared_ptr<MemoryAllocator> allocator;
-    std::string msg;
-    if (JemallocNodumpAllocator::IsSupported(&msg)) {
-      Status s = NewJemallocNodumpAllocator(jopts, &allocator);
-      if (!s.ok()) {
-        ROCKSDB_GTEST_BYPASS("JEMALLOC not supported");
-      }
-    } else {
-      ROCKSDB_GTEST_BYPASS("JEMALLOC not supported");
-    }
-
-    using CacheValueChunk = CompressedSecondaryCache::CacheValueChunk;
-    std::unique_ptr<CompressedSecondaryCache> sec_cache =
-        std::make_unique<CompressedSecondaryCache>(1000, 0, true, 0.5, 0.0,
-                                                   allocator);
-    Random rnd(301);
-    // 10000 = 8169 + 1769 + 62 , so there should be 3 chunks after split.
-    size_t str_size{10000};
-    std::string str = rnd.RandomString(static_cast<int>(str_size));
-    size_t charge{0};
-    CacheValueChunk* chunks_head =
-        sec_cache->SplitValueIntoChunks(str, kLZ4Compression, charge);
-    ASSERT_EQ(charge, str_size + 3 * (sizeof(CacheValueChunk) - 1));
-
-    CacheValueChunk* current_chunk = chunks_head;
-    ASSERT_EQ(current_chunk->size, 8192 - sizeof(CacheValueChunk) + 1);
-    current_chunk = current_chunk->next;
-    ASSERT_EQ(current_chunk->size, 1792 - sizeof(CacheValueChunk) + 1);
-    current_chunk = current_chunk->next;
-    ASSERT_EQ(current_chunk->size, 62);
-
-    sec_cache->DeletionCallback("dummy", chunks_head);
-  }
-
-  void MergeChunksIntoValueTest() {
-    using CacheValueChunk = CompressedSecondaryCache::CacheValueChunk;
-    Random rnd(301);
-    size_t size1{2048};
-    std::string str1 = rnd.RandomString(static_cast<int>(size1));
-    CacheValueChunk* current_chunk = reinterpret_cast<CacheValueChunk*>(
-        new char[sizeof(CacheValueChunk) - 1 + size1]);
-    CacheValueChunk* chunks_head = current_chunk;
-    memcpy(current_chunk->data, str1.data(), size1);
-    current_chunk->size = size1;
-
-    size_t size2{256};
-    std::string str2 = rnd.RandomString(static_cast<int>(size2));
-    current_chunk->next = reinterpret_cast<CacheValueChunk*>(
-        new char[sizeof(CacheValueChunk) - 1 + size2]);
-    current_chunk = current_chunk->next;
-    memcpy(current_chunk->data, str2.data(), size2);
-    current_chunk->size = size2;
-
-    size_t size3{31};
-    std::string str3 = rnd.RandomString(static_cast<int>(size3));
-    current_chunk->next = reinterpret_cast<CacheValueChunk*>(
-        new char[sizeof(CacheValueChunk) - 1 + size3]);
-    current_chunk = current_chunk->next;
-    memcpy(current_chunk->data, str3.data(), size3);
-    current_chunk->size = size3;
-    current_chunk->next = nullptr;
-
-    std::string str = str1 + str2 + str3;
-
-    std::unique_ptr<CompressedSecondaryCache> sec_cache =
-        std::make_unique<CompressedSecondaryCache>(1000, 0, true, 0.5, 0.0);
-    size_t charge{0};
-    CacheAllocationPtr value =
-        sec_cache->MergeChunksIntoValue(chunks_head, charge);
-    ASSERT_EQ(charge, size1 + size2 + size3);
-    std::string value_str{value.get(), charge};
-    ASSERT_EQ(strcmp(value_str.data(), str.data()), 0);
-
-    sec_cache->DeletionCallback("dummy", chunks_head);
-  }
-
-  void SplictValueAndMergeChunksTest() {
-    JemallocAllocatorOptions jopts;
-    std::shared_ptr<MemoryAllocator> allocator;
-    std::string msg;
-    if (JemallocNodumpAllocator::IsSupported(&msg)) {
-      Status s = NewJemallocNodumpAllocator(jopts, &allocator);
-      if (!s.ok()) {
-        ROCKSDB_GTEST_BYPASS("JEMALLOC not supported");
-      }
-    } else {
-      ROCKSDB_GTEST_BYPASS("JEMALLOC not supported");
-    }
-
-    using CacheValueChunk = CompressedSecondaryCache::CacheValueChunk;
-    std::unique_ptr<CompressedSecondaryCache> sec_cache =
-        std::make_unique<CompressedSecondaryCache>(1000, 0, true, 0.5, 0.0,
-                                                   allocator);
-    Random rnd(301);
-    // 10000 = 8169 + 1769 + 62 , so there should be 3 chunks after split.
-    size_t str_size{10000};
-    std::string str = rnd.RandomString(static_cast<int>(str_size));
-    size_t charge{0};
-    CacheValueChunk* chunks_head =
-        sec_cache->SplitValueIntoChunks(str, kLZ4Compression, charge);
-    ASSERT_EQ(charge, str_size + 3 * (sizeof(CacheValueChunk) - 1));
-
-    CacheAllocationPtr value =
-        sec_cache->MergeChunksIntoValue(chunks_head, charge);
-    ASSERT_EQ(charge, str_size);
-    std::string value_str{value.get(), charge};
-    ASSERT_EQ(strcmp(value_str.data(), str.data()), 0);
-
-    sec_cache->DeletionCallback("dummy", chunks_head);
-  }
-
  private:
   bool fail_create_;
 };
@@ -688,42 +547,6 @@ TEST_F(CompressedSecondaryCacheTest,
   BasicTest(true, true);
 }
 
-#ifndef ROCKSDB_LITE
-
-TEST_F(CompressedSecondaryCacheTest, BasicTestFromStringWithNoCompression) {
-  std::string sec_cache_uri =
-      "compressed_secondary_cache://"
-      "capacity=2048;num_shard_bits=0;compression_type=kNoCompression";
-  std::shared_ptr<SecondaryCache> sec_cache;
-  Status s = SecondaryCache::CreateFromString(ConfigOptions(), sec_cache_uri,
-                                              &sec_cache);
-  EXPECT_OK(s);
-  BasicTestHelper(sec_cache);
-}
-
-TEST_F(CompressedSecondaryCacheTest, BasicTestFromStringWithCompression) {
-  std::string sec_cache_uri;
-  if (LZ4_Supported()) {
-    sec_cache_uri =
-        "compressed_secondary_cache://"
-        "capacity=2048;num_shard_bits=0;compression_type=kLZ4Compression;"
-        "compress_format_version=2";
-  } else {
-    ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-    sec_cache_uri =
-        "compressed_secondary_cache://"
-        "capacity=2048;num_shard_bits=0;compression_type=kNoCompression";
-  }
-
-  std::shared_ptr<SecondaryCache> sec_cache;
-  Status s = SecondaryCache::CreateFromString(ConfigOptions(), sec_cache_uri,
-                                              &sec_cache);
-  EXPECT_OK(s);
-  BasicTestHelper(sec_cache);
-}
-
-#endif  // ROCKSDB_LITE
-
 TEST_F(CompressedSecondaryCacheTest, FailsTestWithNoCompression) {
   FailsTest(false);
 }
@@ -776,18 +599,6 @@ TEST_F(CompressedSecondaryCacheTest,
   IntegrationFullCapacityTest(true);
 }
 
-TEST_F(CompressedSecondaryCacheTest, SplitValueIntoChunksTest) {
-  SplitValueIntoChunksTest();
-}
-
-TEST_F(CompressedSecondaryCacheTest, MergeChunksIntoValueTest) {
-  MergeChunksIntoValueTest();
-}
-
-TEST_F(CompressedSecondaryCacheTest, SplictValueAndMergeChunksTest) {
-  SplictValueAndMergeChunksTest();
-}
-
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

cache/fast_lru_cache.cc

@@ -1,612 +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)
-    : capacity_(capacity),
-      strict_capacity_limit_(strict_capacity_limit),
-      table_(
-          CalcHashBits(capacity, estimated_value_size, metadata_charge_policy)),
-      usage_(0),
-      lru_usage_(0) {
-  set_metadata_charge_policy(metadata_charge_policy);
-  // 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,
-    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_);
-  uint32_t length_bits = table_.GetLengthBits();
-  uint32_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);
-
-  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 = UINT32_MAX;
-  } else {
-    *state = index_end << (32 - 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,
-                             Cache::Handle** 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 = reinterpret_cast<Cache::Handle*>(h);
-      }
-    }
-  }
-
-  // Free the entries here outside of mutex for performance reasons.
-  for (auto& h : last_reference_list) {
-    h.FreeData();
-  }
-
-  return s;
-}
-
-Cache::Handle* 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 reinterpret_cast<Cache::Handle*>(h);
-}
-
-bool LRUCacheShard::Ref(Cache::Handle* h) {
-  LRUHandle* e = reinterpret_cast<LRUHandle*>(h);
-  DMutexLock l(mutex_);
-  // To create another reference - entry must be already externally referenced.
-  assert(e->HasRefs());
-  e->Ref();
-  return true;
-}
-
-bool LRUCacheShard::Release(Cache::Handle* handle, bool erase_if_last_ref) {
-  if (handle == nullptr) {
-    return false;
-  }
-  LRUHandle* h = reinterpret_cast<LRUHandle*>(handle);
-  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_;
-}
-
-std::string LRUCacheShard::GetPrintableOptions() const { return std::string{}; }
-
-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) {
-  assert(estimated_value_size > 0 ||
-         metadata_charge_policy != kDontChargeCacheMetadata);
-  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, estimated_value_size, strict_capacity_limit,
-                      metadata_charge_policy);
-  }
-}
-
-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) {
-  return reinterpret_cast<const LRUHandle*>(handle)->value;
-}
-
-size_t LRUCache::GetCharge(Handle* handle) const {
-  CacheMetadataChargePolicy metadata_charge_policy = kDontChargeCacheMetadata;
-  if (num_shards_ > 0) {
-    metadata_charge_policy = shards_[0].metadata_charge_policy_;
-  }
-  return reinterpret_cast<const LRUHandle*>(handle)->GetCharge(
-      metadata_charge_policy);
-}
-
-Cache::DeleterFn LRUCache::GetDeleter(Handle* handle) const {
-  auto h = reinterpret_cast<const LRUHandle*>(handle);
-  return h->deleter;
-}
-
-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;
-  }
-}
-
-}  // 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

cache/fast_lru_cache.h

@@ -1,474 +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); }
-
-  // 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, uint32_t index_begin, uint32_t index_end) {
-    for (uint32_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 CacheShard {
- public:
-  LRUCacheShard(size_t capacity, size_t estimated_value_size,
-                bool strict_capacity_limit,
-                CacheMetadataChargePolicy metadata_charge_policy);
-  ~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) override;
-
-  // Set the flag to reject insertion if cache if full.
-  void SetStrictCapacityLimit(bool strict_capacity_limit) override;
-
-  // 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, Cache::Handle** handle,
-                Cache::Priority priority) override;
-
-  Status Insert(const Slice& key, uint32_t hash, void* value,
-                const Cache::CacheItemHelper* helper, size_t charge,
-                Cache::Handle** handle, Cache::Priority priority) override {
-    return Insert(key, hash, value, charge, helper->del_cb, handle, priority);
-  }
-
-  Cache::Handle* Lookup(const Slice& key, uint32_t hash,
-                        const Cache::CacheItemHelper* /*helper*/,
-                        const Cache::CreateCallback& /*create_cb*/,
-                        Cache::Priority /*priority*/, bool /*wait*/,
-                        Statistics* /*stats*/) override {
-    return Lookup(key, hash);
-  }
-  Cache::Handle* Lookup(const Slice& key, uint32_t hash) override;
-
-  bool Release(Cache::Handle* handle, bool /*useful*/,
-               bool erase_if_last_ref) override {
-    return Release(handle, erase_if_last_ref);
-  }
-  bool IsReady(Cache::Handle* /*handle*/) override { return true; }
-  void Wait(Cache::Handle* /*handle*/) override {}
-
-  bool Ref(Cache::Handle* handle) override;
-  bool Release(Cache::Handle* handle, bool erase_if_last_ref = false) override;
-  void Erase(const Slice& key, uint32_t hash) override;
-
-  size_t GetUsage() const override;
-  size_t GetPinnedUsage() const override;
-
-  void ApplyToSomeEntries(
-      const std::function<void(const Slice& key, void* value, size_t charge,
-                               DeleterFn deleter)>& callback,
-      uint32_t average_entries_per_lock, uint32_t* state) override;
-
-  void EraseUnRefEntries() override;
-
-  std::string GetPrintableOptions() const override;
-
- 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 {
- public:
-  LRUCache(size_t capacity, size_t estimated_value_size, int num_shard_bits,
-           bool strict_capacity_limit,
-           CacheMetadataChargePolicy metadata_charge_policy =
-               kDontChargeCacheMetadata);
-  ~LRUCache() override;
-  const char* Name() const override { return "LRUCache"; }
-  CacheShard* GetShard(uint32_t shard) override;
-  const CacheShard* GetShard(uint32_t shard) const override;
-  void* Value(Handle* handle) override;
-  size_t GetCharge(Handle* handle) const override;
-  uint32_t GetHash(Handle* handle) const override;
-  DeleterFn GetDeleter(Handle* handle) const override;
-  void DisownData() override;
-
- private:
-  LRUCacheShard* shards_ = nullptr;
-  int num_shards_ = 0;
-};
-}  // 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

cache/lru_cache.cc

@@ -16,10 +16,9 @@
 #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 {
 
 LRUHandleTable::LRUHandleTable(int max_upper_hash_bits)
     : length_bits_(/* historical starting size*/ 4),
@@ -111,17 +110,14 @@ void LRUHandleTable::Resize() {
 
 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,
+    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),
@@ -132,14 +128,13 @@ LRUCacheShard::LRUCacheShard(
   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.
@@ -147,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);
     }
   }
@@ -165,7 +161,7 @@ void LRUCacheShard::ApplyToSomeEntries(
   // 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_);
+  MutexLock l(&mutex_);
   uint32_t length_bits = table_.GetLengthBits();
   uint32_t length = uint32_t{1} << length_bits;
 
@@ -185,27 +181,23 @@ void LRUCacheShard::ApplyToSomeEntries(
   }
 
   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_) {
@@ -216,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_;
@@ -259,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() {
@@ -297,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;
   }
 }
 
@@ -323,8 +278,9 @@ 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);
   }
 }
@@ -332,10 +288,9 @@ void LRUCacheShard::EvictFromLRU(size_t charge,
 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);
   }
 
@@ -352,7 +307,7 @@ void LRUCacheShard::SetCapacity(size_t capacity) {
 }
 
 void LRUCacheShard::SetStrictCapacityLimit(bool strict_capacity_limit) {
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
   strict_capacity_limit_ = strict_capacity_limit;
 }
 
@@ -360,15 +315,16 @@ 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) {
@@ -380,13 +336,13 @@ Status LRUCacheShard::InsertItem(LRUHandle* e, Cache::Handle** handle,
           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());
@@ -394,8 +350,10 @@ Status LRUCacheShard::InsertItem(LRUHandle* e, Cache::Handle** 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);
         }
       }
@@ -432,7 +390,7 @@ void LRUCacheShard::Promote(LRUHandle* e) {
   e->SetIncomplete(false);
   e->SetInCache(true);
   e->value = secondary_handle->Value();
-  e->CalcTotalCharge(secondary_handle->Size(), metadata_charge_policy_);
+  e->charge = secondary_handle->Size();
   delete secondary_handle;
 
   // This call could fail if the cache is over capacity and
@@ -450,9 +408,8 @@ void LRUCacheShard::Promote(LRUHandle* e) {
   } else {
     // 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
-    DMutexLock l(mutex_);
-    // TODO
-    e->CalcTotalCharge(0, metadata_charge_policy_);
+    MutexLock l(&mutex_);
+    e->charge = 0;
     e->SetInCache(false);
   }
 }
@@ -464,7 +421,7 @@ Cache::Handle* LRUCacheShard::Lookup(
     bool wait, Statistics* stats) {
   LRUHandle* e = nullptr;
   {
-    DMutexLock l(mutex_);
+    MutexLock l(&mutex_);
     e = table_.Lookup(key, hash);
     if (e != nullptr) {
       assert(e->InCache());
@@ -506,12 +463,11 @@ Cache::Handle* LRUCacheShard::Lookup(
       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);
 
       if (wait) {
         Promote(e);
+        e->SetIsInSecondaryCache(is_in_sec_cache);
         if (!e->value) {
           // The secondary cache returned a handle, but the lookup failed.
           e->Unref();
@@ -525,6 +481,7 @@ Cache::Handle* LRUCacheShard::Lookup(
         // If wait is false, we always return a handle and let the caller
         // release the handle after checking for success or failure.
         e->SetIncomplete(true);
+        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);
@@ -537,7 +494,7 @@ Cache::Handle* LRUCacheShard::Lookup(
 
 bool LRUCacheShard::Ref(Cache::Handle* h) {
   LRUHandle* e = reinterpret_cast<LRUHandle*>(h);
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
   // To create another reference - entry must be already externally referenced.
   assert(e->HasRefs());
   e->Ref();
@@ -545,19 +502,12 @@ bool LRUCacheShard::Ref(Cache::Handle* h) {
 }
 
 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(Cache::Handle* handle, bool erase_if_last_ref) {
   if (handle == nullptr) {
     return false;
@@ -565,7 +515,7 @@ bool LRUCacheShard::Release(Cache::Handle* handle, bool erase_if_last_ref) {
   LRUHandle* e = reinterpret_cast<LRUHandle*>(handle);
   bool last_reference = false;
   {
-    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.
@@ -584,11 +534,12 @@ bool LRUCacheShard::Release(Cache::Handle* handle, bool erase_if_last_ref) {
     // 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, that means the lookup
+    // 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)) {
-      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;
     }
   }
 
@@ -621,6 +572,7 @@ Status LRUCacheShard::Insert(const Slice& key, uint32_t hash, void* value,
 #endif  // __SANITIZE_THREAD__
     e->info_.deleter = deleter;
   }
+  e->charge = charge;
   e->key_length = key.size();
   e->hash = hash;
   e->refs = 0;
@@ -628,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);
 }
@@ -637,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());
@@ -645,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;
       }
     }
@@ -661,7 +613,7 @@ void LRUCacheShard::Erase(const Slice& key, uint32_t hash) {
 
 bool LRUCacheShard::IsReady(Cache::Handle* handle) {
   LRUHandle* e = reinterpret_cast<LRUHandle*>(handle);
-  DMutexLock l(mutex_);
+  MutexLock l(&mutex_);
   bool ready = true;
   if (e->IsPending()) {
     assert(secondary_cache_);
@@ -672,12 +624,12 @@ bool LRUCacheShard::IsReady(Cache::Handle* handle) {
 }
 
 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_;
 }
@@ -686,18 +638,15 @@ 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_);
   }
   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,
@@ -711,7 +660,7 @@ LRUCache::LRUCache(size_t capacity, int num_shard_bits,
   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;
@@ -740,12 +689,7 @@ void* LRUCache::Value(Handle* handle) {
 }
 
 size_t LRUCache::GetCharge(Handle* handle) const {
-  CacheMetadataChargePolicy metadata_charge_policy = kDontChargeCacheMetadata;
-  if (num_shards_ > 0) {
-    metadata_charge_policy = shards_[0].metadata_charge_policy_;
-  }
-  return reinterpret_cast<const LRUHandle*>(handle)->GetCharge(
-      metadata_charge_policy);
+  return reinterpret_cast<const LRUHandle*>(handle)->charge;
 }
 
 Cache::DeleterFn LRUCache::GetDeleter(Handle* handle) const {
@@ -815,26 +759,12 @@ void LRUCache::WaitAll(std::vector<Handle*>& handles) {
   }
 }
 
-std::string LRUCache::GetPrintableOptions() const {
-  std::string ret;
-  ret.reserve(20000);
-  ret.append(ShardedCache::GetPrintableOptions());
-  if (secondary_cache_) {
-    ret.append("  secondary_cache:\n");
-    ret.append(secondary_cache_->GetPrintableOptions());
-  }
-  return ret;
-}
-
-}  // 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.
   }
@@ -842,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 high_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

cache/lru_cache.h

@@ -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.
 
@@ -67,14 +65,14 @@ 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;
 
-  enum Flags : uint16_t {
+  enum Flags : uint8_t {
     // Whether this entry is referenced by the hash table.
     IN_CACHE = (1 << 0),
     // Whether this entry is high priority entry.
@@ -89,13 +87,9 @@ struct LRUHandle {
     IS_PENDING = (1 << 5),
     // Whether this handle is still in a lower tier
     IS_IN_SECONDARY_CACHE = (1 << 6),
-    // Whether this entry is low priority entry.
-    IS_LOW_PRI = (1 << 7),
-    // Whether this entry is in low-pri pool.
-    IN_LOW_PRI_POOL = (1 << 8),
   };
 
-  uint16_t flags;
+  uint8_t flags;
 
 #ifdef __SANITIZE_THREAD__
   // TSAN can report a false data race on flags, where one thread is writing
@@ -126,8 +120,6 @@ struct LRUHandle {
   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 IsLowPri() const { return flags & IS_LOW_PRI; }
-  bool InLowPriPool() const { return flags & IN_LOW_PRI_POOL; }
   bool HasHit() const { return flags & HAS_HIT; }
   bool IsSecondaryCacheCompatible() const {
 #ifdef __SANITIZE_THREAD__
@@ -150,13 +142,8 @@ struct LRUHandle {
   void SetPriority(Cache::Priority priority) {
     if (priority == Cache::Priority::HIGH) {
       flags |= IS_HIGH_PRI;
-      flags &= ~IS_LOW_PRI;
-    } else if (priority == Cache::Priority::LOW) {
-      flags &= ~IS_HIGH_PRI;
-      flags |= IS_LOW_PRI;
     } else {
       flags &= ~IS_HIGH_PRI;
-      flags &= ~IS_LOW_PRI;
     }
   }
 
@@ -168,14 +155,6 @@ struct LRUHandle {
     }
   }
 
-  void SetInLowPriPool(bool in_low_pri_pool) {
-    if (in_low_pri_pool) {
-      flags |= IN_LOW_PRI_POOL;
-    } else {
-      flags &= ~IN_LOW_PRI_POOL;
-    }
-  }
-
   void SetHit() { flags |= HAS_HIT; }
 
   void SetSecondaryCacheCompatible(bool compat) {
@@ -229,32 +208,19 @@ struct LRUHandle {
     delete[] reinterpret_cast<char*>(this);
   }
 
-  inline size_t CalcuMetaCharge(
-      CacheMetadataChargePolicy metadata_charge_policy) const {
-    if (metadata_charge_policy != kFullChargeCacheMetadata) {
-      return 0;
-    } else {
+  // Calculate the memory usage by metadata.
+  inline size_t CalcTotalCharge(
+      CacheMetadataChargePolicy metadata_charge_policy) {
+    size_t meta_charge = 0;
+    if (metadata_charge_policy == kFullChargeCacheMetadata) {
 #ifdef ROCKSDB_MALLOC_USABLE_SIZE
-      return malloc_usable_size(
-          const_cast<void*>(static_cast<const void*>(this)));
+      meta_charge += malloc_usable_size(static_cast<void*>(this));
 #else
       // This is the size that is used when a new handle is created.
-      return sizeof(LRUHandle) - 1 + key_length;
+      meta_charge += sizeof(LRUHandle) - 1 + key_length;
 #endif
     }
-  }
-
-  // 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;
+    return charge + meta_charge;
   }
 };
 
@@ -317,8 +283,7 @@ class LRUHandleTable {
 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,
                 const std::shared_ptr<SecondaryCache>& secondary_cache);
@@ -335,9 +300,6 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShard {
   // 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.
   virtual Status Insert(const Slice& key, uint32_t hash, void* value,
                         size_t charge, Cache::DeleterFn deleter,
@@ -389,19 +351,15 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShard {
 
   virtual std::string GetPrintableOptions() const override;
 
-  void TEST_GetLRUList(LRUHandle** lru, LRUHandle** lru_low_pri,
-                       LRUHandle** lru_bottom_pri);
+  void TEST_GetLRUList(LRUHandle** lru, LRUHandle** lru_low_pri);
 
-  // Retrieves number of elements in LRU, for unit test purpose only.
-  // Not threadsafe.
+  //  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();
-
  private:
   friend class LRUCache;
   // Insert an item into the hash table and, if handle is null, insert into
@@ -441,9 +399,6 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShard {
   // 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_;
 
@@ -454,13 +409,6 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShard {
   // 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
@@ -469,9 +417,6 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShard {
   // 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
   // ------------------------------------
@@ -494,7 +439,7 @@ class ALIGN_AS(CACHE_LINE_SIZE) LRUCacheShard final : public CacheShard {
   // 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_;
 
   std::shared_ptr<SecondaryCache> secondary_cache_;
 };
@@ -506,7 +451,7 @@ class LRUCache
     : 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 =
@@ -522,11 +467,10 @@ class LRUCache
   virtual DeleterFn GetDeleter(Handle* handle) const override;
   virtual void DisownData() override;
   virtual void WaitAll(std::vector<Handle*>& handles) override;
-  std::string GetPrintableOptions() const 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();
 
  private:
@@ -535,10 +479,4 @@ class LRUCache
   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

cache/sharded_cache.h

@@ -86,7 +86,7 @@ class ShardedCache : public Cache {
                         DeleterFn deleter, Handle** handle,
                         Priority priority) override;
   virtual Status Insert(const Slice& key, void* value,
-                        const CacheItemHelper* helper, size_t charge,
+                        const CacheItemHelper* helper, size_t chargge,
                         Handle** handle = nullptr,
                         Priority priority = Priority::LOW) override;
   virtual Handle* Lookup(const Slice& key, Statistics* stats) override;

common.mk

@@ -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

crash_test.mk

@@ -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) --enable_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) --enable_tiered_storage whitebox --random_kill_odd \
-      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)

db/arena_wrapped_db_iter.cc

@@ -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();
   }
@@ -89,8 +89,8 @@ Status ArenaWrappedDBIter::Refresh() {
         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, false /* immutable_memtable */));
+        range_del_iter.reset(
+            sv->mem->NewRangeTombstoneIterator(read_options_, latest_seq));
         range_del_agg->AddTombstones(std::move(range_del_iter));
         cfd_->ReturnThreadLocalSuperVersion(sv);
       }

db/blob/blob_file_builder.cc

@@ -32,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,
@@ -42,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,
@@ -65,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),
@@ -137,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_);
 
@@ -386,48 +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. Therefore, we copy the blob into a
-    // string directly, and insert that into the cache.
-    std::unique_ptr<std::string> buf = std::make_unique<std::string>();
-    buf->assign(blob.data(), blob.size());
-
-    // TODO: support custom allocators and provide a better estimated memory
-    // usage using malloc_usable_size.
-    s = blob_cache->Insert(key, buf.get(), buf->size(),
-                           &DeleteCacheEntry<std::string>,
-                           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

db/blob/blob_file_builder.h

@@ -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_;

db/blob/blob_file_builder_test.cc

@@ -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) {

db/blob/blob_file_cache_test.cc

@@ -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);

db/blob/blob_file_reader.cc

@@ -16,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"
@@ -336,9 +335,7 @@ Status BlobFileReader::GetBlob(const ReadOptions& read_options,
 
   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,
@@ -375,50 +372,40 @@ Status BlobFileReader::GetBlob(const ReadOptions& read_options,
   return Status::OK();
 }
 
-void BlobFileReader::MultiGetBlob(const ReadOptions& read_options,
-                                  autovector<BlobReadRequest*>& blob_reqs,
-                                  uint64_t* bytes_read) const {
-  const size_t num_blobs = blob_reqs.size();
+void BlobFileReader::MultiGetBlob(
+    const ReadOptions& read_options,
+    const autovector<std::reference_wrapper<const Slice>>& user_keys,
+    const autovector<uint64_t>& offsets,
+    const autovector<uint64_t>& value_sizes, autovector<Status*>& statuses,
+    autovector<PinnableSlice*>& values, uint64_t* bytes_read) const {
+  const size_t num_blobs = user_keys.size();
   assert(num_blobs > 0);
-  assert(num_blobs <= 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]->offset <= blob_reqs[i + 1]->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) {
-    const size_t key_size = blob_reqs[i]->user_key->size();
-    const uint64_t offset = blob_reqs[i]->offset;
-    const uint64_t value_size = blob_reqs[i]->len;
-
-    if (!IsValidBlobOffset(offset, key_size, value_size, file_size_)) {
-      *blob_reqs[i]->status = Status::Corruption("Invalid blob offset");
-      continue;
-    }
-    if (blob_reqs[i]->compression != compression_type_) {
-      *blob_reqs[i]->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(blob_reqs[i]->offset >= adjustment);
+    assert(offsets[i] >= adjustment);
     adjustments.push_back(adjustment);
-
-    FSReadRequest read_req = {};
-    read_req.offset = blob_reqs[i]->offset - adjustment;
-    read_req.len = blob_reqs[i]->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);
@@ -441,8 +428,6 @@ void BlobFileReader::MultiGetBlob(const ReadOptions& read_options,
     }
   }
   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);
@@ -450,65 +435,64 @@ void BlobFileReader::MultiGetBlob(const ReadOptions& read_options,
     for (auto& req : read_reqs) {
       req.status.PermitUncheckedError();
     }
-    for (auto& req : blob_reqs) {
-      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) {
-    assert(blob_reqs[i]->status);
-    if (!blob_reqs[i]->status->ok()) {
-      continue;
-    }
-
-    assert(j < read_reqs.size());
-    auto& req = read_reqs[j++];
-    const auto& record_slice = req.result;
-    if (req.status.ok() && record_slice.size() != req.len) {
+  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;
+  }
 
-    *blob_reqs[i]->status = req.status;
-    if (!blob_reqs[i]->status->ok()) {
-      continue;
-    }
-
-    // Verify checksums if enabled
-    if (read_options.verify_checksums) {
-      *blob_reqs[i]->status =
-          VerifyBlob(record_slice, *blob_reqs[i]->user_key, blob_reqs[i]->len);
-      if (!blob_reqs[i]->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], blob_reqs[i]->len);
-    *blob_reqs[i]->status =
-        UncompressBlobIfNeeded(value_slice, compression_type_, clock_,
-                               statistics_, blob_reqs[i]->result);
-    if (blob_reqs[i]->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);
@@ -573,7 +557,6 @@ Status BlobFileReader::UncompressBlobIfNeeded(const Slice& value_slice,
   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,

db/blob/blob_file_reader.h

@@ -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"
@@ -48,9 +47,12 @@ class BlobFileReader {
                  uint64_t* bytes_read) const;
 
   // offsets must be sorted in ascending order by caller.
-  void MultiGetBlob(const ReadOptions& read_options,
-                    autovector<BlobReadRequest*>& blob_reqs,
-                    uint64_t* bytes_read) const;
+  void MultiGetBlob(
+      const ReadOptions& read_options,
+      const autovector<std::reference_wrapper<const Slice>>& user_keys,
+      const autovector<uint64_t>& offsets,
+      const autovector<uint64_t>& value_sizes, autovector<Status*>& statuses,
+      autovector<PinnableSlice*>& values, uint64_t* bytes_read) const;
 
   CompressionType GetCompressionType() const { return compression_type_; }
 

db/blob/blob_file_reader_test.cc

@@ -194,21 +194,21 @@ TEST_F(BlobFileReaderTest, CreateReaderAndGetBlob) {
     // MultiGetBlob
     bytes_read = 0;
     size_t total_size = 0;
-
-    std::array<Status, num_blobs> statuses_buf;
-    std::array<PinnableSlice, num_blobs> value_buf;
-    std::array<BlobReadRequest, num_blobs> requests_buf;
-    autovector<BlobReadRequest*> blob_reqs;
-
-    for (size_t i = 0; i < num_blobs; ++i) {
-      requests_buf[i] =
-          BlobReadRequest(keys[i], blob_offsets[i], blob_sizes[i],
-                          kNoCompression, &value_buf[i], &statuses_buf[i]);
-      blob_reqs.push_back(&requests_buf[i]);
+    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, 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) {
       ASSERT_OK(statuses_buf[i]);
       ASSERT_EQ(value_buf[i], blobs[i]);
@@ -300,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;
+    autovector<Status*> statuses{&statuses_buf[0], &statuses_buf[1],
+                                 &statuses_buf[2]};
     std::array<PinnableSlice, num_blobs> value_buf;
-    std::array<BlobReadRequest, num_blobs> requests_buf;
-    autovector<BlobReadRequest*> blob_reqs;
-
-    for (size_t i = 0; i < num_blobs; ++i) {
-      requests_buf[i] =
-          BlobReadRequest(key_refs[i], offsets[i], blob_sizes[i],
-                          kNoCompression, &value_buf[i], &statuses_buf[i]);
-      blob_reqs.push_back(&requests_buf[i]);
-    }
-
-    reader->MultiGetBlob(read_options, blob_reqs, &bytes_read);
-
+    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());
@@ -345,21 +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;
+    autovector<Status*> statuses{&statuses_buf[0], &statuses_buf[1],
+                                 &statuses_buf[2]};
     std::array<PinnableSlice, num_blobs> value_buf;
-    std::array<BlobReadRequest, num_blobs> requests_buf;
-
-    for (size_t i = 0; i < num_blobs; ++i) {
-      requests_buf[i] =
-          BlobReadRequest(key_refs[i], blob_offsets[i], blob_sizes[i],
-                          kNoCompression, &value_buf[i], &statuses_buf[i]);
-    }
-
-    autovector<BlobReadRequest*> blob_reqs = {
-        &requests_buf[0], &requests_buf[1], &requests_buf[2]};
-
-    reader->MultiGetBlob(read_options, blob_reqs, &bytes_read);
-
+    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());
@@ -386,26 +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;
+    autovector<Status*> statuses{&statuses_buf[0], &statuses_buf[1],
+                                 &statuses_buf[2]};
     std::array<PinnableSlice, num_blobs> value_buf;
-    std::array<BlobReadRequest, num_blobs> requests_buf;
-
-    requests_buf[0] =
-        BlobReadRequest(key_refs[0], blob_offsets[0], blob_sizes[0],
-                        kNoCompression, &value_buf[0], &statuses_buf[0]);
-    requests_buf[1] =
-        BlobReadRequest(key_refs[1], blob_offsets[1], blob_sizes[1] + 1,
-                        kNoCompression, &value_buf[1], &statuses_buf[1]);
-    requests_buf[2] =
-        BlobReadRequest(key_refs[2], blob_offsets[2], blob_sizes[2],
-                        kNoCompression, &value_buf[2], &statuses_buf[2]);
-
-    autovector<BlobReadRequest*> blob_reqs = {
-        &requests_buf[0], &requests_buf[1], &requests_buf[2]};
-
-    reader->MultiGetBlob(read_options, blob_reqs, &bytes_read);
-
+    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]);

db/blob/blob_index.h

@@ -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()) {

db/blob/blob_log_format.cc

@@ -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");

db/blob/blob_log_writer.cc

@@ -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);
           }
         }
       }

db/blob/blob_read_request.h

@@ -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

db/blob/blob_source.cc

@@ -1,465 +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_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<std::string>* blob) const {
-  assert(blob);
-  assert(blob->IsEmpty());
-  assert(blob_cache_);
-  assert(!cache_key.empty());
-
-  Cache::Handle* cache_handle = nullptr;
-  cache_handle = GetEntryFromCache(cache_key);
-  if (cache_handle != nullptr) {
-    *blob = CacheHandleGuard<std::string>(blob_cache_.get(), cache_handle);
-    return Status::OK();
-  }
-
-  assert(blob->IsEmpty());
-
-  return Status::NotFound("Blob not found in cache");
-}
-
-Status BlobSource::PutBlobIntoCache(const Slice& cache_key,
-                                    CacheHandleGuard<std::string>* cached_blob,
-                                    PinnableSlice* blob) const {
-  assert(blob);
-  assert(!cache_key.empty());
-  assert(blob_cache_);
-
-  Status s;
-  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. Therefore, we copy the blob into a string
-  // directly, and insert that into the cache.
-  std::unique_ptr<std::string> buf = std::make_unique<std::string>();
-  buf->assign(blob->data(), blob->size());
-
-  // TODO: support custom allocators and provide a better estimated memory
-  // usage using malloc_usable_size.
-  Cache::Handle* cache_handle = nullptr;
-  s = InsertEntryIntoCache(cache_key, buf.get(), buf->size(), &cache_handle,
-                           priority);
-  if (s.ok()) {
-    buf.release();
-    assert(cache_handle != nullptr);
-    *cached_blob =
-        CacheHandleGuard<std::string>(blob_cache_.get(), cache_handle);
-  }
-
-  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 = [&](const void* buf, size_t size,
-                                          void** out_obj,
-                                          size_t* charge) -> Status {
-      std::string* blob = new std::string();
-      blob->assign(static_cast<const char*>(buf), size);
-      *out_obj = blob;
-      *charge = size;
-      return Status::OK();
-    };
-    cache_handle = blob_cache_->Lookup(key, GetCacheItemHelper(), create_cb,
-                                       Cache::Priority::BOTTOM,
-                                       true /* wait_for_cache */, statistics_);
-  } else {
-    cache_handle = blob_cache_->Lookup(key, statistics_);
-  }
-
-  if (cache_handle != nullptr) {
-    PERF_COUNTER_ADD(blob_cache_hit_count, 1);
-    RecordTick(statistics_, BLOB_DB_CACHE_HIT);
-    RecordTick(statistics_, BLOB_DB_CACHE_BYTES_READ,
-               blob_cache_->GetUsage(cache_handle));
-  } else {
-    RecordTick(statistics_, BLOB_DB_CACHE_MISS);
-  }
-  return cache_handle;
-}
-
-Status BlobSource::InsertEntryIntoCache(const Slice& key, std::string* value,
-                                        size_t charge,
-                                        Cache::Handle** cache_handle,
-                                        Cache::Priority priority) const {
-  Status s;
-
-  if (lowest_used_cache_tier_ == CacheTier::kNonVolatileBlockTier) {
-    s = blob_cache_->Insert(key, value, GetCacheItemHelper(), charge,
-                            cache_handle, priority);
-  } else {
-    s = blob_cache_->Insert(key, value, charge, &DeleteCacheEntry<std::string>,
-                            cache_handle, priority);
-  }
-
-  if (s.ok()) {
-    assert(*cache_handle != nullptr);
-    RecordTick(statistics_, BLOB_DB_CACHE_ADD);
-    RecordTick(statistics_, BLOB_DB_CACHE_BYTES_WRITE,
-               blob_cache_->GetUsage(*cache_handle));
-  } else {
-    RecordTick(statistics_, BLOB_DB_CACHE_ADD_FAILURES);
-  }
-
-  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<std::string> 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() && blob_handle.GetValue()) {
-      {
-        value->Reset();
-        // 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->PinSlice(
-            *blob_handle.GetValue(),
-            [](void* arg1, void* arg2) {
-              Cache* const cache = static_cast<Cache*>(arg1);
-              Cache::Handle* const handle = static_cast<Cache::Handle*>(arg2);
-              cache->Release(handle);
-            },
-            blob_handle.GetCache(), blob_handle.GetCacheHandle());
-        // Make the CacheHandleGuard relinquish ownership of the handle.
-        blob_handle.TransferTo(nullptr);
-      }
-
-      // 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.
-  {
-    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");
-    }
-
-    uint64_t read_size = 0;
-    s = blob_file_reader.GetValue()->GetBlob(
-        read_options, user_key, offset, value_size, compression_type,
-        prefetch_buffer, value, &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_handle, value);
-    if (!s.ok()) {
-      return s;
-    }
-  }
-
-  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<std::string> 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() && blob_handle.GetValue()) {
-        assert(req.status);
-        *req.status = s;
-
-        {
-          req.result->Reset();
-          // 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.
-          req.result->PinSlice(
-              *blob_handle.GetValue(),
-              [](void* arg1, void* arg2) {
-                Cache* const cache = static_cast<Cache*>(arg1);
-                Cache::Handle* const handle = static_cast<Cache::Handle*>(arg2);
-                cache->Release(handle);
-              },
-              blob_handle.GetCache(), blob_handle.GetCacheHandle());
-          // Make the CacheHandleGuard relinquish ownership of the handle.
-          blob_handle.TransferTo(nullptr);
-        }
-
-        // 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))) {
-        assert(blob_reqs[i].status);
-        *blob_reqs[i].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<BlobReadRequest*> _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.push_back(&blob_reqs[i]);
-      }
-    }
-
-    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) {
-        assert(_blob_reqs[i]->status);
-        *_blob_reqs[i]->status = s;
-      }
-      return;
-    }
-
-    assert(blob_file_reader.GetValue());
-
-    blob_file_reader.GetValue()->MultiGetBlob(read_options, _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 (size_t i = 0; i < _blob_reqs.size(); ++i) {
-        if (_blob_reqs[i]->status->ok()) {
-          CacheHandleGuard<std::string> blob_handle;
-          const CacheKey cache_key =
-              base_cache_key.WithOffset(_blob_reqs[i]->offset);
-          const Slice key = cache_key.AsSlice();
-          s = PutBlobIntoCache(key, &blob_handle, _blob_reqs[i]->result);
-          if (!s.ok()) {
-            *_blob_reqs[i]->status = s;
-          }
-        }
-      }
-    }
-
-    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) const {
-  const CacheKey cache_key = GetCacheKey(file_number, file_size, offset);
-  const Slice key = cache_key.AsSlice();
-
-  CacheHandleGuard<std::string> blob_handle;
-  const Status s = GetBlobFromCache(key, &blob_handle);
-
-  if (s.ok() && blob_handle.GetValue() != nullptr) {
-    return true;
-  }
-
-  return false;
-}
-
-// Callbacks for secondary blob cache
-size_t BlobSource::SizeCallback(void* obj) {
-  assert(obj != nullptr);
-  return static_cast<const std::string*>(obj)->size();
-}
-
-Status BlobSource::SaveToCallback(void* from_obj, size_t from_offset,
-                                  size_t length, void* out) {
-  assert(from_obj != nullptr);
-  const std::string* buf = static_cast<const std::string*>(from_obj);
-  assert(buf->size() >= from_offset + length);
-  memcpy(out, buf->data() + from_offset, length);
-  return Status::OK();
-}
-
-Cache::CacheItemHelper* BlobSource::GetCacheItemHelper() {
-  static Cache::CacheItemHelper cache_helper(SizeCallback, SaveToCallback,
-                                             &DeleteCacheEntry<std::string>);
-  return &cache_helper;
-}
-
-}  // namespace ROCKSDB_NAMESPACE

db/blob/blob_source.h

@@ -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 "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;
-
-// 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) const;
-
- private:
-  Status GetBlobFromCache(const Slice& cache_key,
-                          CacheHandleGuard<std::string>* blob) const;
-
-  Status PutBlobIntoCache(const Slice& cache_key,
-                          CacheHandleGuard<std::string>* cached_blob,
-                          PinnableSlice* blob) const;
-
-  Cache::Handle* GetEntryFromCache(const Slice& key) const;
-
-  Status InsertEntryIntoCache(const Slice& key, std::string* 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);
-  }
-
-  // Callbacks for secondary blob 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();
-
-  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

db/blob/db_blob_basic_test.cc

@@ -5,7 +5,6 @@
 
 #include <array>
 #include <sstream>
-#include <string>
 
 #include "db/blob/blob_index.h"
 #include "db/blob/blob_log_format.h"
@@ -49,326 +48,6 @@ TEST_F(DBBlobBasicTest, GetBlob) {
                   .IsIncomplete());
 }
 
-TEST_F(DBBlobBasicTest, GetBlobFromCache) {
-  Options options = GetDefaultOptions();
-
-  LRUCacheOptions co;
-  co.capacity = 2048;
-  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 = 2048;
-  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;
 
@@ -448,141 +127,6 @@ TEST_F(DBBlobBasicTest, MultiGetBlobs) {
   }
 }
 
-TEST_F(DBBlobBasicTest, MultiGetBlobsFromCache) {
-  Options options = GetDefaultOptions();
-
-  LRUCacheOptions co;
-  co.capacity = 2048;
-  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();
@@ -776,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);
 
@@ -818,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]);
   }
 }
 
@@ -1581,126 +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
-
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

db/blob/db_blob_compaction_test.cc

@@ -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) {

db/blob/db_blob_index_test.cc

@@ -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,

db/builder.cc

@@ -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,
@@ -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");
       }

db/builder.h

@@ -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,

db/c_test.c

@@ -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]);

db/column_family.cc

@@ -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) {
@@ -508,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,
@@ -517,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),
@@ -550,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.
@@ -582,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(
@@ -623,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
@@ -773,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) {
@@ -857,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);
@@ -1149,8 +1118,8 @@ Status ColumnFamilyData::RangesOverlapWithMemtables(
 
   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;
@@ -1303,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
@@ -1504,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),
@@ -1520,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_;
@@ -1588,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);

db/column_family.h

@@ -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_;
 };
 

db/column_family_test.cc

@@ -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();

db/compact_files_test.cc

@@ -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());

db/compaction/clipping_iterator.h

@@ -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_;
 };
 

db/compaction/compaction.cc

@@ -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,10 +214,7 @@ 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),
@@ -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(
-          immutable_options_, start_level_, output_level_)) {
+      notify_on_compaction_completion_(false) {
   MarkFilesBeingCompacted(true);
   if (is_manual_compaction_) {
     compaction_reason_ = CompactionReason::kManualCompaction;
@@ -284,39 +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;
-  }
-
-  GetBoundaryKeys(input_vstorage_, inputs_,
-                  &penultimate_level_smallest_user_key_,
-                  &penultimate_level_largest_user_key_, number_levels_ - 1);
 }
 
 Compaction::~Compaction() {
@@ -328,37 +276,6 @@ Compaction::~Compaction() {
   }
 }
 
-bool Compaction::SupportsPerKeyPlacement() const {
-  return penultimate_level_ != kInvalidLevel;
-}
-
-int Compaction::GetPenultimateLevel() const { return penultimate_level_; }
-
-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->Compare(smallest_key, penultimate_level_largest_user_key_) <=
-             0 &&
-         ucmp->Compare(largest_key, penultimate_level_smallest_user_key_) >= 0;
-}
-
-bool Compaction::WithinPenultimateLevelOutputRange(const Slice& key) const {
-  if (!SupportsPerKeyPlacement()) {
-    return false;
-  }
-
-  const Comparator* ucmp =
-      input_vstorage_->InternalComparator()->user_comparator();
-
-  return ucmp->Compare(key, penultimate_level_smallest_user_key_) >= 0 &&
-         ucmp->Compare(key, penultimate_level_largest_user_key_) <= 0;
-}
-
 bool Compaction::InputCompressionMatchesOutput() const {
   int base_level = input_vstorage_->base_level();
   bool matches =
@@ -380,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;
   }
 
@@ -410,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;
   }
 
@@ -440,11 +355,6 @@ bool Compaction::IsTrivialMove() const {
     }
   }
 
-  // PerKeyPlacement compaction should never be trivial move.
-  if (SupportsPerKeyPlacement()) {
-    return false;
-  }
-
   return true;
 }
 
@@ -608,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);
@@ -660,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 {
@@ -709,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_) {
@@ -730,36 +637,8 @@ uint64_t Compaction::MinInputFileOldestAncesterTime(
   return min_oldest_ancester_time;
 }
 
-int Compaction::EvaluatePenultimateLevel(
-    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 || penultimate_level < start_level) {
-    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

db/compaction/compaction.h

@@ -81,11 +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);
+             CompactionReason compaction_reason = CompactionReason::kUnknown);
 
   // No copying allowed
   Compaction(const Compaction&) = delete;
@@ -178,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_; }
 
@@ -212,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_; }
 
@@ -307,25 +292,7 @@ class Compaction {
 
   Slice GetLargestUserKey() const { return largest_user_key_; }
 
-  // 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.
-  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
-  bool WithinPenultimateLevelOutputRange(const Slice& key) const;
+  int GetInputBaseLevel() const;
 
   CompactionReason compaction_reason() const { return compaction_reason_; }
 
@@ -339,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,
@@ -362,15 +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.
-  static int EvaluatePenultimateLevel(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);
@@ -378,24 +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()`.
-  // TODO: Currently the penultimate level output range is the min/max keys of
-  //  non-last-level input files. Which is only good if there's no key moved
-  //  from the last level to the penultimate level. For a more complicated per
-  //  key placement which may move data from the last level to the penultimate
-  //  level, it needs extra check.
-  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);
 
@@ -410,7 +348,7 @@ 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 max_output_file_size_;
   uint64_t max_compaction_bytes_;
@@ -421,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_;
@@ -429,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_;
@@ -446,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_;
@@ -481,42 +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
-  Slice penultimate_level_smallest_user_key_;
-  Slice penultimate_level_largest_user_key_;
 };
 
-#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);
 

db/compaction/compaction_iterator.cc

@@ -28,23 +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 penultimate_level_cutoff_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,
-          penultimate_level_cutoff_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,
@@ -54,14 +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 penultimate_level_cutoff_seqno)
+    const std::string* full_history_ts_low)
     : input_(input, cmp,
              !compaction || compaction->DoesInputReferenceBlobFiles()),
       cmp_(cmp),
@@ -79,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),
@@ -104,13 +92,27 @@ CompactionIterator::CompactionIterator(
           CreatePrefetchBufferCollectionIfNeeded(compaction_.get())),
       current_key_committed_(false),
       cmp_with_history_ts_low_(0),
-      level_(compaction_ == nullptr ? 0 : compaction_->level()),
-      penultimate_level_cutoff_seqno_(penultimate_level_cutoff_seqno) {
+      level_(compaction_ == nullptr ? 0 : compaction_->level()) {
   assert(snapshots_ != nullptr);
-
+  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) {
@@ -155,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();
@@ -185,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;
   }
@@ -195,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;
@@ -222,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());
@@ -230,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;
         }
 
@@ -245,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;
         }
 
@@ -263,7 +263,7 @@ bool CompactionIterator::InvokeFilterIfNeeded(bool* need_skip,
                                      &bytes_read);
         if (!s.ok()) {
           status_ = s;
-          validity_info_.Invalidate();
+          valid_ = false;
           return false;
         }
 
@@ -287,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;
   }
 
@@ -307,14 +307,6 @@ 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) {
-    // 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;
-    current_key_.UpdateInternalKey(ikey_.sequence, kTypeSingleDeletion);
-    // no value associated with single delete
-    value_.clear();
-    iter_stats_.num_record_drop_user++;
   } else if (filter == CompactionFilter::Decision::kChangeValue) {
     if (ikey_.type == kTypeBlobIndex) {
       // value transfer from blob file to inlined data
@@ -336,7 +328,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) {
@@ -349,7 +341,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");
@@ -360,13 +352,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_);
@@ -383,7 +374,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_);
@@ -496,7 +487,7 @@ void CompactionIterator::NextFromInput() {
 
     if (UNLIKELY(!current_key_committed_)) {
       assert(snapshot_checker_ != nullptr);
-      validity_info_.SetValid(ValidContext::kCurrentKeyUncommitted);
+      valid_ = true;
       break;
     }
 
@@ -518,28 +509,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:
@@ -635,44 +625,29 @@ void CompactionIterator::NextFromInput() {
 
           TEST_SYNC_POINT_CALLBACK(
               "CompactionIterator::NextFromInput:SingleDelete:2", nullptr);
-          if (next_ikey.type == kTypeSingleDeletion) {
+          if (next_ikey.type == kTypeSingleDeletion ||
+              next_ikey.type == kTypeDeletion) {
             // We encountered two SingleDeletes for same key in a row. This
             // could be due to unexpected user input. If write-(un)prepared
             // transaction is used, this could also be due to releasing an old
             // snapshot between a Put and its matching SingleDelete.
+            // Furthermore, if write-(un)prepared transaction is rolled back
+            // after prepare, we will write a Delete to cancel a prior Put. If
+            // old snapshot is released between a later Put and its matching
+            // SingleDelete, we will end up with a Delete followed by
+            // SingleDelete.
             // Skip the first SingleDelete and let the next iteration decide
-            // how to handle the second SingleDelete.
+            // how to handle the second SingleDelete or Delete.
 
             // First SingleDelete has been skipped since we already called
             // input_.Next().
             ++iter_stats_.num_record_drop_obsolete;
             ++iter_stats_.num_single_del_mismatch;
-          } else if (next_ikey.type == kTypeDeletion) {
-            std::ostringstream oss;
-            oss << "Found SD and type: " << static_cast<int>(next_ikey.type)
-                << " on the same key, violating the contract "
-                   "of SingleDelete. Check your application to make sure the "
-                   "application does not mix SingleDelete and Delete for "
-                   "the same key. If you are using "
-                   "write-prepared/write-unprepared transactions, and use "
-                   "SingleDelete to delete certain keys, then make sure "
-                   "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());
           } 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_) ||
@@ -689,8 +664,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;
             }
 
@@ -707,7 +681,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).
@@ -719,7 +693,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));
@@ -752,11 +726,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_ ||
@@ -770,13 +744,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)
@@ -855,7 +828,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) {
@@ -888,18 +861,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
@@ -921,7 +892,7 @@ void CompactionIterator::NextFromInput() {
         ++iter_stats_.num_record_drop_range_del;
         AdvanceInputIter();
       } else {
-        validity_info_.SetValid(ValidContext::kNewUserKey);
+        valid_ = true;
       }
     }
 
@@ -930,18 +901,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() {
@@ -954,7 +920,7 @@ bool CompactionIterator::ExtractLargeValueIfNeededImpl() {
 
   if (!s.ok()) {
     status_ = s;
-    validity_info_.Invalidate();
+    valid_ = false;
 
     return false;
   }
@@ -999,7 +965,7 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {
 
       if (!s.ok()) {
         status_ = s;
-        validity_info_.Invalidate();
+        valid_ = false;
 
         return;
       }
@@ -1025,7 +991,7 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {
 
       if (!s.ok()) {
         status_ = s;
-        validity_info_.Invalidate();
+        valid_ = false;
 
         return;
       }
@@ -1058,14 +1024,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;
     }
@@ -1078,64 +1044,14 @@ void CompactionIterator::GarbageCollectBlobIfNeeded() {
   }
 }
 
-void CompactionIterator::DecideOutputLevel() {
-#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;
-#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 > penultimate_level_cutoff_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
@@ -1147,29 +1063,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 < penultimate_level_cutoff_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;
@@ -1200,17 +1106,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) {
@@ -1220,12 +1123,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) {
@@ -1284,10 +1184,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>

db/compaction/compaction_iterator.h

@@ -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(); }
@@ -105,10 +105,6 @@ class CompactionIterator {
     virtual bool DoesInputReferenceBlobFiles() const = 0;
 
     virtual const Compaction* real_compaction() const = 0;
-
-    virtual bool SupportsPerKeyPlacement() const = 0;
-
-    virtual bool WithinPenultimateLevelOutputRange(const Slice& key) const = 0;
   };
 
   class RealCompaction : public CompactionProxy {
@@ -146,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 {
@@ -167,16 +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.
-    bool WithinPenultimateLevelOutputRange(const Slice& key) const override {
-      return compaction_->WithinPenultimateLevelOutputRange(key);
-    }
-
    private:
     const Compaction* compaction_;
   };
@@ -189,14 +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 penultimate_level_cutoff_seqno = kMaxSequenceNumber);
+      const std::string* full_history_ts_low = nullptr);
 
   // Constructor with custom CompactionProxy, used for tests.
   CompactionIterator(
@@ -207,14 +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 penultimate_level_cutoff_seqno = kMaxSequenceNumber);
+      const std::string* full_history_ts_low = nullptr);
 
   ~CompactionIterator();
 
@@ -235,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
@@ -253,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
@@ -332,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_;
@@ -367,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.
@@ -461,15 +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};
-
-  // any key later than this sequence number should have
-  // output_to_penultimate_level_ set to true
-  const SequenceNumber penultimate_level_cutoff_seqno_ = kMaxSequenceNumber;
-
   void AdvanceInputIter() { input_.Next(); }
 
   void SkipUntil(const Slice& skip_until) { input_.Seek(skip_until); }
@@ -481,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));
   }
 };
 

db/compaction/compaction_iterator_test.cc

@@ -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.

db/compaction/compaction_job.h

@@ -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,41 +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_;
-
-  // cutoff sequence number for penultimate level, only set when
-  // per_key_placement feature is enabled.
-  // If a key with sequence number larger than penultimate_level_cutoff_seqno_,
-  // it will be placed on the penultimate_level and seqnuence number won't be
-  // zeroed out.
-  SequenceNumber penultimate_level_cutoff_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
@@ -368,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);
@@ -401,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),
@@ -418,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
@@ -465,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);
 

db/compaction/compaction_job_stats_test.cc

@@ -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;

db/compaction/compaction_job_test.cc

@@ -27,7 +27,6 @@
 #include "rocksdb/options.h"
 #include "rocksdb/write_buffer_manager.h"
 #include "table/mock_table.h"
-#include "table/unique_id_impl.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/string_util.h"
@@ -69,138 +68,12 @@ void VerifyInitializationOfCompactionJobStats(
 #endif  // !defined(IOS_CROSS_COMPILE)
 }
 
-// Mock FSWritableFile for testing io priority.
-// Only override the essential functions for testing compaction io priority.
-class MockTestWritableFile : public FSWritableFileOwnerWrapper {
- public:
-  MockTestWritableFile(std::unique_ptr<FSWritableFile>&& file,
-                       Env::IOPriority io_priority)
-      : FSWritableFileOwnerWrapper(std::move(file)),
-        write_io_priority_(io_priority) {}
-  IOStatus Append(const Slice& data, const IOOptions& options,
-                  IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->Append(data, options, dbg);
-  }
-  IOStatus Append(const Slice& data, const IOOptions& options,
-                  const DataVerificationInfo& verification_info,
-                  IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->Append(data, options, verification_info, dbg);
-  }
-  IOStatus Close(const IOOptions& options, IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->Close(options, dbg);
-  }
-  IOStatus Flush(const IOOptions& options, IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->Flush(options, dbg);
-  }
-  IOStatus Sync(const IOOptions& options, IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->Sync(options, dbg);
-  }
-  IOStatus Fsync(const IOOptions& options, IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->Fsync(options, dbg);
-  }
-  uint64_t GetFileSize(const IOOptions& options, IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->GetFileSize(options, dbg);
-  }
-  IOStatus RangeSync(uint64_t offset, uint64_t nbytes, const IOOptions& options,
-                     IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->RangeSync(offset, nbytes, options, dbg);
-  }
-
-  void PrepareWrite(size_t offset, size_t len, const IOOptions& options,
-                    IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    target()->PrepareWrite(offset, len, options, dbg);
-  }
-
-  IOStatus Allocate(uint64_t offset, uint64_t len, const IOOptions& options,
-                    IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, write_io_priority_);
-    return target()->Allocate(offset, len, options, dbg);
-  }
-
- private:
-  Env::IOPriority write_io_priority_;
-};
-
-// Mock FSRandomAccessFile for testing io priority.
-// Only override the essential functions for testing compaction io priority.
-class MockTestRandomAccessFile : public FSRandomAccessFileOwnerWrapper {
- public:
-  MockTestRandomAccessFile(std::unique_ptr<FSRandomAccessFile>&& file,
-                           Env::IOPriority io_priority)
-      : FSRandomAccessFileOwnerWrapper(std::move(file)),
-        read_io_priority_(io_priority) {}
-
-  IOStatus Read(uint64_t offset, size_t n, const IOOptions& options,
-                Slice* result, char* scratch,
-                IODebugContext* dbg) const override {
-    EXPECT_EQ(options.rate_limiter_priority, read_io_priority_);
-    return target()->Read(offset, n, options, result, scratch, dbg);
-  }
-  IOStatus Prefetch(uint64_t offset, size_t n, const IOOptions& options,
-                    IODebugContext* dbg) override {
-    EXPECT_EQ(options.rate_limiter_priority, read_io_priority_);
-    return target()->Prefetch(offset, n, options, dbg);
-  }
-
- private:
-  Env::IOPriority read_io_priority_;
-};
-
-// Mock FileSystem for testing io priority.
-class MockTestFileSystem : public FileSystemWrapper {
- public:
-  explicit MockTestFileSystem(const std::shared_ptr<FileSystem>& base,
-                              Env::IOPriority read_io_priority,
-                              Env::IOPriority write_io_priority)
-      : FileSystemWrapper(base),
-        read_io_priority_(read_io_priority),
-        write_io_priority_(write_io_priority) {}
-
-  static const char* kClassName() { return "MockTestFileSystem"; }
-  const char* Name() const override { return kClassName(); }
-
-  IOStatus NewRandomAccessFile(const std::string& fname,
-                               const FileOptions& file_opts,
-                               std::unique_ptr<FSRandomAccessFile>* result,
-                               IODebugContext* dbg) override {
-    IOStatus s = target()->NewRandomAccessFile(fname, file_opts, result, dbg);
-    EXPECT_OK(s);
-    result->reset(
-        new MockTestRandomAccessFile(std::move(*result), read_io_priority_));
-    return s;
-  }
-  IOStatus NewWritableFile(const std::string& fname,
-                           const FileOptions& file_opts,
-                           std::unique_ptr<FSWritableFile>* result,
-                           IODebugContext* dbg) override {
-    IOStatus s = target()->NewWritableFile(fname, file_opts, result, dbg);
-    EXPECT_OK(s);
-    result->reset(
-        new MockTestWritableFile(std::move(*result), write_io_priority_));
-    return s;
-  }
-
- private:
-  Env::IOPriority read_io_priority_;
-  Env::IOPriority write_io_priority_;
-};
-
 }  // namespace
 
 class CompactionJobTestBase : public testing::Test {
  protected:
   CompactionJobTestBase(std::string dbname, const Comparator* ucmp,
-                        std::function<std::string(uint64_t)> encode_u64_ts,
-                        bool test_io_priority)
+                        std::function<std::string(uint64_t)> encode_u64_ts)
       : dbname_(std::move(dbname)),
         ucmp_(ucmp),
         db_options_(),
@@ -208,16 +81,15 @@ class CompactionJobTestBase : public testing::Test {
         mutable_db_options_(),
         table_cache_(NewLRUCache(50000, 16)),
         write_buffer_manager_(db_options_.db_write_buffer_size),
-        versions_(new VersionSet(
-            dbname_, &db_options_, env_options_, table_cache_.get(),
-            &write_buffer_manager_, &write_controller_,
-            /*block_cache_tracer=*/nullptr,
-            /*io_tracer=*/nullptr, /*db_id*/ "", /*db_session_id*/ "")),
+        versions_(new VersionSet(dbname_, &db_options_, env_options_,
+                                 table_cache_.get(), &write_buffer_manager_,
+                                 &write_controller_,
+                                 /*block_cache_tracer=*/nullptr,
+                                 /*io_tracer=*/nullptr, /*db_session_id*/ "")),
         shutting_down_(false),
         mock_table_factory_(new mock::MockTableFactory()),
         error_handler_(nullptr, db_options_, &mutex_),
-        encode_u64_ts_(std::move(encode_u64_ts)),
-        test_io_priority_(test_io_priority) {
+        encode_u64_ts_(std::move(encode_u64_ts)) {
     Env* base_env = Env::Default();
     EXPECT_OK(
         test::CreateEnvFromSystem(ConfigOptions(), &base_env, &env_guard_));
@@ -232,12 +104,7 @@ class CompactionJobTestBase : public testing::Test {
     db_options_.db_paths.emplace_back(dbname_,
                                       std::numeric_limits<uint64_t>::max());
     cf_options_.comparator = ucmp_;
-    if (test_io_priority_) {
-      BlockBasedTableOptions table_options;
-      cf_options_.table_factory.reset(NewBlockBasedTableFactory(table_options));
-    } else {
-      cf_options_.table_factory = mock_table_factory_;
-    }
+    cf_options_.table_factory = mock_table_factory_;
   }
 
   std::string GenerateFileName(uint64_t file_number) {
@@ -277,33 +144,6 @@ class CompactionJobTestBase : public testing::Test {
     return blob_index;
   }
 
-  // Creates a table with the specificied key value pairs.
-  void CreateTable(const std::string& table_name,
-                   const mock::KVVector& contents, uint64_t& file_size) {
-    std::unique_ptr<WritableFileWriter> file_writer;
-    Status s = WritableFileWriter::Create(fs_, table_name, FileOptions(),
-                                          &file_writer, nullptr);
-    ASSERT_OK(s);
-    std::unique_ptr<TableBuilder> table_builder(
-        cf_options_.table_factory->NewTableBuilder(
-            TableBuilderOptions(*cfd_->ioptions(), mutable_cf_options_,
-                                cfd_->internal_comparator(),
-                                cfd_->int_tbl_prop_collector_factories(),
-                                CompressionType::kNoCompression,
-                                CompressionOptions(), 0 /* column_family_id */,
-                                kDefaultColumnFamilyName, -1 /* level */),
-            file_writer.get()));
-    // Build table.
-    for (auto kv : contents) {
-      std::string key;
-      std::string value;
-      std::tie(key, value) = kv;
-      table_builder->Add(key, value);
-    }
-    ASSERT_OK(table_builder->Finish());
-    file_size = table_builder->FileSize();
-  }
-
   void AddMockFile(const mock::KVVector& contents, int level = 0) {
     assert(contents.size() > 0);
 
@@ -357,22 +197,16 @@ class CompactionJobTestBase : public testing::Test {
     }
 
     uint64_t file_number = versions_->NewFileNumber();
-
-    uint64_t file_size;
-    if (test_io_priority_) {
-      CreateTable(GenerateFileName(file_number), contents, file_size);
-    } else {
-      file_size = 10;
-      EXPECT_OK(mock_table_factory_->CreateMockTable(
-          env_, GenerateFileName(file_number), std::move(contents)));
-    }
+    EXPECT_OK(mock_table_factory_->CreateMockTable(
+        env_, GenerateFileName(file_number), std::move(contents)));
 
     VersionEdit edit;
-    edit.AddFile(level, file_number, 0, file_size, smallest_key, largest_key,
+    edit.AddFile(level, file_number, 0, 10, smallest_key, largest_key,
                  smallest_seqno, largest_seqno, false, Temperature::kUnknown,
                  oldest_blob_file_number, kUnknownOldestAncesterTime,
                  kUnknownFileCreationTime, kUnknownFileChecksum,
-                 kUnknownFileChecksumFuncName, kNullUniqueId64x2);
+                 kUnknownFileChecksumFuncName, kDisableUserTimestamp,
+                 kDisableUserTimestamp);
 
     mutex_.Lock();
     EXPECT_OK(
@@ -402,8 +236,8 @@ class CompactionJobTestBase : public testing::Test {
     for (int i = 0; i < 2; ++i) {
       auto contents = mock::MakeMockFile();
       for (int k = 0; k < kKeysPerFile; ++k) {
-        auto key = std::to_string(i * kMatchingKeys + k);
-        auto value = std::to_string(i * kKeysPerFile + k);
+        auto key = ToString(i * kMatchingKeys + k);
+        auto value = ToString(i * kKeysPerFile + k);
         InternalKey internal_key(key, ++sequence_number, kTypeValue);
 
         // This is how the key will look like once it's written in bottommost
@@ -443,7 +277,7 @@ class CompactionJobTestBase : public testing::Test {
         new VersionSet(dbname_, &db_options_, env_options_, table_cache_.get(),
                        &write_buffer_manager_, &write_controller_,
                        /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr,
-                       /*db_id*/ "", /*db_session_id*/ ""));
+                       /*db_session_id*/ ""));
     compaction_job_stats_.Reset();
     ASSERT_OK(SetIdentityFile(env_, dbname_));
 
@@ -481,33 +315,13 @@ class CompactionJobTestBase : public testing::Test {
     cfd_ = versions_->GetColumnFamilySet()->GetDefault();
   }
 
-  void RunLastLevelCompaction(
-      const std::vector<std::vector<FileMetaData*>>& input_files,
-      std::function<void(Compaction& comp)>&& verify_func,
-      const std::vector<SequenceNumber>& snapshots = {}) {
-    const int kLastLevel = cf_options_.num_levels - 1;
-    verify_per_key_placement_ = std::move(verify_func);
-    mock::KVVector empty_map;
-    RunCompaction(input_files, empty_map, snapshots, kMaxSequenceNumber,
-                  kLastLevel, false);
-  }
-
   void RunCompaction(
       const std::vector<std::vector<FileMetaData*>>& input_files,
       const mock::KVVector& expected_results,
       const std::vector<SequenceNumber>& snapshots = {},
       SequenceNumber earliest_write_conflict_snapshot = kMaxSequenceNumber,
       int output_level = 1, bool verify = true,
-      uint64_t expected_oldest_blob_file_number = kInvalidBlobFileNumber,
-      bool check_get_priority = false,
-      Env::IOPriority read_io_priority = Env::IO_TOTAL,
-      Env::IOPriority write_io_priority = Env::IO_TOTAL) {
-    // For compaction, set fs as MockTestFileSystem to check the io_priority.
-    if (test_io_priority_) {
-      db_options_.fs.reset(
-          new MockTestFileSystem(fs_, read_io_priority, write_io_priority));
-    }
-
+      uint64_t expected_oldest_blob_file_number = kInvalidBlobFileNumber) {
     auto cfd = versions_->GetColumnFamilySet()->GetDefault();
 
     size_t num_input_files = 0;
@@ -537,7 +351,6 @@ class CompactionJobTestBase : public testing::Test {
     SnapshotChecker* snapshot_checker = nullptr;
     ASSERT_TRUE(full_history_ts_low_.empty() ||
                 ucmp_->timestamp_size() == full_history_ts_low_.size());
-    const std::atomic<bool> kManualCompactionCanceledFalse{false};
     CompactionJob compaction_job(
         0, &compaction, db_options_, mutable_db_options_, env_options_,
         versions_.get(), &shutting_down_, &log_buffer, nullptr, nullptr,
@@ -545,9 +358,9 @@ class CompactionJobTestBase : public testing::Test {
         earliest_write_conflict_snapshot, snapshot_checker, nullptr,
         table_cache_, &event_logger, false, false, dbname_,
         &compaction_job_stats_, Env::Priority::USER, nullptr /* IOTracer */,
-        /*manual_compaction_canceled=*/kManualCompactionCanceledFalse,
-        env_->GenerateUniqueId(), DBImpl::GenerateDbSessionId(nullptr),
-        full_history_ts_low_);
+        /*manual_compaction_paused=*/nullptr,
+        /*manual_compaction_canceled=*/nullptr, /*db_id=*/"",
+        /*db_session_id=*/"", full_history_ts_low_);
     VerifyInitializationOfCompactionJobStats(compaction_job_stats_);
 
     compaction_job.Prepare();
@@ -577,38 +390,6 @@ class CompactionJobTestBase : public testing::Test {
                   expected_oldest_blob_file_number);
       }
     }
-
-    if (check_get_priority) {
-      CheckGetRateLimiterPriority(compaction_job);
-    }
-
-    if (verify_per_key_placement_) {
-      // Verify per_key_placement compaction
-      assert(compaction.SupportsPerKeyPlacement());
-      verify_per_key_placement_(compaction);
-    }
-  }
-
-  void CheckGetRateLimiterPriority(CompactionJob& compaction_job) {
-    // When the state from WriteController is normal.
-    ASSERT_EQ(compaction_job.GetRateLimiterPriority(), Env::IO_LOW);
-
-    WriteController* write_controller =
-        compaction_job.versions_->GetColumnFamilySet()->write_controller();
-
-    {
-      // When the state from WriteController is Delayed.
-      std::unique_ptr<WriteControllerToken> delay_token =
-          write_controller->GetDelayToken(1000000);
-      ASSERT_EQ(compaction_job.GetRateLimiterPriority(), Env::IO_USER);
-    }
-
-    {
-      // When the state from WriteController is Stopped.
-      std::unique_ptr<WriteControllerToken> stop_token =
-          write_controller->GetStopToken();
-      ASSERT_EQ(compaction_job.GetRateLimiterPriority(), Env::IO_USER);
-    }
   }
 
   std::shared_ptr<Env> env_guard_;
@@ -635,17 +416,15 @@ class CompactionJobTestBase : public testing::Test {
   ErrorHandler error_handler_;
   std::string full_history_ts_low_;
   const std::function<std::string(uint64_t)> encode_u64_ts_;
-  bool test_io_priority_;
-  std::function<void(Compaction& comp)> verify_per_key_placement_;
 };
 
 // TODO(icanadi) Make it simpler once we mock out VersionSet
 class CompactionJobTest : public CompactionJobTestBase {
  public:
   CompactionJobTest()
-      : CompactionJobTestBase(
-            test::PerThreadDBPath("compaction_job_test"), BytewiseComparator(),
-            [](uint64_t /*ts*/) { return ""; }, false) {}
+      : CompactionJobTestBase(test::PerThreadDBPath("compaction_job_test"),
+                              BytewiseComparator(),
+                              [](uint64_t /*ts*/) { return ""; }) {}
 };
 
 TEST_F(CompactionJobTest, Simple) {
@@ -1111,10 +890,10 @@ TEST_F(CompactionJobTest, MultiSingleDelete) {
   //      -> Snapshot Put
   // K: SDel SDel Put SDel Put Put Snapshot SDel Put SDel SDel Put SDel
   //      -> Snapshot Put Snapshot SDel
-  // L: SDel Put SDel Put SDel Snapshot SDel Put SDel SDel Put SDel
-  //      -> Snapshot SDel Put SDel
-  // M: (Put) SDel Put SDel Put SDel Snapshot Put SDel SDel Put SDel SDel
-  //      -> SDel Snapshot Put SDel
+  // L: SDel Put Del Put SDel Snapshot Del Put Del SDel Put SDel
+  //      -> Snapshot SDel
+  // M: (Put) SDel Put Del Put SDel Snapshot Put Del SDel Put SDel Del
+  //      -> SDel Snapshot Del
   NewDB();
 
   auto file1 = mock::MakeMockFile({
@@ -1145,14 +924,14 @@ TEST_F(CompactionJobTest, MultiSingleDelete) {
       {KeyStr("L", 16U, kTypeSingleDeletion), ""},
       {KeyStr("L", 15U, kTypeValue), "val"},
       {KeyStr("L", 14U, kTypeSingleDeletion), ""},
-      {KeyStr("L", 13U, kTypeSingleDeletion), ""},
+      {KeyStr("L", 13U, kTypeDeletion), ""},
       {KeyStr("L", 12U, kTypeValue), "val"},
-      {KeyStr("L", 11U, kTypeSingleDeletion), ""},
-      {KeyStr("M", 16U, kTypeSingleDeletion), ""},
+      {KeyStr("L", 11U, kTypeDeletion), ""},
+      {KeyStr("M", 16U, kTypeDeletion), ""},
       {KeyStr("M", 15U, kTypeSingleDeletion), ""},
       {KeyStr("M", 14U, kTypeValue), "val"},
       {KeyStr("M", 13U, kTypeSingleDeletion), ""},
-      {KeyStr("M", 12U, kTypeSingleDeletion), ""},
+      {KeyStr("M", 12U, kTypeDeletion), ""},
       {KeyStr("M", 11U, kTypeValue), "val"},
   });
   AddMockFile(file1);
@@ -1193,12 +972,12 @@ TEST_F(CompactionJobTest, MultiSingleDelete) {
       {KeyStr("K", 1U, kTypeSingleDeletion), ""},
       {KeyStr("L", 5U, kTypeSingleDeletion), ""},
       {KeyStr("L", 4U, kTypeValue), "val"},
-      {KeyStr("L", 3U, kTypeSingleDeletion), ""},
+      {KeyStr("L", 3U, kTypeDeletion), ""},
       {KeyStr("L", 2U, kTypeValue), "val"},
       {KeyStr("L", 1U, kTypeSingleDeletion), ""},
       {KeyStr("M", 10U, kTypeSingleDeletion), ""},
       {KeyStr("M", 7U, kTypeValue), "val"},
-      {KeyStr("M", 5U, kTypeSingleDeletion), ""},
+      {KeyStr("M", 5U, kTypeDeletion), ""},
       {KeyStr("M", 4U, kTypeValue), "val"},
       {KeyStr("M", 3U, kTypeSingleDeletion), ""},
   });
@@ -1240,9 +1019,7 @@ TEST_F(CompactionJobTest, MultiSingleDelete) {
                           {KeyStr("K", 8U, kTypeValue), "val3"},
                           {KeyStr("L", 16U, kTypeSingleDeletion), ""},
                           {KeyStr("L", 15U, kTypeValue), ""},
-                          {KeyStr("L", 11U, kTypeSingleDeletion), ""},
-                          {KeyStr("M", 15U, kTypeSingleDeletion), ""},
-                          {KeyStr("M", 14U, kTypeValue), ""},
+                          {KeyStr("M", 16U, kTypeDeletion), ""},
                           {KeyStr("M", 3U, kTypeSingleDeletion), ""}});
 
   SetLastSequence(22U);
@@ -1328,90 +1105,6 @@ TEST_F(CompactionJobTest, OldestBlobFileNumber) {
                 /* expected_oldest_blob_file_number */ 19);
 }
 
-TEST_F(CompactionJobTest, VerifyPenultimateLevelOutput) {
-  cf_options_.bottommost_temperature = Temperature::kCold;
-  SyncPoint::GetInstance()->SetCallBack(
-      "Compaction::SupportsPerKeyPlacement:Enabled", [&](void* arg) {
-        auto supports_per_key_placement = static_cast<bool*>(arg);
-        *supports_per_key_placement = true;
-      });
-
-  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();
-
-  NewDB();
-
-  // Add files on different levels that may overlap
-  auto file0_1 = mock::MakeMockFile({{KeyStr("z", 12U, kTypeValue), "val"}});
-  AddMockFile(file0_1);
-
-  auto file1_1 = mock::MakeMockFile({{KeyStr("b", 10U, kTypeValue), "val"},
-                                     {KeyStr("f", 11U, kTypeValue), "val"}});
-  AddMockFile(file1_1, 1);
-  auto file1_2 = mock::MakeMockFile({{KeyStr("j", 12U, kTypeValue), "val"},
-                                     {KeyStr("k", 13U, kTypeValue), "val"}});
-  AddMockFile(file1_2, 1);
-  auto file1_3 = mock::MakeMockFile({{KeyStr("p", 14U, kTypeValue), "val"},
-                                     {KeyStr("u", 15U, kTypeValue), "val"}});
-  AddMockFile(file1_3, 1);
-
-  auto file2_1 = mock::MakeMockFile({{KeyStr("f", 8U, kTypeValue), "val"},
-                                     {KeyStr("h", 9U, kTypeValue), "val"}});
-  AddMockFile(file2_1, 2);
-  auto file2_2 = mock::MakeMockFile({{KeyStr("m", 6U, kTypeValue), "val"},
-                                     {KeyStr("p", 7U, kTypeValue), "val"}});
-  AddMockFile(file2_2, 2);
-
-  auto file3_1 = mock::MakeMockFile({{KeyStr("g", 2U, kTypeValue), "val"},
-                                     {KeyStr("k", 3U, kTypeValue), "val"}});
-  AddMockFile(file3_1, 3);
-  auto file3_2 = mock::MakeMockFile({{KeyStr("v", 4U, kTypeValue), "val"},
-                                     {KeyStr("x", 5U, kTypeValue), "val"}});
-  AddMockFile(file3_2, 3);
-
-  auto cfd = versions_->GetColumnFamilySet()->GetDefault();
-  auto files0 = cfd->current()->storage_info()->LevelFiles(0);
-  auto files1 = cfd->current()->storage_info()->LevelFiles(1);
-  auto files2 = cfd->current()->storage_info()->LevelFiles(2);
-  auto files3 = cfd->current()->storage_info()->LevelFiles(3);
-
-  RunLastLevelCompaction(
-      {files0, files1, files2, files3}, /*verify_func=*/[&](Compaction& comp) {
-        for (char c = 'a'; c <= 'z'; c++) {
-          std::string c_str;
-          c_str = c;
-          const Slice key(c_str);
-          if (c == 'a') {
-            ASSERT_FALSE(comp.WithinPenultimateLevelOutputRange(key));
-          } else {
-            ASSERT_TRUE(comp.WithinPenultimateLevelOutputRange(key));
-          }
-        }
-      });
-}
-
-TEST_F(CompactionJobTest, NoEnforceSingleDeleteContract) {
-  db_options_.enforce_single_del_contracts = false;
-  NewDB();
-
-  auto file =
-      mock::MakeMockFile({{KeyStr("a", 4U, kTypeSingleDeletion), ""},
-                          {KeyStr("a", 3U, kTypeDeletion), "dontcare"}});
-  AddMockFile(file);
-  SetLastSequence(4U);
-
-  auto expected_results = mock::MakeMockFile();
-  auto files = cfd_->current()->storage_info()->LevelFiles(0);
-  RunCompaction({files}, expected_results);
-}
-
 TEST_F(CompactionJobTest, InputSerialization) {
   // Setup a random CompactionServiceInput
   CompactionServiceInput input;
@@ -1446,6 +1139,7 @@ TEST_F(CompactionJobTest, InputSerialization) {
   if (input.has_end) {
     input.end = rnd.RandomBinaryString(rnd.Uniform(kStrMaxLen));
   }
+  input.approx_size = rnd64.Uniform(UINT64_MAX);
 
   std::string output;
   ASSERT_OK(input.Write(&output));
@@ -1516,14 +1210,13 @@ TEST_F(CompactionJobTest, ResultSerialization) {
   result.status =
       status_list.at(rnd.Uniform(static_cast<int>(status_list.size())));
   while (!rnd.OneIn(10)) {
-    UniqueId64x2 id{rnd64.Uniform(UINT64_MAX), rnd64.Uniform(UINT64_MAX)};
     result.output_files.emplace_back(
         rnd.RandomString(rnd.Uniform(kStrMaxLen)), rnd64.Uniform(UINT64_MAX),
         rnd64.Uniform(UINT64_MAX),
         rnd.RandomBinaryString(rnd.Uniform(kStrMaxLen)),
         rnd.RandomBinaryString(rnd.Uniform(kStrMaxLen)),
         rnd64.Uniform(UINT64_MAX), rnd64.Uniform(UINT64_MAX),
-        rnd64.Uniform(UINT64_MAX), rnd.OneIn(2), id);
+        rnd64.Uniform(UINT64_MAX), rnd.OneIn(2));
   }
   result.output_level = rnd.Uniform(10);
   result.output_path = rnd.RandomString(rnd.Uniform(kStrMaxLen));
@@ -1551,16 +1244,6 @@ TEST_F(CompactionJobTest, ResultSerialization) {
   ASSERT_FALSE(deserialized1.TEST_Equals(&result, &mismatch));
   ASSERT_EQ(mismatch, "stats.num_input_files");
 
-  // Test unique id mismatch
-  if (!result.output_files.empty()) {
-    CompactionServiceResult deserialized_tmp;
-    ASSERT_OK(CompactionServiceResult::Read(output, &deserialized_tmp));
-    deserialized_tmp.output_files[0].unique_id[0] += 1;
-    ASSERT_FALSE(deserialized_tmp.TEST_Equals(&result, &mismatch));
-    ASSERT_EQ(mismatch, "output_files.unique_id");
-    deserialized_tmp.status.PermitUncheckedError();
-  }
-
   // Test unknown field
   CompactionServiceResult deserialized2;
   output.clear();
@@ -1603,13 +1286,12 @@ TEST_F(CompactionJobTest, ResultSerialization) {
   }
 }
 
-
 class CompactionJobTimestampTest : public CompactionJobTestBase {
  public:
   CompactionJobTimestampTest()
       : CompactionJobTestBase(test::PerThreadDBPath("compaction_job_ts_test"),
                               test::BytewiseComparatorWithU64TsWrapper(),
-                              test::EncodeInt, false) {}
+                              test::EncodeInt) {}
 };
 
 TEST_F(CompactionJobTimestampTest, GCDisabled) {
@@ -1725,69 +1407,6 @@ TEST_F(CompactionJobTimestampTest, SomeKeysExpired) {
   RunCompaction({files}, expected_results);
 }
 
-// The io priority of the compaction reads and writes are different from
-// other DB reads and writes. To prepare the compaction input files, use the
-// default filesystem from Env. To test the io priority of the compaction
-// reads and writes, db_options_.fs is set as MockTestFileSystem.
-class CompactionJobIOPriorityTest : public CompactionJobTestBase {
- public:
-  CompactionJobIOPriorityTest()
-      : CompactionJobTestBase(
-            test::PerThreadDBPath("compaction_job_io_priority_test"),
-            BytewiseComparator(), [](uint64_t /*ts*/) { return ""; }, true) {}
-};
-
-TEST_F(CompactionJobIOPriorityTest, WriteControllerStateNormal) {
-  // When the state from WriteController is normal.
-  NewDB();
-  mock::KVVector expected_results = CreateTwoFiles(false);
-  auto cfd = versions_->GetColumnFamilySet()->GetDefault();
-  auto files = cfd->current()->storage_info()->LevelFiles(0);
-  ASSERT_EQ(2U, files.size());
-  RunCompaction({files}, expected_results, {}, kMaxSequenceNumber, 1, false,
-                kInvalidBlobFileNumber, false, Env::IO_LOW, Env::IO_LOW);
-}
-
-TEST_F(CompactionJobIOPriorityTest, WriteControllerStateDelayed) {
-  // When the state from WriteController is Delayed.
-  NewDB();
-  mock::KVVector expected_results = CreateTwoFiles(false);
-  auto cfd = versions_->GetColumnFamilySet()->GetDefault();
-  auto files = cfd->current()->storage_info()->LevelFiles(0);
-  ASSERT_EQ(2U, files.size());
-  {
-    std::unique_ptr<WriteControllerToken> delay_token =
-        write_controller_.GetDelayToken(1000000);
-    RunCompaction({files}, expected_results, {}, kMaxSequenceNumber, 1, false,
-                  kInvalidBlobFileNumber, false, Env::IO_USER, Env::IO_USER);
-  }
-}
-
-TEST_F(CompactionJobIOPriorityTest, WriteControllerStateStalled) {
-  // When the state from WriteController is Stalled.
-  NewDB();
-  mock::KVVector expected_results = CreateTwoFiles(false);
-  auto cfd = versions_->GetColumnFamilySet()->GetDefault();
-  auto files = cfd->current()->storage_info()->LevelFiles(0);
-  ASSERT_EQ(2U, files.size());
-  {
-    std::unique_ptr<WriteControllerToken> stop_token =
-        write_controller_.GetStopToken();
-    RunCompaction({files}, expected_results, {}, kMaxSequenceNumber, 1, false,
-                  kInvalidBlobFileNumber, false, Env::IO_USER, Env::IO_USER);
-  }
-}
-
-TEST_F(CompactionJobIOPriorityTest, GetRateLimiterPriority) {
-  NewDB();
-  mock::KVVector expected_results = CreateTwoFiles(false);
-  auto cfd = versions_->GetColumnFamilySet()->GetDefault();
-  auto files = cfd->current()->storage_info()->LevelFiles(0);
-  ASSERT_EQ(2U, files.size());
-  RunCompaction({files}, expected_results, {}, kMaxSequenceNumber, 1, false,
-                kInvalidBlobFileNumber, true, Env::IO_LOW, Env::IO_LOW);
-}
-
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

db/compaction/compaction_outputs.cc

@@ -1,321 +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;
-}
-
-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 (!pending_close_ && c_iter.Valid() && partitioner_ && HasBuilder() &&
-      partitioner_->ShouldPartition(
-          PartitionerRequest(last_key_for_partitioner_, c_iter.user_key(),
-                             current_output_file_size_)) == kRequired) {
-    pending_close_ = true;
-  }
-
-  if (pending_close_) {
-    s = close_file_func(*this, c_iter.InputStatus(), key);
-    pending_close_ = false;
-  }
-  if (!s.ok()) {
-    return s;
-  }
-
-  // Open output file if necessary
-  if (!HasBuilder()) {
-    s = open_file_func(*this);
-  }
-  if (!s.ok()) {
-    return s;
-  }
-
-  Output& curr = current_output();
-  assert(builder_ != nullptr);
-  const Slice& value = c_iter.value();
-  s = curr.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);
-
-  // Close output file if it is big enough. Two possibilities determine it's
-  // time to close it: (1) the current key should be this file's last key, (2)
-  // the next key should not be in this file.
-  //
-  // TODO(aekmekji): determine if file should be closed earlier than this
-  // during subcompactions (i.e. if output size, estimated by input size, is
-  // going to be 1.2MB and max_output_file_size = 1MB, prefer to have 0.6MB
-  // and 0.6MB instead of 1MB and 0.2MB)
-  if (compaction_->output_level() != 0 &&
-      current_output_file_size_ >= compaction_->max_output_file_size()) {
-    pending_close_ = true;
-  }
-
-  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, const Slice* comp_end,
-    CompactionIterationStats& range_del_out_stats, bool bottommost_level,
-    const InternalKeyComparator& icmp, SequenceNumber earliest_snapshot,
-    const Slice& next_table_min_key) {
-  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;
-    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 != nullptr &&
-        ucmp->Compare(upper_bound_guard, *comp_end) >= 0) {
-      upper_bound = comp_end;
-    } 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;
-  }
-  bool has_overlapping_endpoints;
-  if (upper_bound != nullptr && meta.largest.size() > 0) {
-    has_overlapping_endpoints =
-        ucmp->Compare(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 == nullptr || upper_bound == nullptr ||
-         ucmp->Compare(*upper_bound, *comp_end) <= 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->Compare(*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;
-      }
-    }
-
-    if (bottommost_level && tombstone.seq_ <= earliest_snapshot) {
-      // 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->Compare(*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->Compare(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.
-      smallest_candidate = InternalKey(
-          *lower_bound, lower_bound_from_sub_compact ? tombstone.seq_ : 0,
-          kTypeRangeDeletion);
-    }
-    InternalKey largest_candidate = tombstone.SerializeEndKey();
-    if (upper_bound != nullptr &&
-        ucmp->Compare(*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.
-      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();
-}
-}  // namespace ROCKSDB_NAMESPACE

db/compaction/compaction_outputs.h

@@ -1,329 +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.
-
-#pragma once
-
-#include "db/blob/blob_garbage_meter.h"
-#include "db/compaction/compaction.h"
-#include "db/compaction/compaction_iterator.h"
-#include "db/internal_stats.h"
-#include "db/output_validator.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-class CompactionOutputs;
-using CompactionFileOpenFunc = std::function<Status(CompactionOutputs&)>;
-using CompactionFileCloseFunc =
-    std::function<Status(CompactionOutputs&, const Status&, const Slice&)>;
-
-// Files produced by subcompaction, most of the functions are used by
-// compaction_job Open/Close compaction file functions.
-class CompactionOutputs {
- public:
-  // compaction output file
-  struct Output {
-    Output(FileMetaData&& _meta, const InternalKeyComparator& _icmp,
-           bool _enable_order_check, bool _enable_hash, bool _finished,
-           uint64_t precalculated_hash)
-        : meta(std::move(_meta)),
-          validator(_icmp, _enable_order_check, _enable_hash,
-                    precalculated_hash),
-          finished(_finished) {}
-    FileMetaData meta;
-    OutputValidator validator;
-    bool finished;
-    std::shared_ptr<const TableProperties> table_properties;
-  };
-
-  CompactionOutputs() = delete;
-
-  explicit 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();
-  }
-
-  // Add generated output to the list
-  void AddOutput(FileMetaData&& meta, const InternalKeyComparator& icmp,
-                 bool enable_order_check, bool enable_hash,
-                 bool finished = false, uint64_t precalculated_hash = 0) {
-    outputs_.emplace_back(std::move(meta), icmp, enable_order_check,
-                          enable_hash, finished, precalculated_hash);
-  }
-
-  // Set new table builder for the current output
-  void NewBuilder(const TableBuilderOptions& tboptions);
-
-  // Assign a new WritableFileWriter to the current output
-  void AssignFileWriter(WritableFileWriter* writer) {
-    file_writer_.reset(writer);
-  }
-
-  // TODO: Remove it when remote compaction support tiered compaction
-  void SetTotalBytes(uint64_t bytes) { stats_.bytes_written += bytes; }
-  void SetNumOutputRecords(uint64_t num) { stats_.num_output_records = num; }
-
-  // TODO: Move the BlobDB builder into CompactionOutputs
-  const std::vector<BlobFileAddition>& GetBlobFileAdditions() const {
-    if (is_penultimate_level_) {
-      assert(blob_file_additions_.empty());
-    }
-    return blob_file_additions_;
-  }
-
-  std::vector<BlobFileAddition>* GetBlobFileAdditionsPtr() {
-    assert(!is_penultimate_level_);
-    return &blob_file_additions_;
-  }
-
-  bool HasBlobFileAdditions() const { return !blob_file_additions_.empty(); }
-
-  BlobGarbageMeter* CreateBlobGarbageMeter() {
-    assert(!is_penultimate_level_);
-    blob_garbage_meter_ = std::make_unique<BlobGarbageMeter>();
-    return blob_garbage_meter_.get();
-  }
-
-  BlobGarbageMeter* GetBlobGarbageMeter() const {
-    if (is_penultimate_level_) {
-      // blobdb doesn't support per_key_placement yet
-      assert(blob_garbage_meter_ == nullptr);
-      return nullptr;
-    }
-    return blob_garbage_meter_.get();
-  }
-
-  void UpdateBlobStats() {
-    assert(!is_penultimate_level_);
-    stats_.num_output_files_blob = blob_file_additions_.size();
-    for (const auto& blob : blob_file_additions_) {
-      stats_.bytes_written_blob += blob.GetTotalBlobBytes();
-    }
-  }
-
-  // Finish the current output file
-  Status Finish(const Status& intput_status,
-                const SeqnoToTimeMapping& seqno_time_mapping);
-
-  // Update output table properties from table builder
-  void UpdateTableProperties() {
-    current_output().table_properties =
-        std::make_shared<TableProperties>(GetTableProperties());
-  }
-
-  IOStatus WriterSyncClose(const Status& intput_status, SystemClock* clock,
-                           Statistics* statistics, bool use_fsync);
-
-  TableProperties GetTableProperties() {
-    return builder_->GetTableProperties();
-  }
-
-  Slice SmallestUserKey() const {
-    if (!outputs_.empty() && outputs_[0].finished) {
-      return outputs_[0].meta.smallest.user_key();
-    } else {
-      return Slice{nullptr, 0};
-    }
-  }
-
-  Slice LargestUserKey() const {
-    if (!outputs_.empty() && outputs_.back().finished) {
-      return outputs_.back().meta.largest.user_key();
-    } else {
-      return Slice{nullptr, 0};
-    }
-  }
-
-  // In case the last output file is empty, which doesn't need to keep.
-  void RemoveLastEmptyOutput() {
-    if (!outputs_.empty() && !outputs_.back().meta.fd.file_size) {
-      // An error occurred, so ignore the last output.
-      outputs_.pop_back();
-    }
-  }
-
-  // Remove the last output, for example the last output doesn't have data (no
-  // entry and no range-dels), but file_size might not be 0, as it has SST
-  // metadata.
-  void RemoveLastOutput() {
-    assert(!outputs_.empty());
-    outputs_.pop_back();
-  }
-
-  bool HasBuilder() const { return builder_ != nullptr; }
-
-  FileMetaData* GetMetaData() { return &current_output().meta; }
-
-  bool HasOutput() const { return !outputs_.empty(); }
-
-  uint64_t NumEntries() const { return builder_->NumEntries(); }
-
-  void ResetBuilder() {
-    builder_.reset();
-    current_output_file_size_ = 0;
-  }
-
-  // Add range-dels from the aggregator to the current output file
-  Status AddRangeDels(const Slice* comp_start, const Slice* comp_end,
-                      CompactionIterationStats& range_del_out_stats,
-                      bool bottommost_level, const InternalKeyComparator& icmp,
-                      SequenceNumber earliest_snapshot,
-                      const Slice& next_table_min_key);
-
-  // Is the current file is already pending for close
-  bool IsPendingClose() const { return pending_close_; }
-
-  // Current file should close before adding a new key
-  void SetPendingClose() { pending_close_ = true; }
-
-  // if the outputs have range delete, range delete is also data
-  bool HasRangeDel() const {
-    return range_del_agg_ && !range_del_agg_->IsEmpty();
-  }
-
- private:
-  friend class SubcompactionState;
-
-  void Cleanup() {
-    if (builder_ != nullptr) {
-      // May happen if we get a shutdown call in the middle of compaction
-      builder_->Abandon();
-      builder_.reset();
-    }
-  }
-
-  uint64_t GetCurrentOutputFileSize() const {
-    return current_output_file_size_;
-  }
-
-  // Add curent key from compaction_iterator to the output file. If needed
-  // close and open new compaction output with the functions provided.
-  Status AddToOutput(const CompactionIterator& c_iter,
-                     const CompactionFileOpenFunc& open_file_func,
-                     const CompactionFileCloseFunc& close_file_func);
-
-  // Close the current output. `open_file_func` is needed for creating new file
-  // for range-dels only output file.
-  Status CloseOutput(const Status& curr_status,
-                     const CompactionFileOpenFunc& open_file_func,
-                     const CompactionFileCloseFunc& close_file_func) {
-    Status status = curr_status;
-    // handle subcompaction containing only range deletions
-    if (status.ok() && !HasBuilder() && !HasOutput() && HasRangeDel()) {
-      status = open_file_func(*this);
-    }
-    if (HasBuilder()) {
-      const Slice empty_key{};
-      Status s = close_file_func(*this, status, empty_key);
-      if (!s.ok() && status.ok()) {
-        status = s;
-      }
-    }
-
-    return status;
-  }
-
-  // This subcompaction's output could be empty if compaction was aborted before
-  // this subcompaction had a chance to generate any output files. When
-  // subcompactions are executed sequentially this is more likely and will be
-  // particularly likely for the later subcompactions to be empty. Once they are
-  // run in parallel however it should be much rarer.
-  // It's caller's responsibility to make sure it's not empty.
-  Output& current_output() {
-    assert(!outputs_.empty());
-    return outputs_.back();
-  }
-
-  // Assign the range_del_agg to the target output level. There's only one
-  // range-del-aggregator per compaction outputs, for
-  // output_to_penultimate_level compaction it is only assigned to the
-  // penultimate level.
-  void AssignRangeDelAggregator(
-      std::unique_ptr<CompactionRangeDelAggregator>&& range_del_agg) {
-    assert(range_del_agg_ == nullptr);
-    range_del_agg_ = std::move(range_del_agg);
-  }
-
-  const Compaction* compaction_;
-
-  // The current file is pending close, which needs to run `close_file_func()`
-  // first to add a new key.
-  bool pending_close_ = false;
-
-  // current output builder and writer
-  std::unique_ptr<TableBuilder> builder_;
-  std::unique_ptr<WritableFileWriter> file_writer_;
-  uint64_t current_output_file_size_ = 0;
-
-  // all the compaction outputs so far
-  std::vector<Output> outputs_;
-
-  // BlobDB info
-  std::vector<BlobFileAddition> blob_file_additions_;
-  std::unique_ptr<BlobGarbageMeter> blob_garbage_meter_;
-
-  // Basic compaction output stats for this level's outputs
-  InternalStats::CompactionOutputsStats stats_;
-
-  // indicate if this CompactionOutputs obj for penultimate_level, should always
-  // be false if per_key_placement feature is not enabled.
-  const bool is_penultimate_level_;
-  std::unique_ptr<CompactionRangeDelAggregator> range_del_agg_ = nullptr;
-
-  // partitioner information
-  std::string last_key_for_partitioner_;
-  std::unique_ptr<SstPartitioner> partitioner_;
-};
-
-// helper struct to concatenate the last level and penultimate level outputs
-// which could be replaced by std::ranges::join_view() in c++20
-struct OutputIterator {
- public:
-  explicit OutputIterator(const std::vector<CompactionOutputs::Output>& a,
-                          const std::vector<CompactionOutputs::Output>& b)
-      : a_(a), b_(b) {
-    within_a = !a_.empty();
-    idx_ = 0;
-  }
-
-  OutputIterator begin() { return *this; }
-
-  OutputIterator end() { return *this; }
-
-  size_t size() { return a_.size() + b_.size(); }
-
-  const CompactionOutputs::Output& operator*() const {
-    return within_a ? a_[idx_] : b_[idx_];
-  }
-
-  OutputIterator& operator++() {
-    idx_++;
-    if (within_a && idx_ >= a_.size()) {
-      within_a = false;
-      idx_ = 0;
-    }
-    assert(within_a || idx_ <= b_.size());
-    return *this;
-  }
-
-  bool operator!=(const OutputIterator& /*rhs*/) const {
-    return within_a || idx_ < b_.size();
-  }
-
- private:
-  const std::vector<CompactionOutputs::Output>& a_;
-  const std::vector<CompactionOutputs::Output>& b_;
-  bool within_a;
-  size_t idx_;
-};
-
-}  // namespace ROCKSDB_NAMESPACE

db/compaction/compaction_picker.cc

@@ -65,7 +65,7 @@ bool FindIntraL0Compaction(const std::vector<FileMetaData*>& level_files,
   size_t compact_bytes = static_cast<size_t>(level_files[start]->fd.file_size);
   uint64_t compensated_compact_bytes =
       level_files[start]->compensated_file_size;
-  size_t compact_bytes_per_del_file = std::numeric_limits<size_t>::max();
+  size_t compact_bytes_per_del_file = port::kMaxSizet;
   // Compaction range will be [start, limit).
   size_t limit;
   // Pull in files until the amount of compaction work per deleted file begins
@@ -214,13 +214,13 @@ void CompactionPicker::GetRange(const CompactionInputFiles& inputs1,
 }
 
 void CompactionPicker::GetRange(const std::vector<CompactionInputFiles>& inputs,
-                                InternalKey* smallest, InternalKey* largest,
-                                int exclude_level) const {
+                                InternalKey* smallest,
+                                InternalKey* largest) const {
   InternalKey current_smallest;
   InternalKey current_largest;
   bool initialized = false;
   for (const auto& in : inputs) {
-    if (in.empty() || in.level == exclude_level) {
+    if (in.empty()) {
       continue;
     }
     GetRange(in, &current_smallest, &current_largest);
@@ -293,12 +293,6 @@ bool CompactionPicker::RangeOverlapWithCompaction(
       // Overlap
       return true;
     }
-    if (c->SupportsPerKeyPlacement()) {
-      if (c->OverlapPenultimateLevelOutputRange(smallest_user_key,
-                                                largest_user_key)) {
-        return true;
-      }
-    }
   }
   // Did not overlap with any running compaction in level `level`
   return false;
@@ -307,11 +301,9 @@ bool CompactionPicker::RangeOverlapWithCompaction(
 bool CompactionPicker::FilesRangeOverlapWithCompaction(
     const std::vector<CompactionInputFiles>& inputs, int level) const {
   bool is_empty = true;
-  int start_level = -1;
   for (auto& in : inputs) {
     if (!in.empty()) {
       is_empty = false;
-      start_level = in.level;  // inputs are sorted by level
       break;
     }
   }
@@ -321,19 +313,7 @@ bool CompactionPicker::FilesRangeOverlapWithCompaction(
   }
 
   InternalKey smallest, largest;
-  GetRange(inputs, &smallest, &largest, Compaction::kInvalidLevel);
-  int penultimate_level =
-      Compaction::EvaluatePenultimateLevel(ioptions_, start_level, level);
-  if (penultimate_level != Compaction::kInvalidLevel) {
-    InternalKey penultimate_smallest, penultimate_largest;
-    GetRange(inputs, &penultimate_smallest, &penultimate_largest, level);
-    if (RangeOverlapWithCompaction(penultimate_smallest.user_key(),
-                                   penultimate_largest.user_key(),
-                                   penultimate_level)) {
-      return true;
-    }
-  }
-
+  GetRange(inputs, &smallest, &largest);
   return RangeOverlapWithCompaction(smallest.user_key(), largest.user_key(),
                                     level);
 }
@@ -421,7 +401,7 @@ Status CompactionPicker::GetCompactionInputsFromFileNumbers(
         "Cannot find matched SST files for the following file numbers:");
     for (auto fn : *input_set) {
       message += " ";
-      message += std::to_string(fn);
+      message += ToString(fn);
     }
     return Status::InvalidArgument(message);
   }
@@ -462,7 +442,7 @@ bool CompactionPicker::SetupOtherInputs(
     const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
     VersionStorageInfo* vstorage, CompactionInputFiles* inputs,
     CompactionInputFiles* output_level_inputs, int* parent_index,
-    int base_index, bool only_expand_towards_right) {
+    int base_index) {
   assert(!inputs->empty());
   assert(output_level_inputs->empty());
   const int input_level = inputs->level;
@@ -515,16 +495,8 @@ bool CompactionPicker::SetupOtherInputs(
     InternalKey all_start, all_limit;
     GetRange(*inputs, *output_level_inputs, &all_start, &all_limit);
     bool try_overlapping_inputs = true;
-    if (only_expand_towards_right) {
-      // Round-robin compaction only allows expansion towards the larger side.
-      vstorage->GetOverlappingInputs(input_level, &smallest, &all_limit,
-                                     &expanded_inputs.files, base_index,
-                                     nullptr);
-    } else {
-      vstorage->GetOverlappingInputs(input_level, &all_start, &all_limit,
-                                     &expanded_inputs.files, base_index,
-                                     nullptr);
-    }
+    vstorage->GetOverlappingInputs(input_level, &all_start, &all_limit,
+                                   &expanded_inputs.files, base_index, nullptr);
     uint64_t expanded_inputs_size =
         TotalCompensatedFileSize(expanded_inputs.files);
     if (!ExpandInputsToCleanCut(cf_name, vstorage, &expanded_inputs)) {
@@ -571,10 +543,6 @@ bool CompactionPicker::SetupOtherInputs(
                      output_level_inputs_size);
       inputs->files = expanded_inputs.files;
     }
-  } else {
-    // Likely to be trivial move. Expand files if they are still trivial moves,
-    // but limit to mutable_cf_options.max_compaction_bytes or 8 files so that
-    // we don't create too much compaction pressure for the next level.
   }
   return true;
 }
@@ -672,12 +640,7 @@ Compaction* CompactionPicker::CompactRange(
         GetCompressionType(vstorage, mutable_cf_options, output_level, 1),
         GetCompressionOptions(mutable_cf_options, vstorage, output_level),
         Temperature::kUnknown, compact_range_options.max_subcompactions,
-        /* grandparents */ {}, /* is manual */ true, trim_ts, /* score */ -1,
-        /* deletion_compaction */ false, /* l0_files_might_overlap */ true,
-        CompactionReason::kUnknown,
-        compact_range_options.blob_garbage_collection_policy,
-        compact_range_options.blob_garbage_collection_age_cutoff);
-
+        /* grandparents */ {}, /* is manual */ true, trim_ts);
     RegisterCompaction(c);
     vstorage->ComputeCompactionScore(ioptions_, mutable_cf_options);
     return c;
@@ -754,7 +717,7 @@ Compaction* CompactionPicker::CompactRange(
   // files that are created during the current compaction.
   if (compact_range_options.bottommost_level_compaction ==
           BottommostLevelCompaction::kForceOptimized &&
-      max_file_num_to_ignore != std::numeric_limits<uint64_t>::max()) {
+      max_file_num_to_ignore != port::kMaxUint64) {
     assert(input_level == output_level);
     // inputs_shrunk holds a continuous subset of input files which were all
     // created before the current manual compaction
@@ -855,11 +818,8 @@ Compaction* CompactionPicker::CompactRange(
                          vstorage->base_level()),
       GetCompressionOptions(mutable_cf_options, vstorage, output_level),
       Temperature::kUnknown, compact_range_options.max_subcompactions,
-      std::move(grandparents), /* is manual */ true, trim_ts, /* score */ -1,
-      /* deletion_compaction */ false, /* l0_files_might_overlap */ true,
-      CompactionReason::kUnknown,
-      compact_range_options.blob_garbage_collection_policy,
-      compact_range_options.blob_garbage_collection_age_cutoff);
+      std::move(grandparents),
+      /* is manual compaction */ true, trim_ts);
 
   TEST_SYNC_POINT_CALLBACK("CompactionPicker::CompactRange:Return", compaction);
   RegisterCompaction(compaction);
@@ -1044,14 +1004,14 @@ Status CompactionPicker::SanitizeCompactionInputFiles(
     return Status::InvalidArgument(
         "Output level for column family " + cf_meta.name +
         " must between [0, " +
-        std::to_string(cf_meta.levels[cf_meta.levels.size() - 1].level) + "].");
+        ToString(cf_meta.levels[cf_meta.levels.size() - 1].level) + "].");
   }
 
   if (output_level > MaxOutputLevel()) {
     return Status::InvalidArgument(
         "Exceed the maximum output level defined by "
         "the current compaction algorithm --- " +
-        std::to_string(MaxOutputLevel()));
+        ToString(MaxOutputLevel()));
   }
 
   if (output_level < 0) {
@@ -1101,8 +1061,8 @@ Status CompactionPicker::SanitizeCompactionInputFiles(
       return Status::InvalidArgument(
           "Cannot compact file to up level, input file: " +
           MakeTableFileName("", file_num) + " level " +
-          std::to_string(input_file_level) + " > output level " +
-          std::to_string(output_level));
+          ToString(input_file_level) + " > output level " +
+          ToString(output_level));
     }
   }
 

db/compaction/compaction_picker.h

@@ -154,8 +154,7 @@ class CompactionPicker {
   // in *smallest, *largest.
   // REQUIRES: inputs is not empty (at least on entry have one file)
   void GetRange(const std::vector<CompactionInputFiles>& inputs,
-                InternalKey* smallest, InternalKey* largest,
-                int exclude_level) const;
+                InternalKey* smallest, InternalKey* largest) const;
 
   int NumberLevels() const { return ioptions_.num_levels; }
 
@@ -189,8 +188,7 @@ class CompactionPicker {
                         VersionStorageInfo* vstorage,
                         CompactionInputFiles* inputs,
                         CompactionInputFiles* output_level_inputs,
-                        int* parent_index, int base_index,
-                        bool only_expand_towards_right = false);
+                        int* parent_index, int base_index);
 
   void GetGrandparents(VersionStorageInfo* vstorage,
                        const CompactionInputFiles& inputs,
@@ -219,8 +217,6 @@ class CompactionPicker {
     return &compactions_in_progress_;
   }
 
-  const InternalKeyComparator* icmp() const { return icmp_; }
-
  protected:
   const ImmutableOptions& ioptions_;
 

db/compaction/compaction_picker_fifo.cc

@@ -83,7 +83,7 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
           break;
         }
       }
-      total_size -= f->fd.file_size;
+      total_size -= f->compensated_file_size;
       inputs[0].files.push_back(f);
     }
   }
@@ -116,8 +116,7 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
       mutable_cf_options.compression_opts, Temperature::kUnknown,
       /* max_subcompactions */ 0, {}, /* is manual */ false,
       /* trim_ts */ "", vstorage->CompactionScore(0),
-      /* is deletion compaction */ true, /* l0_files_might_overlap */ true,
-      CompactionReason::kFIFOTtl);
+      /* is deletion compaction */ true, CompactionReason::kFIFOTtl);
   return c;
 }
 
@@ -161,7 +160,6 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
             0 /* max_subcompactions */, {}, /* is manual */ false,
             /* trim_ts */ "", vstorage->CompactionScore(0),
             /* is deletion compaction */ false,
-            /* l0_files_might_overlap */ true,
             CompactionReason::kFIFOReduceNumFiles);
         return c;
       }
@@ -191,7 +189,7 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
 
   for (auto ritr = level_files.rbegin(); ritr != level_files.rend(); ++ritr) {
     auto f = *ritr;
-    total_size -= f->fd.file_size;
+    total_size -= f->compensated_file_size;
     inputs[0].files.push_back(f);
     char tmp_fsize[16];
     AppendHumanBytes(f->fd.GetFileSize(), tmp_fsize, sizeof(tmp_fsize));
@@ -211,8 +209,7 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
       mutable_cf_options.compression_opts, Temperature::kUnknown,
       /* max_subcompactions */ 0, {}, /* is manual */ false,
       /* trim_ts */ "", vstorage->CompactionScore(0),
-      /* is deletion compaction */ true,
-      /* l0_files_might_overlap */ true, CompactionReason::kFIFOMaxSize);
+      /* is deletion compaction */ true, CompactionReason::kFIFOMaxSize);
   return c;
 }
 
@@ -318,8 +315,7 @@ Compaction* FIFOCompactionPicker::PickCompactionToWarm(
       Temperature::kWarm,
       /* max_subcompactions */ 0, {}, /* is manual */ false, /* trim_ts */ "",
       vstorage->CompactionScore(0),
-      /* is deletion compaction */ false, /* l0_files_might_overlap */ true,
-      CompactionReason::kChangeTemperature);
+      /* is deletion compaction */ false, CompactionReason::kChangeTemperature);
   return c;
 }
 

db/compaction/compaction_picker_level.cc

@@ -7,13 +7,11 @@
 // 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_picker_level.h"
-
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "db/version_edit.h"
+#include "db/compaction/compaction_picker_level.h"
 #include "logging/log_buffer.h"
 #include "test_util/sync_point.h"
 
@@ -76,9 +74,6 @@ class LevelCompactionBuilder {
   // files if needed.
   bool SetupOtherL0FilesIfNeeded();
 
-  // Compaction with round-robin compaction priority allows more files to be
-  // picked to form a large compaction
-  void SetupOtherFilesWithRoundRobinExpansion();
   // Based on initial files, setup other files need to be compacted
   // in this compaction, accordingly.
   bool SetupOtherInputsIfNeeded();
@@ -87,16 +82,11 @@ class LevelCompactionBuilder {
 
   // For the specfied level, pick a file that we want to compact.
   // Returns false if there is no file to compact.
-  // If it returns true, inputs->files.size() will be exactly one for
-  // all compaction priorities except round-robin. For round-robin,
-  // multiple consecutive files may be put into inputs->files.
+  // If it returns true, inputs->files.size() will be exactly one.
   // If level is 0 and there is already a compaction on that level, this
   // function will return false.
   bool PickFileToCompact();
 
-  // Return true if a L0 trivial move is picked up.
-  bool TryPickL0TrivialMove();
-
   // For L0->L0, picks the longest span of files that aren't currently
   // undergoing compaction for which work-per-deleted-file decreases. The span
   // always starts from the newest L0 file.
@@ -108,10 +98,6 @@ class LevelCompactionBuilder {
   // otherwise, returns false.
   bool PickIntraL0Compaction();
 
-  // Return true if TrivialMove is extended. `start_index` is the index of
-  // the intiial file picked, which should already be in `start_level_inputs_`.
-  bool TryExtendNonL0TrivialMove(int start_index);
-
   // Picks a file from level_files to compact.
   // level_files is a vector of (level, file metadata) in ascending order of
   // level. If compact_to_next_level is true, compact the file to the next
@@ -131,7 +117,6 @@ class LevelCompactionBuilder {
   int base_index_ = -1;
   double start_level_score_ = 0;
   bool is_manual_ = false;
-  bool is_l0_trivial_move_ = false;
   CompactionInputFiles start_level_inputs_;
   std::vector<CompactionInputFiles> compaction_inputs_;
   CompactionInputFiles output_level_inputs_;
@@ -276,148 +261,22 @@ void LevelCompactionBuilder::SetupInitialFiles() {
 }
 
 bool LevelCompactionBuilder::SetupOtherL0FilesIfNeeded() {
-  if (start_level_ == 0 && output_level_ != 0 && !is_l0_trivial_move_) {
+  if (start_level_ == 0 && output_level_ != 0) {
     return compaction_picker_->GetOverlappingL0Files(
         vstorage_, &start_level_inputs_, output_level_, &parent_index_);
   }
   return true;
 }
 
-void LevelCompactionBuilder::SetupOtherFilesWithRoundRobinExpansion() {
-  // We only expand when the start level is not L0 under round robin
-  assert(start_level_ >= 1);
-
-  // For round-robin compaction priority, we have 3 constraints when picking
-  // multiple files.
-  // Constraint 1: We can only pick consecutive files
-  //  -> Constraint 1a: When a file is being compacted (or some input files
-  //                    are being compacted after expanding, we cannot
-  //                    choose it and have to stop choosing more files
-  //  -> Constraint 1b: When we reach the last file (with largest keys), we
-  //                    cannot choose more files (the next file will be the
-  //                    first one)
-  // Constraint 2: We should ensure the total compaction bytes (including the
-  //               overlapped files from the next level) is no more than
-  //               mutable_cf_options_.max_compaction_bytes
-  // Constraint 3: We try our best to pick as many files as possible so that
-  //               the post-compaction level size is less than
-  //               MaxBytesForLevel(start_level_)
-  // Constraint 4: We do not expand if it is possible to apply a trivial move
-  // Constraint 5 (TODO): Try to pick minimal files to split into the target
-  //               number of subcompactions
-  TEST_SYNC_POINT("LevelCompactionPicker::RoundRobin");
-
-  // Only expand the inputs when we have selected a file in start_level_inputs_
-  if (start_level_inputs_.size() == 0) return;
-
-  uint64_t start_lvl_bytes_no_compacting = 0;
-  uint64_t curr_bytes_to_compact = 0;
-  uint64_t start_lvl_max_bytes_to_compact = 0;
-  const std::vector<FileMetaData*>& level_files =
-      vstorage_->LevelFiles(start_level_);
-  // Constraint 3 (pre-calculate the ideal max bytes to compact)
-  for (auto f : level_files) {
-    if (!f->being_compacted) {
-      start_lvl_bytes_no_compacting += f->compensated_file_size;
-    }
-  }
-  if (start_lvl_bytes_no_compacting >
-      vstorage_->MaxBytesForLevel(start_level_)) {
-    start_lvl_max_bytes_to_compact = start_lvl_bytes_no_compacting -
-                                     vstorage_->MaxBytesForLevel(start_level_);
-  }
-
-  size_t start_index = vstorage_->FilesByCompactionPri(start_level_)[0];
-  InternalKey smallest, largest;
-  // Constraint 4 (No need to check again later)
-  compaction_picker_->GetRange(start_level_inputs_, &smallest, &largest);
-  CompactionInputFiles output_level_inputs;
-  output_level_inputs.level = output_level_;
-  vstorage_->GetOverlappingInputs(output_level_, &smallest, &largest,
-                                  &output_level_inputs.files);
-  if (output_level_inputs.empty()) {
-    if (TryExtendNonL0TrivialMove((int)start_index)) {
-      return;
-    }
-  }
-  // Constraint 3
-  if (start_level_inputs_[0]->compensated_file_size >=
-      start_lvl_max_bytes_to_compact) {
-    return;
-  }
-  CompactionInputFiles tmp_start_level_inputs;
-  tmp_start_level_inputs = start_level_inputs_;
-  // TODO (zichen): Future parallel round-robin may also need to update this
-  // Constraint 1b (only expand till the end)
-  for (size_t i = start_index + 1; i < level_files.size(); i++) {
-    auto* f = level_files[i];
-    if (f->being_compacted) {
-      // Constraint 1a
-      return;
-    }
-
-    tmp_start_level_inputs.files.push_back(f);
-    if (!compaction_picker_->ExpandInputsToCleanCut(cf_name_, vstorage_,
-                                                    &tmp_start_level_inputs) ||
-        compaction_picker_->FilesRangeOverlapWithCompaction(
-            {tmp_start_level_inputs}, output_level_)) {
-      // Constraint 1a
-      tmp_start_level_inputs.clear();
-      return;
-    }
-
-    curr_bytes_to_compact = 0;
-    for (auto start_lvl_f : tmp_start_level_inputs.files) {
-      curr_bytes_to_compact += start_lvl_f->compensated_file_size;
-    }
-
-    // Check whether any output level files are locked
-    compaction_picker_->GetRange(tmp_start_level_inputs, &smallest, &largest);
-    vstorage_->GetOverlappingInputs(output_level_, &smallest, &largest,
-                                    &output_level_inputs.files);
-    if (!output_level_inputs.empty() &&
-        !compaction_picker_->ExpandInputsToCleanCut(cf_name_, vstorage_,
-                                                    &output_level_inputs)) {
-      // Constraint 1a
-      tmp_start_level_inputs.clear();
-      return;
-    }
-
-    uint64_t start_lvl_curr_bytes_to_compact = curr_bytes_to_compact;
-    for (auto output_lvl_f : output_level_inputs.files) {
-      curr_bytes_to_compact += output_lvl_f->compensated_file_size;
-    }
-    if (curr_bytes_to_compact > mutable_cf_options_.max_compaction_bytes) {
-      // Constraint 2
-      tmp_start_level_inputs.clear();
-      return;
-    }
-
-    start_level_inputs_.files = tmp_start_level_inputs.files;
-    // Constraint 3
-    if (start_lvl_curr_bytes_to_compact > start_lvl_max_bytes_to_compact) {
-      return;
-    }
-  }
-}
-
 bool LevelCompactionBuilder::SetupOtherInputsIfNeeded() {
   // Setup input files from output level. For output to L0, we only compact
   // spans of files that do not interact with any pending compactions, so don't
   // need to consider other levels.
   if (output_level_ != 0) {
     output_level_inputs_.level = output_level_;
-    bool round_robin_expanding =
-        ioptions_.compaction_pri == kRoundRobin &&
-        compaction_reason_ == CompactionReason::kLevelMaxLevelSize;
-    if (round_robin_expanding) {
-      SetupOtherFilesWithRoundRobinExpansion();
-    }
-    if (!is_l0_trivial_move_ &&
-        !compaction_picker_->SetupOtherInputs(
+    if (!compaction_picker_->SetupOtherInputs(
             cf_name_, mutable_cf_options_, vstorage_, &start_level_inputs_,
-            &output_level_inputs_, &parent_index_, base_index_,
-            round_robin_expanding)) {
+            &output_level_inputs_, &parent_index_, base_index_)) {
       return false;
     }
 
@@ -426,22 +285,20 @@ bool LevelCompactionBuilder::SetupOtherInputsIfNeeded() {
       compaction_inputs_.push_back(output_level_inputs_);
     }
 
-    if (!is_l0_trivial_move_) {
-      // In some edge cases we could pick a compaction that will be compacting
-      // a key range that overlap with another running compaction, and both
-      // of them have the same output level. This could happen if
-      // (1) we are running a non-exclusive manual compaction
-      // (2) AddFile ingest a new file into the LSM tree
-      // We need to disallow this from happening.
-      if (compaction_picker_->FilesRangeOverlapWithCompaction(
-              compaction_inputs_, output_level_)) {
-        // This compaction output could potentially conflict with the output
-        // of a currently running compaction, we cannot run it.
-        return false;
-      }
-      compaction_picker_->GetGrandparents(vstorage_, start_level_inputs_,
-                                          output_level_inputs_, &grandparents_);
+    // In some edge cases we could pick a compaction that will be compacting
+    // a key range that overlap with another running compaction, and both
+    // of them have the same output level. This could happen if
+    // (1) we are running a non-exclusive manual compaction
+    // (2) AddFile ingest a new file into the LSM tree
+    // We need to disallow this from happening.
+    if (compaction_picker_->FilesRangeOverlapWithCompaction(compaction_inputs_,
+                                                            output_level_)) {
+      // This compaction output could potentially conflict with the output
+      // of a currently running compaction, we cannot run it.
+      return false;
     }
+    compaction_picker_->GetGrandparents(vstorage_, start_level_inputs_,
+                                        output_level_inputs_, &grandparents_);
   } else {
     compaction_inputs_.push_back(start_level_inputs_);
   }
@@ -492,7 +349,6 @@ Compaction* LevelCompactionBuilder::GetCompaction() {
       Temperature::kUnknown,
       /* max_subcompactions */ 0, std::move(grandparents_), is_manual_,
       /* trim_ts */ "", start_level_score_, false /* deletion_compaction */,
-      /* l0_files_might_overlap */ start_level_ == 0 && !is_l0_trivial_move_,
       compaction_reason_);
 
   // If it's level 0 compaction, make sure we don't execute any other level 0
@@ -561,124 +417,6 @@ uint32_t LevelCompactionBuilder::GetPathId(
   return p;
 }
 
-bool LevelCompactionBuilder::TryPickL0TrivialMove() {
-  if (vstorage_->base_level() <= 0) {
-    return false;
-  }
-  if (start_level_ == 0 && mutable_cf_options_.compression_per_level.empty() &&
-      !vstorage_->LevelFiles(output_level_).empty() &&
-      ioptions_.db_paths.size() <= 1) {
-    // Try to pick trivial move from L0 to L1. We start from the oldest
-    // file. We keep expanding to newer files if it would form a
-    // trivial move.
-    // For now we don't support it with
-    // mutable_cf_options_.compression_per_level to prevent the logic
-    // of determining whether L0 can be trivial moved to the next level.
-    // We skip the case where output level is empty, since in this case, at
-    // least the oldest file would qualify for trivial move, and this would
-    // be a surprising behavior with few benefits.
-
-    // We search from the oldest file from the newest. In theory, there are
-    // files in the middle can form trivial move too, but it is probably
-    // uncommon and we ignore these cases for simplicity.
-    const std::vector<FileMetaData*>& level_files =
-        vstorage_->LevelFiles(start_level_);
-
-    InternalKey my_smallest, my_largest;
-    for (auto it = level_files.rbegin(); it != level_files.rend(); ++it) {
-      CompactionInputFiles output_level_inputs;
-      output_level_inputs.level = output_level_;
-      FileMetaData* file = *it;
-      if (it == level_files.rbegin()) {
-        my_smallest = file->smallest;
-        my_largest = file->largest;
-      } else {
-        if (compaction_picker_->icmp()->Compare(file->largest, my_smallest) <
-            0) {
-          my_smallest = file->smallest;
-        } else if (compaction_picker_->icmp()->Compare(file->smallest,
-                                                       my_largest) > 0) {
-          my_largest = file->largest;
-        } else {
-          break;
-        }
-      }
-      vstorage_->GetOverlappingInputs(output_level_, &my_smallest, &my_largest,
-                                      &output_level_inputs.files);
-      if (output_level_inputs.empty()) {
-        assert(!file->being_compacted);
-        start_level_inputs_.files.push_back(file);
-      } else {
-        break;
-      }
-    }
-  }
-
-  if (!start_level_inputs_.empty()) {
-    // Sort files by key range. Not sure it's 100% necessary but it's cleaner
-    // to always keep files sorted by key the key ranges don't overlap.
-    std::sort(start_level_inputs_.files.begin(),
-              start_level_inputs_.files.end(),
-              [icmp = compaction_picker_->icmp()](FileMetaData* f1,
-                                                  FileMetaData* f2) -> bool {
-                return (icmp->Compare(f1->smallest, f2->smallest) < 0);
-              });
-
-    is_l0_trivial_move_ = true;
-    return true;
-  }
-  return false;
-}
-
-bool LevelCompactionBuilder::TryExtendNonL0TrivialMove(int start_index) {
-  if (start_level_inputs_.size() == 1 &&
-      (ioptions_.db_paths.empty() || ioptions_.db_paths.size() == 1) &&
-      (mutable_cf_options_.compression_per_level.empty())) {
-    // Only file of `index`, and it is likely a trivial move. Try to
-    // expand if it is still a trivial move, but not beyond
-    // max_compaction_bytes or 4 files, so that we don't create too
-    // much compaction pressure for the next level.
-    // Ignore if there are more than one DB path, as it would be hard
-    // to predict whether it is a trivial move.
-    const std::vector<FileMetaData*>& level_files =
-        vstorage_->LevelFiles(start_level_);
-    const size_t kMaxMultiTrivialMove = 4;
-    FileMetaData* initial_file = start_level_inputs_.files[0];
-    size_t total_size = initial_file->fd.GetFileSize();
-    CompactionInputFiles output_level_inputs;
-    output_level_inputs.level = output_level_;
-    for (int i = start_index + 1;
-         i < static_cast<int>(level_files.size()) &&
-         start_level_inputs_.size() < kMaxMultiTrivialMove;
-         i++) {
-      FileMetaData* next_file = level_files[i];
-      if (next_file->being_compacted) {
-        break;
-      }
-      vstorage_->GetOverlappingInputs(output_level_, &(initial_file->smallest),
-                                      &(next_file->largest),
-                                      &output_level_inputs.files);
-      if (!output_level_inputs.empty()) {
-        break;
-      }
-      if (i < static_cast<int>(level_files.size()) - 1 &&
-          compaction_picker_->icmp()->user_comparator()->Compare(
-              next_file->largest.user_key(),
-              level_files[i + 1]->smallest.user_key()) == 0) {
-        // Not a clean up after adding the next file. Skip.
-        break;
-      }
-      total_size += next_file->fd.GetFileSize();
-      if (total_size > mutable_cf_options_.max_compaction_bytes) {
-        break;
-      }
-      start_level_inputs_.files.push_back(next_file);
-    }
-    return start_level_inputs_.size() > 1;
-  }
-  return false;
-}
-
 bool LevelCompactionBuilder::PickFileToCompact() {
   // level 0 files are overlapping. So we cannot pick more
   // than one concurrent compactions at this level. This
@@ -691,43 +429,30 @@ bool LevelCompactionBuilder::PickFileToCompact() {
   }
 
   start_level_inputs_.clear();
-  start_level_inputs_.level = start_level_;
 
   assert(start_level_ >= 0);
 
-  if (TryPickL0TrivialMove()) {
-    return true;
-  }
-
+  // Pick the largest file in this level that is not already
+  // being compacted
+  const std::vector<int>& file_size =
+      vstorage_->FilesByCompactionPri(start_level_);
   const std::vector<FileMetaData*>& level_files =
       vstorage_->LevelFiles(start_level_);
 
-  // Pick the file with the highest score in this level that is not already
-  // being compacted.
-  const std::vector<int>& file_scores =
-      vstorage_->FilesByCompactionPri(start_level_);
-
   unsigned int cmp_idx;
   for (cmp_idx = vstorage_->NextCompactionIndex(start_level_);
-       cmp_idx < file_scores.size(); cmp_idx++) {
-    int index = file_scores[cmp_idx];
+       cmp_idx < file_size.size(); cmp_idx++) {
+    int index = file_size[cmp_idx];
     auto* f = level_files[index];
 
     // do not pick a file to compact if it is being compacted
     // from n-1 level.
     if (f->being_compacted) {
-      if (ioptions_.compaction_pri == kRoundRobin) {
-        // TODO(zichen): this file may be involved in one compaction from
-        // an upper level, cannot advance the cursor for round-robin policy.
-        // Currently, we do not pick any file to compact in this case. We
-        // should fix this later to ensure a compaction is picked but the
-        // cursor shall not be advanced.
-        return false;
-      }
       continue;
     }
 
     start_level_inputs_.files.push_back(f);
+    start_level_inputs_.level = start_level_;
     if (!compaction_picker_->ExpandInputsToCleanCut(cf_name_, vstorage_,
                                                     &start_level_inputs_) ||
         compaction_picker_->FilesRangeOverlapWithCompaction(
@@ -735,15 +460,11 @@ bool LevelCompactionBuilder::PickFileToCompact() {
       // A locked (pending compaction) input-level file was pulled in due to
       // user-key overlap.
       start_level_inputs_.clear();
-
-      if (ioptions_.compaction_pri == kRoundRobin) {
-        return false;
-      }
       continue;
     }
 
-    // Now that input level is fully expanded, we check whether any output
-    // files are locked due to pending compaction.
+    // Now that input level is fully expanded, we check whether any output files
+    // are locked due to pending compaction.
     //
     // Note we rely on ExpandInputsToCleanCut() to tell us whether any output-
     // level files are locked, not just the extra ones pulled in for user-key
@@ -754,29 +475,19 @@ bool LevelCompactionBuilder::PickFileToCompact() {
     output_level_inputs.level = output_level_;
     vstorage_->GetOverlappingInputs(output_level_, &smallest, &largest,
                                     &output_level_inputs.files);
-    if (output_level_inputs.empty()) {
-      if (TryExtendNonL0TrivialMove(index)) {
-        break;
-      }
-    } else {
-      if (!compaction_picker_->ExpandInputsToCleanCut(cf_name_, vstorage_,
-                                                      &output_level_inputs)) {
-        start_level_inputs_.clear();
-        if (ioptions_.compaction_pri == kRoundRobin) {
-          return false;
-        }
-        continue;
-      }
+    if (!output_level_inputs.empty() &&
+        !compaction_picker_->ExpandInputsToCleanCut(cf_name_, vstorage_,
+                                                    &output_level_inputs)) {
+      start_level_inputs_.clear();
+      continue;
     }
-
     base_index_ = index;
     break;
   }
 
   // store where to start the iteration in the next call to PickCompaction
-  if (ioptions_.compaction_pri != kRoundRobin) {
-    vstorage_->SetNextCompactionIndex(start_level_, cmp_idx);
-  }
+  vstorage_->SetNextCompactionIndex(start_level_, cmp_idx);
+
   return start_level_inputs_.size() > 0;
 }
 
@@ -793,7 +504,7 @@ bool LevelCompactionBuilder::PickIntraL0Compaction() {
     return false;
   }
   return FindIntraL0Compaction(level_files, kMinFilesForIntraL0Compaction,
-                               std::numeric_limits<uint64_t>::max(),
+                               port::kMaxUint64,
                                mutable_cf_options_.max_compaction_bytes,
                                &start_level_inputs_, earliest_mem_seqno_);
 }

db/compaction/compaction_picker_test.cc

@@ -12,8 +12,6 @@
 #include "db/compaction/compaction_picker_level.h"
 #include "db/compaction/compaction_picker_universal.h"
 #include "db/compaction/file_pri.h"
-#include "rocksdb/advanced_options.h"
-#include "table/unique_id_impl.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/string_util.h"
@@ -116,7 +114,8 @@ class CompactionPickerTest : public testing::Test {
         InternalKey(largest, largest_seq, kTypeValue), smallest_seq,
         largest_seq, marked_for_compact, temperature, kInvalidBlobFileNumber,
         kUnknownOldestAncesterTime, kUnknownFileCreationTime,
-        kUnknownFileChecksum, kUnknownFileChecksumFuncName, kNullUniqueId64x2);
+        kUnknownFileChecksum, kUnknownFileChecksumFuncName,
+        kDisableUserTimestamp, kDisableUserTimestamp);
     f->compensated_file_size =
         (compensated_file_size != 0) ? compensated_file_size : file_size;
     f->oldest_ancester_time = oldest_ancestor_time;
@@ -274,9 +273,9 @@ TEST_F(CompactionPickerTest, NeedsCompactionLevel) {
       // start a brand new version in each test.
       NewVersionStorage(kLevels, kCompactionStyleLevel);
       for (int i = 0; i < file_count; ++i) {
-        Add(level, i, std::to_string((i + 100) * 1000).c_str(),
-            std::to_string((i + 100) * 1000 + 999).c_str(), file_size, 0,
-            i * 100, i * 100 + 99);
+        Add(level, i, ToString((i + 100) * 1000).c_str(),
+            ToString((i + 100) * 1000 + 999).c_str(),
+            file_size, 0, i * 100, i * 100 + 99);
       }
       UpdateVersionStorageInfo();
       ASSERT_EQ(vstorage_->CompactionScoreLevel(0), level);
@@ -429,7 +428,8 @@ TEST_F(CompactionPickerTest, LevelTriggerDynamic4) {
 #ifndef ROCKSDB_LITE
 TEST_F(CompactionPickerTest, NeedsCompactionUniversal) {
   NewVersionStorage(1, kCompactionStyleUniversal);
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
+  UniversalCompactionPicker universal_compaction_picker(
+      ioptions_, &icmp_);
   UpdateVersionStorageInfo();
   // must return false when there's no files.
   ASSERT_EQ(universal_compaction_picker.NeedsCompaction(vstorage_.get()),
@@ -439,8 +439,8 @@ TEST_F(CompactionPickerTest, NeedsCompactionUniversal) {
   for (int i = 1;
        i <= mutable_cf_options_.level0_file_num_compaction_trigger * 2; ++i) {
     NewVersionStorage(1, kCompactionStyleUniversal);
-    Add(0, i, std::to_string((i + 100) * 1000).c_str(),
-        std::to_string((i + 100) * 1000 + 999).c_str(), 1000000, 0, i * 100,
+    Add(0, i, ToString((i + 100) * 1000).c_str(),
+        ToString((i + 100) * 1000 + 999).c_str(), 1000000, 0, i * 100,
         i * 100 + 99);
     UpdateVersionStorageInfo();
     ASSERT_EQ(level_compaction_picker.NeedsCompaction(vstorage_.get()),
@@ -852,17 +852,17 @@ TEST_F(CompactionPickerTest, UniversalIncrementalSpace4) {
   // L3: (1101, 1180) (1201, 1280) ... (7901, 7908)
   // L4: (1130, 1150) (1160, 1210) (1230, 1250) (1260 1310) ... (7960, 8010)
   for (int i = 11; i < 79; i++) {
-    Add(3, 100 + i * 3, std::to_string(i * 100).c_str(),
-        std::to_string(i * 100 + 80).c_str(), kFileSize, 0, 200, 251);
+    Add(3, 100 + i * 3, ToString(i * 100).c_str(),
+        ToString(i * 100 + 80).c_str(), kFileSize, 0, 200, 251);
     // Add a tie breaker
     if (i == 66) {
       Add(3, 10000U, "6690", "6699", kFileSize, 0, 200, 251);
     }
 
-    Add(4, 100 + i * 3 + 1, std::to_string(i * 100 + 30).c_str(),
-        std::to_string(i * 100 + 50).c_str(), kFileSize, 0, 200, 251);
-    Add(4, 100 + i * 3 + 2, std::to_string(i * 100 + 60).c_str(),
-        std::to_string(i * 100 + 110).c_str(), kFileSize, 0, 200, 251);
+    Add(4, 100 + i * 3 + 1, ToString(i * 100 + 30).c_str(),
+        ToString(i * 100 + 50).c_str(), kFileSize, 0, 200, 251);
+    Add(4, 100 + i * 3 + 2, ToString(i * 100 + 60).c_str(),
+        ToString(i * 100 + 110).c_str(), kFileSize, 0, 200, 251);
   }
   UpdateVersionStorageInfo();
 
@@ -899,14 +899,14 @@ TEST_F(CompactionPickerTest, UniversalIncrementalSpace5) {
   // L3: (1101, 1180) (1201, 1280) ... (7901, 7908)
   // L4: (1130, 1150) (1160, 1210) (1230, 1250) (1260 1310) ... (7960, 8010)
   for (int i = 11; i < 70; i++) {
-    Add(3, 100 + i * 3, std::to_string(i * 100).c_str(),
-        std::to_string(i * 100 + 80).c_str(),
+    Add(3, 100 + i * 3, ToString(i * 100).c_str(),
+        ToString(i * 100 + 80).c_str(),
         i % 10 == 9 ? kFileSize * 100 : kFileSize, 0, 200, 251);
 
-    Add(4, 100 + i * 3 + 1, std::to_string(i * 100 + 30).c_str(),
-        std::to_string(i * 100 + 50).c_str(), kFileSize, 0, 200, 251);
-    Add(4, 100 + i * 3 + 2, std::to_string(i * 100 + 60).c_str(),
-        std::to_string(i * 100 + 110).c_str(), kFileSize, 0, 200, 251);
+    Add(4, 100 + i * 3 + 1, ToString(i * 100 + 30).c_str(),
+        ToString(i * 100 + 50).c_str(), kFileSize, 0, 200, 251);
+    Add(4, 100 + i * 3 + 2, ToString(i * 100 + 60).c_str(),
+        ToString(i * 100 + 110).c_str(), kFileSize, 0, 200, 251);
   }
   UpdateVersionStorageInfo();
 
@@ -941,8 +941,8 @@ TEST_F(CompactionPickerTest, NeedsCompactionFIFO) {
   // size of L0 files.
   for (int i = 1; i <= kFileCount; ++i) {
     NewVersionStorage(1, kCompactionStyleFIFO);
-    Add(0, i, std::to_string((i + 100) * 1000).c_str(),
-        std::to_string((i + 100) * 1000 + 999).c_str(), kFileSize, 0, i * 100,
+    Add(0, i, ToString((i + 100) * 1000).c_str(),
+        ToString((i + 100) * 1000 + 999).c_str(), kFileSize, 0, i * 100,
         i * 100 + 99);
     UpdateVersionStorageInfo();
     ASSERT_EQ(fifo_compaction_picker.NeedsCompaction(vstorage_.get()),
@@ -1310,228 +1310,6 @@ TEST_F(CompactionPickerTest, CompactionPriMinOverlapping4) {
   ASSERT_EQ(6U, compaction->input(0, 0)->fd.GetNumber());
 }
 
-TEST_F(CompactionPickerTest, CompactionPriRoundRobin) {
-  std::vector<InternalKey> test_cursors = {InternalKey("249", 100, kTypeValue),
-                                           InternalKey("600", 100, kTypeValue),
-                                           InternalKey()};
-  std::vector<uint32_t> selected_files = {8U, 6U, 6U};
-
-  ioptions_.compaction_pri = kRoundRobin;
-  mutable_cf_options_.max_bytes_for_level_base = 12000000;
-  mutable_cf_options_.max_bytes_for_level_multiplier = 10;
-  for (size_t i = 0; i < test_cursors.size(); i++) {
-    // start a brand new version in each test.
-    NewVersionStorage(6, kCompactionStyleLevel);
-    vstorage_->ResizeCompactCursors(6);
-    // Set the cursor
-    vstorage_->AddCursorForOneLevel(2, test_cursors[i]);
-    Add(2, 6U, "150", "199", 50000000U);  // Overlap with 26U, 27U
-    Add(2, 7U, "200", "249", 50000000U);  // File not overlapping
-    Add(2, 8U, "300", "600", 50000000U);  // Overlap with 28U, 29U
-
-    Add(3, 26U, "130", "165", 60000000U);
-    Add(3, 27U, "166", "170", 60000000U);
-    Add(3, 28U, "270", "340", 60000000U);
-    Add(3, 29U, "401", "500", 60000000U);
-    UpdateVersionStorageInfo();
-    LevelCompactionPicker local_level_compaction_picker =
-        LevelCompactionPicker(ioptions_, &icmp_);
-    std::unique_ptr<Compaction> compaction(
-        local_level_compaction_picker.PickCompaction(
-            cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-            &log_buffer_));
-    ASSERT_TRUE(compaction.get() != nullptr);
-    // Since the max bytes for level 2 is 120M, picking one file to compact
-    // makes the post-compaction level size less than 120M, there is exactly one
-    // file picked for round-robin compaction
-    ASSERT_EQ(1U, compaction->num_input_files(0));
-    ASSERT_EQ(selected_files[i], compaction->input(0, 0)->fd.GetNumber());
-    // release the version storage
-    DeleteVersionStorage();
-  }
-}
-
-TEST_F(CompactionPickerTest, CompactionPriMultipleFilesRoundRobin1) {
-  ioptions_.compaction_pri = kRoundRobin;
-  mutable_cf_options_.max_compaction_bytes = 100000000u;
-  mutable_cf_options_.max_bytes_for_level_base = 120;
-  mutable_cf_options_.max_bytes_for_level_multiplier = 10;
-  // start a brand new version in each test.
-  NewVersionStorage(6, kCompactionStyleLevel);
-  vstorage_->ResizeCompactCursors(6);
-  // Set the cursor (file picking should start with 7U)
-  vstorage_->AddCursorForOneLevel(2, InternalKey("199", 100, kTypeValue));
-  Add(2, 6U, "150", "199", 500U);
-  Add(2, 7U, "200", "249", 500U);
-  Add(2, 8U, "300", "600", 500U);
-  Add(2, 9U, "700", "800", 500U);
-  Add(2, 10U, "850", "950", 500U);
-
-  Add(3, 26U, "130", "165", 600U);
-  Add(3, 27U, "166", "170", 600U);
-  Add(3, 28U, "270", "340", 600U);
-  Add(3, 29U, "401", "500", 600U);
-  Add(3, 30U, "601", "800", 600U);
-  Add(3, 31U, "830", "890", 600U);
-  UpdateVersionStorageInfo();
-  LevelCompactionPicker local_level_compaction_picker =
-      LevelCompactionPicker(ioptions_, &icmp_);
-  std::unique_ptr<Compaction> compaction(
-      local_level_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-
-  // The maximum compaction bytes is very large in this case so we can igore its
-  // constraint in this test case. The maximum bytes for level 2 is 1200
-  // bytes, and thus at least 3 files should be picked so that the bytes in
-  // level 2 is less than the maximum
-  ASSERT_EQ(3U, compaction->num_input_files(0));
-  ASSERT_EQ(7U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(8U, compaction->input(0, 1)->fd.GetNumber());
-  ASSERT_EQ(9U, compaction->input(0, 2)->fd.GetNumber());
-  // release the version storage
-  DeleteVersionStorage();
-}
-
-TEST_F(CompactionPickerTest, CompactionPriMultipleFilesRoundRobin2) {
-  ioptions_.compaction_pri = kRoundRobin;
-  mutable_cf_options_.max_compaction_bytes = 2500u;
-  mutable_cf_options_.max_bytes_for_level_base = 120;
-  mutable_cf_options_.max_bytes_for_level_multiplier = 10;
-  // start a brand new version in each test.
-  NewVersionStorage(6, kCompactionStyleLevel);
-  vstorage_->ResizeCompactCursors(6);
-  // Set the cursor (file picking should start with 6U)
-  vstorage_->AddCursorForOneLevel(2, InternalKey("1000", 100, kTypeValue));
-  Add(2, 6U, "150", "199", 500U);  // Overlap with 26U, 27U
-  Add(2, 7U, "200", "249", 500U);  // Overlap with 27U
-  Add(2, 8U, "300", "600", 500U);  // Overlap with 28U, 29U
-  Add(2, 9U, "700", "800", 500U);
-  Add(2, 10U, "850", "950", 500U);
-
-  Add(3, 26U, "130", "165", 600U);
-  Add(3, 27U, "166", "230", 600U);
-  Add(3, 28U, "270", "340", 600U);
-  Add(3, 29U, "401", "500", 600U);
-  Add(3, 30U, "601", "800", 600U);
-  Add(3, 31U, "830", "890", 600U);
-  UpdateVersionStorageInfo();
-  LevelCompactionPicker local_level_compaction_picker =
-      LevelCompactionPicker(ioptions_, &icmp_);
-  std::unique_ptr<Compaction> compaction(
-      local_level_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-
-  // The maximum compaction bytes is only 2500 bytes now. Even though we are
-  // required to choose 3 files so that the post-compaction level size is less
-  // than 1200 bytes. We cannot pick 3 files to compact since the maximum
-  // compaction size is 2500. After picking files 6U and 7U, the number of
-  // compaction bytes has reached 2200, and thus no more space to add another
-  // input file with 50M bytes.
-  ASSERT_EQ(2U, compaction->num_input_files(0));
-  ASSERT_EQ(6U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(7U, compaction->input(0, 1)->fd.GetNumber());
-  // release the version storage
-  DeleteVersionStorage();
-}
-
-TEST_F(CompactionPickerTest, CompactionPriMultipleFilesRoundRobin3) {
-  ioptions_.compaction_pri = kRoundRobin;
-  mutable_cf_options_.max_compaction_bytes = 1000000u;
-  mutable_cf_options_.max_bytes_for_level_base = 120;
-  mutable_cf_options_.max_bytes_for_level_multiplier = 10;
-  // start a brand new version in each test.
-  NewVersionStorage(6, kCompactionStyleLevel);
-  vstorage_->ResizeCompactCursors(6);
-  // Set the cursor (file picking should start with 9U)
-  vstorage_->AddCursorForOneLevel(2, InternalKey("700", 100, kTypeValue));
-  Add(2, 6U, "150", "199", 500U);
-  Add(2, 7U, "200", "249", 500U);
-  Add(2, 8U, "300", "600", 500U);
-  Add(2, 9U, "700", "800", 500U);
-  Add(2, 10U, "850", "950", 500U);
-
-  Add(3, 26U, "130", "165", 600U);
-  Add(3, 27U, "166", "170", 600U);
-  Add(3, 28U, "270", "340", 600U);
-  Add(3, 29U, "401", "500", 600U);
-  Add(3, 30U, "601", "800", 600U);
-  Add(3, 31U, "830", "890", 600U);
-  UpdateVersionStorageInfo();
-  LevelCompactionPicker local_level_compaction_picker =
-      LevelCompactionPicker(ioptions_, &icmp_);
-  std::unique_ptr<Compaction> compaction(
-      local_level_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-
-  // Cannot pick more files since we reach the last file in level 2
-  ASSERT_EQ(2U, compaction->num_input_files(0));
-  ASSERT_EQ(9U, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(10U, compaction->input(0, 1)->fd.GetNumber());
-  // release the version storage
-  DeleteVersionStorage();
-}
-
-TEST_F(CompactionPickerTest, CompactionPriMinOverlappingManyFiles) {
-  NewVersionStorage(6, kCompactionStyleLevel);
-  ioptions_.compaction_pri = kMinOverlappingRatio;
-  mutable_cf_options_.max_bytes_for_level_base = 15000000;
-  mutable_cf_options_.max_bytes_for_level_multiplier = 10;
-
-  // file 7 and 8 over lap with the same file, but file 8 is smaller so
-  // it will be picked.
-  Add(2, 13U, "010", "011",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 14U, "020", "021",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 15U, "030", "031",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 16U, "040", "041",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 17U, "050", "051",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 18U, "060", "061",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 19U, "070", "071",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 20U, "080", "081",
-      6100U);  // Overlaps with a large file. Not picked
-
-  Add(2, 6U, "150", "167", 60000000U);  // Overlaps with file 26, 27
-  Add(2, 7U, "168", "169", 60000000U);  // Overlaps with file 27
-  Add(2, 8U, "201", "300", 61000000U);  // Overlaps with file 28, but the file
-                                        // itself is larger. Should be picked.
-  Add(2, 9U, "610", "611",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 10U, "620", "621",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 11U, "630", "631",
-      6100U);  // Overlaps with a large file. Not picked
-  Add(2, 12U, "640", "641",
-      6100U);  // Overlaps with a large file. Not picked
-
-  Add(3, 31U, "001", "100", 260000000U);
-  Add(3, 26U, "160", "165", 260000000U);
-  Add(3, 27U, "166", "170", 260000000U);
-  Add(3, 28U, "180", "400", 260000000U);
-  Add(3, 29U, "401", "500", 260000000U);
-  Add(3, 30U, "601", "700", 260000000U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(1U, compaction->num_input_files(0));
-  // Picking file 8 because overlapping ratio is the biggest.
-  ASSERT_EQ(8U, compaction->input(0, 0)->fd.GetNumber());
-}
-
 // This test exhibits the bug where we don't properly reset parent_index in
 // PickCompaction()
 TEST_F(CompactionPickerTest, ParentIndexResetBug) {
@@ -2377,92 +2155,6 @@ TEST_F(CompactionPickerTest, IsTrivialMoveOn) {
   ASSERT_TRUE(compaction->IsTrivialMove());
 }
 
-TEST_F(CompactionPickerTest, L0TrivialMove1) {
-  mutable_cf_options_.max_bytes_for_level_base = 10000000u;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 4;
-  mutable_cf_options_.max_compaction_bytes = 10000000u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  Add(0, 1U, "100", "150", 3000U, 0, 710, 800);
-  Add(0, 2U, "151", "200", 3001U, 0, 610, 700);
-  Add(0, 3U, "301", "350", 3000U, 0, 510, 600);
-  Add(0, 4U, "451", "400", 3000U, 0, 410, 500);
-
-  Add(1, 5U, "120", "130", 7000U);
-  Add(1, 6U, "170", "180", 7000U);
-  Add(1, 7U, "220", "230", 7000U);
-  Add(1, 8U, "270", "280", 7000U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(1, compaction->num_input_levels());
-  ASSERT_EQ(2, compaction->num_input_files(0));
-  ASSERT_EQ(3, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(4, compaction->input(0, 1)->fd.GetNumber());
-  ASSERT_TRUE(compaction->IsTrivialMove());
-}
-
-TEST_F(CompactionPickerTest, L0TrivialMoveOneFile) {
-  mutable_cf_options_.max_bytes_for_level_base = 10000000u;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 4;
-  mutable_cf_options_.max_compaction_bytes = 10000000u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  Add(0, 1U, "100", "150", 3000U, 0, 710, 800);
-  Add(0, 2U, "551", "600", 3001U, 0, 610, 700);
-  Add(0, 3U, "101", "150", 3000U, 0, 510, 600);
-  Add(0, 4U, "451", "400", 3000U, 0, 410, 500);
-
-  Add(1, 5U, "120", "130", 7000U);
-  Add(1, 6U, "170", "180", 7000U);
-  Add(1, 7U, "220", "230", 7000U);
-  Add(1, 8U, "270", "280", 7000U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(1, compaction->num_input_levels());
-  ASSERT_EQ(1, compaction->num_input_files(0));
-  ASSERT_EQ(4, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_TRUE(compaction->IsTrivialMove());
-}
-
-TEST_F(CompactionPickerTest, L0TrivialMoveWholeL0) {
-  mutable_cf_options_.max_bytes_for_level_base = 10000000u;
-  mutable_cf_options_.level0_file_num_compaction_trigger = 4;
-  mutable_cf_options_.max_compaction_bytes = 10000000u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  Add(0, 1U, "300", "350", 3000U, 0, 710, 800);
-  Add(0, 2U, "651", "600", 3001U, 0, 610, 700);
-  Add(0, 3U, "501", "550", 3000U, 0, 510, 600);
-  Add(0, 4U, "451", "400", 3000U, 0, 410, 500);
-
-  Add(1, 5U, "120", "130", 7000U);
-  Add(1, 6U, "970", "980", 7000U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(1, compaction->num_input_levels());
-  ASSERT_EQ(4, compaction->num_input_files(0));
-  ASSERT_EQ(1, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(4, compaction->input(0, 1)->fd.GetNumber());
-  ASSERT_EQ(3, compaction->input(0, 2)->fd.GetNumber());
-  ASSERT_EQ(2, compaction->input(0, 3)->fd.GetNumber());
-  ASSERT_TRUE(compaction->IsTrivialMove());
-}
-
 TEST_F(CompactionPickerTest, IsTrivialMoveOffSstPartitioned) {
   mutable_cf_options_.max_bytes_for_level_base = 10000u;
   mutable_cf_options_.max_compaction_bytes = 10001u;
@@ -2511,197 +2203,6 @@ TEST_F(CompactionPickerTest, IsTrivialMoveOff) {
   ASSERT_FALSE(compaction->IsTrivialMove());
 }
 
-TEST_F(CompactionPickerTest, TrivialMoveMultipleFiles1) {
-  mutable_cf_options_.max_bytes_for_level_base = 1000u;
-  mutable_cf_options_.max_compaction_bytes = 10000001u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  ioptions_.compaction_pri = kMinOverlappingRatio;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  Add(2, 1U, "100", "150", 3000U);
-  Add(2, 2U, "151", "200", 3001U);
-  Add(2, 3U, "301", "350", 3000U);
-  Add(2, 4U, "451", "400", 3000U);
-  Add(2, 5U, "551", "500", 3000U);
-  Add(2, 6U, "651", "600", 3000U);
-  Add(2, 7U, "751", "700", 3000U);
-  Add(2, 8U, "851", "900", 3000U);
-
-  Add(3, 15U, "120", "130", 700U);
-  Add(3, 16U, "170", "180", 700U);
-  Add(3, 17U, "220", "230", 700U);
-  Add(3, 18U, "870", "880", 700U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_TRUE(compaction->IsTrivialMove());
-  ASSERT_EQ(1, compaction->num_input_levels());
-  ASSERT_EQ(4, compaction->num_input_files(0));
-  ASSERT_EQ(3, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(4, compaction->input(0, 1)->fd.GetNumber());
-  ASSERT_EQ(5, compaction->input(0, 2)->fd.GetNumber());
-  ASSERT_EQ(6, compaction->input(0, 3)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, TrivialMoveMultipleFiles2) {
-  mutable_cf_options_.max_bytes_for_level_base = 1000u;
-  mutable_cf_options_.max_compaction_bytes = 10000001u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  ioptions_.compaction_pri = kMinOverlappingRatio;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  Add(2, 1U, "100", "150", 3000U);
-  Add(2, 2U, "151", "160", 3001U);
-  Add(2, 3U, "161", "179", 3000U);
-  Add(2, 4U, "220", "400", 3000U);
-  Add(2, 5U, "551", "500", 3000U);
-  Add(2, 6U, "651", "600", 3000U);
-  Add(2, 7U, "751", "700", 3000U);
-  Add(2, 8U, "851", "900", 3000U);
-
-  Add(3, 15U, "120", "130", 700U);
-  Add(3, 17U, "220", "230", 700U);
-  Add(3, 18U, "870", "880", 700U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_TRUE(compaction->IsTrivialMove());
-  ASSERT_EQ(1, compaction->num_input_levels());
-  ASSERT_EQ(2, compaction->num_input_files(0));
-  ASSERT_EQ(2, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(3, compaction->input(0, 1)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, TrivialMoveMultipleFiles3) {
-  mutable_cf_options_.max_bytes_for_level_base = 1000u;
-  mutable_cf_options_.max_compaction_bytes = 10000001u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  ioptions_.compaction_pri = kMinOverlappingRatio;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  // Even if consecutive files can be trivial moved, we don't pick them
-  // since in case trivial move can't be issued for a reason, we cannot
-  // fall back to normal compactions.
-  Add(2, 1U, "100", "150", 3000U);
-  Add(2, 2U, "151", "160", 3001U);
-  Add(2, 5U, "551", "500", 3000U);
-  Add(2, 6U, "651", "600", 3000U);
-  Add(2, 7U, "751", "700", 3000U);
-  Add(2, 8U, "851", "900", 3000U);
-
-  Add(3, 15U, "120", "130", 700U);
-  Add(3, 17U, "220", "230", 700U);
-  Add(3, 18U, "870", "880", 700U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_TRUE(compaction->IsTrivialMove());
-  ASSERT_EQ(1, compaction->num_input_levels());
-  ASSERT_EQ(1, compaction->num_input_files(0));
-  ASSERT_EQ(2, compaction->input(0, 0)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, TrivialMoveMultipleFiles4) {
-  mutable_cf_options_.max_bytes_for_level_base = 1000u;
-  mutable_cf_options_.max_compaction_bytes = 10000001u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  ioptions_.compaction_pri = kMinOverlappingRatio;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  Add(2, 1U, "100", "150", 4000U);
-  Add(2, 2U, "151", "160", 4001U);
-  Add(2, 3U, "161", "179", 4000U);
-
-  Add(3, 15U, "120", "130", 700U);
-  Add(3, 17U, "220", "230", 700U);
-  Add(3, 18U, "870", "880", 700U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_TRUE(compaction->IsTrivialMove());
-  ASSERT_EQ(1, compaction->num_input_levels());
-  ASSERT_EQ(2, compaction->num_input_files(0));
-  ASSERT_EQ(2, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(3, compaction->input(0, 1)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, TrivialMoveMultipleFiles5) {
-  mutable_cf_options_.max_bytes_for_level_base = 1000u;
-  mutable_cf_options_.max_compaction_bytes = 10000001u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  ioptions_.compaction_pri = kMinOverlappingRatio;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  // File 4 and 5 aren't clean cut, so only 2 and 3 are picked.
-  Add(2, 1U, "100", "150", 4000U);
-  Add(2, 2U, "151", "160", 4001U);
-  Add(2, 3U, "161", "179", 4000U);
-  Add(2, 4U, "180", "185", 4000U);
-  Add(2, 5U, "185", "190", 4000U);
-
-  Add(3, 15U, "120", "130", 700U);
-  Add(3, 17U, "220", "230", 700U);
-  Add(3, 18U, "870", "880", 700U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_TRUE(compaction->IsTrivialMove());
-  ASSERT_EQ(1, compaction->num_input_levels());
-  ASSERT_EQ(2, compaction->num_input_files(0));
-  ASSERT_EQ(2, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(3, compaction->input(0, 1)->fd.GetNumber());
-}
-
-TEST_F(CompactionPickerTest, TrivialMoveMultipleFiles6) {
-  mutable_cf_options_.max_bytes_for_level_base = 1000u;
-  mutable_cf_options_.max_compaction_bytes = 10000001u;
-  ioptions_.level_compaction_dynamic_level_bytes = false;
-  ioptions_.compaction_pri = kMinOverlappingRatio;
-  NewVersionStorage(6, kCompactionStyleLevel);
-
-  Add(2, 1U, "100", "150", 3000U);
-  Add(2, 2U, "151", "200", 3001U);
-  Add(2, 3U, "301", "350", 3000U);
-  Add(2, 4U, "451", "400", 3000U);
-  Add(2, 5U, "551", "500", 3000U);
-  file_map_[5U].first->being_compacted = true;
-  Add(2, 6U, "651", "600", 3000U);
-  Add(2, 7U, "751", "700", 3000U);
-  Add(2, 8U, "851", "900", 3000U);
-
-  Add(3, 15U, "120", "130", 700U);
-  Add(3, 16U, "170", "180", 700U);
-  Add(3, 17U, "220", "230", 700U);
-  Add(3, 18U, "870", "880", 700U);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(level_compaction_picker.PickCompaction(
-      cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-      &log_buffer_));
-  ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_TRUE(compaction->IsTrivialMove());
-  ASSERT_EQ(1, compaction->num_input_levels());
-  // Since the next file is being compacted. Stopping at 3 and 4.
-  ASSERT_EQ(2, compaction->num_input_files(0));
-  ASSERT_EQ(3, compaction->input(0, 0)->fd.GetNumber());
-  ASSERT_EQ(4, compaction->input(0, 1)->fd.GetNumber());
-}
-
 TEST_F(CompactionPickerTest, CacheNextCompactionIndex) {
   NewVersionStorage(6, kCompactionStyleLevel);
   mutable_cf_options_.max_compaction_bytes = 100000000000u;
@@ -2716,11 +2217,7 @@ TEST_F(CompactionPickerTest, CacheNextCompactionIndex) {
   Add(1 /* level */, 4U /* file_number */, "250" /* smallest */,
       "299" /* largest */, 700000000U /* file_size */);
   Add(2 /* level */, 5U /* file_number */, "150" /* smallest */,
-      "199" /* largest */, 100U /* file_size */);
-  Add(2 /* level */, 6U /* file_number */, "200" /* smallest */,
-      "240" /* largest */, 1U /* file_size */);
-  Add(2 /* level */, 7U /* file_number */, "260" /* smallest */,
-      "270" /* largest */, 1U /* file_size */);
+      "199" /* largest */, 1U /* file_size */);
   file_map_[5U].first->being_compacted = true;
 
   UpdateVersionStorageInfo();
@@ -2729,9 +2226,9 @@ TEST_F(CompactionPickerTest, CacheNextCompactionIndex) {
       cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
       &log_buffer_));
   ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(2U, compaction->num_input_levels());
+  ASSERT_EQ(1U, compaction->num_input_levels());
   ASSERT_EQ(1U, compaction->num_input_files(0));
-  ASSERT_EQ(1U, compaction->num_input_files(1));
+  ASSERT_EQ(0U, compaction->num_input_files(1));
   ASSERT_EQ(3U, compaction->input(0, 0)->fd.GetNumber());
   ASSERT_EQ(2, vstorage_->NextCompactionIndex(1 /* level */));
 
@@ -2739,9 +2236,9 @@ TEST_F(CompactionPickerTest, CacheNextCompactionIndex) {
       cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
       &log_buffer_));
   ASSERT_TRUE(compaction.get() != nullptr);
-  ASSERT_EQ(2U, compaction->num_input_levels());
+  ASSERT_EQ(1U, compaction->num_input_levels());
   ASSERT_EQ(1U, compaction->num_input_files(0));
-  ASSERT_EQ(1U, compaction->num_input_files(1));
+  ASSERT_EQ(0U, compaction->num_input_files(1));
   ASSERT_EQ(4U, compaction->input(0, 0)->fd.GetNumber());
   ASSERT_EQ(3, vstorage_->NextCompactionIndex(1 /* level */));
 
@@ -3156,8 +2653,8 @@ TEST_F(CompactionPickerTest, UniversalMarkedManualCompaction) {
       universal_compaction_picker.CompactRange(
           cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
           ColumnFamilyData::kCompactAllLevels, 6, CompactRangeOptions(),
-          nullptr, nullptr, &manual_end, &manual_conflict,
-          std::numeric_limits<uint64_t>::max(), ""));
+          nullptr, nullptr, &manual_end, &manual_conflict, port::kMaxUint64,
+          ""));
 
   ASSERT_TRUE(compaction);
 
@@ -3175,334 +2672,6 @@ TEST_F(CompactionPickerTest, UniversalMarkedManualCompaction) {
   ASSERT_EQ(0U, vstorage_->FilesMarkedForCompaction().size());
 }
 
-TEST_F(CompactionPickerTest, UniversalSizeAmpTierCompactionNonLastLevel) {
-  // This test make sure size amplification compaction could still be triggered
-  // if the last sorted run is not the last level.
-  const uint64_t kFileSize = 100000;
-  const int kNumLevels = 7;
-  const int kLastLevel = kNumLevels - 1;
-
-  ioptions_.compaction_style = kCompactionStyleUniversal;
-  ioptions_.preclude_last_level_data_seconds = 1000;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 200;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(kNumLevels, kCompactionStyleUniversal);
-  Add(0, 100U, "100", "300", 1 * kFileSize);
-  Add(0, 101U, "200", "400", 1 * kFileSize);
-  Add(4, 90U, "100", "600", 4 * kFileSize);
-  Add(5, 80U, "200", "300", 2 * kFileSize);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-
-  // Make sure it's a size amp compaction and includes all files
-  ASSERT_EQ(compaction->compaction_reason(),
-            CompactionReason::kUniversalSizeAmplification);
-  ASSERT_EQ(compaction->output_level(), kLastLevel);
-  ASSERT_EQ(compaction->input_levels(0)->num_files, 2);
-  ASSERT_EQ(compaction->input_levels(4)->num_files, 1);
-  ASSERT_EQ(compaction->input_levels(5)->num_files, 1);
-}
-
-TEST_F(CompactionPickerTest, UniversalSizeRatioTierCompactionLastLevel) {
-  // This test makes sure the size amp calculation skips the last level (L6), so
-  // size amp compaction is not triggered, instead a size ratio compaction is
-  // triggered.
-  const uint64_t kFileSize = 100000;
-  const int kNumLevels = 7;
-  const int kLastLevel = kNumLevels - 1;
-  const int kPenultimateLevel = kLastLevel - 1;
-
-  ioptions_.compaction_style = kCompactionStyleUniversal;
-  ioptions_.preclude_last_level_data_seconds = 1000;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 200;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(kNumLevels, kCompactionStyleUniversal);
-  Add(0, 100U, "100", "300", 1 * kFileSize);
-  Add(0, 101U, "200", "400", 1 * kFileSize);
-  Add(5, 90U, "100", "600", 4 * kFileSize);
-  Add(6, 80U, "200", "300", 2 * kFileSize);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-
-  // Internally, size amp compaction is evaluated before size ratio compaction.
-  // Here to make sure it's size ratio compaction instead of size amp
-  ASSERT_EQ(compaction->compaction_reason(),
-            CompactionReason::kUniversalSizeRatio);
-  ASSERT_EQ(compaction->output_level(), kPenultimateLevel - 1);
-  ASSERT_EQ(compaction->input_levels(0)->num_files, 2);
-  ASSERT_EQ(compaction->input_levels(5)->num_files, 0);
-  ASSERT_EQ(compaction->input_levels(6)->num_files, 0);
-}
-
-TEST_F(CompactionPickerTest, UniversalSizeAmpTierCompactionNotSuport) {
-  // Tiered compaction only support level_num > 2 (otherwise the penultimate
-  // level is going to be level 0, which may make thing more complicated), so
-  // when there's only 2 level, still treating level 1 as the last level for
-  // size amp compaction
-  const uint64_t kFileSize = 100000;
-  const int kNumLevels = 2;
-  const int kLastLevel = kNumLevels - 1;
-
-  ioptions_.compaction_style = kCompactionStyleUniversal;
-  ioptions_.preclude_last_level_data_seconds = 1000;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 200;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(kNumLevels, kCompactionStyleUniversal);
-  Add(0, 100U, "100", "300", 1 * kFileSize);
-  Add(0, 101U, "200", "400", 1 * kFileSize);
-  Add(0, 90U, "100", "600", 4 * kFileSize);
-  Add(1, 80U, "200", "300", 2 * kFileSize);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-
-  // size amp compaction is still triggered even preclude_last_level is set
-  ASSERT_EQ(compaction->compaction_reason(),
-            CompactionReason::kUniversalSizeAmplification);
-  ASSERT_EQ(compaction->output_level(), kLastLevel);
-  ASSERT_EQ(compaction->input_levels(0)->num_files, 3);
-  ASSERT_EQ(compaction->input_levels(1)->num_files, 1);
-}
-
-TEST_F(CompactionPickerTest, UniversalSizeAmpTierCompactionLastLevel) {
-  // This test makes sure the size amp compaction for tiered storage could still
-  // be triggered, but only for non-last-level files
-  const uint64_t kFileSize = 100000;
-  const int kNumLevels = 7;
-  const int kLastLevel = kNumLevels - 1;
-  const int kPenultimateLevel = kLastLevel - 1;
-
-  ioptions_.compaction_style = kCompactionStyleUniversal;
-  ioptions_.preclude_last_level_data_seconds = 1000;
-  mutable_cf_options_.compaction_options_universal
-      .max_size_amplification_percent = 200;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-
-  NewVersionStorage(kNumLevels, kCompactionStyleUniversal);
-  Add(0, 100U, "100", "300", 3 * kFileSize);
-  Add(0, 101U, "200", "400", 2 * kFileSize);
-  Add(5, 90U, "100", "600", 2 * kFileSize);
-  Add(6, 80U, "200", "300", 2 * kFileSize);
-  UpdateVersionStorageInfo();
-
-  std::unique_ptr<Compaction> compaction(
-      universal_compaction_picker.PickCompaction(
-          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          &log_buffer_));
-
-  // It's a Size Amp compaction, but doesn't include the last level file and
-  // output to the penultimate level.
-  ASSERT_EQ(compaction->compaction_reason(),
-            CompactionReason::kUniversalSizeAmplification);
-  ASSERT_EQ(compaction->output_level(), kPenultimateLevel);
-  ASSERT_EQ(compaction->input_levels(0)->num_files, 2);
-  ASSERT_EQ(compaction->input_levels(5)->num_files, 1);
-  ASSERT_EQ(compaction->input_levels(6)->num_files, 0);
-}
-
-class PerKeyPlacementCompactionPickerTest
-    : public CompactionPickerTest,
-      public testing::WithParamInterface<bool> {
- public:
-  PerKeyPlacementCompactionPickerTest() : CompactionPickerTest() {}
-
-  void SetUp() override { enable_per_key_placement_ = GetParam(); }
-
- protected:
-  bool enable_per_key_placement_ = false;
-};
-
-TEST_P(PerKeyPlacementCompactionPickerTest, OverlapWithNormalCompaction) {
-  SyncPoint::GetInstance()->SetCallBack(
-      "Compaction::SupportsPerKeyPlacement:Enabled", [&](void* arg) {
-        auto supports_per_key_placement = static_cast<bool*>(arg);
-        *supports_per_key_placement = enable_per_key_placement_;
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  int num_levels = ioptions_.num_levels;
-  NewVersionStorage(num_levels, kCompactionStyleLevel);
-
-  Add(0, 21U, "100", "150", 60000000U);
-  Add(0, 22U, "300", "350", 60000000U);
-  Add(5, 40U, "200", "250", 60000000U);
-  Add(6, 50U, "101", "351", 60000000U);
-  UpdateVersionStorageInfo();
-
-  CompactionOptions comp_options;
-  std::unordered_set<uint64_t> input_set;
-  input_set.insert(40);
-  std::vector<CompactionInputFiles> input_files;
-  ASSERT_OK(level_compaction_picker.GetCompactionInputsFromFileNumbers(
-      &input_files, &input_set, vstorage_.get(), comp_options));
-
-  std::unique_ptr<Compaction> comp1(level_compaction_picker.CompactFiles(
-      comp_options, input_files, 5, vstorage_.get(), mutable_cf_options_,
-      mutable_db_options_, 0));
-
-  input_set.clear();
-  input_files.clear();
-  input_set.insert(21);
-  input_set.insert(22);
-  input_set.insert(50);
-  ASSERT_OK(level_compaction_picker.GetCompactionInputsFromFileNumbers(
-      &input_files, &input_set, vstorage_.get(), comp_options));
-
-  ASSERT_EQ(
-      enable_per_key_placement_,
-      level_compaction_picker.FilesRangeOverlapWithCompaction(input_files, 6));
-}
-
-TEST_P(PerKeyPlacementCompactionPickerTest, NormalCompactionOverlap) {
-  SyncPoint::GetInstance()->SetCallBack(
-      "Compaction::SupportsPerKeyPlacement:Enabled", [&](void* arg) {
-        auto supports_per_key_placement = static_cast<bool*>(arg);
-        *supports_per_key_placement = enable_per_key_placement_;
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  int num_levels = ioptions_.num_levels;
-  NewVersionStorage(num_levels, kCompactionStyleLevel);
-
-  Add(0, 21U, "100", "150", 60000000U);
-  Add(0, 22U, "300", "350", 60000000U);
-  Add(4, 40U, "200", "220", 60000000U);
-  Add(4, 41U, "230", "250", 60000000U);
-  Add(6, 50U, "101", "351", 60000000U);
-  UpdateVersionStorageInfo();
-
-  CompactionOptions comp_options;
-  std::unordered_set<uint64_t> input_set;
-  input_set.insert(21);
-  input_set.insert(22);
-  input_set.insert(50);
-  std::vector<CompactionInputFiles> input_files;
-  ASSERT_OK(level_compaction_picker.GetCompactionInputsFromFileNumbers(
-      &input_files, &input_set, vstorage_.get(), comp_options));
-
-  std::unique_ptr<Compaction> comp1(level_compaction_picker.CompactFiles(
-      comp_options, input_files, 6, vstorage_.get(), mutable_cf_options_,
-      mutable_db_options_, 0));
-
-  input_set.clear();
-  input_files.clear();
-  input_set.insert(40);
-  input_set.insert(41);
-  ASSERT_OK(level_compaction_picker.GetCompactionInputsFromFileNumbers(
-      &input_files, &input_set, vstorage_.get(), comp_options));
-
-  ASSERT_EQ(
-      enable_per_key_placement_,
-      level_compaction_picker.FilesRangeOverlapWithCompaction(input_files, 5));
-}
-
-TEST_P(PerKeyPlacementCompactionPickerTest,
-       OverlapWithNormalCompactionUniveral) {
-  SyncPoint::GetInstance()->SetCallBack(
-      "Compaction::SupportsPerKeyPlacement:Enabled", [&](void* arg) {
-        auto supports_per_key_placement = static_cast<bool*>(arg);
-        *supports_per_key_placement = enable_per_key_placement_;
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  int num_levels = ioptions_.num_levels;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-  NewVersionStorage(num_levels, kCompactionStyleUniversal);
-
-  Add(0, 21U, "100", "150", 60000000U);
-  Add(0, 22U, "300", "350", 60000000U);
-  Add(5, 40U, "200", "250", 60000000U);
-  Add(6, 50U, "101", "351", 60000000U);
-  UpdateVersionStorageInfo();
-
-  CompactionOptions comp_options;
-  std::unordered_set<uint64_t> input_set;
-  input_set.insert(40);
-  std::vector<CompactionInputFiles> input_files;
-  ASSERT_OK(universal_compaction_picker.GetCompactionInputsFromFileNumbers(
-      &input_files, &input_set, vstorage_.get(), comp_options));
-
-  std::unique_ptr<Compaction> comp1(universal_compaction_picker.CompactFiles(
-      comp_options, input_files, 5, vstorage_.get(), mutable_cf_options_,
-      mutable_db_options_, 0));
-
-  input_set.clear();
-  input_files.clear();
-  input_set.insert(21);
-  input_set.insert(22);
-  input_set.insert(50);
-  ASSERT_OK(universal_compaction_picker.GetCompactionInputsFromFileNumbers(
-      &input_files, &input_set, vstorage_.get(), comp_options));
-
-  ASSERT_EQ(enable_per_key_placement_,
-            universal_compaction_picker.FilesRangeOverlapWithCompaction(
-                input_files, 6));
-}
-
-TEST_P(PerKeyPlacementCompactionPickerTest, NormalCompactionOverlapUniversal) {
-  SyncPoint::GetInstance()->SetCallBack(
-      "Compaction::SupportsPerKeyPlacement:Enabled", [&](void* arg) {
-        auto supports_per_key_placement = static_cast<bool*>(arg);
-        *supports_per_key_placement = enable_per_key_placement_;
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  int num_levels = ioptions_.num_levels;
-  UniversalCompactionPicker universal_compaction_picker(ioptions_, &icmp_);
-  NewVersionStorage(num_levels, kCompactionStyleUniversal);
-
-  Add(0, 21U, "100", "150", 60000000U);
-  Add(0, 22U, "300", "350", 60000000U);
-  Add(4, 40U, "200", "220", 60000000U);
-  Add(4, 41U, "230", "250", 60000000U);
-  Add(6, 50U, "101", "351", 60000000U);
-  UpdateVersionStorageInfo();
-
-  CompactionOptions comp_options;
-  std::unordered_set<uint64_t> input_set;
-  input_set.insert(21);
-  input_set.insert(22);
-  input_set.insert(50);
-  std::vector<CompactionInputFiles> input_files;
-  ASSERT_OK(universal_compaction_picker.GetCompactionInputsFromFileNumbers(
-      &input_files, &input_set, vstorage_.get(), comp_options));
-
-  std::unique_ptr<Compaction> comp1(universal_compaction_picker.CompactFiles(
-      comp_options, input_files, 6, vstorage_.get(), mutable_cf_options_,
-      mutable_db_options_, 0));
-
-  input_set.clear();
-  input_files.clear();
-  input_set.insert(40);
-  input_set.insert(41);
-  ASSERT_OK(universal_compaction_picker.GetCompactionInputsFromFileNumbers(
-      &input_files, &input_set, vstorage_.get(), comp_options));
-
-  ASSERT_EQ(enable_per_key_placement_,
-            universal_compaction_picker.FilesRangeOverlapWithCompaction(
-                input_files, 5));
-}
-
-INSTANTIATE_TEST_CASE_P(PerKeyPlacementCompactionPickerTest,
-                        PerKeyPlacementCompactionPickerTest, ::testing::Bool());
-
 #endif  // ROCKSDB_LITE
 
 }  // namespace ROCKSDB_NAMESPACE

db/compaction/compaction_picker_universal.cc

@@ -106,9 +106,6 @@ class UniversalCompactionBuilder {
   Compaction* PickCompactionToOldest(size_t start_index,
                                      CompactionReason compaction_reason);
 
-  Compaction* PickCompactionWithSortedRunRange(
-      size_t start_index, size_t end_index, CompactionReason compaction_reason);
-
   // Try to pick periodic compaction. The caller should only call it
   // if there is at least one file marked for periodic compaction.
   // null will be returned if no such a compaction can be formed
@@ -761,8 +758,7 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSortedRuns(
                         Temperature::kUnknown,
                         /* max_subcompactions */ 0, grandparents,
                         /* is manual */ false, /* trim_ts */ "", score_,
-                        false /* deletion_compaction */,
-                        /* l0_files_might_overlap */ true, compaction_reason);
+                        false /* deletion_compaction */, compaction_reason);
 }
 
 // Look at overall size amplification. If size amplification
@@ -814,20 +810,8 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSizeAmp() {
         cf_name_.c_str(), file_num_buf, start_index, " to reduce size amp.\n");
   }
 
-  // size of the base sorted run for size amp calculation
-  uint64_t base_sr_size = sorted_runs_.back().size;
-  size_t sr_end_idx = sorted_runs_.size() - 1;
-  // If tiered compaction is enabled and the last sorted run is the last level
-  if (ioptions_.preclude_last_level_data_seconds > 0 &&
-      ioptions_.num_levels > 2 &&
-      sorted_runs_.back().level == ioptions_.num_levels - 1 &&
-      sorted_runs_.size() > 1) {
-    sr_end_idx = sorted_runs_.size() - 2;
-    base_sr_size = sorted_runs_[sr_end_idx].size;
-  }
-
   // keep adding up all the remaining files
-  for (size_t loop = start_index; loop < sr_end_idx; loop++) {
+  for (size_t loop = start_index; loop + 1 < sorted_runs_.size(); loop++) {
     sr = &sorted_runs_[loop];
     if (sr->being_compacted) {
       // TODO with incremental compaction is supported, we might want to
@@ -847,20 +831,23 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSizeAmp() {
     return nullptr;
   }
 
+  // size of earliest file
+  uint64_t earliest_file_size = sorted_runs_.back().size;
+
   // size amplification = percentage of additional size
-  if (candidate_size * 100 < ratio * base_sr_size) {
+  if (candidate_size * 100 < ratio * earliest_file_size) {
     ROCKS_LOG_BUFFER(
         log_buffer_,
         "[%s] Universal: size amp not needed. newer-files-total-size %" PRIu64
         " earliest-file-size %" PRIu64,
-        cf_name_.c_str(), candidate_size, base_sr_size);
+        cf_name_.c_str(), candidate_size, earliest_file_size);
     return nullptr;
   } else {
     ROCKS_LOG_BUFFER(
         log_buffer_,
         "[%s] Universal: size amp needed. newer-files-total-size %" PRIu64
         " earliest-file-size %" PRIu64,
-        cf_name_.c_str(), candidate_size, base_sr_size);
+        cf_name_.c_str(), candidate_size, earliest_file_size);
   }
   // Since incremental compaction can't include more than second last
   // level, it can introduce penalty, compared to full compaction. We
@@ -872,7 +859,7 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSizeAmp() {
   // This also prevent the case when compaction falls behind and we
   // need to compact more levels for compactions to catch up.
   if (mutable_cf_options_.compaction_options_universal.incremental) {
-    double fanout_threshold = static_cast<double>(base_sr_size) /
+    double fanout_threshold = static_cast<double>(earliest_file_size) /
                               static_cast<double>(candidate_size) * 1.8;
     Compaction* picked = PickIncrementalForReduceSizeAmp(fanout_threshold);
     if (picked != nullptr) {
@@ -881,8 +868,8 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSizeAmp() {
       return picked;
     }
   }
-  return PickCompactionWithSortedRunRange(
-      start_index, sr_end_idx, CompactionReason::kUniversalSizeAmplification);
+  return PickCompactionToOldest(start_index,
+                                CompactionReason::kUniversalSizeAmplification);
 }
 
 Compaction* UniversalCompactionBuilder::PickIncrementalForReduceSizeAmp(
@@ -1096,7 +1083,6 @@ Compaction* UniversalCompactionBuilder::PickIncrementalForReduceSizeAmp(
       Temperature::kUnknown,
       /* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false,
       /* trim_ts */ "", score_, false /* deletion_compaction */,
-      /* l0_files_might_overlap */ true,
       CompactionReason::kUniversalSizeAmplification);
 }
 
@@ -1239,23 +1225,16 @@ Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
       Temperature::kUnknown,
       /* max_subcompactions */ 0, grandparents, /* is manual */ false,
       /* trim_ts */ "", score_, false /* deletion_compaction */,
-      /* l0_files_might_overlap */ true,
       CompactionReason::kFilesMarkedForCompaction);
 }
 
 Compaction* UniversalCompactionBuilder::PickCompactionToOldest(
     size_t start_index, CompactionReason compaction_reason) {
-  return PickCompactionWithSortedRunRange(start_index, sorted_runs_.size() - 1,
-                                          compaction_reason);
-}
-
-Compaction* UniversalCompactionBuilder::PickCompactionWithSortedRunRange(
-    size_t start_index, size_t end_index, CompactionReason compaction_reason) {
   assert(start_index < sorted_runs_.size());
 
   // Estimate total file size
   uint64_t estimated_total_size = 0;
-  for (size_t loop = start_index; loop <= end_index; loop++) {
+  for (size_t loop = start_index; loop < sorted_runs_.size(); loop++) {
     estimated_total_size += sorted_runs_[loop].size;
   }
   uint32_t path_id =
@@ -1266,7 +1245,7 @@ Compaction* UniversalCompactionBuilder::PickCompactionWithSortedRunRange(
   for (size_t i = 0; i < inputs.size(); ++i) {
     inputs[i].level = start_level + static_cast<int>(i);
   }
-  for (size_t loop = start_index; loop <= end_index; loop++) {
+  for (size_t loop = start_index; loop < sorted_runs_.size(); loop++) {
     auto& picking_sr = sorted_runs_[loop];
     if (picking_sr.level == 0) {
       FileMetaData* f = picking_sr.file;
@@ -1297,19 +1276,12 @@ Compaction* UniversalCompactionBuilder::PickCompactionWithSortedRunRange(
                      file_num_buf);
   }
 
-  int output_level;
-  if (end_index == sorted_runs_.size() - 1) {
-    // output files at the last level, unless it's reserved
-    output_level = vstorage_->num_levels() - 1;
-    // last level is reserved for the files ingested behind
-    if (ioptions_.allow_ingest_behind) {
-      assert(output_level > 1);
-      output_level--;
-    }
-  } else {
-    // if it's not including all sorted_runs, it can only output to the level
-    // above the `end_index + 1` sorted_run.
-    output_level = sorted_runs_[end_index + 1].level - 1;
+  // output files at the bottom most level, unless it's reserved
+  int output_level = vstorage_->num_levels() - 1;
+  // last level is reserved for the files ingested behind
+  if (ioptions_.allow_ingest_behind) {
+    assert(output_level > 1);
+    output_level--;
   }
 
   // We never check size for
@@ -1328,7 +1300,7 @@ Compaction* UniversalCompactionBuilder::PickCompactionWithSortedRunRange(
       Temperature::kUnknown,
       /* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false,
       /* trim_ts */ "", score_, false /* deletion_compaction */,
-      /* l0_files_might_overlap */ true, compaction_reason);
+      compaction_reason);
 }
 
 Compaction* UniversalCompactionBuilder::PickPeriodicCompaction() {
@@ -1399,7 +1371,7 @@ Compaction* UniversalCompactionBuilder::PickPeriodicCompaction() {
 
 uint64_t UniversalCompactionBuilder::GetMaxOverlappingBytes() const {
   if (!mutable_cf_options_.compaction_options_universal.incremental) {
-    return std::numeric_limits<uint64_t>::max();
+    return port::kMaxUint64;
   } else {
     // Try to align cutting boundary with files at the next level if the
     // file isn't end up with 1/2 of target size, or it would overlap

db/compaction/compaction_service_job.cc

@@ -1,829 +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_job.h"
-#include "db/compaction/compaction_state.h"
-#include "logging/logging.h"
-#include "monitoring/iostats_context_imp.h"
-#include "monitoring/thread_status_util.h"
-#include "options/options_helper.h"
-#include "rocksdb/utilities/options_type.h"
-
-#ifndef ROCKSDB_LITE
-namespace ROCKSDB_NAMESPACE {
-class SubcompactionState;
-
-CompactionServiceJobStatus
-CompactionJob::ProcessKeyValueCompactionWithCompactionService(
-    SubcompactionState* sub_compact) {
-  assert(sub_compact);
-  assert(sub_compact->compaction);
-  assert(db_options_.compaction_service);
-
-  const Compaction* compaction = sub_compact->compaction;
-  CompactionServiceInput compaction_input;
-  compaction_input.output_level = compaction->output_level();
-  compaction_input.db_id = db_id_;
-
-  const std::vector<CompactionInputFiles>& inputs =
-      *(compact_->compaction->inputs());
-  for (const auto& files_per_level : inputs) {
-    for (const auto& file : files_per_level.files) {
-      compaction_input.input_files.emplace_back(
-          MakeTableFileName(file->fd.GetNumber()));
-    }
-  }
-  compaction_input.column_family.name =
-      compaction->column_family_data()->GetName();
-  compaction_input.column_family.options =
-      compaction->column_family_data()->GetLatestCFOptions();
-  compaction_input.db_options =
-      BuildDBOptions(db_options_, mutable_db_options_copy_);
-  compaction_input.snapshots = existing_snapshots_;
-  compaction_input.has_begin = sub_compact->start.has_value();
-  compaction_input.begin =
-      compaction_input.has_begin ? sub_compact->start->ToString() : "";
-  compaction_input.has_end = sub_compact->end.has_value();
-  compaction_input.end =
-      compaction_input.has_end ? sub_compact->end->ToString() : "";
-
-  std::string compaction_input_binary;
-  Status s = compaction_input.Write(&compaction_input_binary);
-  if (!s.ok()) {
-    sub_compact->status = s;
-    return CompactionServiceJobStatus::kFailure;
-  }
-
-  std::ostringstream input_files_oss;
-  bool is_first_one = true;
-  for (const auto& file : compaction_input.input_files) {
-    input_files_oss << (is_first_one ? "" : ", ") << file;
-    is_first_one = false;
-  }
-
-  ROCKS_LOG_INFO(
-      db_options_.info_log,
-      "[%s] [JOB %d] Starting remote compaction (output level: %d): %s",
-      compaction_input.column_family.name.c_str(), job_id_,
-      compaction_input.output_level, input_files_oss.str().c_str());
-  CompactionServiceJobInfo info(dbname_, db_id_, db_session_id_,
-                                GetCompactionId(sub_compact), thread_pri_);
-  CompactionServiceJobStatus compaction_status =
-      db_options_.compaction_service->StartV2(info, compaction_input_binary);
-  switch (compaction_status) {
-    case CompactionServiceJobStatus::kSuccess:
-      break;
-    case CompactionServiceJobStatus::kFailure:
-      sub_compact->status = Status::Incomplete(
-          "CompactionService failed to start compaction job.");
-      ROCKS_LOG_WARN(db_options_.info_log,
-                     "[%s] [JOB %d] Remote compaction failed to start.",
-                     compaction_input.column_family.name.c_str(), job_id_);
-      return compaction_status;
-    case CompactionServiceJobStatus::kUseLocal:
-      ROCKS_LOG_INFO(
-          db_options_.info_log,
-          "[%s] [JOB %d] Remote compaction fallback to local by API Start.",
-          compaction_input.column_family.name.c_str(), job_id_);
-      return compaction_status;
-    default:
-      assert(false);  // unknown status
-      break;
-  }
-
-  ROCKS_LOG_INFO(db_options_.info_log,
-                 "[%s] [JOB %d] Waiting for remote compaction...",
-                 compaction_input.column_family.name.c_str(), job_id_);
-  std::string compaction_result_binary;
-  compaction_status = db_options_.compaction_service->WaitForCompleteV2(
-      info, &compaction_result_binary);
-
-  if (compaction_status == CompactionServiceJobStatus::kUseLocal) {
-    ROCKS_LOG_INFO(db_options_.info_log,
-                   "[%s] [JOB %d] Remote compaction fallback to local by API "
-                   "WaitForComplete.",
-                   compaction_input.column_family.name.c_str(), job_id_);
-    return compaction_status;
-  }
-
-  CompactionServiceResult compaction_result;
-  s = CompactionServiceResult::Read(compaction_result_binary,
-                                    &compaction_result);
-
-  if (compaction_status == CompactionServiceJobStatus::kFailure) {
-    if (s.ok()) {
-      if (compaction_result.status.ok()) {
-        sub_compact->status = Status::Incomplete(
-            "CompactionService failed to run the compaction job (even though "
-            "the internal status is okay).");
-      } else {
-        // set the current sub compaction status with the status returned from
-        // remote
-        sub_compact->status = compaction_result.status;
-      }
-    } else {
-      sub_compact->status = Status::Incomplete(
-          "CompactionService failed to run the compaction job (and no valid "
-          "result is returned).");
-      compaction_result.status.PermitUncheckedError();
-    }
-    ROCKS_LOG_WARN(db_options_.info_log,
-                   "[%s] [JOB %d] Remote compaction failed.",
-                   compaction_input.column_family.name.c_str(), job_id_);
-    return compaction_status;
-  }
-
-  if (!s.ok()) {
-    sub_compact->status = s;
-    compaction_result.status.PermitUncheckedError();
-    return CompactionServiceJobStatus::kFailure;
-  }
-  sub_compact->status = compaction_result.status;
-
-  std::ostringstream output_files_oss;
-  is_first_one = true;
-  for (const auto& file : compaction_result.output_files) {
-    output_files_oss << (is_first_one ? "" : ", ") << file.file_name;
-    is_first_one = false;
-  }
-
-  ROCKS_LOG_INFO(db_options_.info_log,
-                 "[%s] [JOB %d] Receive remote compaction result, output path: "
-                 "%s, files: %s",
-                 compaction_input.column_family.name.c_str(), job_id_,
-                 compaction_result.output_path.c_str(),
-                 output_files_oss.str().c_str());
-
-  if (!s.ok()) {
-    sub_compact->status = s;
-    return CompactionServiceJobStatus::kFailure;
-  }
-
-  for (const auto& file : compaction_result.output_files) {
-    uint64_t file_num = versions_->NewFileNumber();
-    auto src_file = compaction_result.output_path + "/" + file.file_name;
-    auto tgt_file = TableFileName(compaction->immutable_options()->cf_paths,
-                                  file_num, compaction->output_path_id());
-    s = fs_->RenameFile(src_file, tgt_file, IOOptions(), nullptr);
-    if (!s.ok()) {
-      sub_compact->status = s;
-      return CompactionServiceJobStatus::kFailure;
-    }
-
-    FileMetaData meta;
-    uint64_t file_size;
-    s = fs_->GetFileSize(tgt_file, IOOptions(), &file_size, nullptr);
-    if (!s.ok()) {
-      sub_compact->status = s;
-      return CompactionServiceJobStatus::kFailure;
-    }
-    meta.fd = FileDescriptor(file_num, compaction->output_path_id(), file_size,
-                             file.smallest_seqno, file.largest_seqno);
-    meta.smallest.DecodeFrom(file.smallest_internal_key);
-    meta.largest.DecodeFrom(file.largest_internal_key);
-    meta.oldest_ancester_time = file.oldest_ancester_time;
-    meta.file_creation_time = file.file_creation_time;
-    meta.marked_for_compaction = file.marked_for_compaction;
-    meta.unique_id = file.unique_id;
-
-    auto cfd = compaction->column_family_data();
-    sub_compact->Current().AddOutput(std::move(meta),
-                                     cfd->internal_comparator(), false, false,
-                                     true, file.paranoid_hash);
-  }
-  sub_compact->compaction_job_stats = compaction_result.stats;
-  sub_compact->Current().SetNumOutputRecords(
-      compaction_result.num_output_records);
-  sub_compact->Current().SetTotalBytes(compaction_result.total_bytes);
-  RecordTick(stats_, REMOTE_COMPACT_READ_BYTES, compaction_result.bytes_read);
-  RecordTick(stats_, REMOTE_COMPACT_WRITE_BYTES,
-             compaction_result.bytes_written);
-  return CompactionServiceJobStatus::kSuccess;
-}
-
-std::string CompactionServiceCompactionJob::GetTableFileName(
-    uint64_t file_number) {
-  return MakeTableFileName(output_path_, file_number);
-}
-
-void CompactionServiceCompactionJob::RecordCompactionIOStats() {
-  compaction_result_->bytes_read += IOSTATS(bytes_read);
-  compaction_result_->bytes_written += IOSTATS(bytes_written);
-  CompactionJob::RecordCompactionIOStats();
-}
-
-CompactionServiceCompactionJob::CompactionServiceCompactionJob(
-    int job_id, Compaction* compaction, const ImmutableDBOptions& db_options,
-    const MutableDBOptions& mutable_db_options, const FileOptions& file_options,
-    VersionSet* versions, const std::atomic<bool>* shutting_down,
-    LogBuffer* log_buffer, FSDirectory* output_directory, Statistics* stats,
-    InstrumentedMutex* db_mutex, ErrorHandler* db_error_handler,
-    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::string& db_id, const std::string& db_session_id,
-    std::string output_path,
-    const CompactionServiceInput& compaction_service_input,
-    CompactionServiceResult* compaction_service_result)
-    : CompactionJob(
-          job_id, compaction, db_options, mutable_db_options, file_options,
-          versions, shutting_down, log_buffer, nullptr, output_directory,
-          nullptr, stats, db_mutex, db_error_handler,
-          std::move(existing_snapshots), kMaxSequenceNumber, nullptr, nullptr,
-          std::move(table_cache), event_logger,
-          compaction->mutable_cf_options()->paranoid_file_checks,
-          compaction->mutable_cf_options()->report_bg_io_stats, dbname,
-          &(compaction_service_result->stats), Env::Priority::USER, io_tracer,
-          manual_compaction_canceled, db_id, db_session_id,
-          compaction->column_family_data()->GetFullHistoryTsLow()),
-      output_path_(std::move(output_path)),
-      compaction_input_(compaction_service_input),
-      compaction_result_(compaction_service_result) {}
-
-Status CompactionServiceCompactionJob::Run() {
-  AutoThreadOperationStageUpdater stage_updater(
-      ThreadStatus::STAGE_COMPACTION_RUN);
-
-  auto* c = compact_->compaction;
-  assert(c->column_family_data() != nullptr);
-  assert(c->column_family_data()->current()->storage_info()->NumLevelFiles(
-             compact_->compaction->level()) > 0);
-
-  write_hint_ =
-      c->column_family_data()->CalculateSSTWriteHint(c->output_level());
-  bottommost_level_ = c->bottommost_level();
-
-  Slice begin = compaction_input_.begin;
-  Slice end = compaction_input_.end;
-  compact_->sub_compact_states.emplace_back(
-      c,
-      compaction_input_.has_begin ? std::optional<Slice>(begin)
-                                  : std::optional<Slice>(),
-      compaction_input_.has_end ? std::optional<Slice>(end)
-                                : std::optional<Slice>(),
-      /*sub_job_id*/ 0);
-
-  log_buffer_->FlushBufferToLog();
-  LogCompaction();
-  const uint64_t start_micros = db_options_.clock->NowMicros();
-  // Pick the only sub-compaction we should have
-  assert(compact_->sub_compact_states.size() == 1);
-  SubcompactionState* sub_compact = compact_->sub_compact_states.data();
-
-  ProcessKeyValueCompaction(sub_compact);
-
-  compaction_stats_.stats.micros =
-      db_options_.clock->NowMicros() - start_micros;
-  compaction_stats_.stats.cpu_micros =
-      sub_compact->compaction_job_stats.cpu_micros;
-
-  RecordTimeToHistogram(stats_, COMPACTION_TIME,
-                        compaction_stats_.stats.micros);
-  RecordTimeToHistogram(stats_, COMPACTION_CPU_TIME,
-                        compaction_stats_.stats.cpu_micros);
-
-  Status status = sub_compact->status;
-  IOStatus io_s = sub_compact->io_status;
-
-  if (io_status_.ok()) {
-    io_status_ = io_s;
-  }
-
-  if (status.ok()) {
-    constexpr IODebugContext* dbg = nullptr;
-
-    if (output_directory_) {
-      io_s = output_directory_->FsyncWithDirOptions(IOOptions(), dbg,
-                                                    DirFsyncOptions());
-    }
-  }
-  if (io_status_.ok()) {
-    io_status_ = io_s;
-  }
-  if (status.ok()) {
-    status = io_s;
-  }
-  if (status.ok()) {
-    // TODO: Add verify_table()
-  }
-
-  // Finish up all book-keeping to unify the subcompaction results
-  compact_->AggregateCompactionStats(compaction_stats_, *compaction_job_stats_);
-  UpdateCompactionStats();
-  RecordCompactionIOStats();
-
-  LogFlush(db_options_.info_log);
-  compact_->status = status;
-  compact_->status.PermitUncheckedError();
-
-  // Build compaction result
-  compaction_result_->output_level = compact_->compaction->output_level();
-  compaction_result_->output_path = output_path_;
-  for (const auto& output_file : sub_compact->GetOutputs()) {
-    auto& meta = output_file.meta;
-    compaction_result_->output_files.emplace_back(
-        MakeTableFileName(meta.fd.GetNumber()), meta.fd.smallest_seqno,
-        meta.fd.largest_seqno, meta.smallest.Encode().ToString(),
-        meta.largest.Encode().ToString(), meta.oldest_ancester_time,
-        meta.file_creation_time, output_file.validator.GetHash(),
-        meta.marked_for_compaction, meta.unique_id);
-  }
-  InternalStats::CompactionStatsFull compaction_stats;
-  sub_compact->AggregateCompactionStats(compaction_stats);
-  compaction_result_->num_output_records =
-      compaction_stats.stats.num_output_records;
-  compaction_result_->total_bytes = compaction_stats.TotalBytesWritten();
-
-  return status;
-}
-
-void CompactionServiceCompactionJob::CleanupCompaction() {
-  CompactionJob::CleanupCompaction();
-}
-
-// Internal binary format for the input and result data
-enum BinaryFormatVersion : uint32_t {
-  kOptionsString = 1,  // Use string format similar to Option string format
-};
-
-static std::unordered_map<std::string, OptionTypeInfo> cfd_type_info = {
-    {"name",
-     {offsetof(struct ColumnFamilyDescriptor, name), OptionType::kEncodedString,
-      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
-    {"options",
-     {offsetof(struct ColumnFamilyDescriptor, options),
-      OptionType::kConfigurable, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone,
-      [](const ConfigOptions& opts, const std::string& /*name*/,
-         const std::string& value, void* addr) {
-        auto cf_options = static_cast<ColumnFamilyOptions*>(addr);
-        return GetColumnFamilyOptionsFromString(opts, ColumnFamilyOptions(),
-                                                value, cf_options);
-      },
-      [](const ConfigOptions& opts, const std::string& /*name*/,
-         const void* addr, std::string* value) {
-        const auto cf_options = static_cast<const ColumnFamilyOptions*>(addr);
-        std::string result;
-        auto status =
-            GetStringFromColumnFamilyOptions(opts, *cf_options, &result);
-        *value = "{" + result + "}";
-        return status;
-      },
-      [](const ConfigOptions& opts, const std::string& name, const void* addr1,
-         const void* addr2, std::string* mismatch) {
-        const auto this_one = static_cast<const ColumnFamilyOptions*>(addr1);
-        const auto that_one = static_cast<const ColumnFamilyOptions*>(addr2);
-        auto this_conf = CFOptionsAsConfigurable(*this_one);
-        auto that_conf = CFOptionsAsConfigurable(*that_one);
-        std::string mismatch_opt;
-        bool result =
-            this_conf->AreEquivalent(opts, that_conf.get(), &mismatch_opt);
-        if (!result) {
-          *mismatch = name + "." + mismatch_opt;
-        }
-        return result;
-      }}},
-};
-
-static std::unordered_map<std::string, OptionTypeInfo> cs_input_type_info = {
-    {"column_family",
-     OptionTypeInfo::Struct(
-         "column_family", &cfd_type_info,
-         offsetof(struct CompactionServiceInput, column_family),
-         OptionVerificationType::kNormal, OptionTypeFlags::kNone)},
-    {"db_options",
-     {offsetof(struct CompactionServiceInput, db_options),
-      OptionType::kConfigurable, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone,
-      [](const ConfigOptions& opts, const std::string& /*name*/,
-         const std::string& value, void* addr) {
-        auto options = static_cast<DBOptions*>(addr);
-        return GetDBOptionsFromString(opts, DBOptions(), value, options);
-      },
-      [](const ConfigOptions& opts, const std::string& /*name*/,
-         const void* addr, std::string* value) {
-        const auto options = static_cast<const DBOptions*>(addr);
-        std::string result;
-        auto status = GetStringFromDBOptions(opts, *options, &result);
-        *value = "{" + result + "}";
-        return status;
-      },
-      [](const ConfigOptions& opts, const std::string& name, const void* addr1,
-         const void* addr2, std::string* mismatch) {
-        const auto this_one = static_cast<const DBOptions*>(addr1);
-        const auto that_one = static_cast<const DBOptions*>(addr2);
-        auto this_conf = DBOptionsAsConfigurable(*this_one);
-        auto that_conf = DBOptionsAsConfigurable(*that_one);
-        std::string mismatch_opt;
-        bool result =
-            this_conf->AreEquivalent(opts, that_conf.get(), &mismatch_opt);
-        if (!result) {
-          *mismatch = name + "." + mismatch_opt;
-        }
-        return result;
-      }}},
-    {"snapshots", OptionTypeInfo::Vector<uint64_t>(
-                      offsetof(struct CompactionServiceInput, snapshots),
-                      OptionVerificationType::kNormal, OptionTypeFlags::kNone,
-                      {0, OptionType::kUInt64T})},
-    {"input_files", OptionTypeInfo::Vector<std::string>(
-                        offsetof(struct CompactionServiceInput, input_files),
-                        OptionVerificationType::kNormal, OptionTypeFlags::kNone,
-                        {0, OptionType::kEncodedString})},
-    {"output_level",
-     {offsetof(struct CompactionServiceInput, output_level), OptionType::kInt,
-      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
-    {"db_id",
-     {offsetof(struct CompactionServiceInput, db_id),
-      OptionType::kEncodedString}},
-    {"has_begin",
-     {offsetof(struct CompactionServiceInput, has_begin), OptionType::kBoolean,
-      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
-    {"begin",
-     {offsetof(struct CompactionServiceInput, begin),
-      OptionType::kEncodedString, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone}},
-    {"has_end",
-     {offsetof(struct CompactionServiceInput, has_end), OptionType::kBoolean,
-      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
-    {"end",
-     {offsetof(struct CompactionServiceInput, end), OptionType::kEncodedString,
-      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
-};
-
-static std::unordered_map<std::string, OptionTypeInfo>
-    cs_output_file_type_info = {
-        {"file_name",
-         {offsetof(struct CompactionServiceOutputFile, file_name),
-          OptionType::kEncodedString, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"smallest_seqno",
-         {offsetof(struct CompactionServiceOutputFile, smallest_seqno),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"largest_seqno",
-         {offsetof(struct CompactionServiceOutputFile, largest_seqno),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"smallest_internal_key",
-         {offsetof(struct CompactionServiceOutputFile, smallest_internal_key),
-          OptionType::kEncodedString, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"largest_internal_key",
-         {offsetof(struct CompactionServiceOutputFile, largest_internal_key),
-          OptionType::kEncodedString, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"oldest_ancester_time",
-         {offsetof(struct CompactionServiceOutputFile, oldest_ancester_time),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"file_creation_time",
-         {offsetof(struct CompactionServiceOutputFile, file_creation_time),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"paranoid_hash",
-         {offsetof(struct CompactionServiceOutputFile, paranoid_hash),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"marked_for_compaction",
-         {offsetof(struct CompactionServiceOutputFile, marked_for_compaction),
-          OptionType::kBoolean, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"unique_id",
-         OptionTypeInfo::Array<uint64_t, 2>(
-             offsetof(struct CompactionServiceOutputFile, unique_id),
-             OptionVerificationType::kNormal, OptionTypeFlags::kNone,
-             {0, OptionType::kUInt64T})},
-};
-
-static std::unordered_map<std::string, OptionTypeInfo>
-    compaction_job_stats_type_info = {
-        {"elapsed_micros",
-         {offsetof(struct CompactionJobStats, elapsed_micros),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"cpu_micros",
-         {offsetof(struct CompactionJobStats, cpu_micros), OptionType::kUInt64T,
-          OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
-        {"num_input_records",
-         {offsetof(struct CompactionJobStats, num_input_records),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_blobs_read",
-         {offsetof(struct CompactionJobStats, num_blobs_read),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_input_files",
-         {offsetof(struct CompactionJobStats, num_input_files),
-          OptionType::kSizeT, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_input_files_at_output_level",
-         {offsetof(struct CompactionJobStats, num_input_files_at_output_level),
-          OptionType::kSizeT, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_output_records",
-         {offsetof(struct CompactionJobStats, num_output_records),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_output_files",
-         {offsetof(struct CompactionJobStats, num_output_files),
-          OptionType::kSizeT, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_output_files_blob",
-         {offsetof(struct CompactionJobStats, num_output_files_blob),
-          OptionType::kSizeT, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"is_full_compaction",
-         {offsetof(struct CompactionJobStats, is_full_compaction),
-          OptionType::kBoolean, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"is_manual_compaction",
-         {offsetof(struct CompactionJobStats, is_manual_compaction),
-          OptionType::kBoolean, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"total_input_bytes",
-         {offsetof(struct CompactionJobStats, total_input_bytes),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"total_blob_bytes_read",
-         {offsetof(struct CompactionJobStats, total_blob_bytes_read),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"total_output_bytes",
-         {offsetof(struct CompactionJobStats, total_output_bytes),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"total_output_bytes_blob",
-         {offsetof(struct CompactionJobStats, total_output_bytes_blob),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_records_replaced",
-         {offsetof(struct CompactionJobStats, num_records_replaced),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"total_input_raw_key_bytes",
-         {offsetof(struct CompactionJobStats, total_input_raw_key_bytes),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"total_input_raw_value_bytes",
-         {offsetof(struct CompactionJobStats, total_input_raw_value_bytes),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_input_deletion_records",
-         {offsetof(struct CompactionJobStats, num_input_deletion_records),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_expired_deletion_records",
-         {offsetof(struct CompactionJobStats, num_expired_deletion_records),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_corrupt_keys",
-         {offsetof(struct CompactionJobStats, num_corrupt_keys),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"file_write_nanos",
-         {offsetof(struct CompactionJobStats, file_write_nanos),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"file_range_sync_nanos",
-         {offsetof(struct CompactionJobStats, file_range_sync_nanos),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"file_fsync_nanos",
-         {offsetof(struct CompactionJobStats, file_fsync_nanos),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"file_prepare_write_nanos",
-         {offsetof(struct CompactionJobStats, file_prepare_write_nanos),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"smallest_output_key_prefix",
-         {offsetof(struct CompactionJobStats, smallest_output_key_prefix),
-          OptionType::kEncodedString, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"largest_output_key_prefix",
-         {offsetof(struct CompactionJobStats, largest_output_key_prefix),
-          OptionType::kEncodedString, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_single_del_fallthru",
-         {offsetof(struct CompactionJobStats, num_single_del_fallthru),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"num_single_del_mismatch",
-         {offsetof(struct CompactionJobStats, num_single_del_mismatch),
-          OptionType::kUInt64T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-};
-
-namespace {
-// this is a helper struct to serialize and deserialize class Status, because
-// Status's members are not public.
-struct StatusSerializationAdapter {
-  uint8_t code;
-  uint8_t subcode;
-  uint8_t severity;
-  std::string message;
-
-  StatusSerializationAdapter() = default;
-  explicit StatusSerializationAdapter(const Status& s) {
-    code = s.code();
-    subcode = s.subcode();
-    severity = s.severity();
-    auto msg = s.getState();
-    message = msg ? msg : "";
-  }
-
-  Status GetStatus() const {
-    return Status{static_cast<Status::Code>(code),
-                  static_cast<Status::SubCode>(subcode),
-                  static_cast<Status::Severity>(severity), message};
-  }
-};
-}  // namespace
-
-static std::unordered_map<std::string, OptionTypeInfo>
-    status_adapter_type_info = {
-        {"code",
-         {offsetof(struct StatusSerializationAdapter, code),
-          OptionType::kUInt8T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"subcode",
-         {offsetof(struct StatusSerializationAdapter, subcode),
-          OptionType::kUInt8T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"severity",
-         {offsetof(struct StatusSerializationAdapter, severity),
-          OptionType::kUInt8T, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-        {"message",
-         {offsetof(struct StatusSerializationAdapter, message),
-          OptionType::kEncodedString, OptionVerificationType::kNormal,
-          OptionTypeFlags::kNone}},
-};
-
-static std::unordered_map<std::string, OptionTypeInfo> cs_result_type_info = {
-    {"status",
-     {offsetof(struct CompactionServiceResult, status),
-      OptionType::kCustomizable, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone,
-      [](const ConfigOptions& opts, const std::string& /*name*/,
-         const std::string& value, void* addr) {
-        auto status_obj = static_cast<Status*>(addr);
-        StatusSerializationAdapter adapter;
-        Status s = OptionTypeInfo::ParseType(
-            opts, value, status_adapter_type_info, &adapter);
-        *status_obj = adapter.GetStatus();
-        return s;
-      },
-      [](const ConfigOptions& opts, const std::string& /*name*/,
-         const void* addr, std::string* value) {
-        const auto status_obj = static_cast<const Status*>(addr);
-        StatusSerializationAdapter adapter(*status_obj);
-        std::string result;
-        Status s = OptionTypeInfo::SerializeType(opts, status_adapter_type_info,
-                                                 &adapter, &result);
-        *value = "{" + result + "}";
-        return s;
-      },
-      [](const ConfigOptions& opts, const std::string& /*name*/,
-         const void* addr1, const void* addr2, std::string* mismatch) {
-        const auto status1 = static_cast<const Status*>(addr1);
-        const auto status2 = static_cast<const Status*>(addr2);
-
-        StatusSerializationAdapter adatper1(*status1);
-        StatusSerializationAdapter adapter2(*status2);
-        return OptionTypeInfo::TypesAreEqual(opts, status_adapter_type_info,
-                                             &adatper1, &adapter2, mismatch);
-      }}},
-    {"output_files",
-     OptionTypeInfo::Vector<CompactionServiceOutputFile>(
-         offsetof(struct CompactionServiceResult, output_files),
-         OptionVerificationType::kNormal, OptionTypeFlags::kNone,
-         OptionTypeInfo::Struct("output_files", &cs_output_file_type_info, 0,
-                                OptionVerificationType::kNormal,
-                                OptionTypeFlags::kNone))},
-    {"output_level",
-     {offsetof(struct CompactionServiceResult, output_level), OptionType::kInt,
-      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
-    {"output_path",
-     {offsetof(struct CompactionServiceResult, output_path),
-      OptionType::kEncodedString, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone}},
-    {"num_output_records",
-     {offsetof(struct CompactionServiceResult, num_output_records),
-      OptionType::kUInt64T, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone}},
-    {"total_bytes",
-     {offsetof(struct CompactionServiceResult, total_bytes),
-      OptionType::kUInt64T, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone}},
-    {"bytes_read",
-     {offsetof(struct CompactionServiceResult, bytes_read),
-      OptionType::kUInt64T, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone}},
-    {"bytes_written",
-     {offsetof(struct CompactionServiceResult, bytes_written),
-      OptionType::kUInt64T, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone}},
-    {"stats", OptionTypeInfo::Struct(
-                  "stats", &compaction_job_stats_type_info,
-                  offsetof(struct CompactionServiceResult, stats),
-                  OptionVerificationType::kNormal, OptionTypeFlags::kNone)},
-};
-
-Status CompactionServiceInput::Read(const std::string& data_str,
-                                    CompactionServiceInput* obj) {
-  if (data_str.size() <= sizeof(BinaryFormatVersion)) {
-    return Status::InvalidArgument("Invalid CompactionServiceInput string");
-  }
-  auto format_version = DecodeFixed32(data_str.data());
-  if (format_version == kOptionsString) {
-    ConfigOptions cf;
-    cf.invoke_prepare_options = false;
-    cf.ignore_unknown_options = true;
-    return OptionTypeInfo::ParseType(
-        cf, data_str.substr(sizeof(BinaryFormatVersion)), cs_input_type_info,
-        obj);
-  } else {
-    return Status::NotSupported(
-        "Compaction Service Input data version not supported: " +
-        std::to_string(format_version));
-  }
-}
-
-Status CompactionServiceInput::Write(std::string* output) {
-  char buf[sizeof(BinaryFormatVersion)];
-  EncodeFixed32(buf, kOptionsString);
-  output->append(buf, sizeof(BinaryFormatVersion));
-  ConfigOptions cf;
-  cf.invoke_prepare_options = false;
-  return OptionTypeInfo::SerializeType(cf, cs_input_type_info, this, output);
-}
-
-Status CompactionServiceResult::Read(const std::string& data_str,
-                                     CompactionServiceResult* obj) {
-  if (data_str.size() <= sizeof(BinaryFormatVersion)) {
-    return Status::InvalidArgument("Invalid CompactionServiceResult string");
-  }
-  auto format_version = DecodeFixed32(data_str.data());
-  if (format_version == kOptionsString) {
-    ConfigOptions cf;
-    cf.invoke_prepare_options = false;
-    cf.ignore_unknown_options = true;
-    return OptionTypeInfo::ParseType(
-        cf, data_str.substr(sizeof(BinaryFormatVersion)), cs_result_type_info,
-        obj);
-  } else {
-    return Status::NotSupported(
-        "Compaction Service Result data version not supported: " +
-        std::to_string(format_version));
-  }
-}
-
-Status CompactionServiceResult::Write(std::string* output) {
-  char buf[sizeof(BinaryFormatVersion)];
-  EncodeFixed32(buf, kOptionsString);
-  output->append(buf, sizeof(BinaryFormatVersion));
-  ConfigOptions cf;
-  cf.invoke_prepare_options = false;
-  return OptionTypeInfo::SerializeType(cf, cs_result_type_info, this, output);
-}
-
-#ifndef NDEBUG
-bool CompactionServiceResult::TEST_Equals(CompactionServiceResult* other) {
-  std::string mismatch;
-  return TEST_Equals(other, &mismatch);
-}
-
-bool CompactionServiceResult::TEST_Equals(CompactionServiceResult* other,
-                                          std::string* mismatch) {
-  ConfigOptions cf;
-  cf.invoke_prepare_options = false;
-  return OptionTypeInfo::TypesAreEqual(cf, cs_result_type_info, this, other,
-                                       mismatch);
-}
-
-bool CompactionServiceInput::TEST_Equals(CompactionServiceInput* other) {
-  std::string mismatch;
-  return TEST_Equals(other, &mismatch);
-}
-
-bool CompactionServiceInput::TEST_Equals(CompactionServiceInput* other,
-                                         std::string* mismatch) {
-  ConfigOptions cf;
-  cf.invoke_prepare_options = false;
-  return OptionTypeInfo::TypesAreEqual(cf, cs_input_type_info, this, other,
-                                       mismatch);
-}
-#endif  // NDEBUG
-}  // namespace ROCKSDB_NAMESPACE
-
-#endif  // !ROCKSDB_LITE

db/compaction/compaction_service_test.cc

@@ -7,7 +7,6 @@
 
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
-#include "table/unique_id_impl.h"
 
 namespace ROCKSDB_NAMESPACE {
 
@@ -16,17 +15,13 @@ class MyTestCompactionService : public CompactionService {
   MyTestCompactionService(
       std::string db_path, Options& options,
       std::shared_ptr<Statistics>& statistics,
-      std::vector<std::shared_ptr<EventListener>>& listeners,
-      std::vector<std::shared_ptr<TablePropertiesCollectorFactory>>
-          table_properties_collector_factories)
+      std::vector<std::shared_ptr<EventListener>>& listeners)
       : db_path_(std::move(db_path)),
         options_(options),
         statistics_(statistics),
         start_info_("na", "na", "na", 0, Env::TOTAL),
         wait_info_("na", "na", "na", 0, Env::TOTAL),
-        listeners_(listeners),
-        table_properties_collector_factories_(
-            std::move(table_properties_collector_factories)) {}
+        listeners_(listeners) {}
 
   static const char* kClassName() { return "MyTestCompactionService"; }
 
@@ -83,16 +78,12 @@ class MyTestCompactionService : public CompactionService {
       options_override.listeners = listeners_;
     }
 
-    if (!table_properties_collector_factories_.empty()) {
-      options_override.table_properties_collector_factories =
-          table_properties_collector_factories_;
-    }
-
     OpenAndCompactOptions options;
     options.canceled = &canceled_;
 
     Status s = DB::OpenAndCompact(
-        options, db_path_, db_path_ + "/" + std::to_string(info.job_id),
+        options, db_path_,
+        db_path_ + "/" + ROCKSDB_NAMESPACE::ToString(info.job_id),
         compaction_input, compaction_service_result, options_override);
     if (is_override_wait_result_) {
       *compaction_service_result = override_wait_result_;
@@ -151,8 +142,6 @@ class MyTestCompactionService : public CompactionService {
   bool is_override_wait_result_ = false;
   std::string override_wait_result_;
   std::vector<std::shared_ptr<EventListener>> listeners_;
-  std::vector<std::shared_ptr<TablePropertiesCollectorFactory>>
-      table_properties_collector_factories_;
   std::atomic_bool canceled_{false};
 };
 
@@ -169,8 +158,7 @@ class CompactionServiceTest : public DBTestBase {
     compactor_statistics_ = CreateDBStatistics();
 
     compaction_service_ = std::make_shared<MyTestCompactionService>(
-        dbname_, *options, compactor_statistics_, remote_listeners,
-        remote_table_properties_collector_factories);
+        dbname_, *options, compactor_statistics_, remote_listeners);
     options->compaction_service = compaction_service_;
     DestroyAndReopen(*options);
   }
@@ -189,7 +177,7 @@ class CompactionServiceTest : public DBTestBase {
     for (int i = 0; i < 20; i++) {
       for (int j = 0; j < 10; j++) {
         int key_id = i * 10 + j;
-        ASSERT_OK(Put(Key(key_id), "value" + std::to_string(key_id)));
+        ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
       }
       ASSERT_OK(Flush());
     }
@@ -199,7 +187,7 @@ class CompactionServiceTest : public DBTestBase {
     for (int i = 0; i < 10; i++) {
       for (int j = 0; j < 10; j++) {
         int key_id = i * 20 + j * 2;
-        ASSERT_OK(Put(Key(key_id), "value_new" + std::to_string(key_id)));
+        ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
       }
       ASSERT_OK(Flush());
     }
@@ -211,16 +199,14 @@ class CompactionServiceTest : public DBTestBase {
     for (int i = 0; i < 200; i++) {
       auto result = Get(Key(i));
       if (i % 2) {
-        ASSERT_EQ(result, "value" + std::to_string(i));
+        ASSERT_EQ(result, "value" + ToString(i));
       } else {
-        ASSERT_EQ(result, "value_new" + std::to_string(i));
+        ASSERT_EQ(result, "value_new" + ToString(i));
       }
     }
   }
 
   std::vector<std::shared_ptr<EventListener>> remote_listeners;
-  std::vector<std::shared_ptr<TablePropertiesCollectorFactory>>
-      remote_table_properties_collector_factories;
 
  private:
   std::shared_ptr<Statistics> compactor_statistics_;
@@ -238,7 +224,7 @@ TEST_F(CompactionServiceTest, BasicCompactions) {
   for (int i = 0; i < 20; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 10 + j;
-      ASSERT_OK(Put(Key(key_id), "value" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -246,7 +232,7 @@ TEST_F(CompactionServiceTest, BasicCompactions) {
   for (int i = 0; i < 10; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -256,9 +242,9 @@ TEST_F(CompactionServiceTest, BasicCompactions) {
   for (int i = 0; i < 200; i++) {
     auto result = Get(Key(i));
     if (i % 2) {
-      ASSERT_EQ(result, "value" + std::to_string(i));
+      ASSERT_EQ(result, "value" + ToString(i));
     } else {
-      ASSERT_EQ(result, "value_new" + std::to_string(i));
+      ASSERT_EQ(result, "value_new" + ToString(i));
     }
   }
   auto my_cs = GetCompactionService();
@@ -289,23 +275,13 @@ TEST_F(CompactionServiceTest, BasicCompactions) {
         auto s = static_cast<Status*>(status);
         *s = Status::Aborted("MyTestCompactionService failed to compact!");
       });
-
-  // tracking success unique id verification
-  std::atomic_int verify_passed{0};
-  SyncPoint::GetInstance()->SetCallBack(
-      "Version::VerifySstUniqueIds::Passed", [&](void* arg) {
-        // override job status
-        auto id = static_cast<UniqueId64x2*>(arg);
-        assert(*id != kNullUniqueId64x2);
-        verify_passed++;
-      });
   SyncPoint::GetInstance()->EnableProcessing();
 
   Status s;
   for (int i = 0; i < 10; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 20 + j * 2;
-      s = Put(Key(key_id), "value_new" + std::to_string(key_id));
+      s = Put(Key(key_id), "value_new" + ToString(key_id));
       if (s.IsAborted()) {
         break;
       }
@@ -323,12 +299,6 @@ TEST_F(CompactionServiceTest, BasicCompactions) {
     }
   }
   ASSERT_TRUE(s.IsAborted());
-
-  // Test verification
-  ASSERT_EQ(verify_passed, 0);
-  options.verify_sst_unique_id_in_manifest = true;
-  Reopen(options);
-  ASSERT_GT(verify_passed, 0);
 }
 
 TEST_F(CompactionServiceTest, ManualCompaction) {
@@ -498,7 +468,7 @@ TEST_F(CompactionServiceTest, CompactionFilter) {
   for (int i = 0; i < 20; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 10 + j;
-      ASSERT_OK(Put(Key(key_id), "value" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -506,7 +476,7 @@ TEST_F(CompactionServiceTest, CompactionFilter) {
   for (int i = 0; i < 10; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -520,9 +490,9 @@ TEST_F(CompactionServiceTest, CompactionFilter) {
     if (i > 5 && i <= 105) {
       ASSERT_EQ(result, "NOT_FOUND");
     } else if (i % 2) {
-      ASSERT_EQ(result, "value" + std::to_string(i));
+      ASSERT_EQ(result, "value" + ToString(i));
     } else {
-      ASSERT_EQ(result, "value_new" + std::to_string(i));
+      ASSERT_EQ(result, "value_new" + ToString(i));
     }
   }
   auto my_cs = GetCompactionService();
@@ -577,9 +547,9 @@ TEST_F(CompactionServiceTest, ConcurrentCompaction) {
   for (int i = 0; i < 200; i++) {
     auto result = Get(Key(i));
     if (i % 2) {
-      ASSERT_EQ(result, "value" + std::to_string(i));
+      ASSERT_EQ(result, "value" + ToString(i));
     } else {
-      ASSERT_EQ(result, "value_new" + std::to_string(i));
+      ASSERT_EQ(result, "value_new" + ToString(i));
     }
   }
   auto my_cs = GetCompactionService();
@@ -594,7 +564,7 @@ TEST_F(CompactionServiceTest, CompactionInfo) {
   for (int i = 0; i < 20; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 10 + j;
-      ASSERT_OK(Put(Key(key_id), "value" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -602,7 +572,7 @@ TEST_F(CompactionServiceTest, CompactionInfo) {
   for (int i = 0; i < 10; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -647,7 +617,7 @@ TEST_F(CompactionServiceTest, CompactionInfo) {
   for (int i = 0; i < 20; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 10 + j;
-      ASSERT_OK(Put(Key(key_id), "value" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -655,7 +625,7 @@ TEST_F(CompactionServiceTest, CompactionInfo) {
   for (int i = 0; i < 4; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -683,7 +653,7 @@ TEST_F(CompactionServiceTest, FallbackLocalAuto) {
   for (int i = 0; i < 20; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 10 + j;
-      ASSERT_OK(Put(Key(key_id), "value" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -691,7 +661,7 @@ TEST_F(CompactionServiceTest, FallbackLocalAuto) {
   for (int i = 0; i < 10; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -701,9 +671,9 @@ TEST_F(CompactionServiceTest, FallbackLocalAuto) {
   for (int i = 0; i < 200; i++) {
     auto result = Get(Key(i));
     if (i % 2) {
-      ASSERT_EQ(result, "value" + std::to_string(i));
+      ASSERT_EQ(result, "value" + ToString(i));
     } else {
-      ASSERT_EQ(result, "value_new" + std::to_string(i));
+      ASSERT_EQ(result, "value_new" + ToString(i));
     }
   }
 
@@ -826,7 +796,7 @@ TEST_F(CompactionServiceTest, RemoteEventListener) {
   for (int i = 0; i < 20; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 10 + j;
-      ASSERT_OK(Put(Key(key_id), "value" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -834,7 +804,7 @@ TEST_F(CompactionServiceTest, RemoteEventListener) {
   for (int i = 0; i < 10; i++) {
     for (int j = 0; j < 10; j++) {
       int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value_new" + std::to_string(key_id)));
+      ASSERT_OK(Put(Key(key_id), "value_new" + ToString(key_id)));
     }
     ASSERT_OK(Flush());
   }
@@ -851,103 +821,13 @@ TEST_F(CompactionServiceTest, RemoteEventListener) {
   for (int i = 0; i < 200; i++) {
     auto result = Get(Key(i));
     if (i % 2) {
-      ASSERT_EQ(result, "value" + std::to_string(i));
+      ASSERT_EQ(result, "value" + ToString(i));
     } else {
-      ASSERT_EQ(result, "value_new" + std::to_string(i));
+      ASSERT_EQ(result, "value_new" + ToString(i));
     }
   }
 }
 
-TEST_F(CompactionServiceTest, TablePropertiesCollector) {
-  const static std::string kUserPropertyName = "TestCount";
-
-  class TablePropertiesCollectorTest : public TablePropertiesCollector {
-   public:
-    Status Finish(UserCollectedProperties* properties) override {
-      *properties = UserCollectedProperties{
-          {kUserPropertyName, std::to_string(count_)},
-      };
-      return Status::OK();
-    }
-
-    UserCollectedProperties GetReadableProperties() const override {
-      return UserCollectedProperties();
-    }
-
-    const char* Name() const override { return "TablePropertiesCollectorTest"; }
-
-    Status AddUserKey(const Slice& /*user_key*/, const Slice& /*value*/,
-                      EntryType /*type*/, SequenceNumber /*seq*/,
-                      uint64_t /*file_size*/) override {
-      count_++;
-      return Status::OK();
-    }
-
-   private:
-    uint32_t count_ = 0;
-  };
-
-  class TablePropertiesCollectorFactoryTest
-      : public TablePropertiesCollectorFactory {
-   public:
-    TablePropertiesCollector* CreateTablePropertiesCollector(
-        TablePropertiesCollectorFactory::Context /*context*/) override {
-      return new TablePropertiesCollectorTest();
-    }
-
-    const char* Name() const override {
-      return "TablePropertiesCollectorFactoryTest";
-    }
-  };
-
-  auto factory = new TablePropertiesCollectorFactoryTest();
-  remote_table_properties_collector_factories.emplace_back(factory);
-
-  const int kNumSst = 3;
-  const int kLevel0Trigger = 4;
-  Options options = CurrentOptions();
-  options.level0_file_num_compaction_trigger = kLevel0Trigger;
-  ReopenWithCompactionService(&options);
-
-  // generate a few SSTs locally which should not have user property
-  for (int i = 0; i < kNumSst; i++) {
-    for (int j = 0; j < 100; j++) {
-      ASSERT_OK(Put(Key(i * 10 + j), "value"));
-    }
-    ASSERT_OK(Flush());
-  }
-
-  TablePropertiesCollection fname_to_props;
-  ASSERT_OK(db_->GetPropertiesOfAllTables(&fname_to_props));
-  for (const auto& file_props : fname_to_props) {
-    auto properties = file_props.second->user_collected_properties;
-    auto it = properties.find(kUserPropertyName);
-    ASSERT_EQ(it, properties.end());
-  }
-
-  // trigger compaction
-  for (int i = kNumSst; i < kLevel0Trigger; i++) {
-    for (int j = 0; j < 100; j++) {
-      ASSERT_OK(Put(Key(i * 10 + j), "value"));
-    }
-    ASSERT_OK(Flush());
-  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact(true));
-
-  ASSERT_OK(db_->GetPropertiesOfAllTables(&fname_to_props));
-
-  bool has_user_property = false;
-  for (const auto& file_props : fname_to_props) {
-    auto properties = file_props.second->user_collected_properties;
-    auto it = properties.find(kUserPropertyName);
-    if (it != properties.end()) {
-      has_user_property = true;
-      ASSERT_GT(std::stoi(it->second), 0);
-    }
-  }
-  ASSERT_TRUE(has_user_property);
-}
-
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

db/compaction/compaction_state.cc

@@ -1,46 +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_state.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-Slice CompactionState::SmallestUserKey() {
-  for (const auto& sub_compact_state : sub_compact_states) {
-    Slice smallest = sub_compact_state.SmallestUserKey();
-    if (!smallest.empty()) {
-      return smallest;
-    }
-  }
-  // If there is no finished output, return an empty slice.
-  return Slice{nullptr, 0};
-}
-
-Slice CompactionState::LargestUserKey() {
-  for (auto it = sub_compact_states.rbegin(); it < sub_compact_states.rend();
-       ++it) {
-    Slice largest = it->LargestUserKey();
-    if (!largest.empty()) {
-      return largest;
-    }
-  }
-  // If there is no finished output, return an empty slice.
-  return Slice{nullptr, 0};
-}
-
-void CompactionState::AggregateCompactionStats(
-    InternalStats::CompactionStatsFull& compaction_stats,
-    CompactionJobStats& compaction_job_stats) {
-  for (const auto& sc : sub_compact_states) {
-    sc.AggregateCompactionStats(compaction_stats);
-    compaction_job_stats.Add(sc.compaction_job_stats);
-  }
-}
-}  // namespace ROCKSDB_NAMESPACE

db/compaction/compaction_state.h

@@ -1,42 +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.
-
-#pragma once
-
-#include "db/compaction/compaction.h"
-#include "db/compaction/subcompaction_state.h"
-#include "db/internal_stats.h"
-
-// Data structures used for compaction_job and compaction_service_job which has
-// the list of sub_compact_states and the aggregated information for the
-// compaction.
-namespace ROCKSDB_NAMESPACE {
-
-// Maintains state for the entire compaction
-class CompactionState {
- public:
-  Compaction* const compaction;
-
-  // REQUIRED: subcompaction states are stored in order of increasing key-range
-  std::vector<SubcompactionState> sub_compact_states;
-  Status status;
-
-  void AggregateCompactionStats(
-      InternalStats::CompactionStatsFull& compaction_stats,
-      CompactionJobStats& compaction_job_stats);
-
-  explicit CompactionState(Compaction* c) : compaction(c) {}
-
-  Slice SmallestUserKey();
-
-  Slice LargestUserKey();
-};
-
-}  // namespace ROCKSDB_NAMESPACE

db/compaction/subcompaction_state.cc

@@ -1,223 +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/subcompaction_state.h"
-
-#include "rocksdb/sst_partitioner.h"
-
-namespace ROCKSDB_NAMESPACE {
-void SubcompactionState::AggregateCompactionStats(
-    InternalStats::CompactionStatsFull& compaction_stats) const {
-  compaction_stats.stats.Add(compaction_outputs_.stats_);
-  if (HasPenultimateLevelOutputs()) {
-    compaction_stats.has_penultimate_level_output = true;
-    compaction_stats.penultimate_level_stats.Add(
-        penultimate_level_outputs_.stats_);
-  }
-}
-
-void SubcompactionState::FillFilesToCutForTtl() {
-  if (compaction->immutable_options()->compaction_style !=
-          CompactionStyle::kCompactionStyleLevel ||
-      compaction->immutable_options()->compaction_pri !=
-          CompactionPri::kMinOverlappingRatio ||
-      compaction->mutable_cf_options()->ttl == 0 ||
-      compaction->num_input_levels() < 2 || compaction->bottommost_level()) {
-    return;
-  }
-
-  // We define new file with 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);
-    }
-  }
-}
-
-OutputIterator SubcompactionState::GetOutputs() const {
-  return OutputIterator(penultimate_level_outputs_.outputs_,
-                        compaction_outputs_.outputs_);
-}
-
-void SubcompactionState::Cleanup(Cache* cache) {
-  penultimate_level_outputs_.Cleanup();
-  compaction_outputs_.Cleanup();
-
-  if (!status.ok()) {
-    for (const auto& out : GetOutputs()) {
-      // If this file was inserted into the table cache then remove
-      // them here because this compaction was not committed.
-      TableCache::Evict(cache, out.meta.fd.GetNumber());
-    }
-  }
-  // TODO: sub_compact.io_status is not checked like status. Not sure if thats
-  // intentional. So ignoring the io_status as of now.
-  io_status.PermitUncheckedError();
-}
-
-Slice SubcompactionState::SmallestUserKey() const {
-  if (has_penultimate_level_outputs_) {
-    Slice a = compaction_outputs_.SmallestUserKey();
-    Slice b = penultimate_level_outputs_.SmallestUserKey();
-    if (a.empty()) {
-      return b;
-    }
-    if (b.empty()) {
-      return a;
-    }
-    const Comparator* user_cmp =
-        compaction->column_family_data()->user_comparator();
-    if (user_cmp->Compare(a, b) > 0) {
-      return b;
-    } else {
-      return a;
-    }
-  } else {
-    return compaction_outputs_.SmallestUserKey();
-  }
-}
-
-Slice SubcompactionState::LargestUserKey() const {
-  if (has_penultimate_level_outputs_) {
-    Slice a = compaction_outputs_.LargestUserKey();
-    Slice b = penultimate_level_outputs_.LargestUserKey();
-    if (a.empty()) {
-      return b;
-    }
-    if (b.empty()) {
-      return a;
-    }
-    const Comparator* user_cmp =
-        compaction->column_family_data()->user_comparator();
-    if (user_cmp->Compare(a, b) < 0) {
-      return b;
-    } else {
-      return a;
-    }
-  } else {
-    return compaction_outputs_.LargestUserKey();
-  }
-}
-
-bool SubcompactionState::ShouldStopBefore(const Slice& internal_key) {
-  uint64_t curr_file_size = Current().GetCurrentOutputFileSize();
-  const InternalKeyComparator* icmp =
-      &compaction->column_family_data()->internal_comparator();
-
-  // 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;
-    }
-  }
-
-  const std::vector<FileMetaData*>& grandparents = compaction->grandparents();
-  bool grandparant_file_switched = false;
-  // Scan to find the earliest grandparent file that contains key.
-  while (grandparent_index_ < grandparents.size() &&
-         icmp->Compare(internal_key,
-                       grandparents[grandparent_index_]->largest.Encode()) >
-             0) {
-    if (seen_key_) {
-      overlapped_bytes_ += grandparents[grandparent_index_]->fd.GetFileSize();
-      grandparant_file_switched = true;
-    }
-    assert(grandparent_index_ + 1 >= grandparents.size() ||
-           icmp->Compare(
-               grandparents[grandparent_index_]->largest.Encode(),
-               grandparents[grandparent_index_ + 1]->smallest.Encode()) <= 0);
-    grandparent_index_++;
-  }
-  seen_key_ = true;
-
-  if (grandparant_file_switched &&
-      overlapped_bytes_ + curr_file_size > compaction->max_compaction_bytes()) {
-    // Too much overlap for current output; start new output
-    overlapped_bytes_ = 0;
-    return true;
-  }
-
-  if (!files_to_cut_for_ttl_.empty()) {
-    if (cur_files_to_cut_for_ttl_ != -1) {
-      // Previous key is inside the range of a file
-      if (icmp->Compare(internal_key,
-                        files_to_cut_for_ttl_[cur_files_to_cut_for_ttl_]
-                            ->largest.Encode()) > 0) {
-        next_files_to_cut_for_ttl_ = cur_files_to_cut_for_ttl_ + 1;
-        cur_files_to_cut_for_ttl_ = -1;
-        return true;
-      }
-    } else {
-      // Look for the key position
-      while (next_files_to_cut_for_ttl_ <
-             static_cast<int>(files_to_cut_for_ttl_.size())) {
-        if (icmp->Compare(internal_key,
-                          files_to_cut_for_ttl_[next_files_to_cut_for_ttl_]
-                              ->smallest.Encode()) >= 0) {
-          if (icmp->Compare(internal_key,
-                            files_to_cut_for_ttl_[next_files_to_cut_for_ttl_]
-                                ->largest.Encode()) <= 0) {
-            // With in the current file
-            cur_files_to_cut_for_ttl_ = next_files_to_cut_for_ttl_;
-            return true;
-          }
-          // Beyond the current file
-          next_files_to_cut_for_ttl_++;
-        } else {
-          // Still fall into the gap
-          break;
-        }
-      }
-    }
-  }
-
-  return false;
-}
-
-Status SubcompactionState::AddToOutput(
-    const CompactionIterator& iter,
-    const CompactionFileOpenFunc& open_file_func,
-    const CompactionFileCloseFunc& close_file_func) {
-  // update target output first
-  is_current_penultimate_level_ = iter.output_to_penultimate_level();
-  current_outputs_ = is_current_penultimate_level_ ? &penultimate_level_outputs_
-                                                   : &compaction_outputs_;
-  if (is_current_penultimate_level_) {
-    has_penultimate_level_outputs_ = true;
-  }
-
-  return Current().AddToOutput(iter, open_file_func, close_file_func);
-}
-
-}  // namespace ROCKSDB_NAMESPACE

db/compaction/subcompaction_state.h

@@ -1,257 +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.
-
-#pragma once
-
-#include <optional>
-
-#include "db/blob/blob_file_addition.h"
-#include "db/blob/blob_garbage_meter.h"
-#include "db/compaction/compaction.h"
-#include "db/compaction/compaction_iterator.h"
-#include "db/compaction/compaction_outputs.h"
-#include "db/internal_stats.h"
-#include "db/output_validator.h"
-#include "db/range_del_aggregator.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-// Maintains state and outputs for each sub-compaction
-// It contains 2 `CompactionOutputs`:
-//  1. one for the normal output files
-//  2. another for the penultimate level outputs
-// a `current` pointer maintains the current output group, when calling
-// `AddToOutput()`, it checks the output of the current compaction_iterator key
-// and point `current` to the target output group. By default, it just points to
-// normal compaction_outputs, if the compaction_iterator key should be placed on
-// the penultimate level, `current` is changed to point to
-// `penultimate_level_outputs`.
-// The later operations uses `Current()` to get the target group.
-//
-// +----------+          +-----------------------------+      +---------+
-// | *current |--------> | compaction_outputs          |----->| output  |
-// +----------+          +-----------------------------+      +---------+
-//       |                                                    | output  |
-//       |                                                    +---------+
-//       |                                                    |  ...    |
-//       |
-//       |               +-----------------------------+      +---------+
-//       +-------------> | penultimate_level_outputs   |----->| output  |
-//                       +-----------------------------+      +---------+
-//                                                            |  ...    |
-
-class SubcompactionState {
- public:
-  const Compaction* compaction;
-
-  // The boundaries of the key-range this compaction is interested in. No two
-  // sub-compactions may have overlapping key-ranges.
-  // 'start' is inclusive, 'end' is exclusive, and nullptr means unbounded
-  const std::optional<Slice> start, end;
-
-  // The return status of this sub-compaction
-  Status status;
-
-  // The return IO Status of this sub-compaction
-  IOStatus io_status;
-
-  // Notify on sub-compaction completion only if listener was notified on
-  // sub-compaction begin.
-  bool notify_on_subcompaction_completion = false;
-
-  // compaction job stats for this sub-compaction
-  CompactionJobStats compaction_job_stats;
-
-  // sub-compaction job id, which is used to identify different sub-compaction
-  // within the same compaction job.
-  const uint32_t sub_job_id;
-
-  Slice SmallestUserKey() const;
-
-  Slice LargestUserKey() const;
-
-  // Get all outputs from the subcompaction. For per_key_placement compaction,
-  // it returns both the last level outputs and penultimate level outputs.
-  OutputIterator GetOutputs() const;
-
-  // Assign range dels aggregator, for each range_del, it can only be assigned
-  // to one output level, for per_key_placement, it's going to be the
-  // penultimate level.
-  void AssignRangeDelAggregator(
-      std::unique_ptr<CompactionRangeDelAggregator>&& range_del_agg) {
-    if (compaction->SupportsPerKeyPlacement()) {
-      penultimate_level_outputs_.AssignRangeDelAggregator(
-          std::move(range_del_agg));
-    } else {
-      compaction_outputs_.AssignRangeDelAggregator(std::move(range_del_agg));
-    }
-  }
-
-  void RemoveLastEmptyOutput() {
-    compaction_outputs_.RemoveLastEmptyOutput();
-    penultimate_level_outputs_.RemoveLastEmptyOutput();
-  }
-
-#ifndef ROCKSDB_LITE
-  void BuildSubcompactionJobInfo(
-      SubcompactionJobInfo& subcompaction_job_info) const {
-    const Compaction* c = compaction;
-    const ColumnFamilyData* cfd = c->column_family_data();
-
-    subcompaction_job_info.cf_id = cfd->GetID();
-    subcompaction_job_info.cf_name = cfd->GetName();
-    subcompaction_job_info.status = status;
-    subcompaction_job_info.subcompaction_job_id = static_cast<int>(sub_job_id);
-    subcompaction_job_info.base_input_level = c->start_level();
-    subcompaction_job_info.output_level = c->output_level();
-    subcompaction_job_info.stats = compaction_job_stats;
-  }
-#endif  // !ROCKSDB_LITE
-
-  SubcompactionState() = delete;
-  SubcompactionState(const SubcompactionState&) = delete;
-  SubcompactionState& operator=(const SubcompactionState&) = delete;
-
-  SubcompactionState(Compaction* c, const std::optional<Slice> _start,
-                     const std::optional<Slice> _end, uint32_t _sub_job_id)
-      : compaction(c),
-        start(_start),
-        end(_end),
-        sub_job_id(_sub_job_id),
-        compaction_outputs_(c, /*is_penultimate_level=*/false),
-        penultimate_level_outputs_(c, /*is_penultimate_level=*/true) {
-    assert(compaction != nullptr);
-    const InternalKeyComparator* icmp =
-        &compaction->column_family_data()->internal_comparator();
-    const InternalKey* output_split_key = compaction->GetOutputSplitKey();
-    // Invalid output_split_key indicates that we do not need to split
-    if (output_split_key != nullptr) {
-      // We may only split the output when the cursor is in the range. Split
-      if ((!end.has_value() ||
-           icmp->user_comparator()->Compare(
-               ExtractUserKey(output_split_key->Encode()), end.value()) < 0) &&
-          (!start.has_value() || icmp->user_comparator()->Compare(
-                                     ExtractUserKey(output_split_key->Encode()),
-                                     start.value()) > 0)) {
-        local_output_split_key_ = output_split_key;
-      }
-    }
-  }
-
-  SubcompactionState(SubcompactionState&& state) noexcept
-      : compaction(state.compaction),
-        start(state.start),
-        end(state.end),
-        status(std::move(state.status)),
-        io_status(std::move(state.io_status)),
-        notify_on_subcompaction_completion(
-            state.notify_on_subcompaction_completion),
-        compaction_job_stats(std::move(state.compaction_job_stats)),
-        sub_job_id(state.sub_job_id),
-        files_to_cut_for_ttl_(std::move(state.files_to_cut_for_ttl_)),
-        cur_files_to_cut_for_ttl_(state.cur_files_to_cut_for_ttl_),
-        next_files_to_cut_for_ttl_(state.next_files_to_cut_for_ttl_),
-        grandparent_index_(state.grandparent_index_),
-        overlapped_bytes_(state.overlapped_bytes_),
-        seen_key_(state.seen_key_),
-        compaction_outputs_(std::move(state.compaction_outputs_)),
-        penultimate_level_outputs_(std::move(state.penultimate_level_outputs_)),
-        is_current_penultimate_level_(state.is_current_penultimate_level_),
-        has_penultimate_level_outputs_(state.has_penultimate_level_outputs_) {
-    current_outputs_ = is_current_penultimate_level_
-                           ? &penultimate_level_outputs_
-                           : &compaction_outputs_;
-  }
-
-  bool HasPenultimateLevelOutputs() const {
-    return has_penultimate_level_outputs_ ||
-           penultimate_level_outputs_.HasRangeDel();
-  }
-
-  void FillFilesToCutForTtl();
-
-  // Returns true iff we should stop building the current output
-  // before processing "internal_key".
-  bool ShouldStopBefore(const Slice& internal_key);
-
-  bool IsCurrentPenultimateLevel() const {
-    return is_current_penultimate_level_;
-  }
-
-  // Add all the new files from this compaction to version_edit
-  void AddOutputsEdit(VersionEdit* out_edit) const {
-    for (const auto& file : penultimate_level_outputs_.outputs_) {
-      out_edit->AddFile(compaction->GetPenultimateLevel(), file.meta);
-    }
-    for (const auto& file : compaction_outputs_.outputs_) {
-      out_edit->AddFile(compaction->output_level(), file.meta);
-    }
-  }
-
-  void Cleanup(Cache* cache);
-
-  void AggregateCompactionStats(
-      InternalStats::CompactionStatsFull& compaction_stats) const;
-
-  CompactionOutputs& Current() const {
-    assert(current_outputs_);
-    return *current_outputs_;
-  }
-
-  // Add compaction_iterator key/value to the `Current` output group.
-  Status AddToOutput(const CompactionIterator& iter,
-                     const CompactionFileOpenFunc& open_file_func,
-                     const CompactionFileCloseFunc& close_file_func);
-
-  // Close all compaction output files, both output_to_penultimate_level outputs
-  // and normal outputs.
-  Status CloseCompactionFiles(const Status& curr_status,
-                              const CompactionFileOpenFunc& open_file_func,
-                              const CompactionFileCloseFunc& close_file_func) {
-    // Call FinishCompactionOutputFile() even if status is not ok: it needs to
-    // close the output file.
-    Status s = penultimate_level_outputs_.CloseOutput(
-        curr_status, open_file_func, close_file_func);
-    s = compaction_outputs_.CloseOutput(s, open_file_func, close_file_func);
-    return s;
-  }
-
- private:
-  // Some identified files with old oldest ancester time and the range should be
-  // isolated out so that the output file(s) in that range can be merged down
-  // for TTL and clear the timestamps for the range.
-  std::vector<FileMetaData*> files_to_cut_for_ttl_;
-  int cur_files_to_cut_for_ttl_ = -1;
-  int next_files_to_cut_for_ttl_ = 0;
-
-  // An index that used to speed up ShouldStopBefore().
-  size_t grandparent_index_ = 0;
-  // The number of bytes overlapping between the current output and
-  // grandparent files used in ShouldStopBefore().
-  uint64_t overlapped_bytes_ = 0;
-  // A flag determines whether the key has been seen in ShouldStopBefore()
-  bool seen_key_ = false;
-
-  // A flag determines if this subcompaction has been split by the cursor
-  bool is_split_ = false;
-
-  // We also maintain the output split key for each subcompaction to avoid
-  // repetitive comparison in ShouldStopBefore()
-  const InternalKey* local_output_split_key_ = nullptr;
-
-  // State kept for output being generated
-  CompactionOutputs compaction_outputs_;
-  CompactionOutputs penultimate_level_outputs_;
-  CompactionOutputs* current_outputs_ = &compaction_outputs_;
-  bool is_current_penultimate_level_ = false;
-  bool has_penultimate_level_outputs_ = false;
-};
-
-}  // namespace ROCKSDB_NAMESPACE

db/comparator_db_test.cc

@@ -397,7 +397,7 @@ TEST_P(ComparatorDBTest, DoubleComparator) {
       for (uint32_t j = 0; j < divide_order; j++) {
         to_divide *= 10.0;
       }
-      source_strings.push_back(std::to_string(r / to_divide));
+      source_strings.push_back(ToString(r / to_divide));
     }
 
     DoRandomIteraratorTest(GetDB(), source_strings, &rnd, 200, 1000, 66);
@@ -449,85 +449,67 @@ TEST_P(ComparatorDBTest, TwoStrComparator) {
   }
 }
 
-namespace {
-void VerifyNotSuccessor(const Slice& s, const Slice& t) {
-  auto bc = BytewiseComparator();
-  auto rbc = ReverseBytewiseComparator();
-  ASSERT_FALSE(bc->IsSameLengthImmediateSuccessor(s, t));
-  ASSERT_FALSE(rbc->IsSameLengthImmediateSuccessor(s, t));
-  ASSERT_FALSE(bc->IsSameLengthImmediateSuccessor(t, s));
-  ASSERT_FALSE(rbc->IsSameLengthImmediateSuccessor(t, s));
-}
-
-void VerifySuccessor(const Slice& s, const Slice& t) {
-  auto bc = BytewiseComparator();
-  auto rbc = ReverseBytewiseComparator();
-  ASSERT_TRUE(bc->IsSameLengthImmediateSuccessor(s, t));
-  ASSERT_FALSE(rbc->IsSameLengthImmediateSuccessor(s, t));
-  ASSERT_FALSE(bc->IsSameLengthImmediateSuccessor(t, s));
-  // Should be true but that increases exposure to a design bug in
-  // auto_prefix_mode, so currently set to FALSE
-  ASSERT_FALSE(rbc->IsSameLengthImmediateSuccessor(t, s));
-}
-
-}  // namespace
-
 TEST_P(ComparatorDBTest, IsSameLengthImmediateSuccessor) {
   {
     // different length
     Slice s("abcxy");
     Slice t("abcxyz");
-    VerifyNotSuccessor(s, t);
+    ASSERT_FALSE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
   {
     Slice s("abcxyz");
     Slice t("abcxy");
-    VerifyNotSuccessor(s, t);
+    ASSERT_FALSE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
   {
     // not last byte different
     Slice s("abc1xyz");
     Slice t("abc2xyz");
-    VerifyNotSuccessor(s, t);
+    ASSERT_FALSE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
   {
     // same string
     Slice s("abcxyz");
     Slice t("abcxyz");
-    VerifyNotSuccessor(s, t);
+    ASSERT_FALSE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
   {
     Slice s("abcxy");
     Slice t("abcxz");
-    VerifySuccessor(s, t);
+    ASSERT_TRUE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
+  }
+  {
+    Slice s("abcxz");
+    Slice t("abcxy");
+    ASSERT_FALSE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
   {
     const char s_array[] = "\x50\x8a\xac";
     const char t_array[] = "\x50\x8a\xad";
     Slice s(s_array);
     Slice t(t_array);
-    VerifySuccessor(s, t);
+    ASSERT_TRUE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
   {
     const char s_array[] = "\x50\x8a\xff";
     const char t_array[] = "\x50\x8b\x00";
     Slice s(s_array, 3);
     Slice t(t_array, 3);
-    VerifySuccessor(s, t);
+    ASSERT_TRUE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
   {
     const char s_array[] = "\x50\x8a\xff\xff";
     const char t_array[] = "\x50\x8b\x00\x00";
     Slice s(s_array, 4);
     Slice t(t_array, 4);
-    VerifySuccessor(s, t);
+    ASSERT_TRUE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
   {
     const char s_array[] = "\x50\x8a\xff\xff";
     const char t_array[] = "\x50\x8b\x00\x01";
     Slice s(s_array, 4);
     Slice t(t_array, 4);
-    VerifyNotSuccessor(s, t);
+    ASSERT_FALSE(BytewiseComparator()->IsSameLengthImmediateSuccessor(s, t));
   }
 }
 

db/convenience.cc

@@ -40,8 +40,7 @@ Status VerifySstFileChecksum(const Options& options,
 Status VerifySstFileChecksum(const Options& options,
                              const EnvOptions& env_options,
                              const ReadOptions& read_options,
-                             const std::string& file_path,
-                             const SequenceNumber& largest_seqno) {
+                             const std::string& file_path) {
   std::unique_ptr<FSRandomAccessFile> file;
   uint64_t file_size;
   InternalKeyComparator internal_comparator(options.comparator);
@@ -62,13 +61,12 @@ Status VerifySstFileChecksum(const Options& options,
           nullptr /* stats */, 0 /* hist_type */, nullptr /* file_read_hist */,
           ioptions.rate_limiter.get()));
   const bool kImmortal = true;
-  auto reader_options = TableReaderOptions(
-      ioptions, options.prefix_extractor, env_options, internal_comparator,
-      false /* skip_filters */, !kImmortal, false /* force_direct_prefetch */,
-      -1 /* level */);
-  reader_options.largest_seqno = largest_seqno;
   s = ioptions.table_factory->NewTableReader(
-      reader_options, std::move(file_reader), file_size, &table_reader,
+      TableReaderOptions(ioptions, options.prefix_extractor, env_options,
+                         internal_comparator, false /* skip_filters */,
+                         !kImmortal, false /* force_direct_prefetch */,
+                         -1 /* level */),
+      std::move(file_reader), file_size, &table_reader,
       false /* prefetch_index_and_filter_in_cache */);
   if (!s.ok()) {
     return s;

db/corruption_test.cc

@@ -7,7 +7,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-#include "rocksdb/options.h"
 #ifndef ROCKSDB_LITE
 
 #include <fcntl.h>
@@ -309,7 +308,7 @@ class CorruptionTest : public testing::Test {
     uint64_t new_size = old_size - bytes_to_truncate;
     // If bytes_to_truncate == 0, it will do full truncation.
     if (bytes_to_truncate == 0) {
-      new_size = 0;
+      new_size = old_size;
     }
     ASSERT_OK(test::TruncateFile(env_, path, new_size));
   }
@@ -355,7 +354,6 @@ TEST_F(CorruptionTest, PostPITRCorruptionWALsRetained) {
     options_.create_missing_column_families = true;
     std::vector<ColumnFamilyHandle*> cfhs;
     ASSERT_OK(DB::Open(options_, dbname_, cf_descs, &cfhs, &db_));
-    assert(db_ != nullptr);  // suppress false clang-analyze report
 
     ASSERT_OK(db_->Put(WriteOptions(), cfhs[0], "k", "v"));
     ASSERT_OK(db_->Put(WriteOptions(), cfhs[1], "k", "v"));
@@ -377,8 +375,6 @@ TEST_F(CorruptionTest, PostPITRCorruptionWALsRetained) {
     options_.avoid_flush_during_recovery = true;
     std::vector<ColumnFamilyHandle*> cfhs;
     ASSERT_OK(DB::Open(options_, dbname_, cf_descs, &cfhs, &db_));
-    assert(db_ != nullptr);  // suppress false clang-analyze report
-
     // Flush one but not both CFs and write some data so there's a seqno gap
     // between the PITR corruption and the next DB session's first WAL.
     ASSERT_OK(db_->Put(WriteOptions(), cfhs[1], "k2", "v2"));
@@ -395,7 +391,6 @@ TEST_F(CorruptionTest, PostPITRCorruptionWALsRetained) {
   for (int i = 0; i < 2; ++i) {
     std::vector<ColumnFamilyHandle*> cfhs;
     ASSERT_OK(DB::Open(options_, dbname_, cf_descs, &cfhs, &db_));
-    assert(db_ != nullptr);  // suppress false clang-analyze report
 
     for (auto* cfh : cfhs) {
       delete cfh;
@@ -554,10 +549,7 @@ TEST_F(CorruptionTest, CorruptedDescriptor) {
   ASSERT_OK(db_->Put(WriteOptions(), "foo", "hello"));
   DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
   ASSERT_OK(dbi->TEST_FlushMemTable());
-  CompactRangeOptions cro;
-  cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-  ASSERT_OK(
-      dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
+  ASSERT_OK(dbi->TEST_CompactRange(0, nullptr, nullptr));
 
   Corrupt(kDescriptorFile, 0, 1000);
   Status s = TryReopen();
@@ -764,7 +756,6 @@ TEST_F(CorruptionTest, ParanoidFileChecksOnCompact) {
     delete db_;
     db_ = nullptr;
     s = DestroyDB(dbname_, options);
-    ASSERT_OK(s);
     std::shared_ptr<mock::MockTableFactory> mock =
         std::make_shared<mock::MockTableFactory>();
     options.table_factory = mock;
@@ -775,9 +766,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksOnCompact) {
     DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
     ASSERT_OK(dbi->TEST_FlushMemTable());
     mock->SetCorruptionMode(mode);
-    CompactRangeOptions cro;
-    cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-    s = dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr);
+    s = dbi->TEST_CompactRange(0, nullptr, nullptr, nullptr, true);
     if (mode == mock::MockTableFactory::kCorruptNone) {
       ASSERT_OK(s);
     } else {
@@ -813,10 +802,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRangeFirst) {
     } else {
       DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
       ASSERT_OK(dbi->TEST_FlushMemTable());
-      CompactRangeOptions cro;
-      cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-      ASSERT_OK(
-          dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
+      ASSERT_OK(dbi->TEST_CompactRange(0, nullptr, nullptr, nullptr, true));
     }
     db_->ReleaseSnapshot(snap);
   }
@@ -852,10 +838,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRange) {
     } else {
       DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
       ASSERT_OK(dbi->TEST_FlushMemTable());
-      CompactRangeOptions cro;
-      cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-      ASSERT_OK(
-          dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
+      ASSERT_OK(dbi->TEST_CompactRange(0, nullptr, nullptr, nullptr, true));
     }
     db_->ReleaseSnapshot(snap);
   }
@@ -888,10 +871,7 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRangeLast) {
     } else {
       DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
       ASSERT_OK(dbi->TEST_FlushMemTable());
-      CompactRangeOptions cro;
-      cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-      ASSERT_OK(
-          dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
+      ASSERT_OK(dbi->TEST_CompactRange(0, nullptr, nullptr, nullptr, true));
     }
     db_->ReleaseSnapshot(snap);
   }
@@ -918,10 +898,7 @@ TEST_F(CorruptionTest, LogCorruptionErrorsInCompactionIterator) {
 
   DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
   ASSERT_OK(dbi->TEST_FlushMemTable());
-  CompactRangeOptions cro;
-  cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-  Status s =
-      dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr);
+  Status s = dbi->TEST_CompactRange(0, nullptr, nullptr, nullptr, true);
   ASSERT_NOK(s);
   ASSERT_TRUE(s.IsCorruption());
 }
@@ -947,10 +924,7 @@ TEST_F(CorruptionTest, CompactionKeyOrderCheck) {
 
   mock->SetCorruptionMode(mock::MockTableFactory::kCorruptNone);
   ASSERT_OK(db_->SetOptions({{"check_flush_compaction_key_order", "true"}}));
-  CompactRangeOptions cro;
-  cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-  ASSERT_NOK(
-      dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
+  ASSERT_NOK(dbi->TEST_CompactRange(0, nullptr, nullptr, nullptr, true));
 }
 
 TEST_F(CorruptionTest, FlushKeyOrderCheck) {
@@ -997,10 +971,7 @@ TEST_F(CorruptionTest, DisableKeyOrderCheck) {
   ASSERT_OK(db_->Put(WriteOptions(), "foo2", "v1"));
   ASSERT_OK(db_->Put(WriteOptions(), "foo4", "v1"));
   ASSERT_OK(dbi->TEST_FlushMemTable());
-  CompactRangeOptions cro;
-  cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-  ASSERT_OK(
-      dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
+  ASSERT_OK(dbi->TEST_CompactRange(0, nullptr, nullptr, nullptr, true));
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearAllCallBacks();
 }
@@ -1074,22 +1045,15 @@ INSTANTIATE_TEST_CASE_P(CorruptionTest, CrashDuringRecoveryWithCorruptionTest,
 // "Column family inconsistency: SST file contains data beyond the point of
 // corruption" error will be hit, causing recovery to fail.
 //
-// After adding the fix, only after new WAL is synced, RocksDB persist a new
-// MANIFEST with column families to ensure RocksDB is in consistent state.
+// After adding the fix, corrupted WALs whose numbers are larger than the
+// corrupted wal and smaller than the new WAL are moved to a separate folder.
+// Only after new WAL is synced, RocksDB persist a new MANIFEST with column
+// families to ensure RocksDB is in consistent state.
 // RocksDB writes an empty WriteBatch as a sentinel to the new WAL which is
 // synced immediately afterwards. The sequence number of the sentinel
 // WriteBatch will be the next sequence number immediately after the largest
 // sequence number recovered from previous WALs and MANIFEST because of which DB
 // will be in consistent state.
-// 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. It won't have the "SST ahead of WAL" error.
-//
-// The combination of corrupting a WAL and injecting an error during subsequent
-// re-open exposes the bug of prematurely persisting a new MANIFEST with
-// advanced ColumnFamilyData::log_number.
 TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecovery) {
   CloseDb();
   Options options;
@@ -1100,7 +1064,7 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecovery) {
   options.env = env_;
   ASSERT_OK(DestroyDB(dbname_, options));
   options.create_if_missing = true;
-  options.max_write_buffer_number = 8;
+  options.max_write_buffer_number = 3;
 
   Reopen(&options);
   Status s;
@@ -1126,16 +1090,13 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecovery) {
 
     // Write one key to test_cf.
     ASSERT_OK(db_->Put(WriteOptions(), handles[1], "old_key", "dontcare"));
-    ASSERT_OK(db_->Flush(FlushOptions(), handles[1]));
-
     // Write to default_cf and flush this cf several times to advance wal
-    // number. TEST_SwitchMemtable makes sure WALs are not synced and test can
-    // corrupt un-sync WAL.
+    // number.
     for (int i = 0; i < 2; ++i) {
-      ASSERT_OK(db_->Put(WriteOptions(), "key" + std::to_string(i),
-                         "value" + std::to_string(i)));
+      ASSERT_OK(db_->Put(WriteOptions(), "key" + std::to_string(i), "value"));
       ASSERT_OK(dbimpl->TEST_SwitchMemtable());
     }
+    ASSERT_OK(db_->Put(WriteOptions(), handles[1], "dontcare", "dontcare"));
 
     for (auto* h : handles) {
       delete h;
@@ -1144,13 +1105,12 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecovery) {
     CloseDb();
   }
 
-  // 2. Corrupt second last un-syned wal file to emulate power reset which
-  // caused the DB to lose the un-synced WAL.
+  // 2. Corrupt second last wal file to emulate power reset which caused the DB
+  // to lose the un-synced WAL.
   {
     std::vector<uint64_t> file_nums;
     GetSortedWalFiles(file_nums);
     size_t size = file_nums.size();
-    assert(size >= 2);
     uint64_t log_num = file_nums[size - 2];
     CorruptFileWithTruncation(FileType::kWalFile, log_num,
                               /*bytes_to_truncate=*/8);
@@ -1167,31 +1127,25 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecovery) {
   // Case2: If avoid_flush_during_recovery = false, all column families have
   // flushed their data from WAL to L0 during recovery, and none of them will
   // ever need to read the WALs again.
-
-  // 4. Fault is injected to fail the recovery.
   {
-    SyncPoint::GetInstance()->DisableProcessing();
-    SyncPoint::GetInstance()->ClearAllCallBacks();
-    SyncPoint::GetInstance()->SetCallBack(
-        "DBImpl::GetLogSizeAndMaybeTruncate:0", [&](void* arg) {
-          auto* tmp_s = reinterpret_cast<Status*>(arg);
-          assert(tmp_s);
-          *tmp_s = Status::IOError("Injected");
-        });
-    SyncPoint::GetInstance()->EnableProcessing();
-
-    handles.clear();
-    options.avoid_flush_during_recovery = true;
+    options.avoid_flush_during_recovery = avoid_flush_during_recovery_;
     s = DB::Open(options, dbname_, cf_descs, &handles, &db_);
-    ASSERT_TRUE(s.IsIOError());
-    ASSERT_EQ("IO error: Injected", s.ToString());
+    ASSERT_OK(s);
     for (auto* h : handles) {
       delete h;
     }
+    handles.clear();
     CloseDb();
+  }
 
-    SyncPoint::GetInstance()->DisableProcessing();
-    SyncPoint::GetInstance()->ClearAllCallBacks();
+  // 4. Corrupt max_wal_num to emulate second power reset which caused the
+  // DB to again lose the un-synced WAL.
+  {
+    std::vector<uint64_t> file_nums;
+    GetSortedWalFiles(file_nums);
+    size_t size = file_nums.size();
+    uint64_t log_num = file_nums[size - 1];
+    CorruptFileWithTruncation(FileType::kWalFile, log_num);
   }
 
   // 5. After second crash reopen the db with second corruption. Default family
@@ -1214,23 +1168,6 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecovery) {
   {
     options.avoid_flush_during_recovery = avoid_flush_during_recovery_;
     ASSERT_OK(DB::Open(options, dbname_, cf_descs, &handles, &db_));
-
-    // Verify that data is not lost.
-    {
-      std::string v;
-      ASSERT_OK(db_->Get(ReadOptions(), handles[1], "old_key", &v));
-      ASSERT_EQ("dontcare", v);
-
-      v.clear();
-      ASSERT_OK(db_->Get(ReadOptions(), "key" + std::to_string(0), &v));
-      ASSERT_EQ("value" + std::to_string(0), v);
-
-      // Since  it's corrupting second last wal, below key is not found.
-      v.clear();
-      ASSERT_EQ(db_->Get(ReadOptions(), "key" + std::to_string(1), &v),
-                Status::NotFound());
-    }
-
     for (auto* h : handles) {
       delete h;
     }
@@ -1246,22 +1183,15 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecovery) {
 // file contains data beyond the point of corruption" error will be hit, causing
 // recovery to fail.
 //
-// After adding the fix, only after new WAL is synced, RocksDB persist a new
-// MANIFEST with column families to ensure RocksDB is in consistent state.
+// After adding the fix, corrupted WALs whose numbers are larger than the
+// corrupted wal and smaller than the new WAL are moved to a separate folder.
+// Only after new WAL is synced, RocksDB persist a new MANIFEST with column
+// families to ensure RocksDB is in consistent state.
 // RocksDB writes an empty WriteBatch as a sentinel to the new WAL which is
 // synced immediately afterwards. The sequence number of the sentinel
 // WriteBatch will be the next sequence number immediately after the largest
 // sequence number recovered from previous WALs and MANIFEST because of which DB
 // will be in consistent state.
-// 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. It won't have the "SST ahead of WAL" error.
-//
-// The combination of corrupting a WAL and injecting an error during subsequent
-// re-open exposes the bug of prematurely persisting a new MANIFEST with
-// advanced ColumnFamilyData::log_number.
 TEST_P(CrashDuringRecoveryWithCorruptionTest, TxnDbCrashDuringRecovery) {
   CloseDb();
   Options options;
@@ -1295,6 +1225,7 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, TxnDbCrashDuringRecovery) {
   // advance wal number so that some column families have advanced log_number
   // while other don't.
   {
+    options.avoid_flush_during_recovery = avoid_flush_during_recovery_;
     ASSERT_OK(TransactionDB::Open(options, txn_db_opts, dbname_, cf_descs,
                                   &handles, &txn_db));
 
@@ -1303,8 +1234,6 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, TxnDbCrashDuringRecovery) {
     ASSERT_OK(txn->Put(handles[1], "foo", "value"));
     ASSERT_OK(txn->SetName("txn0"));
     ASSERT_OK(txn->Prepare());
-    ASSERT_OK(txn_db->Flush(FlushOptions()));
-
     delete txn;
     txn = nullptr;
 
@@ -1313,19 +1242,17 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, TxnDbCrashDuringRecovery) {
 
     // Put and flush cf0
     for (int i = 0; i < 2; ++i) {
-      ASSERT_OK(txn_db->Put(WriteOptions(), "key" + std::to_string(i),
-                            "value" + std::to_string(i)));
+      ASSERT_OK(txn_db->Put(WriteOptions(), "dontcare", "value"));
       ASSERT_OK(dbimpl->TEST_SwitchMemtable());
     }
 
     // Put cf1
     txn = txn_db->BeginTransaction(WriteOptions(), TransactionOptions());
-    ASSERT_OK(txn->Put(handles[1], "foo1", "value1"));
+    ASSERT_OK(txn->Put(handles[1], "foo1", "value"));
     ASSERT_OK(txn->Commit());
 
     delete txn;
     txn = nullptr;
-
     for (auto* h : handles) {
       delete h;
     }
@@ -1339,7 +1266,6 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, TxnDbCrashDuringRecovery) {
     std::vector<uint64_t> file_nums;
     GetSortedWalFiles(file_nums);
     size_t size = file_nums.size();
-    assert(size >= 2);
     uint64_t log_num = file_nums[size - 2];
     CorruptFileWithTruncation(FileType::kWalFile, log_num,
                               /*bytes_to_truncate=*/8);
@@ -1349,33 +1275,20 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, TxnDbCrashDuringRecovery) {
   // family has higher log number than corrupted wal number. There may be old
   // WAL files that it must not delete because they can contain data of
   // uncommitted transactions. As a result, min_log_number_to_keep won't change.
-
   {
-    SyncPoint::GetInstance()->DisableProcessing();
-    SyncPoint::GetInstance()->ClearAllCallBacks();
-    SyncPoint::GetInstance()->SetCallBack(
-        "DBImpl::Open::BeforeSyncWAL", [&](void* arg) {
-          auto* tmp_s = reinterpret_cast<Status*>(arg);
-          assert(tmp_s);
-          *tmp_s = Status::IOError("Injected");
-        });
-    SyncPoint::GetInstance()->EnableProcessing();
+    options.avoid_flush_during_recovery = avoid_flush_during_recovery_;
+    ASSERT_OK(TransactionDB::Open(options, txn_db_opts, dbname_, cf_descs,
+                                  &handles, &txn_db));
 
-    handles.clear();
-    s = TransactionDB::Open(options, txn_db_opts, dbname_, cf_descs, &handles,
-                            &txn_db);
-    ASSERT_TRUE(s.IsIOError());
-    ASSERT_EQ("IO error: Injected", s.ToString());
     for (auto* h : handles) {
       delete h;
     }
-    CloseDb();
-
-    SyncPoint::GetInstance()->DisableProcessing();
-    SyncPoint::GetInstance()->ClearAllCallBacks();
+    handles.clear();
+    delete txn_db;
   }
 
-  // 4. Corrupt max_wal_num.
+  // 4. Corrupt max_wal_num to emulate second power reset which caused the
+  // DB to again lose the un-synced WAL.
   {
     std::vector<uint64_t> file_nums;
     GetSortedWalFiles(file_nums);
@@ -1394,29 +1307,10 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, TxnDbCrashDuringRecovery) {
   // recovered from previous WALs and MANIFEST, db will be in consistent state
   // and opens successfully.
   {
+    options.avoid_flush_during_recovery = false;
+
     ASSERT_OK(TransactionDB::Open(options, txn_db_opts, dbname_, cf_descs,
                                   &handles, &txn_db));
-
-    // Verify that data is not lost.
-    {
-      std::string v;
-      // Key not visible since it's not committed.
-      ASSERT_EQ(txn_db->Get(ReadOptions(), handles[1], "foo", &v),
-                Status::NotFound());
-
-      v.clear();
-      ASSERT_OK(txn_db->Get(ReadOptions(), "key" + std::to_string(0), &v));
-      ASSERT_EQ("value" + std::to_string(0), v);
-
-      // Last WAL is corrupted which contains two keys below.
-      v.clear();
-      ASSERT_EQ(txn_db->Get(ReadOptions(), "key" + std::to_string(1), &v),
-                Status::NotFound());
-      v.clear();
-      ASSERT_EQ(txn_db->Get(ReadOptions(), handles[1], "foo1", &v),
-                Status::NotFound());
-    }
-
     for (auto* h : handles) {
       delete h;
     }
@@ -1424,153 +1318,6 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, TxnDbCrashDuringRecovery) {
   }
 }
 
-// This test is similar to
-// CrashDuringRecoveryWithCorruptionTest.CrashDuringRecovery except it calls
-// flush and corrupts Last WAL. It calls flush to sync some of the WALs and
-// remaining are unsyned one of which is then corrupted to simulate crash.
-//
-// In case of non-TransactionDB with avoid_flush_during_recovery = true, RocksDB
-// won't flush the data from WAL to L0 for all column families if possible. As a
-// result, not all column families can increase their log_numbers, and
-// min_log_number_to_keep won't change.
-// It may prematurely persist a new MANIFEST even before we can declare the DB
-// is in consistent state after recovery (this is when the new WAL is synced)
-// and advances log_numbers for some column families.
-//
-// If there is power failure before we sync the new WAL, we will end up in
-// a situation in which after persisting the MANIFEST, RocksDB will see some
-// column families' log_numbers larger than the corrupted wal, and
-// "Column family inconsistency: SST file contains data beyond the point of
-// corruption" error will be hit, causing recovery to fail.
-//
-// After adding the fix, only after new WAL is synced, RocksDB persist a new
-// MANIFEST with column families to ensure RocksDB is in consistent state.
-// RocksDB writes an empty WriteBatch as a sentinel to the new WAL which is
-// synced immediately afterwards. The sequence number of the sentinel
-// WriteBatch will be the next sequence number immediately after the largest
-// sequence number recovered from previous WALs and MANIFEST because of which DB
-// will be in consistent state.
-// 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. It won't have the "SST ahead of WAL" error.
-
-// The combination of corrupting a WAL and injecting an error during subsequent
-// re-open exposes the bug of prematurely persisting a new MANIFEST with
-// advanced ColumnFamilyData::log_number.
-TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecoveryWithFlush) {
-  CloseDb();
-  Options options;
-  options.wal_recovery_mode = WALRecoveryMode::kPointInTimeRecovery;
-  options.avoid_flush_during_recovery = false;
-  options.env = env_;
-  options.create_if_missing = true;
-
-  ASSERT_OK(DestroyDB(dbname_, options));
-  Reopen(&options);
-
-  ColumnFamilyHandle* cfh = nullptr;
-  const std::string test_cf_name = "test_cf";
-  Status s = db_->CreateColumnFamily(options, test_cf_name, &cfh);
-  ASSERT_OK(s);
-  delete cfh;
-
-  CloseDb();
-
-  std::vector<ColumnFamilyDescriptor> cf_descs;
-  cf_descs.emplace_back(kDefaultColumnFamilyName, options);
-  cf_descs.emplace_back(test_cf_name, options);
-  std::vector<ColumnFamilyHandle*> handles;
-
-  {
-    ASSERT_OK(DB::Open(options, dbname_, cf_descs, &handles, &db_));
-
-    // Write one key to test_cf.
-    ASSERT_OK(db_->Put(WriteOptions(), handles[1], "old_key", "dontcare"));
-
-    // Write to default_cf and flush this cf several times to advance wal
-    // number.
-    for (int i = 0; i < 2; ++i) {
-      ASSERT_OK(db_->Put(WriteOptions(), "key" + std::to_string(i),
-                         "value" + std::to_string(i)));
-      ASSERT_OK(db_->Flush(FlushOptions()));
-    }
-
-    ASSERT_OK(db_->Put(WriteOptions(), handles[1], "dontcare", "dontcare"));
-    for (auto* h : handles) {
-      delete h;
-    }
-    handles.clear();
-    CloseDb();
-  }
-
-  // Corrupt second last un-syned wal file to emulate power reset which
-  // caused the DB to lose the un-synced WAL.
-  {
-    std::vector<uint64_t> file_nums;
-    GetSortedWalFiles(file_nums);
-    size_t size = file_nums.size();
-    uint64_t log_num = file_nums[size - 1];
-    CorruptFileWithTruncation(FileType::kWalFile, log_num,
-                              /*bytes_to_truncate=*/8);
-  }
-
-  // Fault is injected to fail the recovery.
-  {
-    SyncPoint::GetInstance()->DisableProcessing();
-    SyncPoint::GetInstance()->ClearAllCallBacks();
-    SyncPoint::GetInstance()->SetCallBack(
-        "DBImpl::GetLogSizeAndMaybeTruncate:0", [&](void* arg) {
-          auto* tmp_s = reinterpret_cast<Status*>(arg);
-          assert(tmp_s);
-          *tmp_s = Status::IOError("Injected");
-        });
-    SyncPoint::GetInstance()->EnableProcessing();
-
-    handles.clear();
-    options.avoid_flush_during_recovery = true;
-    s = DB::Open(options, dbname_, cf_descs, &handles, &db_);
-    ASSERT_TRUE(s.IsIOError());
-    ASSERT_EQ("IO error: Injected", s.ToString());
-    for (auto* h : handles) {
-      delete h;
-    }
-    CloseDb();
-
-    SyncPoint::GetInstance()->DisableProcessing();
-    SyncPoint::GetInstance()->ClearAllCallBacks();
-  }
-
-  // Reopen db again
-  {
-    options.avoid_flush_during_recovery = avoid_flush_during_recovery_;
-    ASSERT_OK(DB::Open(options, dbname_, cf_descs, &handles, &db_));
-
-    // Verify that data is not lost.
-    {
-      std::string v;
-      ASSERT_OK(db_->Get(ReadOptions(), handles[1], "old_key", &v));
-      ASSERT_EQ("dontcare", v);
-
-      for (int i = 0; i < 2; ++i) {
-        v.clear();
-        ASSERT_OK(db_->Get(ReadOptions(), "key" + std::to_string(i), &v));
-        ASSERT_EQ("value" + std::to_string(i), v);
-      }
-
-      // Since it's corrupting last wal after Flush, below key is not found.
-      v.clear();
-      ASSERT_EQ(db_->Get(ReadOptions(), handles[1], "dontcare", &v),
-                Status::NotFound());
-    }
-
-    for (auto* h : handles) {
-      delete h;
-    }
-  }
-}
-
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

db/cuckoo_table_db_test.cc

@@ -95,8 +95,8 @@ class CuckooTableDBTest : public testing::Test {
 
   int NumTableFilesAtLevel(int level) {
     std::string property;
-    EXPECT_TRUE(db_->GetProperty(
-        "rocksdb.num-files-at-level" + std::to_string(level), &property));
+    EXPECT_TRUE(db_->GetProperty("rocksdb.num-files-at-level" + ToString(level),
+                                 &property));
     return atoi(property.c_str());
   }