Bump up version to 7.5.4

Do not put blobs read during compaction into cache (#10457 )
Summary: During compaction, blobs are currently read using the default `ReadOptions`, which has the `fill_cache` flag set to true. Earlier, this didn't make any difference since we didn't have a blob cache; however, now we have to explicitly set this flag to false to avoid polluting the cache during compaction. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10457 Test Plan: `make check` Reviewed By: riversand963 Differential Revision: D38333528 Pulled By: ltamasi fbshipit-source-id: 5b4d49a1e39543bee73c7df2aa9194fb101875e2
2026-07-07 22:55:23 +08:00 · 2022-11-03 13:51:23 -07:00 · 2022-11-03 13:49:24 -07:00 · 2022-08-24 15:36:30 -07:00 · 2022-08-11 17:16:12 -07:00 · 2022-08-02 12:34:32 -07:00
1784 changed files with 84700 additions and 320090 deletions
@@ -0,0 +1,995 @@
+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:
+      - run:
+          name: Install cmake on macos
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake
+
+  install-jdk8-on-macos:
+    steps:
+      - run:
+          name: Install JDK 8 on macos
+          command: |
+            brew install --cask adoptopenjdk/openjdk/adoptopenjdk8
+
+  increase-max-open-files-on-macos:
+    steps:
+      - run:
+          name: Increase max open files
+          command: |
+            sudo sysctl -w kern.maxfiles=1048576
+            sudo sysctl -w kern.maxfilesperproc=1048576
+            sudo launchctl limit maxfiles 1048576
+
+  pre-steps:
+    steps:
+      - checkout
+      - run:
+          name: Setup Environment Variables
+          command: |
+            echo "export GTEST_THROW_ON_FAILURE=0" >> $BASH_ENV
+            echo "export GTEST_OUTPUT=\"xml:/tmp/test-results/\"" >> $BASH_ENV
+            echo "export SKIP_FORMAT_BUCK_CHECKS=1" >> $BASH_ENV
+            echo "export GTEST_COLOR=1" >> $BASH_ENV
+            echo "export CTEST_OUTPUT_ON_FAILURE=1" >> $BASH_ENV
+            echo "export CTEST_TEST_TIMEOUT=300" >> $BASH_ENV
+            echo "export ZLIB_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/zlib" >> $BASH_ENV
+            echo "export BZIP2_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/bzip2" >> $BASH_ENV
+            echo "export SNAPPY_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/snappy" >> $BASH_ENV
+            echo "export LZ4_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/lz4" >> $BASH_ENV
+            echo "export ZSTD_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/zstd" >> $BASH_ENV
+
+  pre-steps-macos:
+      steps:
+        - pre-steps
+
+  post-steps:
+    steps:
+      - store_test_results: # store test result if there's any
+          path: /tmp/test-results
+      - store_artifacts: # store LOG for debugging if there's any
+          path: LOG
+      - run: # on fail, compress Test Logs for diagnosing the issue
+         name: Compress Test Logs
+         command: tar -cvzf t.tar.gz t
+         when: on_fail
+      - store_artifacts: # on fail, store Test Logs for diagnosing the issue
+          path: t.tar.gz
+          destination: test_logs
+          when: on_fail
+
+  install-clang-10:
+    steps:
+      - run:
+          name: Install Clang 10
+          command: |
+            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+            echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
+            echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
+            echo "APT::Acquire::Retries \"10\";" | sudo tee -a /etc/apt/apt.conf.d/80-retries # llvm.org unreliable
+            sudo apt-get update -y && sudo apt-get install -y clang-10
+
+  install-clang-13:
+    steps:
+      - run:
+          name: Install Clang 13
+          command: |
+            echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | sudo tee -a /etc/apt/sources.list
+            echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" | sudo tee -a /etc/apt/sources.list
+            echo "APT::Acquire::Retries \"10\";" | sudo tee -a /etc/apt/apt.conf.d/80-retries # llvm.org unreliable
+            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+            sudo apt-get update -y && sudo apt-get install -y clang-13
+
+  install-gflags:
+    steps:
+      - run:
+          name: Install gflags
+          command: |
+            sudo apt-get update -y && sudo apt-get install -y libgflags-dev
+
+  install-benchmark:
+    steps:
+      - run:
+          name: Install ninja build
+          command: sudo apt-get update -y && sudo apt-get install -y ninja-build
+      - run:
+          name: Install benchmark
+          command: |
+            git clone --depth 1 --branch v1.6.1 https://github.com/google/benchmark.git ~/benchmark
+            cd ~/benchmark && mkdir build && cd build
+            cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=0
+            ninja && sudo ninja install
+
+  install-valgrind:
+    steps:
+      - run:
+          name: Install valgrind
+          command: sudo apt-get update -y && sudo apt-get install -y valgrind
+
+  upgrade-cmake:
+    steps:
+      - run:
+          name: Upgrade cmake
+          command: |
+            sudo apt remove --purge cmake
+            sudo snap install cmake --classic
+
+  install-gflags-on-macos:
+    steps:
+      - run:
+          name: Install gflags on macos
+          command: |
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install gflags
+
+  install-gtest-parallel:
+    steps:
+      - run:
+          name: Install gtest-parallel
+          command: |
+            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
+
+  install-compression-libs:
+    steps:
+      - run:
+          name: Install compression libs
+          command: |
+            sudo apt-get update -y && sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
+
+  install-streaming-compress-libs:
+    steps:
+      - run:
+          name: Install streaming compression libs
+          command: |
+            sudo apt-get update -y && sudo apt-get install -y libzstd-dev
+
+  install-libprotobuf-mutator:
+    steps:
+      - run:
+          name: Install libprotobuf-mutator libs
+          command: |
+            git clone -b v1.0 git@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 && 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
+  setup-folly:
+    steps:
+      - run:
+          name: Install folly dependencies
+          command: |
+            sudo apt-get install libgoogle-glog-dev
+      - run:
+          name: Checkout folly sources
+          command: |
+            make checkout_folly
+
+  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:
+    steps:
+      - run:
+          name: "Run basic benchmark, 5 min"
+          command: ./tools/benchmark.sh fillseq_enable_wal
+          environment:
+            LD_LIBRARY_PATH: /usr/local/lib
+            DB_DIR: /tmp/rocksdb-benchmark-datadir
+            WAL_DIR: /tmp/rocksdb-benchmark-waldir
+            OUTPUT_DIR: /tmp/benchmark-results
+            NUM_KEYS: 10000000
+
+  post-benchmarks:
+    steps:
+      - store_artifacts: # store the benchmark output
+          path: /tmp/benchmark-results
+          destination: test_logs
+      - run:
+          name: Send benchmark report to visualisation
+          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/_doc
+            true
+
+executors:
+  windows-2xlarge:
+    machine:
+      image: 'windows-server-2019-vs2019:stable'
+      resource_class: windows.2xlarge
+      shell: bash.exe
+
+jobs:
+  build-macos:
+    macos:
+      xcode: 12.5.1
+    resource_class: large
+    environment:
+      ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc cause env_test hang, disable it for now
+    steps:
+      - 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
+      - post-steps
+
+  build-macos-cmake:
+    macos:
+      xcode: 12.5.1
+    resource_class: large
+    parameters:
+      run_even_tests:
+        description: run even or odd tests, used to split tests to 2 groups
+        type: boolean
+        default: true
+    steps:
+      - increase-max-open-files-on-macos
+      - install-cmake-on-macos
+      - install-gflags-on-macos
+      - pre-steps-macos
+      - run:
+          name: "cmake generate project file"
+          command: ulimit -S -n `ulimit -H -n` && mkdir build && cd build && cmake -DWITH_GFLAGS=1 ..
+      - run:
+          name: "Build tests"
+          command: cd build && make V=1 -j32
+      - when:
+          condition: << parameters.run_even_tests >>
+          steps:
+            - run:
+                name: "Run even tests"
+                command: ulimit -S -n `ulimit -H -n` && 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
+      - post-steps
+
+  build-linux:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-gflags
+      - install-streaming-compress-libs
+      - run: make V=1 J=32 -j32 check
+      - post-steps
+
+  build-linux-encrypted_env-no_compression:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-gflags
+      - run: ENCRYPTED_ENV=1 ROCKSDB_DISABLE_SNAPPY=1 ROCKSDB_DISABLE_ZLIB=1 ROCKSDB_DISABLE_BZIP=1 ROCKSDB_DISABLE_LZ4=1 ROCKSDB_DISABLE_ZSTD=1 make V=1 J=32 -j32 check
+      - run: |
+          ./sst_dump --help | egrep -q 'Supported compression types: kNoCompression$' # Verify no compiled in compression
+      - post-steps
+
+  build-linux-shared_lib-alt_namespace-status_checked:
+    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:
+    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: 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:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
+    steps:
+      - checkout # check out the code in the project directory
+      - run: make clean
+      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j16 static_lib tools db_bench
+      - run: 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:
+    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:
+    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: 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:
+    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:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-gflags
+      - install-clang-10
+      - run: COMPILE_WITH_ASAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check # aligned new doesn't work for reason we haven't figured out
+      - post-steps
+
+  build-linux-clang10-mini-tsan:
+    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
+      - 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:
+    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:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-gflags
+      - install-valgrind
+      - run: PORTABLE=1 make V=1 -j32 valgrind_test
+      - post-steps
+
+  build-linux-clang10-clang-analyze:
+    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
+
+  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:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-gflags
+      - upgrade-cmake
+      - setup-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:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-gflags
+      - install-benchmark
+      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20)
+      - 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: make V=1 -j8 -k check-headers # could be moved to a different build
+      - post-steps
+
+  build-linux-gcc-7-with-folly:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-7 g++-7 libgflags-dev
+      - setup-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:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
+    steps:
+      - pre-steps
+      - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-8 g++-8 libgflags-dev
+      - run: CC=gcc-8 CXX=g++-8 V=1 make -j16 all
+      - post-steps
+
+  build-linux-gcc-10-cxx20-no_test_run:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
+    steps:
+      - pre-steps
+      - run: sudo apt-get update -y && sudo apt-get install gcc-10 g++-10 libgflags-dev
+      - run: CC=gcc-10 CXX=g++-10 V=1 ROCKSDB_CXX_STANDARD=c++20 make -j16 all
+      - post-steps
+
+  build-linux-gcc-11-no_test_run:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
+    steps:
+      - pre-steps
+      - 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:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: xlarge
+    steps:
+      - pre-steps
+      - install-clang-13
+      - install-benchmark
+      - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j16 all microbench
+      - post-steps
+
+  # Ensure ASAN+UBSAN with folly, and full testsuite with clang 13
+  build-linux-clang-13-asan-ubsan-with-folly:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-clang-13
+      - install-gflags
+      - 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
+      - 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:
+    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:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: large
+    steps:
+      - pre-steps
+      - install-gflags
+      - install-compression-libs
+      - 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-windows:
+    executor: windows-2xlarge
+    parameters:
+      extra_cmake_opt:
+        default: ""
+        type: string
+      vs_year:
+        default: "2019"
+        type: string
+      cmake_generator:
+        default: "Visual Studio 16 2019"
+        type: string
+    environment:
+      THIRDPARTY_HOME: C:/Users/circleci/thirdparty
+      CMAKE_HOME: C:/Users/circleci/thirdparty/cmake-3.16.4-win64-x64
+      CMAKE_BIN: C:/Users/circleci/thirdparty/cmake-3.16.4-win64-x64/bin/cmake.exe
+      SNAPPY_HOME: C:/Users/circleci/thirdparty/snappy-1.1.7
+      SNAPPY_INCLUDE: C:/Users/circleci/thirdparty/snappy-1.1.7;C:/Users/circleci/thirdparty/snappy-1.1.7/build
+      SNAPPY_LIB_DEBUG: C:/Users/circleci/thirdparty/snappy-1.1.7/build/Debug/snappy.lib
+      VS_YEAR: <<parameters.vs_year>>
+      CMAKE_GENERATOR: <<parameters.cmake_generator>>
+    steps:
+      - checkout
+      - run:
+          name: "Setup VS"
+          command: |
+            if [[ "${VS_YEAR}" == "2019" ]]; then
+              echo "VS2019 already present."
+            elif [[ "${VS_YEAR}" == "2017" ]]; then
+              echo "Installing VS2017..."
+              powershell .circleci/vs2017_install.ps1
+            elif [[ "${VS_YEAR}" == "2015" ]]; then
+              echo "Installing VS2015..."
+              powershell .circleci/vs2015_install.ps1
+            fi
+      - store_artifacts:
+          path: \Users\circleci\AppData\Local\Temp\vslogs.zip
+      - run:
+          name: "Install thirdparty dependencies"
+          command: |
+            mkdir ${THIRDPARTY_HOME}
+            cd ${THIRDPARTY_HOME}
+            echo "Installing CMake..."
+            curl --fail --silent --show-error --output cmake-3.16.4-win64-x64.zip --location https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-win64-x64.zip
+            unzip -q cmake-3.16.4-win64-x64.zip
+            echo "Building Snappy dependency..."
+            curl --fail --silent --show-error --output snappy-1.1.7.zip --location https://github.com/google/snappy/archive/1.1.7.zip
+            unzip -q snappy-1.1.7.zip
+            cd snappy-1.1.7
+            mkdir build
+            cd build
+            ${CMAKE_BIN} -G "${CMAKE_GENERATOR}" ..
+            msbuild.exe Snappy.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
+      - run:
+          name: "Build RocksDB"
+          command: |
+            mkdir build
+            cd build
+            ${CMAKE_BIN} -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 << parameters.extra_cmake_opt >> ..
+            cd ..
+            echo "Building with VS version: ${CMAKE_GENERATOR}"
+            msbuild.exe build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
+      - run:
+          name: "Test RocksDB"
+          shell: powershell.exe
+          command: |
+            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:
+    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: |
+            echo "JAVA_HOME=${JAVA_HOME}"
+            echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
+            which java && java -version
+            which javac && javac -version
+      - run:
+          name: "Test RocksDBJava"
+          command: make V=1 J=8 -j8 jtest
+      - post-steps
+
+  build-linux-java-static:
+    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: |
+            echo "JAVA_HOME=${JAVA_HOME}"
+            echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
+            which java && java -version
+            which javac && javac -version
+      - run:
+          name: "Build RocksDBJava Static Library"
+          command: make V=1 J=8 -j8 rocksdbjavastatic
+      - post-steps
+
+  build-macos-java:
+    macos:
+      xcode: 12.5.1
+    resource_class: large
+    environment:
+      JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
+      ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc causes java 8 crash
+    steps:
+      - increase-max-open-files-on-macos
+      - install-gflags-on-macos
+      - install-jdk8-on-macos
+      - pre-steps-macos
+      - run:
+          name: "Set Java Environment"
+          command: |
+            echo "JAVA_HOME=${JAVA_HOME}"
+            echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
+            which java && java -version
+            which javac && javac -version
+      - run:
+          name: "Test RocksDBJava"
+          command: make V=1 J=16 -j16 jtest
+      - post-steps
+
+  build-macos-java-static:
+    macos:
+      xcode: 12.5.1
+    resource_class: large
+    environment:
+      JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
+    steps:
+      - increase-max-open-files-on-macos
+      - install-gflags-on-macos
+      - install-cmake-on-macos
+      - install-jdk8-on-macos
+      - pre-steps-macos
+      - run:
+          name: "Set Java Environment"
+          command: |
+            echo "JAVA_HOME=${JAVA_HOME}"
+            echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
+            which java && java -version
+            which javac && javac -version
+      - run:
+          name: "Build RocksDBJava x86 and ARM Static Libraries"
+          command: make V=1 J=16 -j16 rocksdbjavastaticosx
+      - post-steps
+
+  build-macos-java-static-universal:
+    macos:
+      xcode: 12.5.1
+    resource_class: large
+    environment:
+      JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
+    steps:
+      - increase-max-open-files-on-macos
+      - install-gflags-on-macos
+      - install-cmake-on-macos
+      - install-jdk8-on-macos
+      - pre-steps-macos
+      - run:
+          name: "Set Java Environment"
+          command: |
+            echo "JAVA_HOME=${JAVA_HOME}"
+            echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
+            which java && java -version
+            which javac && javac -version
+      - run:
+          name: "Build RocksDBJava Universal Binary Static Library"
+          command: make V=1 J=16 -j16 rocksdbjavastaticosx_ub
+      - post-steps
+
+  build-examples:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: large
+    steps:
+      - pre-steps
+      - install-gflags
+      - run:
+          name: "Build examples"
+          command: |
+            OPT=-DTRAVIS V=1 make -j4 static_lib && cd examples && make -j4
+      - post-steps
+
+  build-cmake-mingw:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: large
+    steps:
+      - pre-steps
+      - 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
+            which javac && javac -version
+            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
+      - post-steps
+
+  build-linux-non-shm:
+    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
+
+  build-linux-arm-test-full:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: arm.large
+    steps:
+      - pre-steps
+      - install-gflags
+      - run: make V=1 J=4 -j4 check
+      - post-steps
+
+  build-linux-arm:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: arm.large
+    steps:
+      - pre-steps
+      - install-gflags
+      - run: ROCKSDBTESTS_PLATFORM_DEPENDENT=only make V=1 J=4 -j4 all_but_some_tests check_some
+      - post-steps
+
+  build-linux-arm-cmake-no_test_run:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: arm.large
+    environment:
+      JAVA_HOME: /usr/lib/jvm/java-8-openjdk-arm64
+    steps:
+      - pre-steps
+      - install-gflags
+      - run:
+          name: "Set Java Environment"
+          command: |
+            echo "JAVA_HOME=${JAVA_HOME}"
+            echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
+            which java && java -version
+            which javac && javac -version
+      - run:
+          name: "Build with cmake"
+          command: |
+            mkdir build
+            cd build
+            cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=0 -DWITH_GFLAGS=1 -DWITH_BENCHMARK_TOOLS=0 -DWITH_TOOLS=0 -DWITH_CORE_TOOLS=1 ..
+            make -j4
+      - run:
+          name: "Build Java with cmake"
+          command: |
+            rm -rf build
+            mkdir build
+            cd build
+            cmake -DJNI=1 -DCMAKE_BUILD_TYPE=Release -DWITH_GFLAGS=1 ..
+            make -j4 rocksdb rocksdbjni
+      - post-steps
+
+  build-format-compatible:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-gflags
+      - install-compression-libs
+      - run:
+          name: "test"
+          command: |
+            export TEST_TMPDIR=/dev/shm/rocksdb
+            rm -rf /dev/shm/rocksdb
+            mkdir /dev/shm/rocksdb
+            tools/check_format_compatible.sh
+      - post-steps
+
+  build-fuzzers:
+    machine:
+      image: ubuntu-2004:202111-02
+    resource_class: large
+    steps:
+      - pre-steps
+      - install-clang-13
+      - run: sudo apt-get update -y && sudo apt-get install -y cmake ninja-build binutils liblzma-dev libz-dev pkg-config autoconf libtool
+      - install-libprotobuf-mutator
+      - run:
+          name: "Build rocksdb lib"
+          command: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j4 static_lib
+      - run:
+          name: "Build fuzzers"
+          command: cd fuzz && make sst_file_writer_fuzzer db_fuzzer db_map_fuzzer
+      - post-steps
+
+  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:
+    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:
+    jobs:
+      - build-linux-clang10-asan
+      - build-linux-clang10-ubsan
+      - build-linux-clang10-mini-tsan:
+          start_test: ""
+          end_test: "env_test"
+      - build-linux-clang10-mini-tsan:
+          start_test: "env_test"
+          end_test: ""
+      - build-linux-shared_lib-alt_namespace-status_checked
+  jobs-linux-no-test-run:
+    jobs:
+      - build-linux-release
+      - build-linux-release-rtti
+      - 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:
+    jobs:
+      - build-linux-clang10-clang-analyze
+      - build-linux-unity-and-headers
+      - build-linux-mini-crashtest
+  jobs-windows:
+    jobs:
+      - build-windows:
+          name: "build-windows-vs2019"
+      - build-windows:
+          name: "build-windows-vs2019-cxx20"
+          extra_cmake_opt: -DCMAKE_CXX_STANDARD=20
+      - build-windows:
+          name: "build-windows-vs2017"
+          vs_year: "2017"
+          cmake_generator: "Visual Studio 15 Win64"
+      - build-cmake-mingw
+  jobs-java:
+    jobs:
+      - build-linux-java
+      - build-linux-java-static
+      - build-macos-java
+      - build-macos-java-static
+      - build-macos-java-static-universal
+  jobs-macos:
+    jobs:
+      - build-macos
+      - build-macos-cmake:
+          run_even_tests: true
+      - build-macos-cmake:
+          run_even_tests: false
+  jobs-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 * * *"
+          filters:
+            branches:
+              only:
+                - main
+    jobs:
+      - build-format-compatible
+      - build-linux-arm-test-full
+      - build-linux-run-microbench
+      - build-linux-non-shm
+      - build-linux-clang-13-asan-ubsan-with-folly
+      - build-linux-valgrind
@@ -0,0 +1,6 @@
+# Supress UBSAN warnings related to stl_tree.h, e.g.
+# UndefinedBehaviorSanitizer: undefined-behavior /usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_tree.h:1505:43 in 
+# /usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_tree.h:1505:43:
+# runtime error: upcast of address 0x000001fa8820 with insufficient space for an object of type
+# 'std::_Rb_tree_node<std::pair<const std::__cxx11::basic_string<char>, rocksdb::(anonymous namespace)::LockHoldingInfo> >'
+src:*bits/stl_tree.h
@@ -0,0 +1,24 @@
+$VS_DOWNLOAD_LINK = "https://go.microsoft.com/fwlink/?LinkId=691126"
+$COLLECT_DOWNLOAD_LINK = "https://aka.ms/vscollect.exe"
+curl.exe --retry 3 -kL $VS_DOWNLOAD_LINK --output vs_installer.exe
+if ($LASTEXITCODE -ne 0) {
+    echo "Download of the VS 2015 installer failed"
+    exit 1
+}
+$VS_INSTALL_ARGS = @("/Quiet", "/NoRestart")
+$process = Start-Process "${PWD}\vs_installer.exe" -ArgumentList $VS_INSTALL_ARGS -NoNewWindow -Wait -PassThru
+Remove-Item -Path vs_installer.exe -Force
+$exitCode = $process.ExitCode
+if (($exitCode -ne 0) -and ($exitCode -ne 3010)) {
+    echo "VS 2015 installer exited with code $exitCode, which should be one of [0, 3010]."
+    curl.exe --retry 3 -kL $COLLECT_DOWNLOAD_LINK --output Collect.exe
+    if ($LASTEXITCODE -ne 0) {
+        echo "Download of the VS Collect tool failed."
+        exit 1
+    }
+    Start-Process "${PWD}\Collect.exe" -NoNewWindow -Wait -PassThru
+    New-Item -Path "C:\w\build-results" -ItemType "directory" -Force
+    Copy-Item -Path "C:\Users\circleci\AppData\Local\Temp\vslogs.zip" -Destination "C:\w\build-results\"
+    exit 1
+}
+echo "VS 2015 installed."
@@ -0,0 +1,35 @@
+$VS_DOWNLOAD_LINK = "https://aka.ms/vs/15/release/vs_buildtools.exe"
+$COLLECT_DOWNLOAD_LINK = "https://aka.ms/vscollect.exe"
+$VS_INSTALL_ARGS = @("--nocache","--quiet","--wait", "--add Microsoft.VisualStudio.Workload.VCTools",
+                                                     "--add Microsoft.VisualStudio.Component.VC.Tools.14.13",
+                                                     "--add Microsoft.Component.MSBuild",
+                                                     "--add Microsoft.VisualStudio.Component.Roslyn.Compiler",
+                                                     "--add Microsoft.VisualStudio.Component.TextTemplating",
+                                                     "--add Microsoft.VisualStudio.Component.VC.CoreIde",
+                                                     "--add Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
+                                                     "--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
+                                                     "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+                                                     "--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81")
+
+curl.exe --retry 3 -kL $VS_DOWNLOAD_LINK --output vs_installer.exe
+if ($LASTEXITCODE -ne 0) {
+    echo "Download of the VS 2017 installer failed"
+    exit 1
+}
+
+$process = Start-Process "${PWD}\vs_installer.exe" -ArgumentList $VS_INSTALL_ARGS -NoNewWindow -Wait -PassThru
+Remove-Item -Path vs_installer.exe -Force
+$exitCode = $process.ExitCode
+if (($exitCode -ne 0) -and ($exitCode -ne 3010)) {
+    echo "VS 2017 installer exited with code $exitCode, which should be one of [0, 3010]."
+    curl.exe --retry 3 -kL $COLLECT_DOWNLOAD_LINK --output Collect.exe
+    if ($LASTEXITCODE -ne 0) {
+        echo "Download of the VS Collect tool failed."
+        exit 1
+    }
+    Start-Process "${PWD}\Collect.exe" -NoNewWindow -Wait -PassThru
+    New-Item -Path "C:\w\build-results" -ItemType "directory" -Force
+    Copy-Item -Path "C:\Users\circleci\AppData\Local\Temp\vslogs.zip" -Destination "C:\w\build-results\"
+    exit 1
+}
+echo "VS 2017 installed."
@@ -1,86 +0,0 @@
-# When making changes, verify the output of:
-#   clang-tidy -list-checks
---
-Checks: "-*,\
-  bugprone-argument-comment,\
-  bugprone-dangling-handle,\
-  bugprone-fold-init-type,\
-  bugprone-forward-declaration-namespace,\
-  bugprone-forwarding-reference-overload,\
-  bugprone-shadow,\
-  bugprone-sizeof-*,\
-  bugprone-string-constructor,\
-  bugprone-undefined-memory-manipulation,\
-  bugprone-unused-return-value,\
-  bugprone-use-after-move,\
-  cert-env33-c,\
-  cert-err58-cpp,\
-  cert-msc30-c,\
-  cert-msc50-cpp,\
-  clang-analyzer-*,\
-  clang-diagnostic-*,\
-  -clang-diagnostic-missing-designated-field-initializers,\
-  concurrency-mt-unsafe,\
-  cppcoreguidelines-avoid-non-const-global-variables,\
-  cppcoreguidelines-missing-std-forward,\
-  cppcoreguidelines-pro-type-member-init,\
-  cppcoreguidelines-special-member-functions,\
-  cppcoreguidelines-virtual-class-destructor,\
-  google-build-using-namespace,\
-  google-explicit-constructor,\
-  google-readability-avoid-underscore-in-googletest-name,\
-  misc-definitions-in-headers,\
-  misc-redundant-expression,\
-  modernize-make-shared,\
-  modernize-use-emplace,\
-  modernize-use-noexcept,\
-  modernize-use-override,\
-  modernize-use-using,\
-  performance-faster-string-find,\
-  performance-for-range-copy,\
-  performance-implicit-conversion-in-loop,\
-  performance-inefficient-algorithm,\
-  performance-inefficient-string-concatenation,\
-  performance-inefficient-vector-operation,\
-  performance-move-const-arg,\
-  performance-move-constructor-init,\
-  performance-no-automatic-move,\
-  performance-no-int-to-ptr,\
-  performance-noexcept-move-constructor,\
-  performance-noexcept-swap,\
-  performance-trivially-destructible,\
-  performance-type-promotion-in-math-fn,\
-  performance-unnecessary-copy-initialization,\
-  performance-unnecessary-value-param,\
-  readability-braces-around-statements,\
-  readability-duplicate-include,\
-  readability-isolate-declaration,\
-  readability-operators-representation,\
-  readability-redundant-string-init"
-
-WarningsAsErrors: "bugprone-use-after-move"
-
-CheckOptions:
- key: bugprone-easily-swappable-parameters.MinimumLength
-  value: 4
- key: cppcoreguidelines-avoid-non-const-global-variables.AllowThreadLocal
-  value: true
- key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
-  value: true
- key: cppcoreguidelines-special-member-functions.AllowImplicitlyDeletedCopyOrMove
-  value: true
- key: modernize-use-using.IgnoreExternC
-  value: true
- key: performance-move-const-arg.CheckTriviallyCopyableMove
-  value: false
- key: performance-unnecessary-value-param.AllowedTypes
-  value: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$'
- key: performance-unnecessary-copy-initialization.AllowedTypes
-  value: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$'
- key: readability-operators-representation.BinaryOperators
-  value: '&&;&=;&;|;~;!;!=;||;|=;^;^='
- key: readability-redundant-string-init.StringNames
-  value: '::std::basic_string'
- key: readability-named-parameter.InsertPlainNamesInForwardDecls
-  value: true
-...
@@ -1,26 +0,0 @@
-name: build-folly
-description: Build folly and dependencies (skipped if cache hit)
-inputs:
-  cache-hit:
-    description: Whether the folly cache was hit
-    required: true
-runs:
-  using: composite
-  steps:
-  - name: Build folly and dependencies
-    if: ${{ inputs.cache-hit != 'true' }}
-    run: |
-      clean_path=()
-      IFS=: read -ra path_entries <<< "$PATH"
-      for entry in "${path_entries[@]}"; do
-        if [[ "$entry" != "/usr/lib/ccache" ]]; then
-          clean_path+=("$entry")
-        fi
-      done
-      export PATH="$(IFS=:; echo "${clean_path[*]}")"
-      make build_folly
-    shell: bash
-  - name: Skip folly build (using cached version)
-    if: ${{ inputs.cache-hit == 'true' }}
-    run: echo "Folly build skipped - using cached version"
-    shell: bash
@@ -1,8 +0,0 @@
-name: build-for-benchmarks
-runs:
-  using: composite
-  steps:
-  - uses: "./.github/actions/pre-steps"
-  - name: Linux build for benchmarks
-    run: make V=1 J=8 -j8 release
-    shell: bash
@@ -1,33 +0,0 @@
-name: cache-folly
-description: Cache folly build to speed up CI
-outputs:
-  cache-hit:
-    description: Whether the cache was hit
-    value: ${{ steps.cache-folly-build.outputs.cache-hit }}
-runs:
-  using: composite
-  steps:
-  - name: Extract FOLLY_MK_HASH
-    id: extract-folly-hash
-    shell: bash
-    run: |
-      FOLLY_MK_HASH=$(md5sum folly.mk | cut -d' ' -f1)
-      echo "hash=$FOLLY_MK_HASH" >> $GITHUB_OUTPUT
-  - name: Extract FOLLY_INSTALL_DIR
-    id: extract-folly-install-dir
-    shell: bash
-    run: |
-      FOLLY_INSTALL_DIR=$(cd third-party/folly && python3 build/fbcode_builder/getdeps.py show-inst-dir)
-      echo "dir=$(echo $FOLLY_INSTALL_DIR | sed 's|installed/folly|installed|')" >> $GITHUB_OUTPUT
-  - name: Cache folly build
-    id: cache-folly-build
-    uses: actions/cache@v4
-    with:
-      # Cache the folly build directory
-      path: ${{ steps.extract-folly-install-dir.outputs.dir }}
-      # Key is based on:
-      # - OS and architecture
-      # - The docker image, which may not always be specified/known
-      # - Hash of folly.mk, which includes the folly repository commit hash
-      # NOTE: this is still only intended for DEBUG folly builds
-      key: folly-build-${{ runner.os }}-${{ runner.arch }}-${{ github.job_container.image }}-${{ steps.extract-folly-hash.outputs.hash }}-${{ env.PORTABLE == '1' && 'portable' || 'native' }}
@@ -1,21 +0,0 @@
-name: cache-getdeps-downloads
-description: Cache getdeps downloads to avoid unreliable mirrors and speed up builds
-outputs:
-  cache-hit:
-    description: Whether the cache was hit
-    value: ${{ steps.cache-downloads.outputs.cache-hit }}
-runs:
-  using: composite
-  steps:
-  - name: Cache getdeps downloads
-    id: cache-downloads
-    uses: actions/cache@v4
-    with:
-      # Use a fixed path that we control - folly.mk will sync with getdeps downloads dir
-      path: /tmp/rocksdb-getdeps-cache
-      # Use a rolling cache key - the cache accumulates downloads over time
-      # The key includes a weekly timestamp to ensure periodic refresh
-      key: getdeps-downloads-${{ runner.os }}-${{ runner.arch }}-week-${{ github.run_id }}
-      restore-keys: |
-        getdeps-downloads-${{ runner.os }}-${{ runner.arch }}-week-
-        getdeps-downloads-${{ runner.os }}-${{ runner.arch }}-
@@ -1,10 +0,0 @@
-name: increase-max-open-files-on-macos
-runs:
-  using: composite
-  steps:
-  - name: Increase max open files
-    run: |-
-      sudo sysctl -w kern.maxfiles=1048576
-      sudo sysctl -w kern.maxfilesperproc=1048576
-      sudo launchctl limit maxfiles 1048576
-    shell: bash
@@ -1,7 +0,0 @@
-name: install-gflags-on-macos
-runs:
-  using: composite
-  steps:
-  - name: Install gflags on macos
-    run: HOMEBREW_NO_AUTO_UPDATE=1 brew install gflags
-    shell: bash
@@ -1,7 +0,0 @@
-name: install-gflags
-runs:
-  using: composite
-  steps:
-  - name: Install gflags
-    run: sudo apt-get update -y && sudo apt-get install -y libgflags-dev
-    shell: bash
@@ -1,9 +0,0 @@
-name: install-jdk8-on-macos
-runs:
-  using: composite
-  steps:
-  - name: Install JDK 8 on macos
-    run: |-
-      HOMEBREW_NO_AUTO_UPDATE=1 brew tap bell-sw/liberica
-      HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask liberica-jdk8
-    shell: bash
@@ -1,11 +0,0 @@
-name: install-maven
-runs:
-  using: composite
-  steps:
-  - name: Install Maven
-    run: |
-      wget --no-check-certificate https://archive.apache.org/dist/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.tar.gz
-      tar zxf apache-maven-3.9.11-bin.tar.gz
-      echo "export M2_HOME=$(pwd)/apache-maven-3.9.11" >> $GITHUB_ENV
-      echo "$(pwd)/apache-maven-3.9.11/bin" >> $GITHUB_PATH
-    shell: bash
@@ -1,22 +0,0 @@
-name: perform-benchmarks
-runs:
-  using: composite
-  steps:
-  - name: Test low-variance benchmarks
-    run: "./tools/benchmark_ci.py --db_dir ${{ runner.temp }}/rocksdb-benchmark-datadir --output_dir ${{ runner.temp }}/benchmark-results --num_keys 20000000"
-    env:
-      LD_LIBRARY_PATH: "/usr/local/lib"
-      DURATION_RO: 300
-      DURATION_RW: 500
-      NUM_THREADS: 1
-      MAX_BACKGROUND_JOBS: 4
-      CI_TESTS_ONLY: 'true'
-      WRITE_BUFFER_SIZE_MB: 16
-      TARGET_FILE_SIZE_BASE_MB: 16
-      MAX_BYTES_FOR_LEVEL_BASE_MB: 64
-      COMPRESSION_TYPE: none
-      CACHE_INDEX_AND_FILTER_BLOCKS: 1
-      MIN_LEVEL_TO_COMPRESS: 3
-      CACHE_SIZE_MB: 10240
-      MB_WRITE_PER_SEC: 2
-    shell: bash
@@ -1,17 +0,0 @@
-name: post-benchmarks
-runs:
-  using: composite
-  steps:
-  - name: Upload Benchmark Results artifact
-    uses: actions/upload-artifact@v4.0.0
-    with:
-      name: benchmark-results
-      path: "${{ runner.temp }}/benchmark-results/**"
-      if-no-files-found: error
-  - name: Send benchmark report to visualisation
-    run: |-
-      set +e
-      set +o pipefail
-      ./build_tools/benchmark_log_tool.py --tsvfile ${{ runner.temp }}/benchmark-results/report.tsv --esdocument https://search-rocksdb-bench-k2izhptfeap2hjfxteolsgsynm.us-west-2.es.amazonaws.com/bench_test3_rix/_doc
-      true
-    shell: bash
@@ -1,38 +0,0 @@
-name: post-steps
-description: Steps that are taken after a RocksDB job
-inputs:
-  artifact-prefix:
-    description: Prefix to append to the name of artifacts that are uploaded
-    required: true
-    default: "${{ github.job }}"
-runs:
-  using: composite
-  steps:
-  - name: Upload Test Results artifact
-    uses: actions/upload-artifact@v4.0.0
-    with:
-      name: "${{ inputs.artifact-prefix }}-test-results"
-      path: "${{ runner.temp }}/test-results/**"
-  - name: Upload DB LOG file artifact
-    uses: actions/upload-artifact@v4.0.0
-    with:
-      name: "${{ inputs.artifact-prefix }}-db-log-file"
-      path: LOG
-  - name: Copy Test Logs (on Failure)
-    if: ${{ failure() }}
-    run: |
-      mkdir -p ${{ runner.temp }}/failure-test-logs
-      cp -r t/* ${{ runner.temp }}/failure-test-logs
-    shell: bash
-  - name: Upload Test Logs (on Failure) artifact
-    uses: actions/upload-artifact@v4.0.0
-    with:
-      name: "${{ inputs.artifact-prefix }}-failure-test-logs"
-      path: ${{ runner.temp }}/failure-test-logs/**
-      if-no-files-found: ignore
-  - name: Upload Core Dumps artifact
-    uses: actions/upload-artifact@v4.0.0
-    with:
-      name: "${{ inputs.artifact-prefix }}-core-dumps"
-      path: "core.*"
-      if-no-files-found: ignore
@@ -1,5 +0,0 @@
-name: pre-steps-macos
-runs:
-  using: composite
-  steps:
-  - uses: "./.github/actions/pre-steps"
@@ -1,21 +0,0 @@
-name: pre-steps
-runs:
-  using: composite
-  steps:
-  - name: Install lld linker for faster builds
-    run: apt-get update -y && apt-get install -y lld 2>/dev/null || true
-    shell: bash
-  - name: Setup Environment Variables
-    run: |-
-      echo "GTEST_THROW_ON_FAILURE=0" >> "$GITHUB_ENV"
-      echo "GTEST_OUTPUT=\"xml:${{ runner.temp }}/test-results/\"" >> "$GITHUB_ENV"
-      echo "SKIP_FORMAT_BUCK_CHECKS=1" >> "$GITHUB_ENV"
-      echo "GTEST_COLOR=1" >> "$GITHUB_ENV"
-      echo "CTEST_OUTPUT_ON_FAILURE=1" >> "$GITHUB_ENV"
-      echo "CTEST_TEST_TIMEOUT=300" >> "$GITHUB_ENV"
-      echo "ZLIB_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/zlib" >> "$GITHUB_ENV"
-      echo "BZIP2_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/bzip2" >> "$GITHUB_ENV"
-      echo "SNAPPY_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/snappy" >> "$GITHUB_ENV"
-      echo "LZ4_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/lz4" >> "$GITHUB_ENV"
-      echo "ZSTD_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/zstd" >> "$GITHUB_ENV"
-    shell: bash
@@ -1,54 +0,0 @@
-name: setup-ccache
-description: Setup ccache for faster C++ compilation caching
-inputs:
-  cache-key-prefix:
-    description: Unique prefix for the cache key (e.g., 'build-linux')
-    required: true
-  portable:
-    description: Set PORTABLE=1 to disable -march=native (set to "false" for jobs linking pre-built Folly)
-    required: false
-    default: "true"
-runs:
-  using: composite
-  steps:
-    - name: Set ccache environment variables
-      run: |
-        echo "CCACHE_DIR=${{ github.workspace }}/.ccache" >> $GITHUB_ENV
-        echo "CCACHE_BASEDIR=${{ github.workspace }}" >> $GITHUB_ENV
-        echo "CCACHE_NOHASHDIR=true" >> $GITHUB_ENV
-        echo "CCACHE_COMPILERCHECK=content" >> $GITHUB_ENV
-        echo "CCACHE_SLOPPINESS=clang_index_store,file_stat_matches,include_file_ctime,include_file_mtime,ivfsoverlay,pch_defines,modules,system_headers,time_macros" >> $GITHUB_ENV
-        echo "CCACHE_MAXSIZE=4G" >> $GITHUB_ENV
-        if [ "${{ inputs.portable }}" = "true" ]; then
-          echo "PORTABLE=1" >> $GITHUB_ENV
-        fi
-      shell: bash
-    - name: Restore ccache
-      uses: actions/cache@v4
-      with:
-        path: ${{ github.workspace }}/.ccache
-        key: ccache-${{ inputs.cache-key-prefix }}-${{ github.head_ref || github.ref }}-${{ github.sha }}
-        restore-keys: |-
-          ccache-${{ inputs.cache-key-prefix }}-${{ github.head_ref || github.ref }}-
-          ccache-${{ inputs.cache-key-prefix }}-refs/heads/main-
-    - name: Install ccache
-      run: |
-        if [ "$RUNNER_OS" = "macOS" ]; then
-          which ccache || brew install ccache
-        else
-          which ccache || (apt-get update && apt-get install -y ccache)
-        fi
-      shell: bash
-    - name: Add ccache to PATH
-      run: |
-        if [ "$RUNNER_OS" = "macOS" ]; then
-          echo "$(brew --prefix ccache)/libexec" >> $GITHUB_PATH
-        else
-          echo "/usr/lib/ccache" >> $GITHUB_PATH
-        fi
-      shell: bash
-    - name: Zero ccache stats and set build marker
-      run: |
-        ccache -z
-        touch "$CCACHE_DIR/.build_marker"
-      shell: bash
@@ -1,11 +0,0 @@
-name: setup-folly
-runs:
-  using: composite
-  steps:
-  - name: Checkout folly sources
-    run: |
-      make checkout_folly
-    shell: bash
-  - name: Install patchelf and libaio
-    run: apt-get update -y && apt-get install -y patchelf libaio-dev
-    shell: bash
@@ -1,20 +0,0 @@
-name: build-folly
-runs:
-  using: composite
-  steps:
-  - name: Fix repo ownership
-    # Needed in some cases, as safe.directory setting doesn't take effect
-    # under env -i
-    run: chown `whoami` . || true
-    shell: bash
-  - name: Set upstream
-    run: git remote add upstream https://github.com/facebook/rocksdb.git
-    shell: bash
-  - name: Fetch upstream
-    run: git fetch upstream
-    shell: bash
-  - name: Git status
-    # NOTE: some old branch builds under check_format_compatible.sh invoke
-    # git under env -i
-    run: git status && git remote -v && env -i git branch
-    shell: bash
@@ -1,15 +0,0 @@
-name: teardown-ccache
-description: Trim stale ccache entries and print stats
-runs:
-  using: composite
-  steps:
-    - name: Trim and print ccache stats
-      run: |
-        if [ -z "$CCACHE_DIR" ]; then
-          echo "teardown-ccache: CCACHE_DIR not set, skipping (setup-ccache may not have run)"
-          exit 0
-        fi
-        .github/scripts/ccache-trim.sh || true
-        ccache -s || echo "teardown-ccache: ccache not found, skipping stats"
-      if: always()
-      shell: bash
@@ -1,91 +0,0 @@
-name: windows-build-steps
-inputs:
-  suite-run:
-    description: Comma-separated list of test suites to run (empty to skip C++ tests)
-    required: false
-    default: arena_test,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
-  run-java:
-    description: Whether to run Java tests
-    required: false
-    default: "true"
-runs:
-  using: composite
-  steps:
-  - name: Add msbuild to PATH
-    uses: microsoft/setup-msbuild@v1.3.1
-  - name: ccache
-    uses: hendrikmuhs/ccache-action@v1.2
-    with:
-      max-size: "10GB"
-      key: ccache-windows-${{ github.workflow }}
-      restore-keys: |
-        ccache-windows-
-  - name: Configure ccache
-    shell: pwsh
-    run: |
-      ccache --set-config=base_dir=C:\a\rocksdb\rocksdb
-      ccache --set-config=hash_dir=false
-      ccache --set-config=compiler_check=content
-  - name: Custom steps
-    env:
-      THIRDPARTY_HOME: ${{ github.workspace }}/thirdparty
-      CMAKE_HOME: C:/Program Files/CMake
-      CMAKE_BIN: C:/Program Files/CMake/bin/cmake.exe
-      CTEST_BIN: C:/Program Files/CMake/bin/ctest.exe
-      JAVA_HOME: C:/Program Files/BellSoft/LibericaJDK-8
-      SNAPPY_HOME: ${{ github.workspace }}/thirdparty/snappy-1.2.2
-      SNAPPY_INCLUDE: ${{ github.workspace }}/thirdparty/snappy-1.2.2;${{ github.workspace }}/thirdparty/snappy-1.2.2/build
-      SNAPPY_LIB_DEBUG: ${{ github.workspace }}/thirdparty/snappy-1.2.2/build/Debug/snappy.lib
-    run: |-
-      # NOTE: if ... Exit $LASTEXITCODE lines needed to exit and report failure
-      echo ===================== Install Dependencies =====================
-      choco install liberica8jdk -y
-      if(!$?) { Exit $LASTEXITCODE }
-      mkdir $Env:THIRDPARTY_HOME
-      cd $Env:THIRDPARTY_HOME
-      echo "Building Snappy dependency..."
-      curl -Lo snappy-1.2.2.zip https://github.com/google/snappy/archive/refs/tags/1.2.2.zip
-      if(!$?) { Exit $LASTEXITCODE }
-      unzip -q snappy-1.2.2.zip
-      if(!$?) { Exit $LASTEXITCODE }
-      cd snappy-1.2.2
-      mkdir build
-      cd build
-      & cmake -G "$Env:CMAKE_GENERATOR" .. -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF
-      if(!$?) { Exit $LASTEXITCODE }
-      msbuild Snappy.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
-      if(!$?) { Exit $LASTEXITCODE }
-      echo ======================== Build RocksDB =========================
-      cd ${{ github.workspace }}
-      $env:Path = $env:JAVA_HOME + ";" + $env:Path
-      mkdir build
-      cd build
-      & cmake -G "$Env:CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Debug -DWIN_CI=1 -DPORTABLE="$Env:CMAKE_PORTABLE" -DSNAPPY=1 -DXPRESS=1 -DJNI=1 ..
-      if(!$?) { Exit $LASTEXITCODE }
-      cd ..
-      echo "Building with VS version: $Env:CMAKE_GENERATOR"
-      # use more parallel processes than the number of processes available, as most of the compile command would be cache hit
-      msbuild build/rocksdb.sln /m:32 /p:LinkIncremental=false -property:Configuration=Debug -property:Platform=x64
-      if(!$?) { Exit $LASTEXITCODE }
-      echo ========================= Test RocksDB =========================
-      $suiteRun = "${{ inputs.suite-run }}"
-      if ($suiteRun -ne "") {
-        $suiteArray = $suiteRun -split ','
-        build_tools\run_ci_db_test.ps1 -SuiteRun $suiteArray -Concurrency 16
-        if(!$?) { Exit $LASTEXITCODE }
-      } else {
-        echo "Skipping C++ tests (suite-run is empty)"
-      }
-      if ("${{ inputs.run-java }}" -eq "true") {
-        echo ======================== Test RocksJava ========================
-        cd build\java
-        & ctest -C Debug -j 16
-        if(!$?) { Exit $LASTEXITCODE }
-      } else {
-        echo "Skipping Java tests"
-      }
-    shell: pwsh
-  - name: Show ccache stats
-    shell: pwsh
-    run: |
-      ccache --show-stats -v
@@ -1,27 +0,0 @@
-// Shared markdown builder for AI review comment bodies.
-//
-// Usage:
-//   const build = require('./build-ai-review-comment.js');
-//   return build({ icon, headerTitle, triggerLine, responseBody, footerLines
-//   });
-
-module.exports = function buildAiReviewComment(
-    {icon, headerTitle, triggerLine, responseBody, footerLines}) {
-  return [
-    `## ${icon} ${headerTitle}`,
-    '',
-    triggerLine,
-    '',
-    '---',
-    '',
-    responseBody,
-    '',
-    '---',
-    '',
-    '<details>',
-    '<summary>ℹ️ About this response</summary>',
-    '',
-    ...footerLines,
-    '</details>',
-  ].join('\n');
-};
@@ -1,39 +0,0 @@
-#!/bin/bash
-# Trim ccache to keep only entries accessed during the current build.
-#
-# Usage: 
-#   1. Before build: touch "$CCACHE_DIR/.build_marker"
-#   2. Run build (ccache updates mtime on hits, creates new files for misses)
-#   3. After build: .github/scripts/ccache-trim.sh
-#
-# This removes cache files not accessed during the build (stale entries from
-# previous commits). Only intended for CI where each run builds one commit.
-# Do NOT use on local builds where multiple worktrees may share the cache.
-
-set -e
-
-CCACHE_DIR="${CCACHE_DIR:?CCACHE_DIR must be set}"
-MARKER="$CCACHE_DIR/.build_marker"
-
-if [ ! -f "$MARKER" ]; then
-    echo "ccache-trim: No .build_marker found, skipping (was the marker created before build?)"
-    exit 0
-fi
-
-# Count files before cleanup
-before=$(find "$CCACHE_DIR" -type f \( -name '*R' -o -name '*M' \) | wc -l)
-
-# Delete cache files (results and manifests) older than the marker
-find "$CCACHE_DIR" -type f \( -name '*R' -o -name '*M' \) ! -newer "$MARKER" -delete
-
-# Clean up empty directories
-find "$CCACHE_DIR" -mindepth 2 -type d -empty -delete 2>/dev/null || true
-
-# Recalculate size counters
-ccache -c 2>/dev/null || true
-
-after=$(find "$CCACHE_DIR" -type f \( -name '*R' -o -name '*M' \) | wc -l)
-echo "ccache-trim: $before -> $after cache files (removed $((before - after)) stale entries)"
-
-# Clean up marker
-rm -f "$MARKER"
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Compute test shard for parallel CI execution.
-# Distributes tests round-robin across N shards for balanced load.
-# Outputs ROCKSDBTESTS_SUBSET — the list of test binaries for this shard.
-# The Makefile uses this to build and run only the assigned tests.
-#
-# Usage: compute-test-shard.sh <shard_index> <num_shards>
-
-set -euo pipefail
-
-shard=${1:?Usage: compute-test-shard.sh <shard_index> <num_shards>}
-nshards=${2:?Usage: compute-test-shard.sh <shard_index> <num_shards>}
-
-# Get sorted test list (db_test first since it's the heaviest, then alpha)
-make -s list_all_tests 2>/dev/null | tr ' ' '\n' | grep '_test$' | sort -u > /tmp/sorted.txt
-(echo db_test; grep -v '^db_test$' /tmp/sorted.txt) > /tmp/all_tests.txt
-
-total=$(wc -l < /tmp/all_tests.txt)
-
-# Round-robin: assign test i to shard (i % nshards).
-# This spreads heavy tests (which are scattered alphabetically) evenly.
-awk -v s="$shard" -v n="$nshards" 'NR > 0 && (NR - 1) % n == s' /tmp/all_tests.txt > /tmp/include.txt
-
-included=$(wc -l < /tmp/include.txt)
-first=$(head -1 /tmp/include.txt)
-last=$(tail -1 /tmp/include.txt)
-
-# Output space-separated list for ROCKSDBTESTS_SUBSET
-subset=$(tr '\n' ' ' < /tmp/include.txt)
-echo "subset=${subset}" >> "$GITHUB_OUTPUT"
-
-echo "Shard $shard/$nshards: $included tests (round-robin), first=$first last=$last (total $total)"
@@ -1,118 +0,0 @@
-// Parse Claude Code execution log and produce a markdown review comment.
-//
-// Usage from actions/github-script:
-//   const parse = require('./.github/scripts/parse-claude-review.js');
-//   const markdown = parse({ executionFile, conclusion, meta });
-//
-// Parameters:
-//   executionFile - path to the JSON execution log from claude-code-base-action
-//   conclusion    - 'success' or 'failure' from the action output
-//   meta          - { trigger, autoMode, headSha, reviewer, isQuery, isPartial
-//   }
-
-const fs = require('fs');
-const buildComment = require('./build-ai-review-comment.js');
-
-module.exports = function parseClaude({executionFile, conclusion, meta}) {
-  function getTriggerLine() {
-    if (meta.trigger !== 'auto') {
-      return `*Requested by @${meta.reviewer}*`;
-    }
-    const shortSha = meta.headSha ? meta.headSha.substring(0, 7) : 'unknown';
-    if (meta.autoMode === 'early') {
-      return `*Auto-triggered after CI reached the early-review threshold — reviewing commit ${
-          shortSha}*`;
-    }
-    return `*Auto-triggered after CI passed — reviewing commit ${shortSha}*`;
-  }
-
-  let responseBody = '';
-
-  try {
-    const executionLog = JSON.parse(fs.readFileSync(executionFile, 'utf8'));
-
-    if (!Array.isArray(executionLog)) {
-      throw new Error('Expected array format from claude-code-base-action');
-    }
-
-    const resultMessage = executionLog.find(m => m.type === 'result');
-
-    // Helper: extract the last substantial assistant text from the log.
-    // Used as a fallback when Claude ran out of turns and the recovery
-    // session also failed to produce a result.
-    function getLastAssistantText(log, minLength = 200) {
-      for (let i = log.length - 1; i >= 0; i--) {
-        const m = log[i];
-        if (m.type !== 'assistant') continue;
-        const content = m.message && m.message.content;
-        if (!Array.isArray(content)) continue;
-        for (let j = content.length - 1; j >= 0; j--) {
-          if (content[j].type === 'text' && content[j].text &&
-              content[j].text.trim().length >= minLength) {
-            const text = content[j].text.trim();
-            // Truncate to avoid enormous PR comments
-            return text.length > 50000 ? text.substring(0, 50000) +
-                    '\n\n*[Truncated — full output in execution log artifact]*' :
-                                         text;
-          }
-        }
-      }
-      return null;
-    }
-
-    if (!resultMessage) {
-      responseBody = '⚠️ No result message found in execution log.';
-    } else if (resultMessage.subtype === 'success' && resultMessage.result) {
-      responseBody = resultMessage.result;
-    } else if (resultMessage.is_error || resultMessage.subtype === 'error') {
-      const errorInfo =
-          resultMessage.result || resultMessage.error || 'Unknown error';
-      responseBody = `❌ **Claude encountered an error:**\n\n${errorInfo}`;
-    } else if (resultMessage.subtype === 'error_max_turns') {
-      // The workflow runs a recovery session when this happens, so this
-      // branch is typically only hit if recovery wasn't attempted (e.g.,
-      // no findings file was written). Extract what we can.
-      const partial = getLastAssistantText(executionLog);
-      if (partial) {
-        responseBody =
-            `⚠️ **Review incomplete — Claude hit the turn limit.**\n\nBelow is the last partial output. You can request a fresh review with \`/claude-review\`.\n\n---\n\n${
-                partial}`;
-      } else {
-        responseBody =
-            '⚠️ **Review incomplete — Claude hit the turn limit before producing output.** You can request a fresh review with `/claude-review`.';
-      }
-    } else if (resultMessage.result) {
-      responseBody = `⚠️ **Completed with status: ${
-          resultMessage.subtype}**\n\n${resultMessage.result}`;
-    } else {
-      responseBody = '⚠️ Claude completed but produced no output.';
-    }
-  } catch (error) {
-    responseBody = `❌ Error parsing Claude response: ${error.message}`;
-  }
-
-  const isPartial = !!meta.isPartial;
-  const icon = isPartial ? '🟡' : (conclusion === 'success' ? '✅' : '⚠️');
-  const headerTitle = meta.isQuery ? 'Claude Response' : 'Claude Code Review';
-  const triggerLine = getTriggerLine();
-
-  return buildComment({
-    icon,
-    headerTitle,
-    triggerLine,
-    responseBody,
-    footerLines: [
-      'Generated by [Claude Code](https://github.com/anthropics/claude-code-action).',
-      'Review methodology: `claude_md/code_review.md`',
-      '',
-      '**Limitations:**',
-      '- Claude may miss context from files not in the diff',
-      '- Large PRs may be truncated',
-      '- Always apply human judgment to AI suggestions',
-      '',
-      '**Commands:**',
-      '- `/claude-review [context]` — Request a code review',
-      '- `/claude-query <question>` — Ask about the PR or codebase',
-    ],
-  });
-};
@@ -1,98 +0,0 @@
-// Parse Codex review artifacts and produce a markdown review comment.
-//
-// Usage from actions/github-script:
-//   const parse = require('./.github/scripts/parse-codex-review.js');
-//   const markdown = parse({ responseFile, recoveryFile, findingsFile, logFile,
-//   exitCode, meta });
-//
-// Parameters:
-//   responseFile - path to Codex final response output
-//   recoveryFile - path to recovery output formatted from review-findings.md
-//   findingsFile - path to incremental findings file written during review
-//   logFile      - path to Codex stdout/stderr log
-//   exitCode     - Codex process exit code
-//   meta         - { trigger, autoMode, headSha, reviewer, isQuery, isPartial }
-
-const fs = require('fs');
-const buildComment = require('./build-ai-review-comment.js');
-
-module.exports = function parseCodex(
-    {responseFile, recoveryFile, findingsFile, logFile, exitCode, meta}) {
-  function getTriggerLine() {
-    if (meta.trigger !== 'auto') {
-      return `*Requested by @${meta.reviewer}*`;
-    }
-    const shortSha = meta.headSha ? meta.headSha.substring(0, 7) : 'unknown';
-    if (meta.autoMode === 'early') {
-      return `*Auto-triggered after CI reached the early-review threshold — reviewing commit ${
-          shortSha}*`;
-    }
-    return `*Auto-triggered after CI passed — reviewing commit ${shortSha}*`;
-  }
-
-  function readIfPresent(path) {
-    if (!path || !fs.existsSync(path)) {
-      return '';
-    }
-    const text = fs.readFileSync(path, 'utf8').trim();
-    return text;
-  }
-
-  function tailFile(path, maxChars = 12000) {
-    const text = readIfPresent(path);
-    if (!text) {
-      return '';
-    }
-    if (text.length <= maxChars) {
-      return text;
-    }
-    return text.slice(text.length - maxChars);
-  }
-
-  let responseBody = '';
-  const recovered = readIfPresent(recoveryFile);
-  const direct = readIfPresent(responseFile);
-  const findings = readIfPresent(findingsFile);
-
-  if (recovered) {
-    responseBody = recovered;
-  } else if (direct) {
-    responseBody = direct;
-  } else if (findings) {
-    responseBody =
-        '⚠️ **Review incomplete — Codex did not produce a final response.**\n\n' +
-        'Below are the incremental findings recovered from `review-findings.md`.\n\n---\n\n' +
-        findings;
-  } else {
-    const logTail = tailFile(logFile);
-    responseBody = logTail ?
-        `❌ **Codex review failed before producing findings.**\n\n\`\`\`\n${
-            logTail}\n\`\`\`` :
-        '❌ Codex review failed before producing any output.';
-  }
-
-  const isPartial = !!meta.isPartial;
-  const code = Number.parseInt(exitCode || '1', 10);
-  const icon = isPartial ? '🟡' : (code === 0 ? '✅' : '⚠️');
-  const triggerLine = getTriggerLine();
-
-  return buildComment({
-    icon,
-    headerTitle: meta.isQuery ? 'Codex Response' : 'Codex Code Review',
-    triggerLine,
-    responseBody,
-    footerLines: [
-      'Generated by Codex CLI.',
-      'Review methodology: `claude_md/code_review.md`',
-      '',
-      '**Limitations:**',
-      '- Codex may miss context from files not in the diff',
-      '- Large PRs may be truncated',
-      '- Always apply human judgment to AI suggestions',
-      '',
-      '**Commands:**',
-      '- `/codex-review [context]` — Request a code review',
-      '- `/codex-query <question>` — Ask about the PR or codebase',
-    ],
-  });
-};
@@ -1,204 +0,0 @@
-// Shared PR comment posting utility.
-// Used by both clang-tidy-comment.yml and claude-review-comment.yml.
-//
-// Usage from actions/github-script:
-//   const post = require('./.github/scripts/post-pr-comment.js');
-//   await post({ github, context, core, prNumber, body, marker });
-//
-// Parameters:
-//   github   - octokit instance from actions/github-script
-//   context  - GitHub Actions context
-//   core     - @actions/core for logging
-//   prNumber - PR number to comment on
-//   body     - comment body (markdown string)
-//   marker   - HTML comment marker for dedup (e.g. '<!-- claude-review -->')
-//              If an existing comment with this marker is found, it is updated.
-//              If not found, a new comment is created.
-//   legacyMarkers - optional list of legacy markers that should be migrated by
-//              being considered part of the same comment family.
-//   prunePrefix - optional marker prefix whose older comments should be
-//                 superseded. If obsoleteTitle is set, older comments are
-//                 collapsed instead of deleted.
-//   preserveLatest - optional count of active comments to keep when
-//                    prunePrefix is set.
-//   obsoleteMarker - optional HTML marker used to detect already-obsolete
-//                    comments.
-//   obsoleteTitle - optional heading to use when collapsing superseded
-//                   comments into a details block.
-
-module.exports = async function postPrComment({
-  github,
-  context,
-  core,
-  prNumber,
-  body,
-  marker,
-  legacyMarkers = [],
-  prunePrefix = '',
-  preserveLatest = 0,
-  obsoleteMarker = '',
-  obsoleteTitle = '',
-}) {
-  if (!prNumber || !body) {
-    core.warning('Missing prNumber or body; skipping comment.');
-    return;
-  }
-
-  const owner = context.repo.owner;
-  const repo = context.repo.repo;
-
-  // Ensure marker is embedded in the body
-  const markedBody = body.includes(marker) ? body : `${marker}\n${body}`;
-
-  async function listComments() {
-    return await github.paginate(github.rest.issues.listComments, {
-      owner,
-      repo,
-      issue_number: prNumber,
-      per_page: 100,
-    });
-  }
-
-  function commentActivityTime(comment) {
-    const timestamp =
-        Date.parse(comment.updated_at || comment.created_at || '');
-    return Number.isNaN(timestamp) ? 0 : timestamp;
-  }
-
-  function commentSortDescending(left, right) {
-    const timeDelta = commentActivityTime(right) - commentActivityTime(left);
-    if (timeDelta !== 0) {
-      return timeDelta;
-    }
-    return Number(right.id || 0) - Number(left.id || 0);
-  }
-
-  function isObsoleteComment(comment) {
-    return !!obsoleteMarker && typeof comment.body === 'string' &&
-        comment.body.includes(obsoleteMarker);
-  }
-
-  function buildObsoleteBody(comment) {
-    const originalBody =
-        typeof comment.body === 'string' && comment.body.trim() ?
-        comment.body :
-        '*No original review body preserved.*';
-    const title = obsoleteTitle || 'AI Review - OBSOLETE';
-    return `${obsoleteMarker}\n## ${
-        title}\n\n<details>\n<summary>Superseded by a newer AI review. Expand to see the original review.</summary>\n\n${
-        originalBody}\n\n</details>`;
-  }
-
-  async function deleteCommentIfPresent(comment, reason) {
-    try {
-      await github.rest.issues.deleteComment({
-        owner,
-        repo,
-        comment_id: comment.id,
-      });
-      core.info(`${reason} ${comment.id}`);
-    } catch (error) {
-      if (error.status === 404) {
-        core.info(`Comment ${comment.id} was already deleted by another run.`);
-        return;
-      }
-      throw error;
-    }
-  }
-
-  async function supersedeCommentIfPresent(comment, reason) {
-    if (!obsoleteTitle) {
-      await deleteCommentIfPresent(comment, reason);
-      return;
-    }
-    if (isObsoleteComment(comment)) {
-      return;
-    }
-    try {
-      await github.rest.issues.updateComment({
-        owner,
-        repo,
-        comment_id: comment.id,
-        body: buildObsoleteBody(comment),
-      });
-      core.info(`${reason} ${comment.id}`);
-    } catch (error) {
-      if (error.status === 404) {
-        core.info(`Comment ${comment.id} was already deleted by another run.`);
-        return;
-      }
-      throw error;
-    }
-  }
-
-  let comments = await listComments();
-  const existing = comments.find(
-      comment =>
-          typeof comment.body === 'string' && comment.body.includes(marker));
-  let currentCommentId = null;
-
-  if (existing) {
-    try {
-      const response = await github.rest.issues.updateComment({
-        owner,
-        repo,
-        comment_id: existing.id,
-        body: markedBody,
-      });
-      currentCommentId = existing.id;
-      core.info(`Updated existing comment ${existing.id}`);
-    } catch (error) {
-      if (error.status !== 404) {
-        throw error;
-      }
-      core.info(
-          `Comment ${existing.id} disappeared before update; ` +
-          'creating a fresh comment instead.');
-    }
-  }
-
-  if (!currentCommentId) {
-    const response = await github.rest.issues.createComment({
-      owner,
-      repo,
-      issue_number: prNumber,
-      body: markedBody,
-    });
-    currentCommentId = response.data.id;
-    core.info('Created new PR comment');
-  }
-
-  if (prunePrefix || legacyMarkers.length > 0) {
-    comments = await listComments();
-    const relatedComments = comments.filter(
-        comment => comment.id !== currentCommentId &&
-            typeof comment.body === 'string' &&
-            ((prunePrefix && comment.body.includes(prunePrefix)) ||
-             legacyMarkers.some(
-                 legacyMarker => comment.body.includes(legacyMarker))));
-    const activeRelatedComments =
-        comments
-            .filter(
-                comment => typeof comment.body === 'string' &&
-                    !isObsoleteComment(comment) &&
-                    (comment.id === currentCommentId ||
-                     relatedComments.some(
-                         relatedComment => relatedComment.id === comment.id)))
-            .sort(commentSortDescending);
-
-    const keep =
-        new Set(activeRelatedComments.slice(0, Math.max(preserveLatest, 1))
-                    .map(comment => comment.id));
-
-    const supersedeCandidates = obsoleteTitle ?
-        activeRelatedComments.filter(comment => !keep.has(comment.id)) :
-        relatedComments.filter(comment => !keep.has(comment.id));
-
-    for (const comment of supersedeCandidates) {
-      if (keep.has(comment.id)) {
-        continue;
-      }
-      await supersedeCommentIfPresent(comment, 'Superseded old AI review');
-    }
-  }
-};
@@ -1,347 +0,0 @@
-const test = require('node:test');
-const assert = require('node:assert/strict');
-
-const postPrComment = require('./post-pr-comment.js');
-
-const OBSOLETE_MARKER = '<!-- claude-review-obsolete -->';
-const OBSOLETE_TITLE = 'Claude Code Review - OBSOLETE';
-
-function makeComment(id, body, createdAt, updatedAt) {
-  return {
-    id,
-    body,
-    created_at: createdAt,
-    updated_at: updatedAt || createdAt,
-  };
-}
-
-function createHarness(initialComments, options = {}) {
-  let comments = initialComments.map(comment => ({...comment}));
-  let nextCommentId = options.nextCommentId || 1000;
-  let paginateCount = 0;
-
-  const calls = {
-    update: [],
-    create: [],
-    delete: [],
-  };
-
-  const github = {
-    paginate: async () => {
-      paginateCount++;
-      if (options.onPaginate) {
-        const updated = options.onPaginate({
-          paginateCount,
-          comments: comments.map(comment => ({...comment})),
-        });
-        if (updated) {
-          comments = updated.map(comment => ({...comment}));
-        }
-      }
-      return comments.map(comment => ({...comment}));
-    },
-    rest: {
-      issues: {
-        listComments: () => {
-          throw new Error('listComments should only be used through paginate');
-        },
-        updateComment: async ({comment_id, body}) => {
-          calls.update.push({comment_id, body});
-          const error =
-              options.updateErrors && options.updateErrors[comment_id];
-          if (error) {
-            throw error;
-          }
-          const index =
-              comments.findIndex(comment => comment.id === comment_id);
-          if (index === -1) {
-            const notFound = new Error(`Comment ${comment_id} not found`);
-            notFound.status = 404;
-            throw notFound;
-          }
-          const updated = {
-            ...comments[index],
-            body,
-            updated_at: options.updateTimestamp || '2026-04-24T00:00:00Z',
-          };
-          comments[index] = updated;
-          return {data: {...updated}};
-        },
-        createComment: async ({issue_number, body}) => {
-          calls.create.push({issue_number, body});
-          const created = makeComment(
-              nextCommentId++, body,
-              options.createTimestamp || '2026-04-24T00:00:00Z');
-          comments.push(created);
-          return {data: {id: created.id}};
-        },
-        deleteComment: async ({comment_id}) => {
-          calls.delete.push({comment_id});
-          const error =
-              options.deleteErrors && options.deleteErrors[comment_id];
-          if (error) {
-            throw error;
-          }
-          comments = comments.filter(comment => comment.id !== comment_id);
-        },
-      },
-    },
-  };
-
-  return {
-    github,
-    calls,
-    getComments: () => comments.map(comment => ({...comment})),
-  };
-}
-
-function createCore() {
-  return {
-    info: () => {},
-    warning: () => {},
-  };
-}
-
-function escapeRegExp(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-function assertObsoleteComment(comment, originalBody) {
-  assert.ok(comment);
-  assert.match(comment.body, new RegExp(escapeRegExp(OBSOLETE_MARKER)));
-  assert.match(comment.body, new RegExp(`## ${escapeRegExp(OBSOLETE_TITLE)}`));
-  assert.match(comment.body, /<details>/);
-  assert.match(comment.body, /Superseded by a newer AI review/);
-  assert.match(comment.body, new RegExp(escapeRegExp(originalBody)));
-}
-
-const context = {
-  repo: {
-    owner: 'facebook',
-    repo: 'rocksdb',
-  },
-};
-
-test(
-    'creates a fresh review comment and supersedes legacy comments',
-    async () => {
-      const harness = createHarness(
-          [
-            makeComment(
-                1, '<!-- claude-review-auto -->\nold legacy', 'not-a-date'),
-            makeComment(
-                2, '<!-- claude-review-auto -->\nnew legacy',
-                '2026-04-21T00:00:00Z'),
-          ],
-          {
-            updateTimestamp: '2026-04-24T00:00:00Z',
-          });
-
-      await postPrComment({
-        github: harness.github,
-        context,
-        core: createCore(),
-        prNumber: 14659,
-        body: 'review body',
-        marker: '<!-- claude-review-auto-run-500 -->',
-        legacyMarkers: ['<!-- claude-review-auto -->'],
-        prunePrefix: '<!-- claude-review-auto-',
-        preserveLatest: 1,
-        obsoleteMarker: OBSOLETE_MARKER,
-        obsoleteTitle: OBSOLETE_TITLE,
-      });
-
-      assert.equal(harness.calls.create.length, 1);
-      assert.deepEqual(
-          harness.calls.update.map(call => call.comment_id), [2, 1]);
-      assert.equal(harness.calls.delete.length, 0);
-
-      const comments = harness.getComments();
-      assert.equal(comments.length, 3);
-      assert.match(
-          comments.find(comment => comment.id === 1000).body,
-          /<!-- claude-review-auto-run-500 -->/);
-      assertObsoleteComment(
-          comments.find(comment => comment.id === 2),
-          '<!-- claude-review-auto -->\nnew legacy');
-      assertObsoleteComment(
-          comments.find(comment => comment.id === 1),
-          '<!-- claude-review-auto -->\nold legacy');
-    });
-
-test(
-    'updates an exact-match comment and supersedes leftover legacy comments',
-    async () => {
-      const harness = createHarness(
-          [
-            makeComment(
-                3, '<!-- claude-review-auto-abcdef0 -->\ncurrent body',
-                '2026-04-24T00:00:00Z'),
-            makeComment(
-                4, '<!-- claude-review-auto -->\nlegacy body',
-                '2026-04-20T00:00:00Z'),
-          ],
-          {
-            updateTimestamp: '2026-04-24T01:00:00Z',
-          });
-
-      await postPrComment({
-        github: harness.github,
-        context,
-        core: createCore(),
-        prNumber: 14659,
-        body: 'refreshed body',
-        marker: '<!-- claude-review-auto-abcdef0 -->',
-        legacyMarkers: ['<!-- claude-review-auto -->'],
-        prunePrefix: '<!-- claude-review-auto-',
-        preserveLatest: 1,
-        obsoleteMarker: OBSOLETE_MARKER,
-        obsoleteTitle: OBSOLETE_TITLE,
-      });
-
-      assert.deepEqual(
-          harness.calls.update.map(call => call.comment_id), [3, 4]);
-      assert.equal(harness.calls.create.length, 0);
-      assert.equal(harness.calls.delete.length, 0);
-
-      const comments = harness.getComments();
-      assert.match(
-          comments.find(comment => comment.id === 3).body,
-          /<!-- claude-review-auto-abcdef0 -->\nrefreshed body/);
-      assertObsoleteComment(
-          comments.find(comment => comment.id === 4),
-          '<!-- claude-review-auto -->\nlegacy body');
-    });
-
-test(
-    'creates a new comment if the target disappears before update',
-    async () => {
-      const missing = new Error('gone');
-      missing.status = 404;
-      const harness = createHarness(
-          [
-            makeComment(
-                10, '<!-- claude-review-auto-abcdef0 -->\nold body',
-                '2026-04-20T00:00:00Z'),
-          ],
-          {
-            updateErrors: {
-              10: missing,
-            },
-          });
-
-      await postPrComment({
-        github: harness.github,
-        context,
-        core: createCore(),
-        prNumber: 14659,
-        body: 'replacement body',
-        marker: '<!-- claude-review-auto-abcdef0 -->',
-      });
-
-      assert.equal(harness.calls.update.length, 1);
-      assert.equal(harness.calls.create.length, 1);
-      assert.match(
-          harness.calls.create[0].body, /<!-- claude-review-auto-abcdef0 -->/);
-    });
-
-test(
-    'ignores 404 when superseding a comment already deleted by another run',
-    async () => {
-      const missing = new Error('gone');
-      missing.status = 404;
-      const harness = createHarness(
-          [
-            makeComment(
-                20, '<!-- claude-review-auto-oldest -->\noldest',
-                '2026-04-20T00:00:00Z'),
-            makeComment(
-                21, '<!-- claude-review-auto-newer -->\nnewer',
-                '2026-04-21T00:00:00Z'),
-          ],
-          {
-            nextCommentId: 30,
-            createTimestamp: '2026-04-24T00:00:00Z',
-            deleteErrors: {
-              20: missing,
-            },
-          });
-
-      await postPrComment({
-        github: harness.github,
-        context,
-        core: createCore(),
-        prNumber: 14659,
-        body: 'fresh body',
-        marker: '<!-- claude-review-auto-latest -->',
-        prunePrefix: '<!-- claude-review-auto-',
-        preserveLatest: 1,
-        obsoleteMarker: OBSOLETE_MARKER,
-        obsoleteTitle: OBSOLETE_TITLE,
-      });
-
-      assert.equal(harness.calls.create.length, 1);
-      assert.equal(harness.calls.delete.length, 0);
-      assert.deepEqual(
-          harness.calls.update.map(call => call.comment_id), [21, 20]);
-
-      const comments = harness.getComments();
-      assertObsoleteComment(
-          comments.find(comment => comment.id === 21),
-          '<!-- claude-review-auto-newer -->\nnewer');
-    });
-
-test(
-    'supersedes the current review when a newer concurrent one appears',
-    async () => {
-      const harness = createHarness(
-          [
-            makeComment(
-                40, '<!-- claude-review-auto-current -->\ncurrent',
-                '2026-04-20T00:00:00Z'),
-            makeComment(
-                41, '<!-- claude-review-auto-older -->\nolder',
-                '2026-04-19T00:00:00Z'),
-          ],
-          {
-            updateTimestamp: '2026-04-24T00:00:00Z',
-            onPaginate: ({paginateCount, comments}) => {
-              if (paginateCount !== 2) {
-                return comments;
-              }
-              return comments.concat([
-                makeComment(
-                    42, '<!-- claude-review-auto-newer -->\nnewer',
-                    '2026-04-25T00:00:00Z'),
-              ]);
-            },
-          });
-
-      await postPrComment({
-        github: harness.github,
-        context,
-        core: createCore(),
-        prNumber: 14659,
-        body: 'updated current body',
-        marker: '<!-- claude-review-auto-current -->',
-        prunePrefix: '<!-- claude-review-auto-',
-        preserveLatest: 1,
-        obsoleteMarker: OBSOLETE_MARKER,
-        obsoleteTitle: OBSOLETE_TITLE,
-      });
-
-      assert.deepEqual(
-          harness.calls.update.map(call => call.comment_id), [40, 40, 41]);
-      assert.equal(harness.calls.delete.length, 0);
-
-      const comments = harness.getComments();
-      assert.match(
-          comments.find(comment => comment.id === 42).body,
-          /<!-- claude-review-auto-newer -->\nnewer/);
-      assertObsoleteComment(
-          comments.find(comment => comment.id === 40),
-          '<!-- claude-review-auto-current -->\nupdated current body');
-      assertObsoleteComment(
-          comments.find(comment => comment.id === 41),
-          '<!-- claude-review-auto-older -->\nolder');
-    });
@@ -1,185 +0,0 @@
-# Shared comment-posting workflow for AI reviews.
-
-name: AI Review Comment
-
-on:
-  workflow_call:
-    inputs:
-      provider:
-        description: Provider key, for example "claude" or "codex"
-        required: true
-        type: string
-      result_artifact_name:
-        description: Artifact name produced by the analysis workflow
-        required: true
-        type: string
-      comment_file:
-        description: Markdown comment file produced by the analysis workflow
-        required: true
-        type: string
-
-permissions:
-  pull-requests: write
-  issues: write
-
-jobs:
-  comment:
-    if: github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout scripts
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github/scripts
-          sparse-checkout-cone-mode: true
-
-      - name: Download review artifact
-        id: download
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ inputs.result_artifact_name }}
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: true
-
-      - name: Post or update PR comment
-        if: steps.download.outcome == 'success'
-        env:
-          PROVIDER: ${{ inputs.provider }}
-          COMMENT_FILE: ${{ inputs.comment_file }}
-          RUN_ID: ${{ github.event.workflow_run.id }}
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            if (!fs.existsSync(process.env.COMMENT_FILE) ||
-                !fs.existsSync('pr_number.txt')) {
-              core.info('No review results found; skipping.');
-              return;
-            }
-
-            const post = require('./.github/scripts/post-pr-comment.js');
-            const provider = process.env.PROVIDER;
-            const providerTitle = provider === 'codex' ? 'Codex' : 'Claude';
-            const body = fs.readFileSync(process.env.COMMENT_FILE, 'utf8');
-            const prNumber = parseInt(
-              fs.readFileSync('pr_number.txt', 'utf8').trim(),
-              10
-            );
-            const trigger = fs.existsSync('trigger_type.txt') ?
-              fs.readFileSync('trigger_type.txt', 'utf8').trim() :
-              'auto';
-            const headSha = fs.existsSync('head_sha.txt') ?
-              fs.readFileSync('head_sha.txt', 'utf8').trim() :
-              '';
-            const shortSha = headSha ? headSha.substring(0, 7) : '';
-            const runId = process.env.RUN_ID;
-
-            let marker = '';
-            let legacyMarkers = [];
-            let prunePrefix = '';
-            let preserveLatest = 0;
-            let obsoleteMarker = '';
-            let obsoleteTitle = '';
-
-            if (trigger === 'auto') {
-              if (!shortSha) {
-                core.warning(
-                  'Missing head_sha.txt for auto review; skipping comment.'
-                );
-                return;
-              }
-              marker = `<!-- ${provider}-review-auto-run-${runId} -->`;
-              legacyMarkers = [`<!-- ${provider}-review-auto -->`];
-              prunePrefix = `<!-- ${provider}-review-auto-`;
-              preserveLatest = 1;
-              obsoleteMarker = `<!-- ${provider}-review-obsolete -->`;
-              obsoleteTitle = `${providerTitle} Code Review - OBSOLETE`;
-            } else {
-              marker = `<!-- ${provider}-review-manual-run-${runId} -->`;
-            }
-
-            await post({
-              github,
-              context,
-              core,
-              prNumber,
-              body,
-              marker,
-              legacyMarkers,
-              prunePrefix,
-              preserveLatest,
-              obsoleteMarker,
-              obsoleteTitle,
-            });
-
-      - name: Add reaction to trigger comment
-        if: steps.download.outcome == 'success'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            if (!fs.existsSync('trigger_type.txt')) return;
-            const trigger = fs.readFileSync('trigger_type.txt', 'utf8').trim();
-            if (trigger !== 'manual') return;
-            if (!fs.existsSync('comment_id.txt')) return;
-            const commentId = parseInt(
-              fs.readFileSync('comment_id.txt', 'utf8').trim(),
-              10
-            );
-            if (!commentId) return;
-
-            await github.rest.reactions.createForIssueComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: commentId,
-              content: 'rocket'
-            });
-
-  failure-notice:
-    if: github.event.workflow_run.conclusion == 'failure'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download artifact for PR number
-        id: download
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ inputs.result_artifact_name }}
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: true
-
-      - name: React with failure
-        if: steps.download.outcome == 'success'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            if (!fs.existsSync('comment_id.txt')) return;
-            const commentId = parseInt(
-              fs.readFileSync('comment_id.txt', 'utf8').trim(),
-              10
-            );
-            if (!commentId) return;
-
-            await github.rest.reactions.createForIssueComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: commentId,
-              content: 'confused'
-            });
-
-  unauthorized-notice:
-    runs-on: ubuntu-latest
-    if: >-
-      github.event.workflow_run.event == 'issue_comment' &&
-      github.event.workflow_run.conclusion == 'skipped'
-    steps:
-      - name: Log skipped unauthorized request
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.info(
-              'Analysis workflow was skipped, which usually means the ' +
-              'issue_comment requester was not in the authorized list.'
-            );
@@ -1,15 +0,0 @@
-name: facebook/rocksdb/benchmark-linux
-on: workflow_dispatch
-permissions: {}
-  # FIXME: Disabled temporarily
-  # schedule:
-  # - cron: 7 */2 * * *  # At minute 7 past every 2nd hour
-jobs:
-  benchmark-linux:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on: ubuntu-latest # FIXME: change this back to self-hosted when ready
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/build-for-benchmarks"
-    - uses: "./.github/actions/perform-benchmarks"
-    - uses: "./.github/actions/post-benchmarks"
@@ -1,51 +0,0 @@
-name: Post clang-tidy PR comment
-on:
-  workflow_run:
-    workflows: ["clang-tidy"]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  comment:
-    if: github.event.workflow_run.event == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout scripts
-      uses: actions/checkout@v4
-      with:
-        sparse-checkout: .github/scripts
-        sparse-checkout-cone-mode: true
-
-    - name: Download clang-tidy results
-      id: download
-      uses: actions/download-artifact@v4.1.3
-      with:
-        name: clang-tidy-result
-        run-id: ${{ github.event.workflow_run.id }}
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-      continue-on-error: true
-
-    - name: Post or update PR comment
-      if: steps.download.outcome == 'success'
-      uses: actions/github-script@v7
-      with:
-        script: |
-          const fs = require('fs');
-          if (!fs.existsSync('clang-tidy-comment.md') || !fs.existsSync('pr_number.txt')) {
-            core.info('No clang-tidy results found; skipping.');
-            return;
-          }
-          const body = fs.readFileSync('clang-tidy-comment.md', 'utf8');
-          const prNumber = parseInt(fs.readFileSync('pr_number.txt', 'utf8').trim());
-          const post = require('./.github/scripts/post-pr-comment.js');
-
-          await post({
-            github,
-            context,
-            core,
-            prNumber,
-            body,
-            marker: '<!-- clang-tidy-bot -->',
-          });
@@ -1,74 +0,0 @@
-name: clang-tidy
-on:
-  push:
-  pull_request:
-
-permissions: {}
-
-jobs:
-  clang-tidy:
-    if: github.repository_owner == 'facebook'
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.1
-    steps:
-    - uses: actions/checkout@v4.1.0
-      with:
-        fetch-depth: 2
-    - name: Mark workspace as safe for git
-      run: git config --global --add safe.directory $GITHUB_WORKSPACE
-    - name: Determine diff base
-      id: diff-base
-      run: |
-        if [ "${{ github.event_name }}" = "pull_request" ]; then
-          BASE="${{ github.event.pull_request.base.sha }}"
-          git fetch --depth=1 origin "$BASE"
-        else
-          BASE="${{ github.event.before }}"
-          if echo "$BASE" | grep -q '^0\{40\}$'; then
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            echo "New branch push; skipping clang-tidy."
-            exit 0
-          fi
-        fi
-        echo "ref=$BASE" >> "$GITHUB_OUTPUT"
-        echo "skip=false" >> "$GITHUB_OUTPUT"
-    - name: Install clang-tidy
-      if: steps.diff-base.outputs.skip != 'true'
-      run: apt-get update && apt-get install -y clang-tidy-21 && ln -sf /usr/bin/clang-tidy-21 /usr/local/bin/clang-tidy
-    - name: Generate compile_commands.json
-      if: steps.diff-base.outputs.skip != 'true'
-      run: |
-        mkdir build && cd build
-        cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-              -DCMAKE_C_COMPILER=clang-21 \
-              -DCMAKE_CXX_COMPILER=clang++-21 ..
-        cd ..
-        ln -sf build/compile_commands.json compile_commands.json
-    - name: Run clang-tidy on changed files
-      id: clang-tidy
-      if: steps.diff-base.outputs.skip != 'true'
-      run: |
-        python3 tools/run_clang_tidy.py \
-          -j 4 \
-          --diff-base ${{ steps.diff-base.outputs.ref }} \
-          --github-annotations \
-          --github-step-summary \
-          --comment-output clang-tidy-comment.md
-      continue-on-error: true
-    - name: Save PR number
-      if: github.event_name == 'pull_request' && always()
-      run: echo "${{ github.event.pull_request.number }}" > pr_number.txt
-    - name: Upload clang-tidy results
-      if: always()
-      uses: actions/upload-artifact@v4.0.0
-      with:
-        name: clang-tidy-result
-        path: |
-          clang-tidy-comment.md
-          pr_number.txt
-        if-no-files-found: ignore
-    - name: Fail if clang-tidy found issues
-      if: steps.clang-tidy.outcome == 'failure'
-      run: exit 1
@@ -1,25 +0,0 @@
-# Claude Code Review — Comment Posting Workflow
-#
-# Thin wrapper around .github/workflows/ai-review-comment.yml so the provider
-# specific workflow name stays stable while the shared implementation lives in
-# one reusable workflow.
-
-name: Post Claude Review Comment
-
-on:
-  workflow_run:
-    workflows: ["Claude Code Review"]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-  issues: write
-
-jobs:
-  review-comment:
-    uses: ./.github/workflows/ai-review-comment.yml
-    with:
-      provider: claude
-      result_artifact_name: claude-review-result
-      comment_file: claude-review-comment.md
-    secrets: inherit
@@ -1,69 +0,0 @@
-# Claude Code Review — Analysis Workflow
-#
-# Thin wrapper around .github/workflows/ai-review-analysis.yml so provider
-# specific triggers and workflow_dispatch inputs stay stable while the shared
-# implementation lives in one reusable workflow.
-
-name: Claude Code Review
-
-on:
-  workflow_run:
-    workflows: ["facebook/rocksdb/pr-jobs"]
-    types: [completed]
-
-  # The early pull_request_target path is limited to same-repo PRs by the job
-  # condition below. Fork PRs skip this path and rely on workflow_run instead.
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-
-  issue_comment:
-    types: [created]
-
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: PR number to review
-        required: true
-        type: number
-      model:
-        description: Claude model to use (defaults to latest Opus)
-        required: false
-        type: choice
-        options:
-          - claude-opus-4-6
-          - claude-sonnet-4-6
-        default: claude-opus-4-6
-      thinking_budget:
-        description: Override MAX_THINKING_TOKENS (blank = auto-classify, capped at 24000)
-        required: false
-        type: string
-        default: ""
-
-permissions:
-  contents: read
-  # The shared analysis workflow polls check state, inspects prior runs, and
-  # reads PR metadata. Keep those permissions read-only in the caller.
-  actions: read
-  checks: read
-  pull-requests: read
-
-jobs:
-  review:
-    if: >-
-      github.event_name != 'pull_request_target' ||
-      github.event.pull_request.head.repo.full_name == github.repository
-    uses: ./.github/workflows/ai-review-analysis.yml
-    with:
-      provider: claude
-      display_name: Claude
-      review_command: /claude-review
-      query_command: /claude-query
-      result_artifact_name: claude-review-result
-      comment_file: claude-review-comment.md
-      default_model: claude-opus-4-6
-      selected_model: ${{ github.event_name == 'workflow_dispatch' && inputs.model || '' }}
-      classifier_model: claude-sonnet-4-6
-      recovery_model: claude-sonnet-4-6
-      thinking_budget: ${{ github.event_name == 'workflow_dispatch' && inputs.thinking_budget || '' }}
-      dispatch_pr_number: ${{ github.event_name == 'workflow_dispatch' && inputs.pr_number || '' }}
-    secrets: inherit
@@ -1,25 +0,0 @@
-# Codex Code Review — Comment Posting Workflow
-#
-# Thin wrapper around .github/workflows/ai-review-comment.yml so the provider
-# specific workflow name stays stable while the shared implementation lives in
-# one reusable workflow.
-
-name: Post Codex Review Comment
-
-on:
-  workflow_run:
-    workflows: ["Codex Code Review"]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-  issues: write
-
-jobs:
-  review-comment:
-    uses: ./.github/workflows/ai-review-comment.yml
-    with:
-      provider: codex
-      result_artifact_name: codex-review-result
-      comment_file: codex-review-comment.md
-    secrets: inherit
@@ -1,68 +0,0 @@
-# Codex Code Review — Analysis Workflow
-#
-# Thin wrapper around .github/workflows/ai-review-analysis.yml so provider
-# specific triggers and workflow_dispatch inputs stay stable while the shared
-# implementation lives in one reusable workflow.
-
-name: Codex Code Review
-
-on:
-  workflow_run:
-    workflows: ["facebook/rocksdb/pr-jobs"]
-    types: [completed]
-
-  # The early pull_request_target path is limited to same-repo PRs by the job
-  # condition below. Fork PRs skip this path and rely on workflow_run instead.
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-
-  issue_comment:
-    types: [created]
-
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: PR number to review
-        required: true
-        type: number
-      model:
-        description: Codex model to use
-        required: false
-        type: choice
-        options:
-          - gpt-5.5
-          - gpt-5.3-codex
-          - gpt-5.2-codex
-        default: gpt-5.5
-      thinking_budget:
-        description: Override MAX_THINKING_TOKENS (blank = auto-classify)
-        required: false
-        type: string
-        default: ""
-
-permissions:
-  contents: read
-  # The shared analysis workflow polls check state, inspects prior runs, and
-  # reads PR metadata. Keep those permissions read-only in the caller.
-  actions: read
-  checks: read
-  pull-requests: read
-
-jobs:
-  review:
-    if: >-
-      github.event_name != 'pull_request_target' ||
-      github.event.pull_request.head.repo.full_name == github.repository
-    uses: ./.github/workflows/ai-review-analysis.yml
-    with:
-      provider: codex
-      display_name: Codex
-      review_command: /codex-review
-      query_command: /codex-query
-      result_artifact_name: codex-review-result
-      comment_file: codex-review-comment.md
-      default_model: gpt-5.5
-      selected_model: ${{ github.event_name == 'workflow_dispatch' && inputs.model || '' }}
-      thinking_budget: ${{ github.event_name == 'workflow_dispatch' && inputs.thinking_budget || '' }}
-      dispatch_pr_number: ${{ github.event_name == 'workflow_dispatch' && inputs.pr_number || '' }}
-    secrets: inherit
@@ -1,19 +0,0 @@
-name: facebook/rocksdb/nightly
-on: workflow_dispatch
-permissions: {}
-jobs:
-  # These jobs would be in nightly but are failing or otherwise broken for
-  # some reason.
-  build-linux-arm-test-full:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: arm64large
-    container:
-      image: ubuntu-2004:202111-02
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/install-gflags"
-    - run: make V=1 J=4 -j4 check
-    - uses: "./.github/actions/post-steps"
@@ -1,190 +0,0 @@
-name: facebook/rocksdb/nightly
-on:
-  schedule:
-  - cron: 0 9 * * *
-  workflow_dispatch:
-permissions: {}
-jobs:
-  build-format-compatible:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-      with:
-        fetch-depth: 0 # Need full repo history
-        fetch-tags: true
-    - uses: "./.github/actions/setup-upstream"
-    - uses: "./.github/actions/pre-steps"
-    - name: test
-      run: |-
-        export TEST_TMPDIR=/dev/shm/rocksdb
-        rm -rf /dev/shm/rocksdb
-        mkdir /dev/shm/rocksdb
-        git config --global --add safe.directory /__w/rocksdb/rocksdb
-        tools/check_format_compatible.sh
-    - uses: "./.github/actions/post-steps"
-  build-linux-non-shm:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    env:
-      TEST_TMPDIR: "/tmp/rocksdb_test_tmp"
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - run: make V=1 -j32 check
-    - uses: "./.github/actions/post-steps"
-  build-linux-clang-21-asan-ubsan-with-folly:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.1
-      options: --shm-size=16gb
-    env:
-      CC: clang-21
-      CXX: clang++-21
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - name: Build folly and dependencies
-      run: |
-        clean_path=()
-        IFS=: read -ra path_entries <<< "$PATH"
-        for entry in "${path_entries[@]}"; do
-          if [[ "$entry" != "/usr/lib/ccache" ]]; then
-            clean_path+=("$entry")
-          fi
-        done
-        export PATH="$(IFS=:; echo "${clean_path[*]}")"
-        ccache_bin="$(command -v ccache || true)"
-        if [[ -n "$ccache_bin" && -x "$ccache_bin" ]]; then
-          mv "$ccache_bin" "${ccache_bin}.disabled"
-        fi
-        export CC=gcc
-        export CXX=g++
-        export USE_CCACHE=0
-        export CCACHE_DISABLE=1
-        make build_folly
-      shell: bash
-    - run: LIB_MODE=static USE_CLANG=1 USE_FOLLY=1 COMPILE_WITH_UBSAN=1 COMPILE_WITH_ASAN=1 make -j32 check
-    - uses: "./.github/actions/post-steps"
-  build-linux-cmake-with-folly:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - uses: "./.github/actions/cache-folly"
-      id: cache-folly
-    - uses: "./.github/actions/build-folly"
-      with:
-        cache-hit: ${{ steps.cache-folly.outputs.cache-hit }}
-    - run: "(mkdir build && cd build && cmake -DUSE_FOLLY=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 .. && make VERBOSE=1 -j20 && ctest -j20)"
-    - uses: "./.github/actions/post-steps"
-  build-linux-release-with-folly:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - run: "DEBUG_LEVEL=0 make -j20 build_folly"
-    - run: "USE_FOLLY=1 LIB_MODE=static DEBUG_LEVEL=0 V=1 make -j20 release"
-    - run: "(mkdir build && cd build && cmake -DUSE_FOLLY=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j20 && ctest -j20)"
-    - uses: "./.github/actions/post-steps"
-  build-windows-vs2022-avx2:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on: windows-2022
-    env:
-      CMAKE_GENERATOR: Visual Studio 17 2022
-      CMAKE_PORTABLE: AVX2
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/windows-build-steps"
-  build-linux-arm-test-full:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 4-core-ubuntu-arm
-    steps:
-      - uses: actions/checkout@v4.1.0
-      - uses: "./.github/actions/pre-steps"
-      - run: sudo apt-get update && sudo apt-get install -y build-essential libgflags-dev
-      - run: make V=1 J=4 -j4 check
-      - uses: "./.github/actions/post-steps"
-  build-linux-arm-crashtest:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 4-core-ubuntu-arm
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - run: sudo apt-get update && sudo apt-get install -y build-essential libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
-    - run: sudo mount -o remount,size=16G /dev/shm
-    - run: sudo dd bs=1048576 count=4096 if=/dev/zero of=/swapfile && sudo chmod 600 /swapfile && sudo mkswap /swapfile && sudo swapon /swapfile
-    - run: ulimit -S -n `ulimit -H -n` && make V=1 -j8 CRASH_TEST_EXT_ARGS='--duration=1800 --max_key=2500000' blackbox_crash_test_with_atomic_flush
-    - run: rm -rf /dev/shm/rocksdb.*
-    - run: ulimit -S -n `ulimit -H -n` && make V=1 -j8 CRASH_TEST_EXT_ARGS='--duration=1800 --max_key=2500000' blackbox_crash_test_with_multiops_wc_txn
-    - uses: "./.github/actions/post-steps"
-  build-examples:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - name: Build examples
-      run: make V=1 -j4 static_lib && cd examples && make V=1 -j4
-    - uses: "./.github/actions/post-steps"
-  build-fuzzers:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - name: Build rocksdb lib
-      run: CC=clang-21 CXX=clang++-21 USE_CLANG=1 make -j4 static_lib
-    - name: Build fuzzers
-      run: cd fuzz && make sst_file_writer_fuzzer db_fuzzer db_map_fuzzer
-    - uses: "./.github/actions/post-steps"
-  build-linux-cmake-with-folly-lite:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - run: "(mkdir build && cd build && cmake -DUSE_FOLLY_LITE=1 -DWITH_GFLAGS=1 -DCMAKE_CXX_FLAGS=-DGLOG_USE_GLOG_EXPORT .. && make VERBOSE=1 -j20 && ctest -j20)"
-    - uses: "./.github/actions/post-steps"
@@ -1,47 +0,0 @@
-name: facebook/rocksdb/pr-jobs-candidate
-on: workflow_dispatch
-permissions: {}
-jobs:
-  # These jobs would be in pr-jobs but are failing or otherwise broken for
-  # some reason.
-  # =========================== ARM Jobs ============================ #
-  build-linux-arm:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: arm64large # GitHub hosted ARM runners do not yet exist
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/install-gflags"
-    - run: ROCKSDBTESTS_PLATFORM_DEPENDENT=only make V=1 J=4 -j4 all_but_some_tests check_some
-    - uses: "./.github/actions/post-steps"
-  build-linux-arm-cmake-no_test_run:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: arm64large # GitHub hosted ARM runners do not yet exist
-    env:
-      JAVA_HOME: "/usr/lib/jvm/java-8-openjdk-arm64"
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/install-gflags"
-    - name: Set Java Environment
-      run: |-
-        echo "JAVA_HOME=${JAVA_HOME}"
-        echo 'export PATH=$JAVA_HOME/bin:$PATH' >> $BASH_ENV
-        which java && java -version
-        which javac && javac -version
-    - name: Build with cmake
-      run: |-
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=0 -DWITH_GFLAGS=1 -DWITH_BENCHMARK_TOOLS=0 -DWITH_TOOLS=0 -DWITH_CORE_TOOLS=1 ..
-        make -j4
-    - name: Build Java with cmake
-      run: |-
-        rm -rf build
-        mkdir build
-        cd build
-        cmake -DJNI=1 -DCMAKE_BUILD_TYPE=Release -DWITH_GFLAGS=1 ..
-        make -j4 rocksdb rocksdbjni
-    - uses: "./.github/actions/post-steps"
@@ -1,727 +0,0 @@
-name: facebook/rocksdb/pr-jobs
-on: [push, pull_request]
-permissions: {}
-env:
-  # Set to a job name to run only that job (on any repo), or leave empty for
-  # normal behavior (all jobs on facebook repo only).
-  ONLY_JOB: ''
-jobs:
-  config:
-    runs-on: ubuntu-latest
-    outputs:
-      only_job: ${{ steps.set.outputs.only_job }}
-    steps:
-    - id: set
-      run: echo "only_job=$ONLY_JOB" >> "$GITHUB_OUTPUT"
-  # NOTE: multiple workflows would be recommended, but the current GHA UI in
-  # PRs doesn't make it clear when there's an overall error with a workflow,
-  # making it easy to overlook something broken. Grouping everything into one
-  # workflow minimizes the problem because it will be suspicious if there are
-  # no GHA results.
-  #
-  # The if: ${{ github.repository_owner == 'facebook' }} lines prevent the
-  # jobs from attempting to run on repo forks, because of a few problems:
-  # * runs-on labels are repository (owner) specific, so the job might wait
-  # for days waiting for a runner that simply isn't available.
-  # * Pushes to branches on forks for pull requests (the normal process) would
-  # run the workflow jobs twice: once in the pull-from fork and once for the PR
-  # destination repo. This is wasteful and dumb.
-  # * It is not known how to avoid copy-pasting the line to each job,
-  # increasing the risk of misconfiguration, especially on forks that might
-  # want to run with this GHA setup.
-  #
-  # SELECTIVE JOB EXECUTION: Set the ONLY_JOB env var at the top of this file
-  # to a job name (e.g. "build-linux-clang-tidy") to run only that job,
-  # bypassing the repository owner check. Leave it empty for normal behavior.
-  #
-  # DEBUGGING WITH SSH: Temporarily add this as a job step, either before the
-  # step of interest without the "if:" line or after the failing step with the
-  # "if:" line. Then use ssh command printed in CI output.
-  #  - name: Setup tmate session # TEMPORARY!
-  #    if: ${{ failure() }}
-  #    uses: mxschmitt/action-tmate@v3
-  #    with:
-  #      limit-access-to-actor: true
-
-  # ======================== Fast Initial Checks ====================== #
-  check-format-and-targets:
-    if: needs.config.outputs.only_job == 'check-format-and-targets' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@v4.1.0
-      with:
-        fetch-depth: 0 # Need full checkout to determine merge base
-        fetch-tags: true
-    - uses: "./.github/actions/setup-upstream"
-    - name: Setup Python
-      uses: actions/setup-python@v5
-    - name: Install Dependencies
-      run: python -m pip install --upgrade pip
-    - name: Install argparse
-      run: pip install argparse
-    - name: Install clang-format
-      run: |
-        pip install https://files.pythonhosted.org/packages/fb/ac/3c04772acc0257f5730e83adb542b2603c1a62d1315010ab593a980af404/clang_format-21.1.2-py2.py3-none-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl
-        clang-format --version
-    - name: Download clang-format-diff.py
-      run: wget https://rocksdb-deps.s3.us-west-2.amazonaws.com/llvm/llvm-project/release/12.x/clang/tools/clang-format/clang-format-diff.py
-    - name: Check format
-      run: VERBOSE_CHECK=1 make check-format
-    - name: Compare buckify output
-      run: make check-buck-targets
-    - name: Simple source code checks
-      run: make check-sources
-    - name: Validate GitHub Actions YAML
-      run: make check-workflow-yaml
-    - name: Sanity check check_format_compatible.sh
-      run: |-
-        export TEST_TMPDIR=/dev/shm/rocksdb
-        rm -rf /dev/shm/rocksdb
-        mkdir /dev/shm/rocksdb
-        git reset --hard
-        git config --global --add safe.directory /__w/rocksdb/rocksdb
-        SANITY_CHECK=1 LONG_TEST=1 tools/check_format_compatible.sh
-  # ========================= Linux With Tests ======================== #
-  build-linux:
-    if: needs.config.outputs.only_job == 'build-linux' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: build-linux
-    - run: make V=1 J=32 -j32 check
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-cmake-mingw:
-    if: needs.config.outputs.only_job == 'build-linux-cmake-mingw' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: cmake-mingw
-    - run: update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
-    - name: Build cmake-mingw
-      run: |-
-        export PATH=$JAVA_HOME/bin:$PATH
-        echo "JAVA_HOME=${JAVA_HOME}"
-        which java && java -version
-        which javac && javac -version
-        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
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-make-with-folly:
-    if: needs.config.outputs.only_job == 'build-linux-make-with-folly' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 32-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: make-with-folly
-    - uses: "./.github/actions/cache-folly"
-      id: cache-folly
-    - uses: "./.github/actions/build-folly"
-      with:
-        cache-hit: ${{ steps.cache-folly.outputs.cache-hit }}
-    - run: USE_FOLLY=1 LIB_MODE=static V=1 make -j64 check
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-make-with-folly-lite-no-test:
-    if: needs.config.outputs.only_job == 'build-linux-make-with-folly-lite-no-test' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: make-folly-lite
-    - run: USE_FOLLY_LITE=1 EXTRA_CXXFLAGS=-DGLOG_USE_GLOG_EXPORT V=1 make -j32 all
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-cmake-with-folly-coroutines:
-    if: needs.config.outputs.only_job == 'build-linux-cmake-with-folly-coroutines' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 32-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: cmake-folly-coroutines
-    - uses: "./.github/actions/cache-folly"
-      id: cache-folly
-    - uses: "./.github/actions/build-folly"
-      with:
-        cache-hit: ${{ steps.cache-folly.outputs.cache-hit }}
-    - run: "(mkdir build && cd build && cmake -DUSE_COROUTINES=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 -DPORTABLE=ON .. && make VERBOSE=1 -j64 && ctest -j64)"
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-cmake-with-benchmark-no-thread-status:
-    if: needs.config.outputs.only_job == 'build-linux-cmake-with-benchmark-no-thread-status' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 16-core-ubuntu
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [0, 1, 2, 3]
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: cmake-benchmark
-    - name: Build
-      run: mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 -DPORTABLE=ON -DCMAKE_CXX_FLAGS=-DNROCKSDB_THREAD_STATUS .. && make VERBOSE=1 -j20
-    - name: Test shard ${{ matrix.shard }} of 4
-      run: cd build && ctest -j20 -I ${{ matrix.shard }},,4
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-      with:
-        artifact-prefix: "${{ github.job }}-shard${{ matrix.shard }}"
-  build-linux-encrypted_env-no_compression:
-    if: needs.config.outputs.only_job == 'build-linux-encrypted_env-no_compression' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: encrypted-env-no-compression
-    - run: ENCRYPTED_ENV=1 ROCKSDB_DISABLE_SNAPPY=1 ROCKSDB_DISABLE_ZLIB=1 ROCKSDB_DISABLE_BZIP=1 ROCKSDB_DISABLE_LZ4=1 ROCKSDB_DISABLE_ZSTD=1 make V=1 J=32 -j32 check
-    - run: "./sst_dump --help | grep -E -q 'Supported built-in compression types: kNoCompression$' # Verify no compiled in compression\n"
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  # ======================== Linux No Test Runs ======================= #
-  build-linux-release:
-    if: needs.config.outputs.only_job == 'build-linux-release' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: release
-    - run: make V=1 -j32 LIB_MODE=shared release
-    - run: ls librocksdb.so
-    - run: "./trace_analyzer --version" # A tool dependent on gflags that can run in release build
-    - run: make clean
-    - run: USE_RTTI=1 make V=1 -j32 release
-    - run: ls librocksdb.a
-    - run: "./trace_analyzer --version"
-    - run: make clean
-    - run: apt-get remove -y libgflags-dev
-    - run: make V=1 -j32 LIB_MODE=shared release
-    - run: ls librocksdb.so
-    - run: if ./trace_analyzer --version; then false; else true; fi
-    - run: make clean
-    - run: USE_RTTI=1 make V=1 -j32 release
-    - run: ls librocksdb.a
-    - run: if ./trace_analyzer --version; then false; else true; fi
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-clang-13-no_test_run:
-    if: needs.config.outputs.only_job == 'build-linux-clang-13-no_test_run' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 8-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: clang-13
-    # FIXME: get back to "all microbench" targets
-    - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 EXTRA_CXXFLAGS=-stdlib=libc++ EXTRA_LDFLAGS=-stdlib=libc++ make -j32 shared_lib
-    - run: make clean
-    # FIXME: get back to "release" target
-    - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 EXTRA_CXXFLAGS=-stdlib=libc++ EXTRA_LDFLAGS=-stdlib=libc++ DEBUG_LEVEL=0 make -j32 shared_lib
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-clang-21-no_test_run:
-    if: needs.config.outputs.only_job == 'build-linux-clang-21-no_test_run' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: clang-21
-    - run: CC=clang-21 CXX=clang++-21 USE_CLANG=1 make -j32 all microbench
-    - run: make clean
-    - run: CC=clang-21 CXX=clang++-21 USE_CLANG=1 DEBUG_LEVEL=0 make -j32 release
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-gcc-14-no_test_run:
-    if: needs.config.outputs.only_job == 'build-linux-gcc-14-no_test_run' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: gcc-14
-    - run: CC=gcc-14 CXX=g++-14 V=1 make -j32 all microbench
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-
-  # ======================== Linux Other Checks ======================= #
-
-  build-linux-unity-and-headers:
-    if: needs.config.outputs.only_job == 'build-linux-unity-and-headers' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: gcc:latest
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - run: apt-get update -y && apt-get install -y libgflags-dev
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: unity-headers
-    - name: Unity build
-      run: make V=1 -j8 unity_test
-    - run: make V=1 -j8 -k check-headers
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-mini-crashtest:
-    if: needs.config.outputs.only_job == 'build-linux-mini-crashtest' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 4-core-ubuntu
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - crash_test_target: blackbox_crash_test_with_atomic_flush
-          crash_duration: 480
-        - crash_test_target: blackbox_crash_test
-          crash_duration: 240
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: mini-crashtest
-    - run: ulimit -S -n `ulimit -H -n` && make V=1 -j8 CRASH_TEST_EXT_ARGS='--duration=${{ matrix.crash_duration }} --max_key=2500000' ${{ matrix.crash_test_target }}
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-      with:
-        artifact-prefix: "${{ github.job }}-${{ matrix.crash_test_target }}"
-  # ======================= Linux with Sanitizers ===================== #
-  build-linux-clang21-asan-ubsan:
-    if: needs.config.outputs.only_job == 'build-linux-clang21-asan-ubsan' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 32-core-ubuntu
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [0, 1, 2]
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: clang21-asan-ubsan
-    - run: COMPILE_WITH_ASAN=1 COMPILE_WITH_UBSAN=1 CC=clang-21 CXX=clang++-21 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j40 check
-      env:
-        CI_SHARD_INDEX: ${{ matrix.shard }}
-        CI_TOTAL_SHARDS: 3
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-      with:
-        artifact-prefix: "${{ github.job }}-shard${{ matrix.shard }}"
-  build-linux-clang21-mini-tsan:
-    if: needs.config.outputs.only_job == 'build-linux-clang21-mini-tsan' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 32-core-ubuntu
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [0, 1, 2]
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: clang21-tsan
-    - run: COMPILE_WITH_TSAN=1 CC=clang-21 CXX=clang++-21 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check
-      env:
-        CI_SHARD_INDEX: ${{ matrix.shard }}
-        CI_TOTAL_SHARDS: 3
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-      with:
-        artifact-prefix: "${{ github.job }}-shard${{ matrix.shard }}"
-  build-linux-static_lib-alt_namespace-status_checked:
-    if: needs.config.outputs.only_job == 'build-linux-static_lib-alt_namespace-status_checked' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: static-alt-namespace
-    - run: ASSERT_STATUS_CHECKED=1 TEST_UINT128_COMPAT=1 ROCKSDB_MODIFY_NPHASH=1 LIB_MODE=static OPT="-DROCKSDB_USE_STD_SEMAPHORES -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" make V=1 -j24 check
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  # ========================= MacOS build only ======================== #
-  build-macos:
-    if: needs.config.outputs.only_job == 'build-macos' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
-    env:
-      ROCKSDB_DISABLE_JEMALLOC: 1
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: maxim-lobanov/setup-xcode@v1.6.0
-      with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos
-    - uses: "./.github/actions/increase-max-open-files-on-macos"
-    - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/pre-steps-macos"
-    - name: Build
-      run: ulimit -S -n `ulimit -H -n` && make V=1 J=16 -j8 all
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  # ========================= MacOS with Tests ======================== #
-  build-macos-cmake:
-    if: needs.config.outputs.only_job == 'build-macos-cmake' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
-    strategy:
-      matrix:
-        run_sharded_tests: [0, 1, 2, 3]
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: maxim-lobanov/setup-xcode@v1.6.0
-      with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos-cmake
-    - uses: "./.github/actions/increase-max-open-files-on-macos"
-    - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/pre-steps-macos"
-    - name: cmake generate project file
-      run: ulimit -S -n `ulimit -H -n` && mkdir build && cd build && cmake -DWITH_GFLAGS=1 ..
-    - name: Build tests
-      run: cd build && make VERBOSE=1 -j8
-    - name: Run shard 0 out of 4 test shards
-      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j8 -I 0,,4
-      if: ${{ matrix.run_sharded_tests == 0 }}
-    - name: Run shard 1 out of 4 test shards
-      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j8 -I 1,,4
-      if: ${{ matrix.run_sharded_tests == 1 }}
-    - name: Run shard 2 out of 4 test shards
-      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j8 -I 2,,4
-      if: ${{ matrix.run_sharded_tests == 2 }}
-    - name: Run shard 3 out of 4 test shards
-      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j8 -I 3,,4
-      if: ${{ matrix.run_sharded_tests == 3 }}
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  # ======================== Windows with Tests ======================= #
-  # NOTE: some windows jobs are in "nightly" to save resources
-  build-windows-vs2022:
-    if: needs.config.outputs.only_job == 'build-windows-vs2022' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: windows-8-core
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - test_shard: db_test
-          suite_run: db_test
-          run_java: "false"
-        - test_shard: other
-          suite_run: arena_test,db_basic_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
-          run_java: "false"
-        - test_shard: java
-          suite_run: ""
-          run_java: "true"
-    env:
-      CMAKE_GENERATOR: Visual Studio 17 2022
-      CMAKE_PORTABLE: 1
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/windows-build-steps"
-      with:
-        suite-run: ${{ matrix.suite_run }}
-        run-java: ${{ matrix.run_java }}
-  # ============================ Java Jobs ============================ #
-  build-linux-java:
-    if: needs.config.outputs.only_job == 'build-linux-java' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: java
-    - name: Set Java Environment
-      run: |-
-        echo "JAVA_HOME=${JAVA_HOME}"
-        which java && java -version
-        which javac && javac -version
-    - name: Test RocksDBJava
-      run: make V=1 J=8 -j8 jtest
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-  build-linux-java-static:
-    if: needs.config.outputs.only_job == 'build-linux-java-static' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: java-static
-    - name: Set Java Environment
-      run: |-
-        echo "JAVA_HOME=${JAVA_HOME}"
-        which java && java -version
-        which javac && javac -version
-    - name: Build RocksDBJava Static Library
-      run: make V=1 J=8 -j8 rocksdbjavastatic
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-  build-macos-java:
-    if: needs.config.outputs.only_job == 'build-macos-java' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
-    env:
-      JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
-      ROCKSDB_DISABLE_JEMALLOC: 1
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: maxim-lobanov/setup-xcode@v1.6.0
-      with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos-java
-    - uses: "./.github/actions/increase-max-open-files-on-macos"
-    - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/install-jdk8-on-macos"
-    - uses: "./.github/actions/pre-steps-macos"
-    - name: Set Java Environment
-      run: |-
-        echo "JAVA_HOME=${JAVA_HOME}"
-        which java && java -version
-        which javac && javac -version
-    - name: Test RocksDBJava
-      run: make V=1 J=16 -j16 jtest
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-macos-java-static:
-    if: needs.config.outputs.only_job == 'build-macos-java-static' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
-    env:
-      JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: maxim-lobanov/setup-xcode@v1.6.0
-      with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos-java-static
-    - uses: "./.github/actions/increase-max-open-files-on-macos"
-    - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/install-jdk8-on-macos"
-    - uses: "./.github/actions/pre-steps-macos"
-    - name: Set Java Environment
-      run: |-
-        echo "JAVA_HOME=${JAVA_HOME}"
-        which java && java -version
-        which javac && javac -version
-    - name: Build RocksDBJava x86 and ARM Static Libraries
-      run: make V=1 J=16 -j16 rocksdbjavastaticosx
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-macos-java-static-universal:
-    if: needs.config.outputs.only_job == 'build-macos-java-static-universal' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
-    env:
-      JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: maxim-lobanov/setup-xcode@v1.6.0
-      with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos-java-static-universal
-    - uses: "./.github/actions/increase-max-open-files-on-macos"
-    - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/install-jdk8-on-macos"
-    - uses: "./.github/actions/pre-steps-macos"
-    - name: Set Java Environment
-      run: |-
-        echo "JAVA_HOME=${JAVA_HOME}"
-        which java && java -version
-        which javac && javac -version
-    - name: Build RocksDBJava Universal Binary Static Library
-      run: make V=1 J=16 -j16 rocksdbjavastaticosx_ub
-    - uses: "./.github/actions/teardown-ccache"
-      if: always()
-    - uses: "./.github/actions/post-steps"
-  build-linux-java-pmd:
-    if: needs.config.outputs.only_job == 'build-linux-java-pmd' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: evolvedbinary/rocksjava:alpine3_x64-be
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/install-maven"
-    - uses: "./.github/actions/pre-steps"
-    - name: Set Java Environment
-      run: |-
-        echo "JAVA_HOME=${JAVA_HOME}"
-        which java && java -version
-        which javac && javac -version
-    - name: PMD RocksDBJava
-      run: make V=1 J=8 -j8 jpmd
-    - uses: actions/upload-artifact@v4.0.0
-      with:
-        name: pmd-report
-        path: "${{ github.workspace }}/java/target/pmd.xml"
-    - uses: actions/upload-artifact@v4.0.0
-      with:
-        name: maven-site
-        path: "${{ github.workspace }}/java/target/site"
-  build-linux-arm:
-    if: needs.config.outputs.only_job == 'build-linux-arm' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 4-core-ubuntu-arm
-    steps:
-      - uses: actions/checkout@v4.1.0
-      - uses: "./.github/actions/pre-steps"
-      - run: sudo apt-get update && sudo apt-get install -y build-essential ccache
-      - uses: "./.github/actions/setup-ccache"
-        with:
-          cache-key-prefix: arm
-      - run: ROCKSDBTESTS_PLATFORM_DEPENDENT=only make V=1 J=4 -j4 all_but_some_tests check_some
-      - name: Print ccache stats
-        run: ccache -s
-        if: always()
-        shell: bash
-      - uses: "./.github/actions/post-steps"
@@ -0,0 +1,44 @@
+name: Check buck targets and code format
+on: [push, pull_request]
+jobs:
+  check:
+    name: Check TARGETS file and code format
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout feature branch
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Fetch from upstream
+      run: |
+        git remote add upstream https://github.com/facebook/rocksdb.git && git fetch upstream
+
+    - name: Where am I
+      run: |
+        echo git status && git status
+        echo "git remote -v" && git remote -v
+        echo git branch && git branch
+
+    - name: Setup Python
+      uses: actions/setup-python@v1
+
+    - name: Install Dependencies
+      run: python -m pip install --upgrade pip
+
+    - name: Install argparse
+      run: pip install argparse
+
+    - name: Download clang-format-diff.py
+      uses: wei/wget@v1
+      with:
+        args: https://raw.githubusercontent.com/llvm/llvm-project/release/12.x/clang/tools/clang-format/clang-format-diff.py
+
+    - name: Check format
+      run: VERBOSE_CHECK=1 make check-format
+
+    - name: Compare buckify output
+      run: make check-buck-targets
+
+    - name: Simple source code checks
+      run: make check-sources
@@ -1,20 +0,0 @@
-name: facebook/rocksdb/weekly
-on:
-  schedule:
-  - cron: 0 9 * * 0
-  workflow_dispatch:
-permissions: {}
-jobs:
-  build-linux-valgrind:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    timeout-minutes: 840
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - run: make V=1 -j20 valgrind_test
-    - uses: "./.github/actions/post-steps"
@@ -47,9 +47,6 @@ package/
 unity.a
 tags
 etags
-GPATH
-GRTAGS
-GTAGS
 rocksdb_dump
 rocksdb_undump
 db_test2
@@ -59,7 +56,6 @@ io_tracer_parser
 .DS_Store
 .vs
 .vscode
-.clangd

 java/out
 java/target
@@ -88,10 +84,8 @@ fbcode/
 fbcode
 buckifier/*.pyc
 buckifier/__pycache__
-.arcconfig

 compile_commands.json
-meta_gen_cpp_compile_commands.json
 clang-format-diff.py
 .py3/

@@ -100,13 +94,3 @@ fuzz/crash-*

 cmake-build-*
 third-party/folly/
-.cache
-*.sublime-*
-
-# Claude Code local settings
-.claude/settings.local.json
-
-tools/__pycache__/
-# Keep documentation trackable even if broader ignores match names like "*_test".
-!docs/
-!docs/**
@@ -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
@@ -1,9 +0,0 @@
-# Agent Instructions
-
-This repository's authoritative agent instructions live in `CLAUDE.md`.
-
-Read and follow [`CLAUDE.md`](./CLAUDE.md) in full before making changes or
-reviewing code in this checkout.
-
-If there is any ambiguity between this file and `CLAUDE.md`, `CLAUDE.md` takes
-precedence.
@@ -1,331 +0,0 @@
-# RocksDB Code Generation and Review Guidance
-
-This document provides guidance for generating and reviewing code in the RocksDB project, derived from analysis of code review feedback across hundreds of complex merged Pull Requests. Use this as a reference when writing code with AI assistants or conducting code reviews.
-
---
-
-## General Best Practices
-
-### Code Quality and Maintainability
-
-**Clarity and Readability:** Write clear, self-documenting code. Use meaningful variable names, add comments for complex logic, and structure code to minimize cognitive load. Avoid clever tricks that sacrifice readability for marginal performance gains unless absolutely necessary.
-
-**Consistent Style:** Follow existing code style conventions. RocksDB uses `.clang-format` for formatting, specific naming conventions, and structural patterns. Deviations from these patterns are frequently flagged in reviews.
-
-**Error Handling:** Ensure robust error handling throughout the codebase. Use RocksDB's `Status` type consistently, propagate errors appropriately, and avoid silently ignoring failures. Reviewers pay close attention to edge cases and failure modes.
-
-### Testing Philosophy
-
-**Comprehensive Coverage:** Every change should include appropriate test coverage. This includes unit tests for isolated functionality, integration tests for component interactions, and stress tests for concurrency and performance validation. Reviewers will ask for additional tests if coverage is insufficient.
-
-**Edge Cases and Failure Modes:** Tests should explicitly cover edge cases, boundary conditions, and potential failure scenarios. This is especially important for changes affecting core database operations, compaction, or recovery logic.
-
-**Platform-Specific Testing:** RocksDB supports multiple platforms (Linux, Windows, macOS) and compilers (GCC, Clang, MSVC). Changes should be tested across relevant platforms, particularly when touching platform-specific code or using compiler-specific features.
-
-### Performance Considerations
-
-**⚠️ PERFORMANCE IS CRITICAL:** RocksDB is a high-performance storage engine where every CPU cycle and memory access matters. When writing code, always evaluate from a performance perspective. This is not optional—performance-aware coding is a fundamental requirement for all contributions.
-
-**Benchmarking and Profiling:** Performance claims should be backed by empirical evidence. Use RocksDB's benchmarking tools (e.g., `db_bench`) to validate improvements. Reviewers will request benchmark results for changes that could impact performance.
-
-**Memory Allocation:** Minimize dynamic memory allocations, especially in hot paths. Prefer stack allocation over heap allocation. Reuse buffers when possible. Consider using arena allocators or memory pools for frequent small allocations. Every `new`, `malloc`, or container resize has a cost.
-
-**Memory Copy:** Avoid unnecessary memory copies. Use move semantics, `std::string_view`, `Slice`, and pass-by-reference where appropriate. Be aware of implicit copies in STL containers and function returns. Prefer in-place operations over copy-and-modify patterns.
-
-**CPU Cache Efficiency:** Design data structures and access patterns to be cache-friendly. Keep frequently accessed data together (data locality). Prefer sequential memory access over random access. Be mindful of cache line sizes (typically 64 bytes) and avoid false sharing in concurrent code. Consider struct packing and field ordering to improve cache utilization.
-
-**Loop Optimization:** Look for opportunities to collapse nested loops, reduce loop overhead, and minimize branch mispredictions. Hoist invariant computations out of loops. Consider loop unrolling for tight inner loops. Batch operations when possible to amortize per-operation overhead.
-
-**SIMD and Vectorization:** Leverage SIMD instructions (SSE, AVX) for data-parallel operations when appropriate. Structure data to enable auto-vectorization by the compiler. Consider explicit SIMD intrinsics for critical hot paths like checksum computation, encoding/decoding, and bulk data processing.
-
-**Branch Prediction:** Minimize unpredictable branches in hot paths. Use `LIKELY`/`UNLIKELY` macros to hint branch prediction. Consider branchless alternatives for simple conditionals. Order switch cases and if-else chains by frequency.
-
-**Memory and Resource Management:** Be mindful of memory allocations, especially in hot paths. Use RAII patterns, smart pointers, and RocksDB's memory management utilities appropriately.
-
-**Hot Path Analysis:** When deciding how aggressively to optimize code, consider whether it's on a hot path:
- **Hot path** (executed thousands+ times, e.g., data access, iteration, compaction loops): Performance is paramount. Apply all optimization techniques—loop collapsing, SIMD, cache optimization, pre-allocation, etc. The cost of each operation is multiplied by execution frequency.
- **Cold path** (executed rarely, e.g., DB open, configuration parsing, error handling): Maintainability and clarity are more important. Prefer readable code over micro-optimizations. Complex optimizations here add maintenance burden with negligible performance benefit.
- **Warm path** (moderate frequency): Balance both concerns. Use profiling data to guide optimization decisions.
-
-**Avoid Premature Optimization:** While performance is critical, focus on correctness first, then optimize based on profiling data. However, be performance-aware from the start—choosing the right algorithm and data structure upfront is not premature optimization. Use the hot path analysis above to decide how much optimization effort is warranted.
-
-### API Design and Compatibility
-
-**Backwards Compatibility:** RocksDB maintains strong backwards compatibility guarantees. Breaking changes are rare and require extensive justification. When deprecating features, follow the project's deprecation policy (typically spanning multiple releases).
-
-**API Consistency:** New APIs should be consistent with existing patterns. Use similar naming conventions, parameter ordering, and return types. Reviewers will suggest changes to improve consistency with the broader codebase.
-
-**Documentation:** Public APIs must be thoroughly documented. Include usage examples, parameter descriptions, and notes on thread safety, performance characteristics, and compatibility considerations.
-
---
-
-## Component-Specific Guidance
-
-### Database Core (`db`)
-
-The database core handles write-ahead logging (WAL), memtables, compaction, and recovery. This component receives the most scrutiny in code reviews.
-
-**Concurrency and Thread Safety:** Database operations are highly concurrent. Reviewers carefully examine locking strategies, atomic operations, and memory ordering. Document synchronization assumptions clearly. Use appropriate memory ordering semantics (`acquire`/`release` vs. `seq_cst`).
-
-**Compaction Logic:** Changes to compaction are complex and high-risk. Ensure that compaction logic respects configured parameters, handles edge cases (empty databases, single-file compactions), and maintains correctness under concurrent operations.
-
-**Error Propagation:** Database operations can fail in many ways (I/O errors, corruption, resource exhaustion). Ensure that errors are properly propagated, logged, and handled. Avoid assertions in production code paths.
-
-**Testing:** Database core changes require extensive testing, including unit tests, integration tests, and stress tests. Test with various configurations, compaction styles, and concurrent workloads.
-
-### Public Headers (`include`)
-
-Public headers define RocksDB's API surface. Changes here have the highest compatibility impact.
-
-**API Design:** New APIs should be intuitive, consistent with existing patterns, and well-documented. Consider how the API will be used in practice and avoid adding unnecessary complexity.
-
-**Backwards Compatibility:** Breaking changes to public APIs require extensive justification and a deprecation plan. Maintain ABI compatibility for bug fixes and patch releases.
-
-**Documentation:** Every public API must be thoroughly documented with usage examples, parameter descriptions, and notes on thread safety and performance characteristics.
-
-**Deprecation:** When deprecating APIs, follow the project's policy. Mark deprecated APIs clearly, provide migration guidance, and maintain support for at least one major release.
-
-### Internal Utilities (`util`)
-
-Internal utilities provide common functionality used throughout the codebase.
-
-**Code Reuse:** Utilities should be general-purpose and reusable. Avoid duplicating functionality that already exists elsewhere in the codebase.
-
-**Error Handling:** Utility functions should handle errors robustly and propagate them appropriately. Consider edge cases like overflow, underflow, and invalid inputs.
-
-**Testing:** Utility functions should have comprehensive test coverage, including edge cases and failure modes. Consider adding death tests for assertions.
-
-**Performance:** Utilities are often used in hot paths. Ensure that implementations are efficient and avoid unnecessary allocations or copies.
-
-### Table Management (`table`)
-
-Table management handles SST file format, block-based tables, and table readers/writers.
-
-**Block Format and Checksums:** Changes to block format require extreme care. Ensure that checksums are computed and verified correctly. Test with various compression algorithms and block sizes.
-
-**Iterator Correctness:** Table iterators are used throughout the codebase. Ensure that iterator semantics (Seek, Next, Prev) are correct, especially at boundaries and with deletions.
-
-**Caching and Prefetching:** Table readers interact with the block cache and prefetching logic. Ensure that cache keys are unique and that prefetching respects configured limits.
-
-**Performance:** Table operations are performance-critical. Benchmark changes that could impact read or write performance.
-
-### Utilities (`utilities`)
-
-Utilities include optional features like transactions, backup engine, and checkpoint.
-
-**Feature Isolation:** Utilities should be self-contained and not introduce unnecessary dependencies on core database internals.
-
-**Deprecation and Cleanup:** Legacy features are being phased out. When removing deprecated code, ensure that migration paths are documented and that users have sufficient warning.
-
-**Cross-Platform Compatibility:** Utilities often interact with OS-specific APIs. Ensure that code works on all supported platforms.
-
-### Options and Configuration (`options`)
-
-Options define RocksDB's configuration system.
-
-**Type Safety:** Use appropriate types for options (e.g., `uint32_t` for flags, scoped enums for enumerated values).
-
-**Deprecation Policy:** When deprecating options, follow the project's policy. Document the deprecation, provide migration guidance, and maintain support for at least one major release.
-
-**Dynamic Configuration:** Some options can be changed dynamically. Ensure that dynamic changes are thread-safe and take effect correctly.
-
-**Validation:** Validate option values and provide clear error messages for invalid configurations.
-
-### Cache (`cache`)
-
-Cache management is critical for RocksDB's performance.
-
-**Concurrency:** Cache operations are highly concurrent. Ensure that implementations are thread-safe and use appropriate synchronization primitives.
-
-**Performance:** Cache operations are in the hot path. Optimize for low latency and high throughput. Benchmark changes carefully.
-
-**Memory Management:** Cache implementations must manage memory carefully to avoid leaks and excessive allocations.
-
-**Eviction Policies:** Changes to eviction policies should be well-tested and benchmarked to ensure they improve overall performance.
-
---
-
-## Code Review Checklist
-
-When reviewing RocksDB code (or preparing code for review), use this checklist:
-
-### Correctness
- [ ] Does the change preserve database semantics (e.g., snapshot isolation, key ordering)?
- [ ] Are all error cases handled appropriately?
- [ ] Is the change thread-safe? Are synchronization primitives used correctly?
- [ ] Are there any potential data races or deadlocks?
-
-### Testing
- [ ] Does the change include appropriate test coverage?
- [ ] Are edge cases and failure modes tested?
- [ ] Have the tests been run on all supported platforms?
- [ ] Are stress tests passing?
-
-### Performance
- [ ] Are there benchmark results for performance-sensitive changes?
- [ ] Does the change avoid unnecessary allocations or copies?
- [ ] Are hot paths optimized appropriately?
-
-### API and Compatibility
- [ ] Is the change backwards compatible?
- [ ] Are new APIs consistent with existing patterns?
- [ ] Is the public API documented?
- [ ] Are deprecated features handled according to policy?
-
-### Code Quality
- [ ] Does the code follow RocksDB's style conventions?
- [ ] Is the code clear and maintainable?
- [ ] Are comments and documentation sufficient?
- [ ] Are there any code smells or anti-patterns?
-
---
-
-## Common Review Feedback Patterns
-
-The following patterns emerged as frequent sources of review feedback:
-
-1. **Test Coverage:** Reviewers frequently request additional tests for edge cases, platform-specific behavior, and failure modes. Complex changes require comprehensive test coverage including unit tests, integration tests, and stress tests.
-
-2. **Error Handling:** Ensure proper error propagation using RocksDB's `Status` type. Avoid silent failures and provide clear error messages that include context about what failed and why.
-
-3. **API Design:** New APIs should be consistent with existing patterns. Use descriptive names that follow established conventions. Avoid breaking changes without strong justification and a clear deprecation plan.
-
-4. **Documentation:** Public APIs must be documented with usage examples and notes on thread safety, performance characteristics, and compatibility considerations. Complex internal logic should also be well-commented.
-
-5. **Performance:** Performance-sensitive changes require benchmark results to validate improvements. Use `db_bench` and other profiling tools to measure impact. Avoid premature optimization that adds complexity without measurable benefit.
-
-6. **Concurrency:** Thread safety is critical in RocksDB. Document synchronization assumptions clearly. Use appropriate memory ordering semantics. Consider potential race conditions and deadlocks.
-
-7. **Code Style:** Follow existing conventions for naming, formatting, and structure. Use `.clang-format` for consistent formatting. Prefer scoped enums (`enum class`) over unscoped enums.
-
-8. **Backwards Compatibility:** RocksDB maintains strong compatibility guarantees. Breaking changes require extensive justification. When deprecating features, provide migration guidance and maintain support across multiple releases.
-
-9. **Refactoring:** Reviewers appreciate refactoring that improves code readability and maintainability. Look for opportunities to deduplicate code and simplify complex logic.
-
-10. **Platform Compatibility:** Ensure changes work correctly on all supported platforms (Linux, Windows, macOS) and with all supported compilers (GCC, Clang, MSVC).
-
---
-
-## Important tips
-
-### Build system
-* There are 3 build system. Make, CMake, BUCK(meta internal).
-* When a new .cc file is added, update Makefile, CMakeLists.txt, src.mk, BUCK.
-* Don't manually edit BUCK file, after updating src.mk, run
-    /usr/local/bin/python3 buckifier/buckify_rocksdb.py to update it
-* Use make to build and run the test. CMake and BUCK are not used locally.
-* Use `make dbg` command to build all of the unit test in debug mode.
-* For -j in make command, use the number of CPU cores to decide it.
-
-### Unit Test
-* After all of the unit tests are added, review them and try to extract common
-    reusable utility functions to reduce code duplication due to copy past between
-    unit tests. This should be done every time unit test is updated.
-* Don't use sleep to wait for certain events to happen. This will cause test to
-    be flaky. Instead, use sync point to synchronize thread progress.
-* Cap unit test execution with 60 seconds timeout.
-* When there are multiple unit tests need to be executed, try to use
-    gtest_parallel.py if available. E.g.
-    python3 ${GTEST_PARALLEL}/gtest_parallel.py ./table_test
-* After writing a test, stress-test for flakiness:
-    ```bash
-    COERCE_CONTEXT_SWITCH=1 make {test_binary}
-    ./{test_binary} --gtest_filter="*YourTestName*" --gtest_repeat=5
-    ```
-
-### Unit test dedup guidelines
-* Extract helper functions for repeated patterns such as object
-    construction, round-trip (encode → decode → verify), and common
-    assertion sequences.
-* Use table-driven tests (struct array + loop) when multiple test cases
-    share the same logic but differ only in input/expected data.
-* Prefer randomized tests over exhaustive parameter permutations. Use
-    `Random` from `util/random.h` (not `std::mt19937`). Use a time-based
-    seed with `SCOPED_TRACE("seed=" + std::to_string(seed))` so failures
-    are reproducible.
-* Keep deterministic edge-case tests separate from randomized tests
-    (error paths, boundary conditions, format verification).
-* Methods only used in tests should be private with `friend class` +
-    `TEST_F` fixture wrappers. In wrappers, always fully qualify the
-    target method to avoid infinite recursion.
-
-### Adding new public API
-    Refer to claude_md/add_public_api.md
-
-### Adding new option
-    Refer to claude_md/add_option.md
-
-### Removing deprecated option
-    Refer to claude_md/remove_option.md
-
-### Metrics
-* When adding a new feature, evaluate whether there is opportunity to add
-    metrics. Try to avoid causing performance regression on hot path when adding
-    metrics.
-
-### Stress test
-* When adding a new feature, make sure stress test covers the new option.
-
-### Component docs
-* For component-level design notes and implementation walkthroughs, start with
-    `docs/components/index.md`.
-* Documentation under `docs/components/` is organized by subsystem in
-    `docs/components/<area>/`.
-* Each subsystem directory should have an `index.md` entry point plus focused
-    chapter files for deeper topics.
-
-### DB bench update
-* When adding a performance related feature, support it in db_bench
-
-### Adding release note
-* Release note should be kept short at high level for external user consumption.
-
-### Blog posts (docs/_posts)
-* Blog post authors must be defined in `docs/_data/authors.yml` to be displayed
-
-### Final verification of the change
-* Execute make clean to clean all of the changes.
-* Execute make check to build all of the changes and execute all of the tests.
-    Note that executing all of the tests could take multiple minutes.
-* Run `ASSERT_STATUS_CHECKED=1 make check` to verify all Status objects are
-    properly checked. This catches missing error handling that can lead to
-    silent data corruption.
-
-### Monitoring make check progress
-* Use `make check-progress` to get machine-parseable JSON progress while
-    `make check` is running. This is useful for Claude Code to monitor long
-    builds without timeout issues.
-* Run `make check` in background, then poll progress:
-    ```bash
-    make check &
-    # Poll periodically:
-    make check-progress
-    ```
-* The output shows current phase and progress:
-    ```json
-    {"status":"running","phase":"compiling","completed":300,"total":919,...}
-    {"status":"running","phase":"testing","completed":1500,"total":29962,"failed":0,"percent":5,...}
-    {"status":"completed","phase":"testing","completed":29962,"total":29962,"failed":0,"percent":100,...}
-    ```
-* Phases: `compiling` -> `linking` -> `generating` -> `testing` -> `completed`
-* Key fields: `status`, `phase`, `completed`, `total`, `failed`, `percent`
-* When tests fail, `failed_tests` array shows details (up to 10 failures):
-    ```json
-    {"status":"running",...,"failed":3,"failed_tests":[
-      {"test":"cache_test-CacheTest.Usage","exit_code":1,"signal":0,"output":"...test log..."},
-      {"test":"env_test-EnvTest.Open","exit_code":0,"signal":11,"output":"...Segmentation fault..."}
-    ]}
-    ```
-* `exit_code`: non-zero means test assertion failed
-* `signal`: non-zero means test was killed (e.g., 9=SIGKILL, 6=SIGABRT, 11=SIGSEGV)
-* `output`: last 50 lines of test log including error messages and stack traces
-
-### Executing benchmark using db_bench
-* Since the goal is to measure performance, we need to build a release binary
-    using `make clean && DEBUG_LEVEL=0 make db_bench`. If there is an engine
-    crash due to bug, we need to switch back to debug build. Make sure to run
-    `make clean` before running `make dbg`.
-
-### Formatting code
-* After making change, use `make format-auto` to auto-apply formatting without
-    interactive prompts (Claude Code friendly).
@@ -27,12 +27,12 @@
 #
 # Linux:
 #
-# 1. Install a recent toolchain if you're on a older distro. C++20 required (GCC >= 11, Clang >= 10)
+# 1. Install a recent toolchain if you're on a older distro. C++17 required (GCC >= 7, Clang >= 5)
 # 2. mkdir build; cd build
 # 3. cmake ..
 # 4. make -j

-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.10)

 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/")
 include(ReadVersion)
@@ -44,29 +44,6 @@ project(rocksdb
  HOMEPAGE_URL https://rocksdb.org/
  LANGUAGES CXX C ASM)

-if(APPLE)
-  # On macOS Cmake, when cross-compiling, sometimes CMAKE_SYSTEM_PROCESSOR wrongfully stays
-  # the same as CMAKE_HOST_SYSTEM_PROCESSOR regardless the target CPU.
-  # The manual call to  set(CMAKE_SYSTEM_PROCESSOR) has to be set after the project() call.
-  # because project() might reset CMAKE_SYSTEM_PROCESSOR back to the value of CMAKE_HOST_SYSTEM_PROCESSOR.
-  # Check if CMAKE_SYSTEM_PROCESSOR is not equal to CMAKE_OSX_ARCHITECTURES
-  if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "")
-    if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_OSX_ARCHITECTURES)
-      # Split CMAKE_OSX_ARCHITECTURES into a list
-      string(REPLACE ";" " " ARCH_LIST ${CMAKE_OSX_ARCHITECTURES})
-      separate_arguments(ARCH_LIST UNIX_COMMAND ${ARCH_LIST})
-      # Count the number of architectures
-      list(LENGTH ARCH_LIST ARCH_COUNT)
-      # Ensure that exactly one architecture is specified
-      if(NOT ARCH_COUNT EQUAL 1)
-          message(FATAL_ERROR "CMAKE_OSX_ARCHITECTURES must have exactly one value. Current value: ${CMAKE_OSX_ARCHITECTURES}")
-      endif()
-      set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_OSX_ARCHITECTURES})
-      message(STATUS "CMAKE_SYSTEM_PROCESSOR is manually set to ${CMAKE_SYSTEM_PROCESSOR}")
-    endif()
-  endif()
-endif()
-
 if(POLICY CMP0042)
  cmake_policy(SET CMP0042 NEW)
 endif()
@@ -80,17 +57,11 @@ if(NOT CMAKE_BUILD_TYPE)
  set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING
    "Default BUILD_TYPE is ${default_build_type}" FORCE)
 endif()
-message(STATUS "CMAKE_BUILD_TYPE is set to ${CMAKE_BUILD_TYPE}")

-# Use ccache for compilation if available. Use CMAKE_C/CXX_COMPILER_LAUNCHER
-# instead of RULE_LAUNCH_COMPILE to avoid double-wrapping when ccache is also
-# injected via PATH (e.g., /usr/lib/ccache or brew --prefix ccache/libexec).
-# Note: we intentionally do NOT set RULE_LAUNCH_LINK because ccache cannot
-# cache link operations -- it only adds overhead.
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
-  set(CMAKE_C_COMPILER_LAUNCHER ccache)
-  set(CMAKE_CXX_COMPILER_LAUNCHER ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
 endif(CCACHE_FOUND)

 option(WITH_JEMALLOC "build with JeMalloc" OFF)
@@ -103,10 +74,14 @@ option(WITH_WINDOWS_UTF8_FILENAMES "use UTF8 as characterset for opening files,
 if (WITH_WINDOWS_UTF8_FILENAMES)
  add_definitions(-DROCKSDB_WINDOWS_UTF8_FILENAMES)
 endif()
-option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
+
+if ($ENV{CIRCLECI})
+  message(STATUS "Build for CircieCI env, a few tests may be disabled")
+  add_definitions(-DCIRCLECI)
+endif()

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

 include(CMakeDependentOption)
@@ -138,9 +113,7 @@ else()
    option(WITH_GFLAGS "build with GFlags" ON)
  endif()
  set(GFLAGS_LIB)
-  # Skip all gflags detection and setup when USE_FOLLY or USE_COROUTINES is enabled
-  # since Folly provides its own gflags (USE_COROUTINES automatically sets USE_FOLLY)
-  if(WITH_GFLAGS AND NOT USE_FOLLY AND NOT USE_COROUTINES)
+  if(WITH_GFLAGS)
    # Config with namespace available since gflags 2.2.2
    option(GFLAGS_USE_TARGET_NAMESPACE "Use gflags import target with namespace." ON)
    find_package(gflags CONFIG)
@@ -159,9 +132,6 @@ else()
    include_directories(${GFLAGS_INCLUDE_DIR})
    list(APPEND THIRDPARTY_LIBS ${GFLAGS_LIB})
    add_definitions(-DGFLAGS=1)
-  elseif(WITH_GFLAGS AND (USE_FOLLY OR USE_COROUTINES))
-    # Still set the DGFLAGS=1 define when using Folly since Folly provides gflags
-    add_definitions(-DGFLAGS=1)
  endif()

  if(WITH_SNAPPY)
@@ -200,7 +170,7 @@ else()
  if(WITH_ZSTD)
    find_package(zstd REQUIRED)
    add_definitions(-DZSTD)
-    include_directories(${ZSTD_INCLUDE_DIRS})
+    include_directories(${ZSTD_INCLUDE_DIR})
    list(APPEND THIRDPARTY_LIBS zstd::zstd)
  endif()
 endif()
@@ -214,20 +184,9 @@ if(WIN32 AND MSVC)
  endif()
 endif()

-option(WIN_CI "Accelerate build speed and reduce build artifect size for github CI with MSVC" OFF)
-
 if(MSVC)
-  if(WIN_CI)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /nologo /EHsc /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /W4 /wd4127 /wd4996 /wd4100 /wd4324 /wd4702")
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4996 /wd4100 /wd4324")
-  endif()
-  if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DNDEBUG")
-    message(STATUS "Setting /DNDEBUG as CMAKE_BUILD_TYPE is set to ${CMAKE_BUILD_TYPE}")
-  endif()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4800 /wd4996 /wd4351 /wd4100 /wd4204 /wd4324")
 else()
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wextra -Wall -pthread")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare -Wshadow -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-invalid-offsetof")
@@ -236,7 +195,6 @@ else()
  endif()
  if(MINGW)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
    add_definitions(-D_POSIX_C_SOURCE=1)
  endif()
  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -286,46 +244,45 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
  endif(HAS_S390X_MARCH_NATIVE)
 endif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")

-if(CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64")
-  CHECK_C_COMPILER_FLAG("-march=loongarch64" HAS_LOONGARCH64)
-  if(HAS_LOONGARCH64)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=loongarch64 -mtune=loongarch64")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=loongarch64 -mtune=loongarch64")
-  endif(HAS_LOONGARCH64)
-endif(CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64")
-
-set(PORTABLE 0 CACHE STRING "Minimum CPU arch to support, or 0 = current CPU, 1 = baseline CPU")
-if(PORTABLE MATCHES "1|ON|YES|TRUE|Y")
-  # Usually nothing to do; compiler default is typically the most general
-  if(NOT MSVC)
+option(PORTABLE "build a portable binary" OFF)
+option(FORCE_SSE42 "force building with SSE4.2, even when PORTABLE=ON" OFF)
+option(FORCE_AVX "force building with AVX, even when PORTABLE=ON" OFF)
+option(FORCE_AVX2 "force building with AVX2, even when PORTABLE=ON" OFF)
+if(PORTABLE)
+  # MSVC does not need a separate compiler flag to enable SSE4.2; if nmmintrin.h
+  # is available, it is available by default.
+  if(FORCE_SSE42 AND NOT MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -mpclmul")
+  endif()
+  if(MSVC)
+    if(FORCE_AVX)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX")
+    endif()
+    # MSVC automatically enables BMI / lzcnt with AVX2.
+    if(FORCE_AVX2)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
+    endif()
+  else()
+    if(FORCE_AVX)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
+    endif()
+    if(FORCE_AVX2)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx2 -mbmi -mlzcnt")
+    endif()
    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390x")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=z196")
    endif()
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=loongarch64")
-    endif()
  endif()
-elseif(PORTABLE MATCHES "0|OFF|NO|FALSE|N")
+else()
  if(MSVC)
-    # NOTE: No auto-detection of current CPU, but instead assume some useful
-    # level of optimization is supported
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
  else()
-    # Require instruction set from current CPU (with some legacy or opt-out
-    # exceptions)
    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^s390x" AND NOT HAS_S390X_MARCH_NATIVE)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=z196")
    elseif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64" AND NOT HAS_ARMV8_CRC)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
    endif()
  endif()
-else()
-  # Name of a CPU arch spec or feature set to require
-  if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:${PORTABLE}")
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${PORTABLE}")
-  endif()
 endif()

 include(CheckCXXSourceCompiles)
@@ -334,8 +291,30 @@ if(NOT MSVC)
  set(CMAKE_REQUIRED_FLAGS "-msse4.2 -mpclmul")
 endif()

+if (NOT PORTABLE OR FORCE_SSE42)
+  CHECK_CXX_SOURCE_COMPILES("
+#include <cstdint>
+#include <nmmintrin.h>
+#include <wmmintrin.h>
+int main() {
+  volatile uint32_t x = _mm_crc32_u32(0, 0);
+  const auto a = _mm_set_epi64x(0, 0);
+  const auto b = _mm_set_epi64x(0, 0);
+  const auto c = _mm_clmulepi64_si128(a, b, 0x00);
+  auto d = _mm_cvtsi128_si64(c);
+}
+" HAVE_SSE42)
+  if(HAVE_SSE42)
+    add_definitions(-DHAVE_SSE42)
+    add_definitions(-DHAVE_PCLMUL)
+  elseif(FORCE_SSE42)
+    message(FATAL_ERROR "FORCE_SSE42=ON but unable to compile with SSE4.2 enabled")
+  endif()
+endif()
+
 # Check if -latomic is required or not
-if (NOT MSVC AND NOT APPLE)
+if (NOT MSVC)
+  set(CMAKE_REQUIRED_FLAGS "--std=c++17")
  CHECK_CXX_SOURCE_COMPILES("
 #include <atomic>
 std::atomic<uint64_t> x(0);
@@ -416,7 +395,7 @@ option(WITH_NUMA "build with NUMA policy support" OFF)
 if(WITH_NUMA)
  find_package(NUMA REQUIRED)
  add_definitions(-DNUMA)
-  include_directories(${NUMA_INCLUDE_DIRS})
+  include_directories(${NUMA_INCLUDE_DIR})
  list(APPEND THIRDPARTY_LIBS NUMA::NUMA)
 endif()

@@ -472,33 +451,24 @@ else()
  endif()
 endif()

-# Used to run optimized debug build and tests so we can run faster
+# Used to run CI build and tests so we can run faster
 option(OPTDBG "Build optimized debug build with MSVC" OFF)
 option(WITH_RUNTIME_DEBUG "build with debug version of runtime library" ON)
 if(MSVC)
-  if (WIN_CI)
+  if(OPTDBG)
    message(STATUS "Debug optimization is enabled")
    set(CMAKE_CXX_FLAGS_DEBUG "/Oxt")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FASTLINK")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FASTLINK")
  else()
-    if(OPTDBG)
-      message(STATUS "Debug optimization is enabled")
-      set(CMAKE_CXX_FLAGS_DEBUG "/Oxt")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /RTC1")
+
+    # Minimal Build is deprecated after MSVC 2015
+    if( MSVC_VERSION GREATER 1900 )
+      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm-")
    else()
-      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /RTC1")
-
-      # Minimal Build is deprecated after MSVC 2015
-      if( MSVC_VERSION GREATER 1900 )
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm-")
-      else()
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm")
-      endif()
+      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm")
    endif()
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
-  endif()

+  endif()
  if(WITH_RUNTIME_DEBUG)
    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /${RUNTIME_LIBRARY}d")
  else()
@@ -506,29 +476,26 @@ if(MSVC)
  endif()
  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oxt /Zp8 /Gm- /Gy /${RUNTIME_LIBRARY}")

+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
 endif()

 if(CMAKE_COMPILER_IS_GNUCXX)
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp")
 endif()

+option(ROCKSDB_LITE "Build RocksDBLite version" OFF)
+if(ROCKSDB_LITE)
+  add_definitions(-DROCKSDB_LITE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -Os")
+endif()
+
 if(CMAKE_SYSTEM_NAME MATCHES "Cygwin")
  add_definitions(-fno-builtin-memcmp -DCYGWIN)
 elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
  add_definitions(-DOS_MACOSX)
-elseif(CMAKE_SYSTEM_NAME MATCHES "iOS")
-  add_definitions(-DOS_MACOSX -DIOS_CROSS_COMPILE)
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
  add_definitions(-DOS_LINUX)
-  # Use lld linker if available for faster linking (12x faster than ld.bfd)
-  if(NOT ROCKSDB_NO_FAST_LINKER)
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -fuse-ld=lld -Wl,--version
-      OUTPUT_VARIABLE LLD_VERSION_OUTPUT ERROR_QUIET RESULT_VARIABLE LLD_RESULT)
-    if(LLD_RESULT EQUAL 0 AND LLD_VERSION_OUTPUT MATCHES "LLD")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
-    endif()
-  endif()
 elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
  add_definitions(-DOS_SOLARIS)
 elseif(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
@@ -605,7 +572,7 @@ if(HAVE_SCHED_GETCPU)
  add_definitions(-DROCKSDB_SCHED_GETCPU_PRESENT)
 endif()

-check_cxx_symbol_exists(getauxval "sys/auxv.h" HAVE_AUXV_GETAUXVAL)
+check_cxx_symbol_exists(getauxval auvx.h HAVE_AUXV_GETAUXVAL)
 if(HAVE_AUXV_GETAUXVAL)
  add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
 endif()
@@ -617,95 +584,10 @@ endif()

 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/include)
-
-if(USE_COROUTINES)
-  if(USE_FOLLY OR USE_FOLLY_LITE)
-    message(FATAL_ERROR "Please specify exactly one of USE_COROUTINES,"
-    " USE_FOLLY, and USE_FOLLY_LITE")
-  endif()
-  set(CMAKE_CXX_STANDARD 20)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcoroutines -Wno-maybe-uninitialized")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-redundant-move")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-memory-model")
-  add_compile_definitions(USE_COROUTINES)
-  set(USE_FOLLY 1)
-endif()
-
 if(USE_FOLLY)
-  if(USE_FOLLY_LITE)
-    message(FATAL_ERROR "Please specify one of USE_FOLLY or USE_FOLLY_LITE")
-  endif()
-  if(ROCKSDB_BUILD_SHARED)
-    message(FATAL_ERROR "Cannot build RocksDB shared library with folly")
-  endif()
-  set(ROCKSDB_BUILD_SHARED OFF)
-  set(GFLAGS_SHARED FALSE)
-  find_package(folly)
-  # If cmake could not find the folly-config.cmake file, fall back
-  # to looking in third-party/folly for folly and its dependencies
-  if(NOT FOLLY_LIBRARIES)
-    exec_program(python3 ${PROJECT_SOURCE_DIR}/third-party/folly ARGS
-    build/fbcode_builder/getdeps.py show-inst-dir OUTPUT_VARIABLE
-    FOLLY_INST_PATH)
-    exec_program(ls ARGS -d ${FOLLY_INST_PATH}/../boost* OUTPUT_VARIABLE
-    BOOST_INST_PATH)
-    exec_program(ls ARGS -d ${FOLLY_INST_PATH}/../fmt* OUTPUT_VARIABLE
-    FMT_INST_PATH)
-    exec_program(ls ARGS -d ${FOLLY_INST_PATH}/../gflags* OUTPUT_VARIABLE
-    GFLAGS_INST_PATH)
-    set(Boost_DIR ${BOOST_INST_PATH}/lib/cmake/Boost-1.83.0)
-    if(EXISTS ${FMT_INST_PATH}/lib64)
-      set(fmt_DIR ${FMT_INST_PATH}/lib64/cmake/fmt)
-    else()
-      set(fmt_DIR ${FMT_INST_PATH}/lib/cmake/fmt)
-    endif()
-    set(gflags_DIR ${GFLAGS_INST_PATH}/lib/cmake/gflags)
-
-    exec_program(sed ARGS -i 's/gflags_shared//g'
-    ${FOLLY_INST_PATH}/lib/cmake/folly/folly-targets.cmake)
-
-    include(${FOLLY_INST_PATH}/lib/cmake/folly/folly-config.cmake)
-
-    # Fix gflags library name for debug builds
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath=${GFLAGS_INST_PATH}/lib")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GFLAGS_INST_PATH}/lib/libgflags_debug.so.2.2")
-    endif()
-  endif()
-
-  # Folly itself uses gflags transitively, but RocksDB tools and benchmarks
-  # also call gflags APIs directly, so they need an explicit link dependency.
-  if(WITH_GFLAGS)
-    if(NOT TARGET gflags::gflags AND NOT TARGET gflags_shared AND
-       NOT gflags_LIBRARIES)
-      find_package(gflags CONFIG QUIET)
-      if(NOT gflags_FOUND)
-        find_package(gflags REQUIRED)
-      endif()
-    endif()
-    if(TARGET gflags::gflags)
-      set(GFLAGS_LIB gflags::gflags)
-    elseif(TARGET gflags_shared)
-      set(GFLAGS_LIB gflags_shared)
-    elseif(DEFINED GFLAGS_TARGET AND TARGET ${GFLAGS_TARGET})
-      set(GFLAGS_LIB ${GFLAGS_TARGET})
-    elseif(gflags_LIBRARIES)
-      set(GFLAGS_LIB ${gflags_LIBRARIES})
-    else()
-      message(FATAL_ERROR
-        "WITH_GFLAGS is enabled, but no gflags library could be resolved")
-    endif()
-    list(APPEND THIRDPARTY_LIBS ${GFLAGS_LIB})
-  endif()
-
-  add_compile_definitions(USE_FOLLY FOLLY_NO_CONFIG HAVE_CXX11_ATOMIC)
-  list(APPEND THIRDPARTY_LIBS Folly::folly)
-  set(FOLLY_LIBS Folly::folly)
-  # --copy-dt-needed-entries is ld.bfd-specific; lld handles DT_NEEDED transitively
-  if(NOT CMAKE_EXE_LINKER_FLAGS MATCHES "fuse-ld=lld")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
-  endif()
+  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)

@@ -715,24 +597,17 @@ set(SOURCES
        cache/cache.cc
        cache/cache_entry_roles.cc
        cache/cache_key.cc
-        cache/cache_helpers.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/secondary_cache.cc
-        cache/secondary_cache_adapter.cc
        cache/sharded_cache.cc
-        cache/tiered_secondary_cache.cc
        db/arena_wrapped_db_iter.cc
-        db/attribute_group_iterator_impl.cc
-        db/blob/blob_contents.cc
        db/blob/blob_fetcher.cc
        db/blob/blob_file_addition.cc
        db/blob/blob_file_builder.cc
        db/blob/blob_file_cache.cc
-        db/blob/blob_file_partition_manager.cc
        db/blob/blob_file_garbage.cc
        db/blob/blob_file_meta.cc
        db/blob/blob_file_reader.cc
@@ -741,11 +616,9 @@ set(SOURCES
        db/blob/blob_log_sequential_reader.cc
        db/blob/blob_log_writer.cc
        db/blob/blob_source.cc
-        db/blob/blob_write_batch_transformer.cc
        db/blob/prefetch_buffer_collection.cc
        db/builder.cc
        db/c.cc
-        db/coalescing_iterator.cc
        db/column_family.cc
        db/compaction/compaction.cc
        db/compaction/compaction_iterator.cc
@@ -766,7 +639,6 @@ set(SOURCES
        db/db_impl/db_impl_write.cc
        db/db_impl/db_impl_compaction_flush.cc
        db/db_impl/db_impl_files.cc
-        db/db_impl/db_impl_follower.cc
        db/db_impl/db_impl_open.cc
        db/db_impl/db_impl_debug.cc
        db/db_impl/db_impl_experimental.cc
@@ -789,14 +661,12 @@ set(SOURCES
        db/log_reader.cc
        db/log_writer.cc
        db/malloc_stats.cc
-        db/manifest_ops.cc
        db/memtable.cc
        db/memtable_list.cc
        db/merge_helper.cc
        db/merge_operator.cc
-        db/multi_scan.cc
        db/output_validator.cc
-        db/periodic_task_scheduler.cc
+        db/periodic_work_scheduler.cc
        db/range_del_aggregator.cc
        db/range_tombstone_fragmenter.cc
        db/repair.cc
@@ -810,26 +680,19 @@ set(SOURCES
        db/version_edit.cc
        db/version_edit_handler.cc
        db/version_set.cc
-        db/version_util.cc
        db/wal_edit.cc
        db/wal_manager.cc
-        db/wide/read_path_blob_resolver.cc
        db/wide/wide_column_serialization.cc
-        db/wide/wide_columns.cc
-        db/wide/wide_columns_helper.cc
        db/write_batch.cc
        db/write_batch_base.cc
        db/write_controller.cc
-        db/write_stall_stats.cc
        db/write_thread.cc
-        db_stress_tool/db_stress_compression_manager.cc
        env/composite_env.cc
        env/env.cc
        env/env_chroot.cc
        env/env_encryption.cc
        env/file_system.cc
        env/file_system_tracer.cc
-        env/fs_on_demand.cc
        env/fs_remap.cc
        env/mock_env.cc
        env/unique_id_gen.cc
@@ -857,7 +720,6 @@ set(SOURCES
        memtable/hash_skiplist_rep.cc
        memtable/skiplistrep.cc
        memtable/vectorrep.cc
-        memtable/wbwi_memtable.cc
        memtable/write_buffer_manager.cc
        monitoring/histogram.cc
        monitoring/histogram_windowing.cc
@@ -876,11 +738,9 @@ set(SOURCES
        options/configurable.cc
        options/customizable.cc
        options/db_options.cc
-        options/offpeak_time_info.cc
        options/options.cc
        options/options_helper.cc
        options/options_parser.cc
-        port/mmap.cc
        port/stack_trace.cc
        table/adaptive/adaptive_table_factory.cc
        table/block_based/binary_search_index_reader.cc
@@ -888,10 +748,8 @@ set(SOURCES
        table/block_based/block_based_table_builder.cc
        table/block_based/block_based_table_factory.cc
        table/block_based/block_based_table_iterator.cc
-        table/block_based/multi_scan_index_iterator.cc
        table/block_based/block_based_table_reader.cc
        table/block_based/block_builder.cc
-        table/block_based/block_cache.cc
        table/block_based/block_prefetcher.cc
        table/block_based/block_prefix_index.cc
        table/block_based/data_block_hash_index.cc
@@ -913,12 +771,10 @@ set(SOURCES
        table/cuckoo/cuckoo_table_builder.cc
        table/cuckoo/cuckoo_table_factory.cc
        table/cuckoo/cuckoo_table_reader.cc
-        table/external_table.cc
        table/format.cc
        table/get_context.cc
        table/iterator.cc
        table/merging_iterator.cc
-        table/compaction_merging_iterator.cc
        table/meta_blocks.cc
        table/persistent_cache_helper.cc
        table/plain/plain_table_bloom.cc
@@ -952,20 +808,16 @@ set(SOURCES
        trace_replay/trace_record.cc
        trace_replay/trace_replay.cc
        util/async_file_reader.cc
-        util/auto_tune_compressor.cc
        util/cleanable.cc
        util/coding.cc
        util/compaction_job_stats_impl.cc
        util/comparator.cc
        util/compression.cc
-        util/simple_mixed_compressor.cc
        util/compression_context_cache.cc
        util/concurrent_task_limiter_impl.cc
        util/crc32c.cc
-        util/data_structure.cc
        util/dynamic_bloom.cc
        util/hash.cc
-        util/io_dispatcher_imp.cc
        util/murmurhash.cc
        util/random.cc
        util/rate_limiter.cc
@@ -973,12 +825,9 @@ set(SOURCES
        util/slice.cc
        util/file_checksum_helper.cc
        util/status.cc
-        util/stderr_logger.cc
        util/string_util.cc
        util/thread_local.cc
        util/threadpool_imp.cc
-        util/udt_util.cc
-        util/write_batch_util.cc
        util/xxhash.cc
        utilities/agg_merge/agg_merge.cc
        utilities/backup/backup_engine.cc
@@ -995,7 +844,6 @@ set(SOURCES
        utilities/cassandra/merge_operator.cc
        utilities/checkpoint/checkpoint_impl.cc
        utilities/compaction_filters.cc
-        utilities/sorted_run_builder/sorted_run_builder.cc
        utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
        utilities/counted_fs.cc
        utilities/debug.cc
@@ -1022,11 +870,8 @@ set(SOURCES
        utilities/persistent_cache/block_cache_tier_metadata.cc
        utilities/persistent_cache/persistent_cache_tier.cc
        utilities/persistent_cache/volatile_tier_impl.cc
-        utilities/secondary_index/secondary_index_iterator.cc
-        utilities/secondary_index/simple_secondary_index.cc
        utilities/simulator_cache/cache_simulator.cc
        utilities/simulator_cache/sim_cache.cc
-        utilities/table_properties_collectors/compact_for_tiering_collector.cc
        utilities/table_properties_collectors/compact_on_deletion_collector.cc
        utilities/trace/file_trace_reader_writer.cc
        utilities/trace/replayer_impl.cc
@@ -1047,10 +892,6 @@ set(SOURCES
        utilities/transactions/write_prepared_txn_db.cc
        utilities/transactions/write_unprepared_txn.cc
        utilities/transactions/write_unprepared_txn_db.cc
-        utilities/trie_index/bitvector.cc
-        utilities/trie_index/louds_trie.cc
-        utilities/trie_index/trie_index_factory.cc
-        utilities/types_util.cc
        utilities/ttl/db_ttl_impl.cc
        utilities/wal_filter.cc
        utilities/write_batch_with_index/write_batch_with_index.cc
@@ -1081,12 +922,6 @@ if ( ROCKSDB_PLUGINS )
        plugin/${plugin}/${src}
        PROPERTIES COMPILE_FLAGS "${${plugin}_COMPILE_FLAGS}")
    endforeach()
-    foreach (test ${${plugin}_TESTS})
-      list(APPEND PLUGIN_TESTS plugin/${plugin}/${test})
-      set_source_files_properties(
-        plugin/${plugin}/${test}
-        PROPERTIES COMPILE_FLAGS "${${plugin}_COMPILE_FLAGS}")
-    endforeach()
    foreach (path ${${plugin}_INCLUDE_PATHS})
      include_directories(${path})
    endforeach()
@@ -1101,6 +936,12 @@ if ( ROCKSDB_PLUGINS )
  endforeach()
 endif()

+if(HAVE_SSE42 AND NOT MSVC)
+  set_source_files_properties(
+    util/crc32c.cc
+    PROPERTIES COMPILE_FLAGS "-msse4.2 -mpclmul")
+endif()
+
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64")
  list(APPEND SOURCES
    util/crc32c_ppc.c
@@ -1138,55 +979,23 @@ else()
    env/io_posix.cc)
 endif()

-if(USE_FOLLY_LITE)
+if(USE_FOLLY)
  list(APPEND SOURCES
    third-party/folly/folly/container/detail/F14Table.cpp
    third-party/folly/folly/detail/Futex.cpp
-    third-party/folly/folly/lang/Exception.cpp
    third-party/folly/folly/lang/SafeAssert.cpp
    third-party/folly/folly/lang/ToAscii.cpp
    third-party/folly/folly/ScopeGuard.cpp
    third-party/folly/folly/synchronization/AtomicNotification.cpp
    third-party/folly/folly/synchronization/DistributedMutex.cpp
    third-party/folly/folly/synchronization/ParkingLot.cpp)
-  include_directories(${PROJECT_SOURCE_DIR}/third-party/folly)
-  # Add boost to the include path
-  exec_program(python3 ${PROJECT_SOURCE_DIR}/third-party/folly ARGS
-  build/fbcode_builder/getdeps.py show-source-dir boost OUTPUT_VARIABLE
-  BOOST_SOURCE_PATH)
-  exec_program(ls ARGS -d ${BOOST_SOURCE_PATH}/boost* OUTPUT_VARIABLE
-  BOOST_INCLUDE_DIR)
-  include_directories(${BOOST_INCLUDE_DIR})
-  # Add fmt to the include path
-  exec_program(python3 ${PROJECT_SOURCE_DIR}/third-party/folly ARGS
-  build/fbcode_builder/getdeps.py show-source-dir fmt OUTPUT_VARIABLE
-  FMT_SOURCE_PATH)
-  exec_program(ls ARGS -d ${FMT_SOURCE_PATH}/fmt*/include OUTPUT_VARIABLE
-  FMT_INCLUDE_DIR)
-  include_directories(${FMT_INCLUDE_DIR})
-
-  exec_program(python3 ${PROJECT_SOURCE_DIR}/third-party/folly ARGS
-  build/fbcode_builder/getdeps.py show-inst-dir glog OUTPUT_VARIABLE
-  GLOG_INST_PATH)
-  if(EXISTS ${GLOG_INST_PATH}/lib64)
-    set(GLOG_LIB_DIR ${GLOG_INST_PATH}/lib64)
-  else()
-    set(GLOG_LIB_DIR ${GLOG_INST_PATH}/lib)
-  endif()
-
-  add_definitions(-DUSE_FOLLY -DFOLLY_NO_CONFIG)
-  find_library(GLOG_LIBRARY NAMES glog PATHS ${GLOG_LIB_DIR} NO_DEFAULT_PATH)
-  if(NOT GLOG_LIBRARY)
-    find_library(GLOG_LIBRARY NAMES glog)
-  endif()
-  if(GLOG_LIBRARY)
-    list(APPEND THIRDPARTY_LIBS ${GLOG_LIBRARY})
-  endif()
 endif()

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

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

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

@@ -1254,15 +1058,11 @@ set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc)
 configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)

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

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

@@ -1401,7 +1201,6 @@ if(WITH_TESTS OR WITH_BENCHMARK_TOOLS)
  add_subdirectory(third-party/gtest-1.8.1/fused-src/gtest)
  add_library(testharness STATIC
  test_util/mock_time_env.cc
-  test_util/secondary_cache_test_util.cc
  test_util/testharness.cc)
  target_link_libraries(testharness gtest)
 endif()
@@ -1417,7 +1216,6 @@ if(WITH_TESTS)
        cache/cache_test.cc
        cache/compressed_secondary_cache_test.cc
        cache/lru_cache_test.cc
-        cache/tiered_secondary_cache_test.cc
        db/blob/blob_counting_iterator_test.cc
        db/blob/blob_file_addition_test.cc
        db/blob/blob_file_builder_test.cc
@@ -1427,7 +1225,6 @@ if(WITH_TESTS)
        db/blob/blob_garbage_meter_test.cc
        db/blob/blob_source_test.cc
        db/blob/db_blob_basic_test.cc
-        db/blob/db_blob_direct_write_test.cc
        db/blob/db_blob_compaction_test.cc
        db/blob/db_blob_corruption_test.cc
        db/blob/db_blob_index_test.cc
@@ -1449,11 +1246,8 @@ if(WITH_TESTS)
        db/db_bloom_filter_test.cc
        db/db_compaction_filter_test.cc
        db/db_compaction_test.cc
-        db/db_compaction_abort_test.cc
-        db/db_clip_test.cc
        db/db_dynamic_level_test.cc
        db/db_encryption_test.cc
-        db/db_etc3_test.cc
        db/db_flush_test.cc
        db/db_inplace_update_test.cc
        db/db_io_failure_test.cc
@@ -1465,7 +1259,6 @@ if(WITH_TESTS)
        db/db_memtable_test.cc
        db/db_merge_operator_test.cc
        db/db_merge_operand_test.cc
-        db/db_open_with_config_test.cc
        db/db_options_test.cc
        db/db_properties_test.cc
        db/db_range_del_test.cc
@@ -1493,7 +1286,6 @@ if(WITH_TESTS)
        db/file_indexer_test.cc
        db/filename_test.cc
        db/flush_job_test.cc
-        db/db_follower_test.cc
        db/import_column_family_test.cc
        db/listener_test.cc
        db/log_test.cc
@@ -1501,10 +1293,9 @@ if(WITH_TESTS)
        db/memtable_list_test.cc
        db/merge_helper_test.cc
        db/merge_test.cc
-        db/multi_cf_iterator_test.cc
        db/options_file_test.cc
        db/perf_context_test.cc
-        db/periodic_task_scheduler_test.cc
+        db/periodic_work_scheduler_test.cc
        db/plain_table_db_test.cc
        db/seqno_time_test.cc
        db/prefix_test.cc
@@ -1518,9 +1309,7 @@ if(WITH_TESTS)
        db/wal_manager_test.cc
        db/wal_edit_test.cc
        db/wide/db_wide_basic_test.cc
-        db/wide/db_wide_blob_direct_write_test.cc
        db/wide/wide_column_serialization_test.cc
-        db/wide/wide_columns_helper_test.cc
        db/write_batch_test.cc
        db/write_callback_test.cc
        db/write_controller_test.cc
@@ -1570,7 +1359,6 @@ if(WITH_TESTS)
        util/autovector_test.cc
        util/bloom_test.cc
        util/coding_test.cc
-        util/compression_test.cc
        util/crc32c_test.cc
        util/defer_test.cc
        util/dynamic_bloom_test.cc
@@ -1584,12 +1372,10 @@ if(WITH_TESTS)
        util/ribbon_test.cc
        util/slice_test.cc
        util/slice_transform_test.cc
-        util/string_util_test.cc
        util/timer_queue_test.cc
        util/timer_test.cc
        util/thread_list_test.cc
        util/thread_local_test.cc
-        util/udt_util_test.cc
        util/work_queue_test.cc
        utilities/agg_merge/agg_merge_test.cc
        utilities/backup/backup_engine_test.cc
@@ -1599,9 +1385,7 @@ if(WITH_TESTS)
        utilities/cassandra/cassandra_row_merge_test.cc
        utilities/cassandra/cassandra_serialize_test.cc
        utilities/checkpoint/checkpoint_test.cc
-        utilities/sorted_run_builder/sorted_run_builder_test.cc
        utilities/env_timed_test.cc
-        utilities/fault_injection_fs_test.cc
        utilities/memory/memory_test.cc
        utilities/merge_operators/string_append/stringappend_test.cc
        utilities/object_registry_test.cc
@@ -1611,25 +1395,18 @@ if(WITH_TESTS)
        utilities/persistent_cache/persistent_cache_test.cc
        utilities/simulator_cache/cache_simulator_test.cc
        utilities/simulator_cache/sim_cache_test.cc
-        utilities/table_properties_collectors/compact_for_tiering_collector_test.cc
        utilities/table_properties_collectors/compact_on_deletion_collector_test.cc
        utilities/transactions/optimistic_transaction_test.cc
        utilities/transactions/transaction_test.cc
        utilities/transactions/lock/point/point_lock_manager_test.cc
-        utilities/transactions/lock/point/point_lock_manager_stress_test.cc
        utilities/transactions/write_committed_transaction_ts_test.cc
        utilities/transactions/write_prepared_transaction_test.cc
-        utilities/transactions/write_prepared_transaction_seqno_test.cc
        utilities/transactions/write_unprepared_transaction_test.cc
        utilities/transactions/lock/range/range_locking_test.cc
        utilities/transactions/timestamped_snapshot_test.cc
-        utilities/trie_index/trie_index_db_test.cc
-        utilities/trie_index/trie_index_test.cc
        utilities/ttl/ttl_test.cc
-        utilities/types_util_test.cc
        utilities/util_merge_operators_test.cc
        utilities/write_batch_with_index/write_batch_with_index_test.cc
-	${PLUGIN_TESTS}
    )
  endif()

@@ -1642,10 +1419,10 @@ if(WITH_TESTS)
      utilities/cassandra/test_utils.cc
  )
  enable_testing()
-  add_custom_target(rocksdb_check COMMAND ${CMAKE_CTEST_COMMAND})
+  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
  set(TESTUTILLIB testutillib${ARTIFACT_SUFFIX})
  add_library(${TESTUTILLIB} STATIC ${TESTUTIL_SOURCE})
-  target_link_libraries(${TESTUTILLIB} ${ROCKSDB_LIB} ${FOLLY_LIBS})
+  target_link_libraries(${TESTUTILLIB} ${ROCKSDB_LIB})
  if(MSVC)
    set_target_properties(${TESTUTILLIB} PROPERTIES COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}/testutillib${ARTIFACT_SUFFIX}.pdb")
  endif()
@@ -1667,7 +1444,7 @@ if(WITH_TESTS)
      target_link_libraries(${exename}${ARTIFACT_SUFFIX} testutillib${ARTIFACT_SUFFIX} testharness gtest ${THIRDPARTY_LIBS} ${ROCKSDB_LIB})
      if(NOT "${exename}" MATCHES "db_sanity_test")
        gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120)
-        add_dependencies(rocksdb_check ${exename}${ARTIFACT_SUFFIX})
+        add_dependencies(check ${exename}${ARTIFACT_SUFFIX})
      endif()
  endforeach(sourcefile ${TESTS})

@@ -1687,7 +1464,7 @@ if(WITH_TESTS)
    add_executable(c_test db/c_test.c)
    target_link_libraries(c_test ${ROCKSDB_LIB_FOR_C} testharness)
    add_test(NAME c_test COMMAND c_test${ARTIFACT_SUFFIX})
-    add_dependencies(rocksdb_check c_test)
+    add_dependencies(check c_test)
  endif()
 endif()

@@ -1695,7 +1472,6 @@ if(WITH_BENCHMARK_TOOLS)
  add_executable(db_bench${ARTIFACT_SUFFIX}
    tools/simulated_hybrid_file_system.cc
    tools/db_bench.cc
-    tools/tool_hooks.cc
    tools/db_bench_tool.cc)
  target_link_libraries(db_bench${ARTIFACT_SUFFIX}
    ${ROCKSDB_LIB} ${THIRDPARTY_LIBS})
@@ -1704,52 +1480,32 @@ if(WITH_BENCHMARK_TOOLS)
    cache/cache_bench.cc
    cache/cache_bench_tool.cc)
  target_link_libraries(cache_bench${ARTIFACT_SUFFIX}
-    ${ROCKSDB_LIB} ${GFLAGS_LIB} ${FOLLY_LIBS})
+    ${ROCKSDB_LIB} ${GFLAGS_LIB})

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

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

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

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

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

 if(WITH_CORE_TOOLS OR WITH_TOOLS)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-    <PropertyGroup>
-        <CLToolExe>ccache_msvc_compiler.bat</CLToolExe>
-        <CLToolPath>$(MSBuildThisFileDirectory)</CLToolPath>
-        <UseMultiToolTask>true</UseMultiToolTask>
-        <EnforceProcessCountAcrossBuilds>true</EnforceProcessCountAcrossBuilds>
-    </PropertyGroup>
-</Project>
@@ -6,7 +6,7 @@ than release mode.

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

 There are few options when compiling RocksDB:

@@ -17,18 +17,15 @@ There are few options when compiling RocksDB:
 * `make check` will compile and run all the unit tests. `make check` will compile RocksDB in debug mode.

 * `make all` will compile our static library, and all our tools and unit tests. Our tools
-depend on gflags 2.2.0 or newer. You will need to have gflags installed to run `make all`. This will compile RocksDB in debug mode. Don't
+depend on gflags. You will need to have gflags installed to run `make all`. This will compile RocksDB in debug mode. Don't
 use binaries compiled by `make all` in production.

-* By default the binary we produce is optimized for the CPU you're compiling on
-(`-march=native` or the equivalent). To build a binary compatible with the most
-general architecture supported by your CPU and compiler, set `PORTABLE=1` for
-the build, but performance will suffer as many operations benefit from newer
-and wider instructions. In addition to `PORTABLE=0` (default) and `PORTABLE=1`,
-it can be set to an architecture name recognized by your compiler. For example,
-on 64-bit x86, a reasonable compromise is `PORTABLE=haswell` which supports
-many or most of the available optimizations while still being compatible with
-most processors made since roughly 2013.
+* By default the binary we produce is optimized for the platform you're compiling on
+(`-march=native` or the equivalent). SSE4.2 will thus be enabled automatically if your
+CPU supports it. To print a warning if your CPU does not support SSE4.2, build with
+`USE_SSE=1 make static_lib` or, if using CMake, `cmake -DFORCE_SSE42=ON`. If you want
+to build a portable binary, add `PORTABLE=1` before your make commands, like this:
+`PORTABLE=1 make static_lib`.

 ## Dependencies

@@ -51,16 +48,11 @@ most processors made since roughly 2013.
 * If you wish to build the RocksJava static target, then cmake is required for building Snappy.

 * If you wish to run microbench (e.g, `make microbench`, `make ribbon_bench` or `cmake -DWITH_BENCHMARK=1`), Google benchmark >= 1.6.0 is needed.
-* You can do the following to install Google benchmark. These commands are copied from `./build_tools/ubuntu20_image/Dockerfile`:
-
-`$ git clone --depth 1 --branch v1.7.0 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 && ninja install`

 ## Supported platforms

 * **Linux - Ubuntu**
-    * Upgrade your gcc to version at least 11 to get C++20 support.
+    * Upgrade your gcc to version at least 7 to get C++17 support.
    * Install gflags. First, try: `sudo apt-get install libgflags-dev`
      If this doesn't work and you're using Ubuntu, here's a nice tutorial:
      (http://askubuntu.com/questions/312173/installing-gflags-12-04)
@@ -72,12 +64,12 @@ most processors made since roughly 2013.
    * Install zstandard: `sudo apt-get install libzstd-dev`.

 * **Linux - CentOS / RHEL**
-    * Upgrade your gcc to version at least 11 to get C++20 support
+    * Upgrade your gcc to version at least 7 to get C++17 support
    * Install gflags:

              git clone https://github.com/gflags/gflags.git
              cd gflags
-              git checkout v2.2.0
+              git checkout v2.0
              ./configure && make && sudo make install

      **Notice**: Once installed, please add the include path for gflags to your `CPATH` environment variable and the
@@ -122,10 +114,11 @@ most processors made since roughly 2013.
              make && sudo make install

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

 * **FreeBSD** (11.01):
@@ -168,29 +161,24 @@ most processors made since roughly 2013.

    * Install the dependencies for RocksDB:

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

    * Build RocksDB from source:

-        ```bash
        cd ~
        git clone https://github.com/facebook/rocksdb.git
        cd rocksdb
        gmake static_lib
-        ```

    * Build RocksJava from source (optional):
-        * In OpenBSD, JDK depends on XWindows system, so please check that you installed OpenBSD with `xbase` package.
-        * Install dependencies : `pkg_add -v jdk%1.8`
-        ```bash
+
        cd rocksdb
        export JAVA_HOME=/usr/local/jdk-1.8.0
        export PATH=$PATH:/usr/local/jdk-1.8.0/bin
-        gmake rocksdbjava SHA256_CMD='sha256 -q'
-        ```
+        gmake rocksdbjava

 * **iOS**:
-  * Run: `TARGET_OS=IOS make static_lib`. When building the project which uses rocksdb iOS library, make sure to define an important pre-processing macros: `IOS_CROSS_COMPILE`.
+  * Run: `TARGET_OS=IOS make static_lib`. When building the project which uses rocksdb iOS library, make sure to define two important pre-processing macros: `ROCKSDB_LITE` and `IOS_CROSS_COMPILE`.

 * **Windows** (Visual Studio 2017 to up):
  * Read and follow the instructions at CMakeLists.txt
@@ -213,7 +201,7 @@ most processors made since roughly 2013.
             export PATH=/opt/freeware/bin:$PATH

 * **Solaris Sparc**
-    * Install GCC 11 and higher.
+    * Install GCC 7 and higher.
    * Use these environment variables:

             export CC=gcc
@@ -2,14 +2,11 @@ This is the list of all known third-party language bindings for RocksDB. If some

 * Java - https://github.com/facebook/rocksdb/tree/main/java
 * Python
-    * https://github.com/rocksdict/RocksDict
-    * http://python-rocksdb.readthedocs.io/en/latest/ (unmaintained) 
+    * http://python-rocksdb.readthedocs.io/en/latest/
    * http://pyrocksdb.readthedocs.org/en/latest/ (unmaintained)
 * Perl - https://metacpan.org/pod/RocksDB
 * Node.js - https://npmjs.org/package/rocksdb
-* Go 
-  * https://github.com/linxGnu/grocksdb
-  * https://github.com/tecbot/gorocksdb (unmaintained)
+* Go - https://github.com/tecbot/gorocksdb
 * Ruby - http://rubygems.org/gems/rocksdb-ruby
 * Haskell - https://hackage.haskell.org/package/rocksdb-haskell
 * PHP - https://github.com/Photonios/rocksdb-php
@@ -5,5 +5,3 @@ This is the list of all known third-party plugins for RocksDB. If something is m
 * [ZenFS](https://github.com/westerndigitalcorporation/zenfs): a file system for zoned block devices
 * [RADOS](https://github.com/riversand963/rocksdb-rados-env): an Env used for interacting with RADOS. Migrated from RocksDB main repo.
 * [PMEM](https://github.com/pmem/pmem-rocksdb-plugin): a collection of plugins to enable Persistent Memory on RocksDB.
-* [IPPCP](https://github.com/intel/ippcp-plugin-rocksdb): a plugin to enable encryption on RocksDB based on Intel optimized open source IPP-Crypto library.
-* [encfs](https://github.com/pegasus-kv/encfs): a plugin to enable encryption on RocksDB based on OpenSSL library.
@@ -1,6 +1,9 @@
 ## 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)

 RocksDB is developed and maintained by Facebook Database Engineering Team.
 It is built on earlier work on [LevelDB](https://github.com/google/leveldb) by Sanjay Ghemawat (sanjay@google.com)
@@ -0,0 +1,21 @@
+# RocksDBLite
+
+RocksDBLite is a project focused on mobile use cases, which don't need a lot of fancy things we've built for server workloads and they are very sensitive to binary size. For that reason, we added a compile flag ROCKSDB_LITE that comments out a lot of the nonessential code and keeps the binary lean.
+
+Some examples of the features disabled by ROCKSDB_LITE:
+* compiled-in support for LDB tool
+* No backup engine
+* No support for replication (which we provide in form of TransactionalIterator)
+* No advanced monitoring tools
+* No special-purpose memtables that are highly optimized for specific use cases
+* No Transactions
+
+When adding a new big feature to RocksDB, please add ROCKSDB_LITE compile guard if:
+* Nobody from mobile really needs your feature,
+* Your feature is adding a lot of weight to the binary.
+
+Don't add ROCKSDB_LITE compile guard if:
+* It would introduce a lot of code complexity. Compile guards make code harder to read. It's a trade-off.
+* Your feature is not adding a lot of weight.
+
+If unsure, ask. :)
@@ -1,49 +1,39 @@
 # This file @generated by:
 #$ python3 buckifier/buckify_rocksdb.py
 # --> DO NOT EDIT MANUALLY <--
-# This file is a Meta-specific integration for buck builds, so can
-# only be validated by Meta employees.
+# This file is a Facebook-specific integration for buck builds, so can
+# only be validated by Facebook employees.
+#
+# @noautodeps @nocodemods
 load("//rocks/buckifier:defs.bzl", "cpp_library_wrapper","rocks_cpp_library_wrapper","cpp_binary_wrapper","cpp_unittest_wrapper","fancy_bench_wrapper","add_c_test_wrapper")
-load("@fbcode_macros//build_defs:export_files.bzl", "export_file")


-oncall("rocksdb_point_of_contact")
-
 cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "cache/cache.cc",
        "cache/cache_entry_roles.cc",
-        "cache/cache_helpers.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/secondary_cache.cc",
-        "cache/secondary_cache_adapter.cc",
        "cache/sharded_cache.cc",
-        "cache/tiered_secondary_cache.cc",
        "db/arena_wrapped_db_iter.cc",
-        "db/attribute_group_iterator_impl.cc",
-        "db/blob/blob_contents.cc",
        "db/blob/blob_fetcher.cc",
        "db/blob/blob_file_addition.cc",
        "db/blob/blob_file_builder.cc",
        "db/blob/blob_file_cache.cc",
        "db/blob/blob_file_garbage.cc",
        "db/blob/blob_file_meta.cc",
-        "db/blob/blob_file_partition_manager.cc",
        "db/blob/blob_file_reader.cc",
        "db/blob/blob_garbage_meter.cc",
        "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/blob_write_batch_transformer.cc",
        "db/blob/prefetch_buffer_collection.cc",
        "db/builder.cc",
        "db/c.cc",
-        "db/coalescing_iterator.cc",
        "db/column_family.cc",
        "db/compaction/compaction.cc",
        "db/compaction/compaction_iterator.cc",
@@ -65,7 +55,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "db/db_impl/db_impl_debug.cc",
        "db/db_impl/db_impl_experimental.cc",
        "db/db_impl/db_impl_files.cc",
-        "db/db_impl/db_impl_follower.cc",
        "db/db_impl/db_impl_open.cc",
        "db/db_impl/db_impl_readonly.cc",
        "db/db_impl/db_impl_secondary.cc",
@@ -87,14 +76,12 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "db/log_writer.cc",
        "db/logs_with_prep_tracker.cc",
        "db/malloc_stats.cc",
-        "db/manifest_ops.cc",
        "db/memtable.cc",
        "db/memtable_list.cc",
        "db/merge_helper.cc",
        "db/merge_operator.cc",
-        "db/multi_scan.cc",
        "db/output_validator.cc",
-        "db/periodic_task_scheduler.cc",
+        "db/periodic_work_scheduler.cc",
        "db/range_del_aggregator.cc",
        "db/range_tombstone_fragmenter.cc",
        "db/repair.cc",
@@ -108,19 +95,13 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "db/version_edit.cc",
        "db/version_edit_handler.cc",
        "db/version_set.cc",
-        "db/version_util.cc",
        "db/wal_edit.cc",
        "db/wal_manager.cc",
-        "db/wide/read_path_blob_resolver.cc",
        "db/wide/wide_column_serialization.cc",
-        "db/wide/wide_columns.cc",
-        "db/wide/wide_columns_helper.cc",
        "db/write_batch.cc",
        "db/write_batch_base.cc",
        "db/write_controller.cc",
-        "db/write_stall_stats.cc",
        "db/write_thread.cc",
-        "db_stress_tool/db_stress_compression_manager.cc",
        "env/composite_env.cc",
        "env/env.cc",
        "env/env_chroot.cc",
@@ -128,7 +109,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "env/env_posix.cc",
        "env/file_system.cc",
        "env/file_system_tracer.cc",
-        "env/fs_on_demand.cc",
        "env/fs_posix.cc",
        "env/fs_remap.cc",
        "env/io_posix.cc",
@@ -158,7 +138,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "memtable/hash_skiplist_rep.cc",
        "memtable/skiplistrep.cc",
        "memtable/vectorrep.cc",
-        "memtable/wbwi_memtable.cc",
        "memtable/write_buffer_manager.cc",
        "monitoring/histogram.cc",
        "monitoring/histogram_windowing.cc",
@@ -178,11 +157,9 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "options/configurable.cc",
        "options/customizable.cc",
        "options/db_options.cc",
-        "options/offpeak_time_info.cc",
        "options/options.cc",
        "options/options_helper.cc",
        "options/options_parser.cc",
-        "port/mmap.cc",
        "port/port_posix.cc",
        "port/stack_trace.cc",
        "port/win/env_default.cc",
@@ -199,7 +176,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "table/block_based/block_based_table_iterator.cc",
        "table/block_based/block_based_table_reader.cc",
        "table/block_based/block_builder.cc",
-        "table/block_based/block_cache.cc",
        "table/block_based/block_prefetcher.cc",
        "table/block_based/block_prefix_index.cc",
        "table/block_based/data_block_footer.cc",
@@ -211,7 +187,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "table/block_based/hash_index_reader.cc",
        "table/block_based/index_builder.cc",
        "table/block_based/index_reader_common.cc",
-        "table/block_based/multi_scan_index_iterator.cc",
        "table/block_based/parsed_full_filter_block.cc",
        "table/block_based/partitioned_filter_block.cc",
        "table/block_based/partitioned_index_iterator.cc",
@@ -219,11 +194,9 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "table/block_based/reader_common.cc",
        "table/block_based/uncompression_dict_reader.cc",
        "table/block_fetcher.cc",
-        "table/compaction_merging_iterator.cc",
        "table/cuckoo/cuckoo_table_builder.cc",
        "table/cuckoo/cuckoo_table_factory.cc",
        "table/cuckoo/cuckoo_table_reader.cc",
-        "table/external_table.cc",
        "table/format.cc",
        "table/get_context.cc",
        "table/iterator.cc",
@@ -258,7 +231,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "trace_replay/trace_record_result.cc",
        "trace_replay/trace_replay.cc",
        "util/async_file_reader.cc",
-        "util/auto_tune_compressor.cc",
        "util/build_version.cc",
        "util/cleanable.cc",
        "util/coding.cc",
@@ -269,24 +241,18 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "util/concurrent_task_limiter_impl.cc",
        "util/crc32c.cc",
        "util/crc32c_arm64.cc",
-        "util/data_structure.cc",
        "util/dynamic_bloom.cc",
        "util/file_checksum_helper.cc",
        "util/hash.cc",
-        "util/io_dispatcher_imp.cc",
        "util/murmurhash.cc",
        "util/random.cc",
        "util/rate_limiter.cc",
        "util/ribbon_config.cc",
-        "util/simple_mixed_compressor.cc",
        "util/slice.cc",
        "util/status.cc",
-        "util/stderr_logger.cc",
        "util/string_util.cc",
        "util/thread_local.cc",
        "util/threadpool_imp.cc",
-        "util/udt_util.cc",
-        "util/write_batch_util.cc",
        "util/xxhash.cc",
        "utilities/agg_merge/agg_merge.cc",
        "utilities/backup/backup_engine.cc",
@@ -330,12 +296,8 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "utilities/persistent_cache/block_cache_tier_metadata.cc",
        "utilities/persistent_cache/persistent_cache_tier.cc",
        "utilities/persistent_cache/volatile_tier_impl.cc",
-        "utilities/secondary_index/secondary_index_iterator.cc",
-        "utilities/secondary_index/simple_secondary_index.cc",
        "utilities/simulator_cache/cache_simulator.cc",
        "utilities/simulator_cache/sim_cache.cc",
-        "utilities/sorted_run_builder/sorted_run_builder.cc",
-        "utilities/table_properties_collectors/compact_for_tiering_collector.cc",
        "utilities/table_properties_collectors/compact_on_deletion_collector.cc",
        "utilities/trace/file_trace_reader_writer.cc",
        "utilities/trace/replayer_impl.cc",
@@ -368,105 +330,399 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "utilities/transactions/write_prepared_txn_db.cc",
        "utilities/transactions/write_unprepared_txn.cc",
        "utilities/transactions/write_unprepared_txn_db.cc",
-        "utilities/trie_index/bitvector.cc",
-        "utilities/trie_index/louds_trie.cc",
-        "utilities/trie_index/trie_index_factory.cc",
        "utilities/ttl/db_ttl_impl.cc",
-        "utilities/types_util.cc",
        "utilities/wal_filter.cc",
        "utilities/write_batch_with_index/write_batch_with_index.cc",
        "utilities/write_batch_with_index/write_batch_with_index_internal.cc",
    ], deps=[
        "//folly/container:f14_hash",
-        "//folly/coro:blocking_wait",
-        "//folly/coro:collect",
-        "//folly/coro:coroutine",
-        "//folly/coro:task",
+        "//folly/experimental/coro:blocking_wait",
+        "//folly/experimental/coro:collect",
+        "//folly/experimental/coro:coroutine",
+        "//folly/experimental/coro:task",
        "//folly/synchronization:distributed_mutex",
-    ], headers=glob(["**/*.h"]), link_whole=False, extra_test_libs=False)
+    ], headers=None, link_whole=False, extra_test_libs=False)

-cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[], deps=[":rocksdb_lib"], headers=[], link_whole=True, extra_test_libs=False)
-
-cpp_library_wrapper(name="rocksdb_with_faiss_lib", srcs=["utilities/secondary_index/faiss_ivf_index.cc"], deps=[
-        "//faiss:faiss",
-        ":rocksdb_lib",
-    ], headers=[], 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/clock_cache.cc",
+        "cache/compressed_secondary_cache.cc",
+        "cache/fast_lru_cache.cc",
+        "cache/lru_cache.cc",
+        "cache/sharded_cache.cc",
+        "db/arena_wrapped_db_iter.cc",
+        "db/blob/blob_fetcher.cc",
+        "db/blob/blob_file_addition.cc",
+        "db/blob/blob_file_builder.cc",
+        "db/blob/blob_file_cache.cc",
+        "db/blob/blob_file_garbage.cc",
+        "db/blob/blob_file_meta.cc",
+        "db/blob/blob_file_reader.cc",
+        "db/blob/blob_garbage_meter.cc",
+        "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",
+        "db/column_family.cc",
+        "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",
+        "db/db_impl/db_impl.cc",
+        "db/db_impl/db_impl_compaction_flush.cc",
+        "db/db_impl/db_impl_debug.cc",
+        "db/db_impl/db_impl_experimental.cc",
+        "db/db_impl/db_impl_files.cc",
+        "db/db_impl/db_impl_open.cc",
+        "db/db_impl/db_impl_readonly.cc",
+        "db/db_impl/db_impl_secondary.cc",
+        "db/db_impl/db_impl_write.cc",
+        "db/db_info_dumper.cc",
+        "db/db_iter.cc",
+        "db/dbformat.cc",
+        "db/error_handler.cc",
+        "db/event_helpers.cc",
+        "db/experimental.cc",
+        "db/external_sst_file_ingestion_job.cc",
+        "db/file_indexer.cc",
+        "db/flush_job.cc",
+        "db/flush_scheduler.cc",
+        "db/forward_iterator.cc",
+        "db/import_column_family_job.cc",
+        "db/internal_stats.cc",
+        "db/log_reader.cc",
+        "db/log_writer.cc",
+        "db/logs_with_prep_tracker.cc",
+        "db/malloc_stats.cc",
+        "db/memtable.cc",
+        "db/memtable_list.cc",
+        "db/merge_helper.cc",
+        "db/merge_operator.cc",
+        "db/output_validator.cc",
+        "db/periodic_work_scheduler.cc",
+        "db/range_del_aggregator.cc",
+        "db/range_tombstone_fragmenter.cc",
+        "db/repair.cc",
+        "db/seqno_to_time_mapping.cc",
+        "db/snapshot_impl.cc",
+        "db/table_cache.cc",
+        "db/table_properties_collector.cc",
+        "db/transaction_log_impl.cc",
+        "db/trim_history_scheduler.cc",
+        "db/version_builder.cc",
+        "db/version_edit.cc",
+        "db/version_edit_handler.cc",
+        "db/version_set.cc",
+        "db/wal_edit.cc",
+        "db/wal_manager.cc",
+        "db/wide/wide_column_serialization.cc",
+        "db/write_batch.cc",
+        "db/write_batch_base.cc",
+        "db/write_controller.cc",
+        "db/write_thread.cc",
+        "env/composite_env.cc",
+        "env/env.cc",
+        "env/env_chroot.cc",
+        "env/env_encryption.cc",
+        "env/env_posix.cc",
+        "env/file_system.cc",
+        "env/file_system_tracer.cc",
+        "env/fs_posix.cc",
+        "env/fs_remap.cc",
+        "env/io_posix.cc",
+        "env/mock_env.cc",
+        "env/unique_id_gen.cc",
+        "file/delete_scheduler.cc",
+        "file/file_prefetch_buffer.cc",
+        "file/file_util.cc",
+        "file/filename.cc",
+        "file/line_file_reader.cc",
+        "file/random_access_file_reader.cc",
+        "file/read_write_util.cc",
+        "file/readahead_raf.cc",
+        "file/sequence_file_reader.cc",
+        "file/sst_file_manager_impl.cc",
+        "file/writable_file_writer.cc",
+        "logging/auto_roll_logger.cc",
+        "logging/event_logger.cc",
+        "logging/log_buffer.cc",
+        "memory/arena.cc",
+        "memory/concurrent_arena.cc",
+        "memory/jemalloc_nodump_allocator.cc",
+        "memory/memkind_kmem_allocator.cc",
+        "memory/memory_allocator.cc",
+        "memtable/alloc_tracker.cc",
+        "memtable/hash_linklist_rep.cc",
+        "memtable/hash_skiplist_rep.cc",
+        "memtable/skiplistrep.cc",
+        "memtable/vectorrep.cc",
+        "memtable/write_buffer_manager.cc",
+        "monitoring/histogram.cc",
+        "monitoring/histogram_windowing.cc",
+        "monitoring/in_memory_stats_history.cc",
+        "monitoring/instrumented_mutex.cc",
+        "monitoring/iostats_context.cc",
+        "monitoring/perf_context.cc",
+        "monitoring/perf_level.cc",
+        "monitoring/persistent_stats_history.cc",
+        "monitoring/statistics.cc",
+        "monitoring/thread_status_impl.cc",
+        "monitoring/thread_status_updater.cc",
+        "monitoring/thread_status_updater_debug.cc",
+        "monitoring/thread_status_util.cc",
+        "monitoring/thread_status_util_debug.cc",
+        "options/cf_options.cc",
+        "options/configurable.cc",
+        "options/customizable.cc",
+        "options/db_options.cc",
+        "options/options.cc",
+        "options/options_helper.cc",
+        "options/options_parser.cc",
+        "port/port_posix.cc",
+        "port/stack_trace.cc",
+        "port/win/env_default.cc",
+        "port/win/env_win.cc",
+        "port/win/io_win.cc",
+        "port/win/port_win.cc",
+        "port/win/win_logger.cc",
+        "port/win/win_thread.cc",
+        "table/adaptive/adaptive_table_factory.cc",
+        "table/block_based/binary_search_index_reader.cc",
+        "table/block_based/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",
+        "table/block_based/block_based_table_reader.cc",
+        "table/block_based/block_builder.cc",
+        "table/block_based/block_prefetcher.cc",
+        "table/block_based/block_prefix_index.cc",
+        "table/block_based/data_block_footer.cc",
+        "table/block_based/data_block_hash_index.cc",
+        "table/block_based/filter_block_reader_common.cc",
+        "table/block_based/filter_policy.cc",
+        "table/block_based/flush_block_policy.cc",
+        "table/block_based/full_filter_block.cc",
+        "table/block_based/hash_index_reader.cc",
+        "table/block_based/index_builder.cc",
+        "table/block_based/index_reader_common.cc",
+        "table/block_based/parsed_full_filter_block.cc",
+        "table/block_based/partitioned_filter_block.cc",
+        "table/block_based/partitioned_index_iterator.cc",
+        "table/block_based/partitioned_index_reader.cc",
+        "table/block_based/reader_common.cc",
+        "table/block_based/uncompression_dict_reader.cc",
+        "table/block_fetcher.cc",
+        "table/cuckoo/cuckoo_table_builder.cc",
+        "table/cuckoo/cuckoo_table_factory.cc",
+        "table/cuckoo/cuckoo_table_reader.cc",
+        "table/format.cc",
+        "table/get_context.cc",
+        "table/iterator.cc",
+        "table/merging_iterator.cc",
+        "table/meta_blocks.cc",
+        "table/persistent_cache_helper.cc",
+        "table/plain/plain_table_bloom.cc",
+        "table/plain/plain_table_builder.cc",
+        "table/plain/plain_table_factory.cc",
+        "table/plain/plain_table_index.cc",
+        "table/plain/plain_table_key_coding.cc",
+        "table/plain/plain_table_reader.cc",
+        "table/sst_file_dumper.cc",
+        "table/sst_file_reader.cc",
+        "table/sst_file_writer.cc",
+        "table/table_factory.cc",
+        "table/table_properties.cc",
+        "table/two_level_iterator.cc",
+        "table/unique_id.cc",
+        "test_util/sync_point.cc",
+        "test_util/sync_point_impl.cc",
+        "test_util/transaction_test_util.cc",
+        "tools/dump/db_dump_tool.cc",
+        "tools/io_tracer_parser_tool.cc",
+        "tools/ldb_cmd.cc",
+        "tools/ldb_tool.cc",
+        "tools/sst_dump_tool.cc",
+        "trace_replay/block_cache_tracer.cc",
+        "trace_replay/io_tracer.cc",
+        "trace_replay/trace_record.cc",
+        "trace_replay/trace_record_handler.cc",
+        "trace_replay/trace_record_result.cc",
+        "trace_replay/trace_replay.cc",
+        "util/async_file_reader.cc",
+        "util/build_version.cc",
+        "util/cleanable.cc",
+        "util/coding.cc",
+        "util/compaction_job_stats_impl.cc",
+        "util/comparator.cc",
+        "util/compression.cc",
+        "util/compression_context_cache.cc",
+        "util/concurrent_task_limiter_impl.cc",
+        "util/crc32c.cc",
+        "util/crc32c_arm64.cc",
+        "util/dynamic_bloom.cc",
+        "util/file_checksum_helper.cc",
+        "util/hash.cc",
+        "util/murmurhash.cc",
+        "util/random.cc",
+        "util/rate_limiter.cc",
+        "util/ribbon_config.cc",
+        "util/slice.cc",
+        "util/status.cc",
+        "util/string_util.cc",
+        "util/thread_local.cc",
+        "util/threadpool_imp.cc",
+        "util/xxhash.cc",
+        "utilities/agg_merge/agg_merge.cc",
+        "utilities/backup/backup_engine.cc",
+        "utilities/blob_db/blob_compaction_filter.cc",
+        "utilities/blob_db/blob_db.cc",
+        "utilities/blob_db/blob_db_impl.cc",
+        "utilities/blob_db/blob_db_impl_filesnapshot.cc",
+        "utilities/blob_db/blob_dump_tool.cc",
+        "utilities/blob_db/blob_file.cc",
+        "utilities/cache_dump_load.cc",
+        "utilities/cache_dump_load_impl.cc",
+        "utilities/cassandra/cassandra_compaction_filter.cc",
+        "utilities/cassandra/format.cc",
+        "utilities/cassandra/merge_operator.cc",
+        "utilities/checkpoint/checkpoint_impl.cc",
+        "utilities/compaction_filters.cc",
+        "utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc",
+        "utilities/convenience/info_log_finder.cc",
+        "utilities/counted_fs.cc",
+        "utilities/debug.cc",
+        "utilities/env_mirror.cc",
+        "utilities/env_timed.cc",
+        "utilities/fault_injection_env.cc",
+        "utilities/fault_injection_fs.cc",
+        "utilities/fault_injection_secondary_cache.cc",
+        "utilities/leveldb_options/leveldb_options.cc",
+        "utilities/memory/memory_util.cc",
+        "utilities/merge_operators.cc",
+        "utilities/merge_operators/bytesxor.cc",
+        "utilities/merge_operators/max.cc",
+        "utilities/merge_operators/put.cc",
+        "utilities/merge_operators/sortlist.cc",
+        "utilities/merge_operators/string_append/stringappend.cc",
+        "utilities/merge_operators/string_append/stringappend2.cc",
+        "utilities/merge_operators/uint64add.cc",
+        "utilities/object_registry.cc",
+        "utilities/option_change_migration/option_change_migration.cc",
+        "utilities/options/options_util.cc",
+        "utilities/persistent_cache/block_cache_tier.cc",
+        "utilities/persistent_cache/block_cache_tier_file.cc",
+        "utilities/persistent_cache/block_cache_tier_metadata.cc",
+        "utilities/persistent_cache/persistent_cache_tier.cc",
+        "utilities/persistent_cache/volatile_tier_impl.cc",
+        "utilities/simulator_cache/cache_simulator.cc",
+        "utilities/simulator_cache/sim_cache.cc",
+        "utilities/table_properties_collectors/compact_on_deletion_collector.cc",
+        "utilities/trace/file_trace_reader_writer.cc",
+        "utilities/trace/replayer_impl.cc",
+        "utilities/transactions/lock/lock_manager.cc",
+        "utilities/transactions/lock/point/point_lock_manager.cc",
+        "utilities/transactions/lock/point/point_lock_tracker.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/concurrent_tree.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/keyrange.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/lock_request.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/manager.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/range_buffer.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/treenode.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/txnid_set.cc",
+        "utilities/transactions/lock/range/range_tree/lib/locktree/wfg.cc",
+        "utilities/transactions/lock/range/range_tree/lib/standalone_port.cc",
+        "utilities/transactions/lock/range/range_tree/lib/util/dbt.cc",
+        "utilities/transactions/lock/range/range_tree/lib/util/memarena.cc",
+        "utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc",
+        "utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc",
+        "utilities/transactions/optimistic_transaction.cc",
+        "utilities/transactions/optimistic_transaction_db_impl.cc",
+        "utilities/transactions/pessimistic_transaction.cc",
+        "utilities/transactions/pessimistic_transaction_db.cc",
+        "utilities/transactions/snapshot_checker.cc",
+        "utilities/transactions/transaction_base.cc",
+        "utilities/transactions/transaction_db_mutex_impl.cc",
+        "utilities/transactions/transaction_util.cc",
+        "utilities/transactions/write_prepared_txn.cc",
+        "utilities/transactions/write_prepared_txn_db.cc",
+        "utilities/transactions/write_unprepared_txn.cc",
+        "utilities/transactions/write_unprepared_txn_db.cc",
+        "utilities/ttl/db_ttl_impl.cc",
+        "utilities/wal_filter.cc",
+        "utilities/write_batch_with_index/write_batch_with_index.cc",
+        "utilities/write_batch_with_index/write_batch_with_index_internal.cc",
+    ], 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)

 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/secondary_cache_test_util.cc",
        "test_util/testharness.cc",
        "test_util/testutil.cc",
        "tools/block_cache_analyzer/block_cache_trace_analyzer.cc",
        "tools/trace_analyzer_tool.cc",
        "utilities/agg_merge/test_agg_merge.cc",
        "utilities/cassandra/test_utils.cc",
-    ], deps=[":rocksdb_lib"], headers=[], link_whole=False, extra_test_libs=True)
-
-cpp_library_wrapper(name="rocksdb_with_faiss_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/secondary_cache_test_util.cc",
-        "test_util/testharness.cc",
-        "test_util/testutil.cc",
-        "tools/block_cache_analyzer/block_cache_trace_analyzer.cc",
-        "tools/trace_analyzer_tool.cc",
-        "utilities/agg_merge/test_agg_merge.cc",
-        "utilities/cassandra/test_utils.cc",
-    ], deps=[":rocksdb_with_faiss_lib"], headers=[], link_whole=False, extra_test_libs=True)
+    ], deps=[":rocksdb_lib"], headers=None, link_whole=False, extra_test_libs=True)

 cpp_library_wrapper(name="rocksdb_tools_lib", srcs=[
        "test_util/testutil.cc",
        "tools/block_cache_analyzer/block_cache_trace_analyzer.cc",
        "tools/db_bench_tool.cc",
        "tools/simulated_hybrid_file_system.cc",
-        "tools/tool_hooks.cc",
        "tools/trace_analyzer_tool.cc",
-    ], deps=[":rocksdb_lib"], headers=[], link_whole=False, extra_test_libs=False)
+    ], deps=[":rocksdb_lib"], headers=None, link_whole=False, extra_test_libs=False)

-cpp_library_wrapper(name="rocksdb_cache_bench_tools_lib", srcs=["cache/cache_bench_tool.cc"], deps=[":rocksdb_lib"], headers=[], link_whole=False, extra_test_libs=False)
-
-cpp_library_wrapper(name="rocksdb_point_lock_bench_tools_lib", srcs=["utilities/transactions/lock/point/point_lock_bench_tool.cc"], deps=[":rocksdb_lib"], headers=[], link_whole=False, extra_test_libs=False)
+cpp_library_wrapper(name="rocksdb_cache_bench_tools_lib", srcs=["cache/cache_bench_tool.cc"], deps=[":rocksdb_lib"], headers=None, link_whole=False, extra_test_libs=False)

 rocks_cpp_library_wrapper(name="rocksdb_stress_lib", srcs=[
        "db_stress_tool/batched_ops_stress.cc",
        "db_stress_tool/cf_consistency_stress.cc",
        "db_stress_tool/db_stress_common.cc",
-        "db_stress_tool/db_stress_compaction_service.cc",
-        "db_stress_tool/db_stress_compression_manager.cc",
        "db_stress_tool/db_stress_driver.cc",
-        "db_stress_tool/db_stress_filters.cc",
        "db_stress_tool/db_stress_gflags.cc",
        "db_stress_tool/db_stress_listener.cc",
        "db_stress_tool/db_stress_shared_state.cc",
+        "db_stress_tool/db_stress_stat.cc",
        "db_stress_tool/db_stress_test_base.cc",
        "db_stress_tool/db_stress_tool.cc",
-        "db_stress_tool/db_stress_wide_merge_operator.cc",
        "db_stress_tool/expected_state.cc",
-        "db_stress_tool/expected_value.cc",
        "db_stress_tool/multi_ops_txns_stress.cc",
        "db_stress_tool/no_batched_ops_stress.cc",
        "test_util/testutil.cc",
        "tools/block_cache_analyzer/block_cache_trace_analyzer.cc",
        "tools/trace_analyzer_tool.cc",
-    ], headers=[])
+    ], headers=None)


-cpp_binary_wrapper(name="ldb", srcs=["tools/ldb.cc"], deps=[":rocksdb_tools_lib"], extra_preprocessor_flags=[], extra_bench_libs=False)
-
 cpp_binary_wrapper(name="db_stress", srcs=["db_stress_tool/db_stress.cc"], deps=[":rocksdb_stress_lib"], extra_preprocessor_flags=[], extra_bench_libs=False)

-cpp_binary_wrapper(name="db_bench", srcs=["tools/db_bench.cc"], deps=[":rocksdb_tools_lib"], extra_preprocessor_flags=[], extra_bench_libs=False)
-
-cpp_binary_wrapper(name="cache_bench", srcs=["cache/cache_bench.cc"], deps=[":rocksdb_cache_bench_tools_lib"], extra_preprocessor_flags=[], extra_bench_libs=False)
-
-cpp_binary_wrapper(name="point_lock_bench", srcs=["utilities/transactions/lock/point/point_lock_bench.cc"], deps=[":rocksdb_point_lock_bench_tools_lib"], extra_preprocessor_flags=[], extra_bench_libs=False)
-
 cpp_binary_wrapper(name="ribbon_bench", srcs=["microbench/ribbon_bench.cc"], deps=[], extra_preprocessor_flags=[], extra_bench_libs=True)

 cpp_binary_wrapper(name="db_basic_bench", srcs=["microbench/db_basic_bench.cc"], deps=[], extra_preprocessor_flags=[], extra_bench_libs=True)
@@ -4676,12 +4932,6 @@ cpp_unittest_wrapper(name="compact_files_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="compact_for_tiering_collector_test",
-            srcs=["utilities/table_properties_collectors/compact_for_tiering_collector_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="compact_on_deletion_collector_test",
            srcs=["utilities/table_properties_collectors/compact_on_deletion_collector_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -4730,12 +4980,6 @@ cpp_unittest_wrapper(name="compressed_secondary_cache_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="compression_test",
-            srcs=["util/compression_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="configurable_test",
            srcs=["options/configurable_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -4808,12 +5052,6 @@ cpp_unittest_wrapper(name="db_blob_corruption_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="db_blob_direct_write_test",
-            srcs=["db/blob/db_blob_direct_write_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_blob_index_test",
            srcs=["db/blob/db_blob_index_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -4832,18 +5070,6 @@ cpp_unittest_wrapper(name="db_bloom_filter_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="db_clip_test",
-            srcs=["db/db_clip_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
-cpp_unittest_wrapper(name="db_compaction_abort_test",
-            srcs=["db/db_compaction_abort_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_compaction_filter_test",
            srcs=["db/db_compaction_filter_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -4868,24 +5094,12 @@ cpp_unittest_wrapper(name="db_encryption_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="db_etc3_test",
-            srcs=["db/db_etc3_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_flush_test",
            srcs=["db/db_flush_test.cc"],
            deps=[":rocksdb_test_lib"],
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="db_follower_test",
-            srcs=["db/db_follower_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_inplace_update_test",
            srcs=["db/db_inplace_update_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -4952,12 +5166,6 @@ cpp_unittest_wrapper(name="db_merge_operator_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="db_open_with_config_test",
-            srcs=["db/db_open_with_config_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_options_test",
            srcs=["db/db_options_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5048,12 +5256,6 @@ cpp_unittest_wrapper(name="db_wide_basic_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="db_wide_blob_direct_write_test",
-            srcs=["db/wide/db_wide_blob_direct_write_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"],
@@ -5108,7 +5310,7 @@ cpp_unittest_wrapper(name="dynamic_bloom_test",
            extra_compiler_flags=[])


-cpp_library_wrapper(name="env_basic_test_lib", srcs=["env/env_basic_test.cc"], deps=[":rocksdb_test_lib"], headers=[], link_whole=False, extra_test_libs=True)
+cpp_library_wrapper(name="env_basic_test_lib", srcs=["env/env_basic_test.cc"], deps=[":rocksdb_test_lib"], headers=None, link_whole=False, extra_test_libs=True)

 cpp_unittest_wrapper(name="env_basic_test",
            srcs=["env/env_basic_test.cc"],
@@ -5158,18 +5360,6 @@ cpp_unittest_wrapper(name="external_sst_file_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="faiss_ivf_index_test",
-            srcs=["utilities/secondary_index/faiss_ivf_index_test.cc"],
-            deps=[":rocksdb_with_faiss_test_lib"],
-            extra_compiler_flags=[])
-
-
-cpp_unittest_wrapper(name="fault_injection_fs_test",
-            srcs=["utilities/fault_injection_fs_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="fault_injection_test",
            srcs=["db/fault_injection_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5248,18 +5438,6 @@ cpp_unittest_wrapper(name="inlineskiplist_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="interval_test",
-            srcs=["util/interval_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
-cpp_unittest_wrapper(name="io_dispatcher_test",
-            srcs=["util/io_dispatcher_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="io_posix_test",
            srcs=["env/io_posix_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5356,12 +5534,6 @@ cpp_unittest_wrapper(name="mock_env_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="multi_cf_iterator_test",
-            srcs=["db/multi_cf_iterator_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="object_registry_test",
            srcs=["utilities/object_registry_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5422,8 +5594,8 @@ cpp_unittest_wrapper(name="perf_context_test",
            extra_compiler_flags=[])


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

@@ -5440,12 +5612,6 @@ cpp_unittest_wrapper(name="plain_table_db_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="point_lock_manager_stress_test",
-            srcs=["utilities/transactions/lock/point/point_lock_manager_stress_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="point_lock_manager_test",
            srcs=["utilities/transactions/lock/point/point_lock_manager_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5554,12 +5720,6 @@ cpp_unittest_wrapper(name="slice_transform_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="sorted_run_builder_test",
-            srcs=["utilities/sorted_run_builder/sorted_run_builder_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="sst_dump_test",
            srcs=["tools/sst_dump_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5626,12 +5786,6 @@ cpp_unittest_wrapper(name="tiered_compaction_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="tiered_secondary_cache_test",
-            srcs=["cache/tiered_secondary_cache_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"],
@@ -5662,36 +5816,12 @@ cpp_unittest_wrapper(name="transaction_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="trie_index_db_test",
-            srcs=["utilities/trie_index/trie_index_db_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
-cpp_unittest_wrapper(name="trie_index_test",
-            srcs=["utilities/trie_index/trie_index_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="ttl_test",
            srcs=["utilities/ttl/ttl_test.cc"],
            deps=[":rocksdb_test_lib"],
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="types_util_test",
-            srcs=["utilities/types_util_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
-cpp_unittest_wrapper(name="udt_util_test",
-            srcs=["util/udt_util_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="util_merge_operators_test",
            srcs=["utilities/util_merge_operators_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5728,12 +5858,6 @@ cpp_unittest_wrapper(name="wide_column_serialization_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="wide_columns_helper_test",
-            srcs=["db/wide/wide_columns_helper_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"],
@@ -5776,12 +5900,6 @@ cpp_unittest_wrapper(name="write_controller_test",
            extra_compiler_flags=[])


-cpp_unittest_wrapper(name="write_prepared_transaction_seqno_test",
-            srcs=["utilities/transactions/write_prepared_transaction_seqno_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="write_prepared_transaction_test",
            srcs=["utilities/transactions/write_prepared_transaction_test.cc"],
            deps=[":rocksdb_test_lib"],
@@ -5793,5 +5911,3 @@ cpp_unittest_wrapper(name="write_unprepared_transaction_test",
            deps=[":rocksdb_test_lib"],
            extra_compiler_flags=[])

-
-export_file(name = "tools/db_crashtest.py")
@@ -15,41 +15,17 @@ At Facebook, we use RocksDB as storage engines in multiple data management servi

 [2] https://code.facebook.com/posts/357056558062811/logdevice-a-distributed-data-store-for-logs/

-## Bilibili
-[Bilibili](bilibili.com) [uses](https://www.alluxio.io/blog/when-ai-meets-alluxio-at-bilibili-building-an-efficient-ai-platform-for-data-preprocessing-and-model-training/) Alluxio to speed up its ML training workloads, and Alluxio uses RocksDB to store its filesystem metadata, so Bilibili uses RocksDB.
-
-Bilibili's [real-time platform](https://www.alibabacloud.com/blog/architecture-and-practices-of-bilibilis-real-time-platform_596676) uses Flink, and uses RocksDB as Flink's state store.
-
-## TikTok
-TikTok, or its parent company ByteDance, uses RocksDB as the storage engine for some storage systems, such as its distributed graph database [ByteGraph](https://vldb.org/pvldb/vol15/p3306-li.pdf). 
-
-Also, TikTok uses [Alluxio](alluxio.io) to [speed up Presto queries](https://www.alluxio.io/resources/videos/improving-presto-performance-with-alluxio-at-tiktok/), and Alluxio stores the files' metadata in RocksDB.
-
-## FoundationDB
-[FoundationDB](https://www.foundationdb.org/) [uses](https://github.com/apple/foundationdb/blob/377f1f692da6ab2fe5bdac57035651db3e5fb66d/fdbserver/KeyValueStoreRocksDB.actor.cpp) RocksDB to implement a [key-value store interface](https://github.com/apple/foundationdb/blob/377f1f692da6ab2fe5bdac57035651db3e5fb66d/fdbserver/KeyValueStoreRocksDB.actor.cpp#L1127) in its server backend.
-
-## Apple
-Apple [uses](https://opensource.apple.com/projects/foundationdb/) FoundationDB, so it also uses RocksDB.
-
-## Snowflake
-Snowflake [uses](https://www.snowflake.com/blog/how-foundationdb-powers-snowflake-metadata-forward/) FoundationDB, so it also uses RocksDB.
-
-## Microsoft
-The Bing search engine from Microsoft uses RocksDB as the storage engine for its web data platform: https://blogs.bing.com/Engineering-Blog/october-2021/RocksDB-in-Microsoft-Bing
-
 ## LinkedIn
-1. [Venice](https://venicedb.org/) is a derived data platform using RocksDB as its storage engine. It is LinkedIn's ML feature store, powering thousands of recommender use cases, including the Feed, Video recommendations, and People You May Know.
-2. LinkedIn's follow feed for storing user's activities. Check out the blog post: https://engineering.linkedin.com/blog/2016/03/followfeed--linkedin-s-feed-made-faster-and-smarter
-3. Apache Samza, open source framework for stream processing.
+Two different use cases at Linkedin are using RocksDB as a storage engine:

-Learn more about LinkedIn's follow feed and Apache Samza in a Tech Talk by Ankit Gupta and Naveen Somasundaram: http://www.youtube.com/watch?v=plqVp_OnSzg
+1. LinkedIn's follow feed for storing user's activities. Check out the blog post: https://engineering.linkedin.com/blog/2016/03/followfeed--linkedin-s-feed-made-faster-and-smarter
+2. Apache Samza, open source framework for stream processing
+
+Learn more about those use cases in a Tech Talk by Ankit Gupta and Naveen Somasundaram: http://www.youtube.com/watch?v=plqVp_OnSzg

 ## Yahoo
 Yahoo is using RocksDB as a storage engine for their biggest distributed data store Sherpa. Learn more about it here: http://yahooeng.tumblr.com/post/120730204806/sherpa-scales-new-heights

-## Tencent
-[PaxosStore](https://github.com/Tencent/paxosstore) is a distributed database supporting WeChat. It uses RocksDB as its storage engine.
-
 ## Baidu
 [Apache Doris](http://doris.apache.org/master/en/) is a MPP analytical database engine released by Baidu. It [uses RocksDB](http://doris.apache.org/master/en/administrator-guide/operation/tablet-meta-tool.html) to manage its tablet's metadata.

@@ -103,18 +79,6 @@ quasardb uses a heavily tuned RocksDB as its persistence layer.
 ## TiKV
 [TiKV](https://github.com/pingcap/tikv) is a GEO-replicated, high-performance, distributed, transactional key-value database. TiKV is powered by Rust and Raft. TiKV uses RocksDB as its persistence layer.

-## TiDB
-[TiDB](https://github.com/pingcap/tidb) uses the TiKV distributed key-value database, so it uses RocksDB.
-
-## PingCAP
-[PingCAP](https://www.pingcap.com/) is the company behind TiDB, its cloud database service uses RocksDB.
-
-## Apache Spark
-[Spark Structured Streaming](https://docs.databricks.com/structured-streaming/rocksdb-state-store.html) uses RocksDB as the local state store.
-
-## Databricks
-[Databricks](https://www.databricks.com/) [replaces AWS RDS with TiDB](https://www.pingcap.com/case-study/how-databricks-tackles-the-scalability-limit-with-a-mysql-alternative/) for scalability, so it uses RocksDB.
-
 ## Apache Flink
 [Apache Flink](https://flink.apache.org/news/2016/03/08/release-1.0.0.html) uses RocksDB to store state locally on a machine.

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

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

@@ -163,9 +124,5 @@ LzLabs is using RocksDB as a storage engine in their multi-database distributed
 ## Solana Labs
 [Solana](https://github.com/solana-labs/solana) is a fast, secure, scalable, and decentralized blockchain.  It uses RocksDB as the underlying storage for its ledger store.

-## Apache Kvrocks
-
-[Apache Kvrocks](https://github.com/apache/kvrocks) is an open-source distributed key-value NoSQL database built on top of RocksDB. It serves as a cost-saving and capacity-increasing alternative drop-in replacement for Redis.
-
 ## Others
 More databases using RocksDB can be found at [dbdb.io](https://dbdb.io/browse?embeds=rocksdb).
@@ -1,23 +1,25 @@
 #!/usr/bin/env python3
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 try:
    from builtins import str
 except ImportError:
    from __builtin__ import str
-import fnmatch
+from targets_builder import TARGETSBuilder
 import json
 import os
+import fnmatch
 import sys

-from targets_builder import TARGETSBuilder, LiteralValue
-
 from util import ColorString

-# This script generates BUCK file for Buck.
+# This script generates TARGETS file for Buck.
 # Buck is a build tool specifying dependencies among different build targets.
 # User can pass extra dependencies as a JSON object via command line, and this
-# script can include these dependencies in the generate BUCK file.
+# script can include these dependencies in the generate TARGETS file.
 # Usage:
 # $python3 buckifier/buckify_rocksdb.py
 # (This generates a TARGET file without user-specified dependency for unit
@@ -25,10 +27,10 @@ from util import ColorString
 # $python3 buckifier/buckify_rocksdb.py \
 #        '{"fake": {
 #                      "extra_deps": [":test_dep", "//fakes/module:mock1"],
-#                      "extra_compiler_flags": ["-DFOO_BAR", "-Os"]
+#                      "extra_compiler_flags": ["-DROCKSDB_LITE", "-Os"]
 #                  }
 #         }'
-# (Generated BUCK file has test_dep and mock1 as dependencies for RocksDB
+# (Generated TARGETS file has test_dep and mock1 as dependencies for RocksDB
 # unit tests, and will use the extra_compiler_flags to compile the unit test
 # source.)

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

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

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

    return s

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

@@ -107,16 +111,15 @@ def get_dependencies():
                v = encode_dict(v)
            rv[k] = v
        return rv
-
    extra_deps = json.loads(sys.argv[1], object_hook=encode_dict)
    for target_alias, deps in extra_deps.items():
        deps_map[target_alias] = deps
    return deps_map


-# Prepare BUCK file for buck
-def generate_buck(repo_path, deps_map):
-    print(ColorString.info("Generating BUCK"))
+# Prepare TARGETS file for buck
+def generate_targets(repo_path, deps_map):
+    print(ColorString.info("Generating TARGETS"))
    # parsed src.mk file
    src_mk = parse_src_mk(repo_path)
    # get all .cc files
@@ -131,143 +134,102 @@ def generate_buck(repo_path, deps_map):
    if len(sys.argv) >= 2:
        # Heuristically quote and canonicalize whitespace for inclusion
        # in how the file was generated.
-        extra_argv = " '{}'".format(" ".join(sys.argv[1].split()))
+        extra_argv = " '{0}'".format(" ".join(sys.argv[1].split()))

-    BUCK = TARGETSBuilder("%s/BUCK" % repo_path, extra_argv)
-
-    # Add oncall("rocksdb_point_of_contact") at the top
-    BUCK.add_oncall("rocksdb_point_of_contact")
+    TARGETS = TARGETSBuilder("%s/TARGETS" % repo_path, extra_argv)

    # rocksdb_lib
-    BUCK.add_library(
+    TARGETS.add_library(
        "rocksdb_lib",
        src_mk["LIB_SOURCES"] +
        # always add range_tree, it's only excluded on ppc64, which we don't use internally
-        src_mk["RANGE_TREE_SOURCES"] + src_mk["TOOL_LIB_SOURCES"],
+        src_mk["RANGE_TREE_SOURCES"] +
+        src_mk["TOOL_LIB_SOURCES"],
        deps=[
            "//folly/container:f14_hash",
-            "//folly/coro:blocking_wait",
-            "//folly/coro:collect",
-            "//folly/coro:coroutine",
-            "//folly/coro:task",
-            "//folly/synchronization:distributed_mutex",
-        ],
-        headers=LiteralValue("glob([\"**/*.h\"])")
-    )
+            "//folly/experimental/coro:blocking_wait",
+            "//folly/experimental/coro:collect",
+            "//folly/experimental/coro:coroutine",
+            "//folly/experimental/coro:task",
+            "//folly/synchronization:distributed_mutex"])
    # rocksdb_whole_archive_lib
-    BUCK.add_library(
+    TARGETS.add_library(
        "rocksdb_whole_archive_lib",
-        [],
+        src_mk["LIB_SOURCES"] +
+        # always add range_tree, it's only excluded on ppc64, which we don't use internally
+        src_mk["RANGE_TREE_SOURCES"] +
+        src_mk["TOOL_LIB_SOURCES"],
        deps=[
-            ":rocksdb_lib",
-        ],
+            "//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,
        extra_external_deps="",
-        link_whole=True,
-    )
-    # rocksdb_with_faiss_lib
-    BUCK.add_library(
-        "rocksdb_with_faiss_lib",
-        src_mk.get("WITH_FAISS_LIB_SOURCES", []),
-        deps=[
-            "//faiss:faiss",
-            ":rocksdb_lib",
-        ],
-    )
+        link_whole=True)
    # rocksdb_test_lib
-    BUCK.add_library(
+    TARGETS.add_library(
        "rocksdb_test_lib",
-        src_mk.get("MOCK_LIB_SOURCES", [])
-        + src_mk.get("TEST_LIB_SOURCES", [])
-        + src_mk.get("EXP_LIB_SOURCES", [])
-        + src_mk.get("ANALYZER_LIB_SOURCES", []),
+        src_mk.get("MOCK_LIB_SOURCES", []) +
+        src_mk.get("TEST_LIB_SOURCES", []) +
+        src_mk.get("EXP_LIB_SOURCES", []) +
+        src_mk.get("ANALYZER_LIB_SOURCES", []),
        [":rocksdb_lib"],
-        extra_test_libs=True,
-    )
-    # rocksdb_with_faiss_test_lib
-    BUCK.add_library(
-        "rocksdb_with_faiss_test_lib",
-        src_mk.get("MOCK_LIB_SOURCES", [])
-        + src_mk.get("TEST_LIB_SOURCES", [])
-        + src_mk.get("EXP_LIB_SOURCES", [])
-        + src_mk.get("ANALYZER_LIB_SOURCES", []),
-        deps=[
-            ":rocksdb_with_faiss_lib",
-        ],
-        extra_test_libs=True,
-    )
+        extra_test_libs=True
+        )
    # rocksdb_tools_lib
-    BUCK.add_library(
+    TARGETS.add_library(
        "rocksdb_tools_lib",
-        src_mk.get("BENCH_LIB_SOURCES", [])
-        + src_mk.get("ANALYZER_LIB_SOURCES", [])
-        + ["test_util/testutil.cc"],
-        [":rocksdb_lib"],
-    )
+        src_mk.get("BENCH_LIB_SOURCES", []) +
+        src_mk.get("ANALYZER_LIB_SOURCES", []) +
+        ["test_util/testutil.cc"],
+        [":rocksdb_lib"])
    # rocksdb_cache_bench_tools_lib
-    BUCK.add_library(
+    TARGETS.add_library(
        "rocksdb_cache_bench_tools_lib",
        src_mk.get("CACHE_BENCH_LIB_SOURCES", []),
-        [":rocksdb_lib"],
-    )
-    # rocksdb_point_lock_bench_tools_lib
-    BUCK.add_library(
-        "rocksdb_point_lock_bench_tools_lib",
-        src_mk.get("POINT_LOCK_BENCH_LIB_SOURCES", []),
-        [":rocksdb_lib"],
-    )
+        [":rocksdb_lib"])
    # rocksdb_stress_lib
-    BUCK.add_rocksdb_library(
+    TARGETS.add_rocksdb_library(
        "rocksdb_stress_lib",
        src_mk.get("ANALYZER_LIB_SOURCES", [])
-        + src_mk.get("STRESS_LIB_SOURCES", [])
-        + ["test_util/testutil.cc"],
-    )
-    # ldb binary
-    BUCK.add_binary(
-        "ldb", ["tools/ldb.cc"], [":rocksdb_tools_lib"]
-    )
+        + src_mk.get('STRESS_LIB_SOURCES', [])
+        + ["test_util/testutil.cc"])
    # db_stress binary
-    BUCK.add_binary(
-        "db_stress", ["db_stress_tool/db_stress.cc"], [":rocksdb_stress_lib"]
-    )
-    # db_bench binary
-    BUCK.add_binary(
-        "db_bench", ["tools/db_bench.cc"], [":rocksdb_tools_lib"]
-    )
-    # cache_bench binary
-    BUCK.add_binary(
-        "cache_bench", ["cache/cache_bench.cc"], [":rocksdb_cache_bench_tools_lib"]
-    )
-    # point_lock_bench binary
-    BUCK.add_binary(
-        "point_lock_bench",
-        ["utilities/transactions/lock/point/point_lock_bench.cc"],
-        [":rocksdb_point_lock_bench_tools_lib"]
-    )
+    TARGETS.add_binary("db_stress",
+                       ["db_stress_tool/db_stress.cc"],
+                       [":rocksdb_stress_lib"])
    # bench binaries
    for src in src_mk.get("MICROBENCH_SOURCES", []):
-        name = src.rsplit("/", 1)[1].split(".")[0] if "/" in src else src.split(".")[0]
-        BUCK.add_binary(name, [src], [], extra_bench_libs=True)
-    print(f"Extra dependencies:\n{json.dumps(deps_map)}")
+        name =  src.rsplit('/',1)[1].split('.')[0] if '/' in src else src.split('.')[0]
+        TARGETS.add_binary(
+            name,
+            [src],
+            [],
+            extra_bench_libs=True
+            )
+    print("Extra dependencies:\n{0}".format(json.dumps(deps_map)))

    # Dictionary test executable name -> relative source file path
    test_source_map = {}

-    # c_test.c is added through BUCK.add_c_test(). If there
+    # c_test.c is added through TARGETS.add_c_test(). If there
    # are more than one .c test file, we need to extend
-    # BUCK.add_c_test() to include other C tests too.
+    # TARGETS.add_c_test() to include other C tests too.
    for test_src in src_mk.get("TEST_MAIN_SOURCES_C", []):
-        if test_src != "db/c_test.c":
+        if test_src != 'db/c_test.c':
            print("Don't know how to deal with " + test_src)
            return False
-    BUCK.add_c_test()
+    TARGETS.add_c_test()

    try:
        with open(f"{repo_path}/buckifier/bench.json") as json_file:
            fast_fancy_bench_config_list = json.load(json_file)
            for config_dict in fast_fancy_bench_config_list:
                clean_benchmarks = {}
-                benchmarks = config_dict["benchmarks"]
+                benchmarks = config_dict['benchmarks']
                for binary, benchmark_dict in benchmarks.items():
                    clean_benchmarks[binary] = {}
                    for benchmark, overloaded_metric_list in benchmark_dict.items():
@@ -275,20 +237,13 @@ def generate_buck(repo_path, deps_map):
                        for metric in overloaded_metric_list:
                            if not isinstance(metric, dict):
                                clean_benchmarks[binary][benchmark].append(metric)
-                BUCK.add_fancy_bench_config(
-                    config_dict["name"],
-                    clean_benchmarks,
-                    False,
-                    config_dict["expected_runtime_one_iter"],
-                    config_dict["sl_iterations"],
-                    config_dict["regression_threshold"],
-                )
+                TARGETS.add_fancy_bench_config(config_dict['name'], clean_benchmarks, False, config_dict['expected_runtime_one_iter'], config_dict['sl_iterations'], config_dict['regression_threshold'])

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

-    BUCK.add_test_header()
+    TARGETS.add_test_header()

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

-    for test_src in src_mk.get("WITH_FAISS_TEST_MAIN_SOURCES", []):
-        test = test_src.split(".c")[0].strip().split("/")[-1].strip()
-        test_source_map[test] = (test_src, True)
-        print("" + test + " " + test_src + " [FAISS]")
-
    for target_alias, deps in deps_map.items():
-        for test, (test_src, with_faiss) in sorted(test_source_map.items()):
+        for test, test_src in sorted(test_source_map.items()):
            if len(test) == 0:
                print(ColorString.warning("Failed to get test name for %s" % test_src))
                continue

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

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

-    print(ColorString.info("Generated BUCK Summary:"))
-    print(ColorString.info("- %d libs" % BUCK.total_lib))
-    print(ColorString.info("- %d binarys" % BUCK.total_bin))
-    print(ColorString.info("- %d tests" % BUCK.total_test))
+    print(ColorString.info("Generated TARGETS Summary:"))
+    print(ColorString.info("- %d libs" % TARGETS.total_lib))
+    print(ColorString.info("- %d binarys" % TARGETS.total_bin))
+    print(ColorString.info("- %d tests" % TARGETS.total_test))
    return True


@@ -372,7 +300,8 @@ def get_rocksdb_path():
    # rocksdb = {script_dir}/..
    script_dir = os.path.dirname(sys.argv[0])
    script_dir = os.path.abspath(script_dir)
-    rocksdb_path = os.path.abspath(os.path.join(script_dir, "../"))
+    rocksdb_path = os.path.abspath(
+        os.path.join(script_dir, "../"))

    return rocksdb_path

@@ -384,11 +313,10 @@ def exit_with_error(msg):

 def main():
    deps_map = get_dependencies()
-    # Generate BUCK file for buck
-    ok = generate_buck(get_rocksdb_path(), deps_map)
+    # Generate TARGETS file for buck
+    ok = generate_targets(get_rocksdb_path(), deps_map)
    if not ok:
-        exit_with_error("Failed to generate BUCK files")
-
+        exit_with_error("Failed to generate TARGETS files")

 if __name__ == "__main__":
    main()
@@ -1,44 +1,32 @@
 #!/usr/bin/env bash
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+# If clang_format_diff.py command is not specfied, we assume we are able to
+# access directly without any path.

-if [[ ! -f "BUCK" ]]
-then
-  echo "BUCK file is missing!"
-  echo "Please do not remove / rename BUCK file in your commit(s)."
-  exit 1
-fi
-
-TGT_DIFF=`git diff BUCK | head -n 1`
+TGT_DIFF=`git diff TARGETS | head -n 1`

 if [ ! -z "$TGT_DIFF" ]
 then
-  echo "BUCK file has uncommitted changes. Skip this check."
+  echo "TARGETS file has uncommitted changes. Skip this check."
  exit 0
 fi

-echo Backup original BUCK file.
+echo Backup original TARGETS file.

-cp BUCK BUCK.bkp
+cp TARGETS TARGETS.bkp

 ${PYTHON:-python3} buckifier/buckify_rocksdb.py

-if [[ ! -f "BUCK" ]]
-then
-  echo "BUCK file went missing after running buckifier/buckify_rocksdb.py!"
-  echo "Please do not remove the BUCK file."
-  exit 1
-fi
-
-TGT_DIFF=`git diff BUCK | head -n 1`
+TGT_DIFF=`git diff TARGETS | head -n 1`

 if [ -z "$TGT_DIFF" ]
 then
-  mv BUCK.bkp BUCK
+  mv TARGETS.bkp TARGETS
  exit 0
 else
-  echo "Please run '${PYTHON:-python3} buckifier/buckify_rocksdb.py' to update BUCK file."
-  echo "Do not manually update BUCK file."
+  echo "Please run '${PYTHON:-python3} buckifier/buckify_rocksdb.py' to update TARGETS file."
+  echo "Do not manually update TARGETS file."
  ${PYTHON:-python3} --version
-  mv BUCK.bkp BUCK
+  mv TARGETS.bkp TARGETS
  exit 1
 fi
@@ -1,175 +1,113 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 try:
-    from builtins import object, str
+    from builtins import object
+    from builtins import str
 except ImportError:
-    from __builtin__ import object, str
-import pprint
-
+    from __builtin__ import object
+    from __builtin__ import str
 import targets_cfg
-
-class LiteralValue:
-    def __init__(self, value):
-        self.value = value
-
-    def __str__(self):
-        return str(self.value)
-
-def smart_quote_value(val):
-    if isinstance(val, LiteralValue):
-        return str(val)
-    return '"%s"' % val
+import pprint

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

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

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


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

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

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

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

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

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

-    def register_test(self, test_name, src, deps, extra_compiler_flags):
-        with open(self.path, "ab") as targets_file:
-            targets_file.write(
-                targets_cfg.unittests_template.format(
-                    test_name=test_name,
-                    test_cc=str(src),
-                    deps=deps,
-                    extra_compiler_flags=extra_compiler_flags,
-                ).encode("utf-8")
-            )
+    def register_test(self,
+                      test_name,
+                      src,
+                      deps,
+                      extra_compiler_flags):
+
+        self.targets_file.write(targets_cfg.unittests_template.format(test_name=test_name,test_cc=str(src),deps=deps,
+            extra_compiler_flags=extra_compiler_flags).encode("utf-8"))
        self.total_test = self.total_test + 1
-
-    def export_file(self, name):
-        with open(self.path, "a") as targets_file:
-            targets_file.write(
-                targets_cfg.export_file_template.format(name=name)
-            )
@@ -1,14 +1,18 @@
-#  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 the Apache 2.0 License (found in the LICENSE.Apache file in the root directory).
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals

-rocksdb_target_header_template = """# This file \100generated by:
+rocksdb_target_header_template = \
+    """# This file \100generated by:
 #$ python3 buckifier/buckify_rocksdb.py{extra_argv}
 # --> DO NOT EDIT MANUALLY <--
-# This file is a Meta-specific integration for buck builds, so can
-# only be validated by Meta employees.
+# This file is a Facebook-specific integration for buck builds, so can
+# only be validated by Facebook employees.
+#
+# @noautodeps @nocodemods
 load("//rocks/buckifier:defs.bzl", "cpp_library_wrapper","rocks_cpp_library_wrapper","cpp_binary_wrapper","cpp_unittest_wrapper","fancy_bench_wrapper","add_c_test_wrapper")
-load("@fbcode_macros//build_defs:export_files.bzl", "export_file")

 """

@@ -23,6 +27,7 @@ rocks_cpp_library_wrapper(name="{name}", srcs=[{srcs}], headers={headers})
 """


+
 binary_template = """
 cpp_binary_wrapper(name="{name}", srcs=[{srcs}], deps=[{deps}], extra_preprocessor_flags=[{extra_preprocessor_flags}], extra_bench_libs={extra_bench_libs})
 """
@@ -39,12 +44,3 @@ fancy_bench_template = """
 fancy_bench_wrapper(suite_name="{name}", binary_to_bench_to_metric_list_map={bench_config}, slow={slow}, expected_runtime={expected_runtime}, sl_iterations={sl_iterations}, regression_threshold={regression_threshold})

 """
-
-export_file_template = """
-export_file(name = "{name}")
-"""
-
-
-oncall_template = """
-oncall("{name}")
-"""
@@ -2,34 +2,37 @@
 """
 This module keeps commonly used components.
 """
-
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
 try:
    from builtins import object
 except ImportError:
    from __builtin__ import object
-import os
 import subprocess
 import sys
+import os
 import time

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

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

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


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

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

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

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

+
    return p.returncode, stdout, stderr


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

    if cmd_dir:
@@ -25,17 +25,17 @@
 #
 # The solution is to move the include out of the #ifdef.

+from __future__ import print_function

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

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

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

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

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

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

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

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

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

 if __name__ == "__main__":
    main()
@@ -4,27 +4,23 @@
 #  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
+'''Access the results of benchmark runs
 Send these results on to OpenSearch graphing service
-"""
+'''

 import argparse
 import itertools
-import logging
 import os
 import re
 import sys
-
 import requests
 from dateutil import parser
+import logging

 logging.basicConfig(level=logging.DEBUG)
-
-
 class Configuration:
-    opensearch_user = os.environ["ES_USER"]
-    opensearch_pass = os.environ["ES_PASS"]
-
+    opensearch_user = os.environ['ES_USER']
+    opensearch_pass = os.environ['ES_PASS']

 class BenchmarkResultException(Exception):
    def __init__(self, message, content):
@@ -34,75 +30,45 @@ class BenchmarkResultException(Exception):

 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",
-    ]
+    expected_keys = ['ops_sec', 'mb_sec',  'lsm_sz',  'blob_sz', 'c_wgb',   'w_amp',
+    'c_mbps',  'c_wsecs', 'c_csecs', 'b_rgb',   'b_wgb',   'usec_op',
+    'p50',     'p99',     'p99.9',   'p99.99', 'pmax',
+    'uptime',  'stall%', 'Nstall',  'u_cpu',   's_cpu',   'rss', 'test', 'date', 'version', 'job_id']

    def sanity_check(row):
-        if "test" not in row:
+        if not 'test' in row:
            logging.debug(f"not 'test' in row: {row}")
            return False
-        if row["test"] == "":
+        if row['test'] == '':
            logging.debug(f"row['test'] == '': {row}")
            return False
-        if "date" not in row:
+        if not 'date' in row:
            logging.debug(f"not 'date' in row: {row}")
            return False
-        if "ops_sec" not in row:
+        if not 'ops_sec' in row:
            logging.debug(f"not 'ops_sec' in row: {row}")
            return False
        try:
-            _ = int(row["ops_sec"])
+            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)
+            (_, _) = 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}"
-            )
+            logging.error(f"parser.parse((row['date']): not a valid format for date in row: {row}")
            return False
        return True

    def conform_opensearch(row):
-        (dt, _) = parser.parse(row["date"], fuzzy_with_tokens=True)
-        # create a test_date field, which was previously what was expected
-        # repair the date field, which has what can be a WRONG ISO FORMAT, (no leading 0 on single-digit day-of-month)
-        # e.g. 2022-07-1T00:14:55 should be 2022-07-01T00:14:55
-        row["test_date"] = dt.isoformat()
-        row["date"] = dt.isoformat()
-        return {key.replace(".", "_"): value for key, value in row.items()}
+        (dt, _) = parser.parse(row['date'], fuzzy_with_tokens=True)
+        row['test_date'] = dt.isoformat()
+        return dict((key.replace('.', '_'), value)
+                    for (key, value) in row.items())


 class ResultParser:
-    def __init__(self, field=r"(\w|[+-:.%])+", intrafield=r"(\s)+", separator="\t"):
+    def __init__(self, field="(\w|[+-:.%])+", intrafield="(\s)+", separator="\t"):
        self.field = re.compile(field)
        self.intra = re.compile(intrafield)
        self.sep = re.compile(separator)
@@ -110,24 +76,24 @@ class ResultParser:
    def ignore(self, l_in: str):
        if len(l_in) == 0:
            return True
-        if l_in[0:1] == "#":
+        if l_in[0:1] == '#':
            return True
        return False

-    def line(self, line_in: str):
-        """Parse a line into items
+    def line(self, l_in: str):
+        '''Parse a line into items
        Being clever about separators
-        """
-        line = line_in
+        '''
+        l = l_in
        row = []
-        while line != "":
-            match_item = self.field.match(line)
+        while l != '':
+            match_item = self.field.match(l)
            if match_item:
                item = match_item.group(0)
                row.append(item)
-                line = line[len(item) :]
+                l = l[len(item):]
            else:
-                match_intra = self.intra.match(line)
+                match_intra = self.intra.match(l)
                if match_intra:
                    intra = match_intra.group(0)
                    # Count the separators
@@ -137,29 +103,26 @@ class ResultParser:
                    sep_count = len(tabbed) - 1
                    if sep_count == 0:
                        sep_count = 1
-                    for _ in range(sep_count - 1):
-                        row.append("")
-                    line = line[len(intra) :]
+                    for i in range(sep_count-1):
+                        row.append('')
+                    l = l[len(intra):]
                else:
                    raise BenchmarkResultException(
-                        "Invalid TSV line", f"{line_in} at {line}"
-                    )
+                        'Invalid TSV line', f"{l_in} at {l}")
        return row

    def parse(self, lines):
-        """Parse something that iterates 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:]
-        ]
+        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)
+    file = open(filename, 'r')
    contents = file.readlines()
    file.close()
    parser = ResultParser()
@@ -169,70 +132,52 @@ def load_report_from_tsv(filename: str):


 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"
-    )
+    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"]),
-        )
+            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}"
-        )
+            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
+    '''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.")
+    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"
-    )
+    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":
+    if (args.upload == 'opensearch'):
        push_report_to_opensearch(reports, args.esdocument)
    else:
        push_report_to_null(reports)

-
-if __name__ == "__main__":
+if __name__ == '__main__':
    sys.exit(main())
@@ -45,33 +45,31 @@ if test -z "$OUTPUT"; then
  exit 1
 fi

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

 # we currently depend on POSIX platform
 COMMON_FLAGS="-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX"

-# Default to fbcode gcc on Meta internal machines
-IS_META_HOST="$(hostname | grep -E '(facebook|meta).com|fbinfra.net')"
-if [ -z "$ROCKSDB_NO_FBCODE" -a "$IS_META_HOST" ]; then
-  if [ -d /mnt/gvfs/third-party ]; then
-    echo "NOTE: Using fbcode build" >&2
+# Default to fbcode gcc on internal fb machines
+if [ -z "$ROCKSDB_NO_FBCODE" -a -d /mnt/gvfs/third-party ]; then
    FBCODE_BUILD="true"
    # If we're compiling with TSAN or shared lib, we need pic build
    PIC_BUILD=$COMPILE_WITH_TSAN
    if [ "$LIB_MODE" == "shared" ]; then
      PIC_BUILD=1
    fi
-    source "$PWD/build_tools/fbcode_config_platform010.sh"
-  else
-    echo "************************************************************************" >&2
-    echo "WARNING: -d /mnt/gvfs/third-party failed; no fbcode build" >&2
-    echo "************************************************************************" >&2
-  fi
+    if [ -n "$ROCKSDB_FBCODE_BUILD_WITH_PLATFORM010" ]; then
+      source "$PWD/build_tools/fbcode_config_platform010.sh"
+    elif [ -n "$ROCKSDB_FBCODE_BUILD_WITH_PLATFORM009" ]; then
+      source "$PWD/build_tools/fbcode_config_platform009.sh"
+    else
+      source "$PWD/build_tools/fbcode_config_platform009.sh"
+    fi
 fi

 # Delete existing output, if it exists
@@ -79,9 +77,7 @@ rm -f "$OUTPUT"
 touch "$OUTPUT"

 if test -z "$CC"; then
-    if [ "$USE_CLANG" -a -x "$(command -v clang)" ]; then
-        CC=clang
-    elif [ -x "$(command -v cc)" ]; then
+    if [ -x "$(command -v cc)" ]; then
        CC=cc
    elif [ -x "$(command -v clang)" ]; then
        CC=clang
@@ -91,9 +87,7 @@ if test -z "$CC"; then
 fi

 if test -z "$CXX"; then
-    if [ "$USE_CLANG" -a -x "$(command -v clang++)" ]; then
-        CXX=clang++
-    elif [ -x "$(command -v g++)" ]; then
+    if [ -x "$(command -v g++)" ]; then
        CXX=g++
    elif [ -x "$(command -v clang++)" ]; then
        CXX=clang++
@@ -103,9 +97,7 @@ if test -z "$CXX"; then
 fi

 if test -z "$AR"; then
-    if [ "$USE_CLANG" -a -x "$(command -v llvm-ar)" ]; then
-        AR=llvm-ar
-    elif [ -x "$(command -v gcc-ar)" ]; then
+    if [ -x "$(command -v gcc-ar)" ]; then
        AR=gcc-ar
    elif [ -x "$(command -v llvm-ar)" ]; then
        AR=llvm-ar
@@ -148,24 +140,6 @@ PLATFORM_SHARED_LDFLAGS="-Wl,--no-as-needed -shared -Wl,-soname -Wl,"
 PLATFORM_SHARED_CFLAGS="-fPIC"
 PLATFORM_SHARED_VERSIONED=true

-# Prefer lld linker when available on Linux. lld is typically 5-10x faster
-# than the default ld.bfd for large C++ projects. macOS uses ld64 (or
-# ld-prime) which is already fast, so we skip lld detection there.
-# Set ROCKSDB_NO_FAST_LINKER=1 to disable this auto-detection.
-if [ -z "$ROCKSDB_NO_FAST_LINKER" ] && [ "$TARGET_OS" = "Linux" ]; then
-    if $CXX -fuse-ld=lld -L/usr/local/lib -x c++ - -o /dev/null 2>/dev/null <<EOF
-int main() { return 0; }
-EOF
-    then
-        PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -fuse-ld=lld"
-        # Ensure lld can find libraries in /usr/local/lib (lld does not
-        # search there by default, unlike ld.bfd)
-        if [ -d /usr/local/lib ]; then
-            PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -L/usr/local/lib"
-        fi
-    fi
-fi
-
 # generic port files (working on all platform by #ifdef) go directly in /port
 GENERIC_PORT_FILES=`cd "$ROCKSDB_ROOT"; find port -name '*.cc' | tr "\n" " "`

@@ -180,7 +154,7 @@ case "$TARGET_OS" in
        ;;
    IOS)
        PLATFORM=IOS
-        COMMON_FLAGS="$COMMON_FLAGS -DOS_MACOSX -DIOS_CROSS_COMPILE "
+        COMMON_FLAGS="$COMMON_FLAGS -DOS_MACOSX -DIOS_CROSS_COMPILE -DROCKSDB_LITE"
        PLATFORM_SHARED_EXT=dylib
        PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name "
        CROSS_COMPILE=true
@@ -195,6 +169,24 @@ case "$TARGET_OS" in
            PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -latomic"
        fi
        PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lpthread -lrt -ldl"
+        if test -z "$ROCKSDB_USE_IO_URING"; then
+            ROCKSDB_USE_IO_URING=1
+        fi
+        if test "$ROCKSDB_USE_IO_URING" -ne 0; then
+            # check for liburing
+            $CXX $PLATFORM_CXXFLAGS -x c++ - -luring -o test.o 2>/dev/null  <<EOF
+              #include <liburing.h>
+              int main() {
+                struct io_uring ring;
+                io_uring_queue_init(1, &ring, 0);
+                return 0;
+              }
+EOF
+            if [ "$?" = 0 ]; then
+                PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -luring"
+                COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_IOURING_PRESENT"
+            fi
+        fi
        # PORT_FILES=port/linux/linux_specific.cc
        ;;
    SunOS)
@@ -285,7 +277,6 @@ if [ "$CROSS_COMPILE" = "true" -o "$FBCODE_BUILD" = "true" ]; then
    if [ "$FBCODE_BUILD" = "true" ]; then
      # Enable backtrace on fbcode since the necessary libraries are present
      COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_BACKTRACE"
-      FOLLY_DIR="third-party/folly"
    fi
    true
 else
@@ -329,8 +320,7 @@ EOF
 EOF
        then
          COMMON_FLAGS="$COMMON_FLAGS -DGFLAGS=1"
-          # Hack: don't link extra gflags assuming it comes with folly
-          [ "$USE_FOLLY" ] || PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags"
+          PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags"
        # check if namespace is gflags
        elif $CXX $PLATFORM_CXXFLAGS -x c++ - -o test.o 2>/dev/null << EOF
            #include <gflags/gflags.h>
@@ -339,8 +329,7 @@ EOF
 EOF
        then
          COMMON_FLAGS="$COMMON_FLAGS -DGFLAGS=1 -DGFLAGS_NAMESPACE=gflags"
-          # Hack: don't link extra gflags assuming it comes with folly
-          [ "$USE_FOLLY" ] || PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags"
+          PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags"
        # check if namespace is google
        elif $CXX $PLATFORM_CXXFLAGS -x c++ - -o test.o 2>/dev/null << EOF
            #include <gflags/gflags.h>
@@ -394,13 +383,9 @@ EOF
    fi

    if ! test $ROCKSDB_DISABLE_ZSTD; then
-        # Test whether zstd library is installed with minimum version
-        # (Keep in sync with compression.h)
+        # Test whether zstd library is installed
        $CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null  <<EOF
          #include <zstd.h>
-          #if ZSTD_VERSION_NUMBER < 10400
-          #error "ZSTD support requires version >= 1.4.0 (libzstd-devel)"
-          #endif  // ZSTD_VERSION_NUMBER
          int main() {}
 EOF
        if [ "$?" = 0 ]; then
@@ -439,7 +424,7 @@ EOF

    if ! test $ROCKSDB_DISABLE_JEMALLOC; then
        # Test whether jemalloc is available
-        if echo 'int main() {}' | $CXX $PLATFORM_CXXFLAGS $LDFLAGS -x c++ - -o test.o -ljemalloc \
+        if echo 'int main() {}' | $CXX $PLATFORM_CXXFLAGS -x c++ - -o test.o -ljemalloc \
          2>/dev/null; then
            # This will enable some preprocessor identifiers in the Makefile
            JEMALLOC=1
@@ -448,19 +433,12 @@ EOF
            WITH_JEMALLOC_FLAG=1
            # check for JEMALLOC installed with HomeBrew
            if [ "$PLATFORM" == "OS_MACOSX" ]; then
-                if [ "$TARGET_ARCHITECTURE" = "arm64" ]; then
-                    # on M1 Macs, homebrew installs here instead of /usr/local
-                    JEMALLOC_PREFIX="/opt/homebrew"
-                else
-                    JEMALLOC_PREFIX="/usr/local"
-                fi
                if hash brew 2>/dev/null && brew ls --versions jemalloc > /dev/null; then
                    JEMALLOC_VER=$(brew ls --versions jemalloc | tail -n 1 | cut -f 2 -d ' ')
-                    JEMALLOC_INCLUDE="-I${JEMALLOC_PREFIX}/Cellar/jemalloc/${JEMALLOC_VER}/include"
-                    JEMALLOC_LIB="${JEMALLOC_PREFIX}/Cellar/jemalloc/${JEMALLOC_VER}/lib/libjemalloc_pic.a"
-                    PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -L${JEMALLOC_PREFIX}/lib $JEMALLOC_LIB"
-                    JAVA_LDFLAGS="$JAVA_LDFLAGS -L${JEMALLOC_PREFIX}/lib $JEMALLOC_LIB"
-                    JAVA_STATIC_LDFLAGS="$JAVA_STATIC_LDFLAGS -L${JEMALLOC_PREFIX}/lib $JEMALLOC_LIB"
+                    JEMALLOC_INCLUDE="-I/usr/local/Cellar/jemalloc/${JEMALLOC_VER}/include"
+                    JEMALLOC_LIB="/usr/local/Cellar/jemalloc/${JEMALLOC_VER}/lib/libjemalloc_pic.a"
+                    PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS $JEMALLOC_LIB"
+                    JAVA_STATIC_LDFLAGS="$JAVA_STATIC_LDFLAGS $JEMALLOC_LIB"
                fi
            fi
        fi
@@ -623,40 +601,11 @@ EOF
            PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lbenchmark"
        fi
    fi
-    if test $USE_FOLLY || test $USE_FOLLY_LITE; then
-        # Test whether libfolly library is installed
-        $CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -x c++ - -o /dev/null 2>/dev/null  <<EOF
-          #include <folly/synchronization/DistributedMutex.h>
-          int main() {}
-EOF
-        if [ "$?" != 0 ]; then
-          FOLLY_DIR="./third-party/folly"
-        fi
-    fi
-
-    if test -z "$ROCKSDB_USE_IO_URING"; then
-        ROCKSDB_USE_IO_URING=1
-    fi
-    if [ "$ROCKSDB_USE_IO_URING" -ne 0 -a "$PLATFORM" = OS_LINUX ]; then
-        # check for liburing
-        $CXX $PLATFORM_CXXFLAGS -x c++ - -luring -o test.o 2>/dev/null  <<EOF
-          #include <liburing.h>
-          int main() {
-            struct io_uring ring;
-            io_uring_queue_init(1, &ring, 0);
-            return 0;
-          }
-EOF
-        if [ "$?" = 0 ]; then
-            PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -luring"
-            COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_IOURING_PRESENT"
-        fi
-    fi
 fi

 # TODO(tec): Fix -Wshorten-64-to-32 errors on FreeBSD and enable the warning.
 # -Wshorten-64-to-32 breaks compilation on FreeBSD aarch64 and i386
-if ! { [ "$TARGET_OS" = FreeBSD -o "$TARGET_OS" = OpenBSD ] && [ "$TARGET_ARCHITECTURE" = arm64 -o "$TARGET_ARCHITECTURE" = i386 ]; }; then
+if ! { [ "$TARGET_OS" = FreeBSD ] && [ "$TARGET_ARCHITECTURE" = arm64 -o "$TARGET_ARCHITECTURE" = i386 ]; }; then
  # Test whether -Wshorten-64-to-32 is available
  $CXX $PLATFORM_CXXFLAGS -x c++ - -o test.o -Wshorten-64-to-32 2>/dev/null  <<EOF
    int main() {}
@@ -666,7 +615,7 @@ EOF
  fi
 fi

-if [ "$PORTABLE" == "" ] || [ "$PORTABLE" == 0 ]; then
+if test "0$PORTABLE" -eq 0; then
  if test -n "`echo $TARGET_ARCHITECTURE | grep ^ppc64`"; then
    # Tune for this POWER processor, treating '+' models as base models
    POWER=`LD_SHOW_AUXV=1 /bin/true | grep AT_PLATFORM | grep -E -o power[0-9]+`
@@ -685,41 +634,41 @@ if [ "$PORTABLE" == "" ] || [ "$PORTABLE" == 0 ]; then
    fi
    COMMON_FLAGS="$COMMON_FLAGS"
  elif test -n "`echo $TARGET_ARCHITECTURE | grep ^riscv64`"; then
-    RISC_ISA=$(cat /proc/cpuinfo | grep -E '^isa\s*:' | head -1 | cut --delimiter=: -f 2 | cut -b 2-)
-    if [ -n "${RISCV_ISA}" ]; then
-      COMMON_FLAGS="$COMMON_FLAGS -march=${RISC_ISA}"
-    fi
+    RISC_ISA=$(cat /proc/cpuinfo | grep isa | head -1 | cut --delimiter=: -f 2 | cut -b 2-)
+    COMMON_FLAGS="$COMMON_FLAGS -march=${RISC_ISA}"
  elif [ "$TARGET_OS" == "IOS" ]; then
    COMMON_FLAGS="$COMMON_FLAGS"
+  elif [ "$TARGET_OS" == "AIX" ] || [ "$TARGET_OS" == "SunOS" ]; then
+    # TODO: Not sure why we don't use -march=native on these OSes
+    if test "$USE_SSE"; then
+      TRY_SSE_ETC="1"
+    fi
  else
    COMMON_FLAGS="$COMMON_FLAGS -march=native "
  fi
 else
-  # PORTABLE specified
-  if [ "$PORTABLE" == 1 ]; then
-    if test -n "`echo $TARGET_ARCHITECTURE | grep ^s390x`"; then
-      COMMON_FLAGS="$COMMON_FLAGS -march=z196 "
-    elif test -n "`echo $TARGET_ARCHITECTURE | grep ^riscv64`"; then
-      COMMON_FLAGS="$COMMON_FLAGS -march=rv64gc"
-    elif test "$USE_SSE"; then
-      # USE_SSE is DEPRECATED
-      # This is a rough approximation of the old USE_SSE behavior
-      COMMON_FLAGS="$COMMON_FLAGS -march=haswell"
-    fi
-    # Other than those cases, not setting -march= here.
-  else
-    # Assume PORTABLE is a minimum assumed cpu type, e.g. PORTABLE=haswell
-    COMMON_FLAGS="$COMMON_FLAGS -march=${PORTABLE}"
+  # PORTABLE=1
+  if test "$USE_SSE"; then
+    TRY_SSE_ETC="1"
+  fi
+
+  if test -n "`echo $TARGET_ARCHITECTURE | grep ^s390x`"; then
+    COMMON_FLAGS="$COMMON_FLAGS -march=z196 "
+  fi
+
+  if test -n "`echo $TARGET_ARCHITECTURE | grep ^riscv64`"; then
+    RISC_ISA=$(cat /proc/cpuinfo | grep isa | head -1 | cut --delimiter=: -f 2 | cut -b 2-)
+    COMMON_FLAGS="$COMMON_FLAGS -march=${RISC_ISA}"
  fi

  if [[ "${PLATFORM}" == "OS_MACOSX" ]]; then
-    # For portability compile for macOS 10.14 (2018) or newer
-    COMMON_FLAGS="$COMMON_FLAGS -mmacosx-version-min=10.14"
-    PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -mmacosx-version-min=10.14"
+    # For portability compile for macOS 10.13 (2017) or newer
+    COMMON_FLAGS="$COMMON_FLAGS -mmacosx-version-min=10.13"
+    PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -mmacosx-version-min=10.13"
    # -mmacosx-version-min must come first here.
-    PLATFORM_SHARED_LDFLAGS="-mmacosx-version-min=10.14 $PLATFORM_SHARED_LDFLAGS"
-    PLATFORM_CMAKE_FLAGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14"
-    JAVA_STATIC_DEPS_COMMON_FLAGS="-mmacosx-version-min=10.14"
+    PLATFORM_SHARED_LDFLAGS="-mmacosx-version-min=10.13 $PLATFORM_SHARED_LDFLAGS"
+    PLATFORM_CMAKE_FLAGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13"
+    JAVA_STATIC_DEPS_COMMON_FLAGS="-mmacosx-version-min=10.13"
    JAVA_STATIC_DEPS_LDFLAGS="$JAVA_STATIC_DEPS_COMMON_FLAGS"
    JAVA_STATIC_DEPS_CCFLAGS="$JAVA_STATIC_DEPS_COMMON_FLAGS"
    JAVA_STATIC_DEPS_CXXFLAGS="$JAVA_STATIC_DEPS_COMMON_FLAGS"
@@ -743,6 +692,101 @@ EOF
  fi
 fi

+if test "$TRY_SSE_ETC"; then
+  # The USE_SSE flag now means "attempt to compile with widely-available
+  # Intel architecture extensions utilized by specific optimizations in the
+  # source code." It's a qualifier on PORTABLE=1 that means "mostly portable."
+  # It doesn't even really check that your current CPU is compatible.
+  #
+  # SSE4.2 available since nehalem, ca. 2008-2010
+  # Includes POPCNT for BitsSetToOne, BitParity
+  TRY_SSE42="-msse4.2"
+  # PCLMUL available since westmere, ca. 2010-2011
+  TRY_PCLMUL="-mpclmul"
+  # AVX2 available since haswell, ca. 2013-2015
+  TRY_AVX2="-mavx2"
+  # BMI available since haswell, ca. 2013-2015
+  # Primarily for TZCNT for CountTrailingZeroBits
+  TRY_BMI="-mbmi"
+  # LZCNT available since haswell, ca. 2013-2015
+  # For FloorLog2
+  TRY_LZCNT="-mlzcnt"
+fi
+
+$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_SSE42 -x c++ - -o test.o 2>/dev/null <<EOF
+  #include <cstdint>
+  #include <nmmintrin.h>
+  int main() {
+    volatile uint32_t x = _mm_crc32_u32(0, 0);
+    (void)x;
+  }
+EOF
+if [ "$?" = 0 ]; then
+  COMMON_FLAGS="$COMMON_FLAGS $TRY_SSE42 -DHAVE_SSE42"
+elif test "$USE_SSE"; then
+  echo "warning: USE_SSE specified but compiler could not use SSE intrinsics, disabling" >&2
+fi
+
+$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_PCLMUL -x c++ - -o test.o 2>/dev/null <<EOF
+  #include <cstdint>
+  #include <wmmintrin.h>
+  int main() {
+    const auto a = _mm_set_epi64x(0, 0);
+    const auto b = _mm_set_epi64x(0, 0);
+    const auto c = _mm_clmulepi64_si128(a, b, 0x00);
+    auto d = _mm_cvtsi128_si64(c);
+    (void)d;
+  }
+EOF
+if [ "$?" = 0 ]; then
+  COMMON_FLAGS="$COMMON_FLAGS $TRY_PCLMUL -DHAVE_PCLMUL"
+elif test "$USE_SSE"; then
+  echo "warning: USE_SSE specified but compiler could not use PCLMUL intrinsics, disabling" >&2
+fi
+
+$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_AVX2 -x c++ - -o test.o 2>/dev/null <<EOF
+  #include <cstdint>
+  #include <immintrin.h>
+  int main() {
+    const auto a = _mm256_setr_epi32(0, 1, 2, 3, 4, 7, 6, 5);
+    const auto b = _mm256_permutevar8x32_epi32(a, a);
+    (void)b;
+  }
+EOF
+if [ "$?" = 0 ]; then
+  COMMON_FLAGS="$COMMON_FLAGS $TRY_AVX2 -DHAVE_AVX2"
+elif test "$USE_SSE"; then
+  echo "warning: USE_SSE specified but compiler could not use AVX2 intrinsics, disabling" >&2
+fi
+
+$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_BMI -x c++ - -o test.o 2>/dev/null <<EOF
+  #include <cstdint>
+  #include <immintrin.h>
+  int main(int argc, char *argv[]) {
+    (void)argv;
+    return (int)_tzcnt_u64((uint64_t)argc);
+  }
+EOF
+if [ "$?" = 0 ]; then
+  COMMON_FLAGS="$COMMON_FLAGS $TRY_BMI -DHAVE_BMI"
+elif test "$USE_SSE"; then
+  echo "warning: USE_SSE specified but compiler could not use BMI intrinsics, disabling" >&2
+fi
+
+$CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS $TRY_LZCNT -x c++ - -o test.o 2>/dev/null <<EOF
+  #include <cstdint>
+  #include <immintrin.h>
+  int main(int argc, char *argv[]) {
+    (void)argv;
+    return (int)_lzcnt_u64((uint64_t)argc);
+  }
+EOF
+if [ "$?" = 0 ]; then
+  COMMON_FLAGS="$COMMON_FLAGS $TRY_LZCNT -DHAVE_LZCNT"
+elif test "$USE_SSE"; then
+  echo "warning: USE_SSE specified but compiler could not use LZCNT intrinsics, disabling" >&2
+fi
+
 $CXX $PLATFORM_CXXFLAGS $COMMON_FLAGS -x c++ - -o test.o 2>/dev/null <<EOF
  #include <cstdint>
  int main() {
@@ -783,19 +827,6 @@ fi

 rm -f test.o test_dl.o

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

@@ -835,10 +866,6 @@ echo "CLANG_ANALYZER=$CLANG_ANALYZER" >> "$OUTPUT"
 echo "PROFILING_FLAGS=$PROFILING_FLAGS" >> "$OUTPUT"
 echo "FIND=$FIND" >> "$OUTPUT"
 echo "WATCH=$WATCH" >> "$OUTPUT"
-echo "FOLLY_PATH=$FOLLY_PATH" >> "$OUTPUT"
-echo "BOOST_SOURCE_PATH=$BOOST_SOURCE_PATH" >> "$OUTPUT"
-echo "FMT_SOURCE_PATH=$FMT_SOURCE_PATH" >> "$OUTPUT"
-
 # This will enable some related identifiers for the preprocessor
 if test -n "$JEMALLOC"; then
  echo "JEMALLOC=1" >> "$OUTPUT"
@@ -849,6 +876,7 @@ fi
 if test -n "$WITH_JEMALLOC_FLAG"; then
  echo "WITH_JEMALLOC_FLAG=$WITH_JEMALLOC_FLAG" >> "$OUTPUT"
 fi
+echo "LUA_PATH=$LUA_PATH" >> "$OUTPUT"
 if test -n "$USE_FOLLY"; then
  echo "USE_FOLLY=$USE_FOLLY" >> "$OUTPUT"
 fi
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) Meta Platforms, Inc. and affiliates. All Rights Reserved.
-#
-# Check for some simple mistakes in public headers (on the command line)
-# that should prevent commit or push
-
-BAD=""
-
-# Look for potential for ODR violations caused by public headers depending on
-# build parameters that could vary between RocksDB build and application build.
-# * Cases like ROCKSDB_NAMESPACE, and ROCKSDB_ASSERT_STATUS_CHECKED are
-#   intentional, hard to avoid. (We expect definitions to change and the user
-#   should also.)
-# * Cases like _WIN32, OS_WIN, and __cplusplus are essentially ODR-safe.
-# * Cases like
-#   #ifdef BLAH  // ODR-SAFE
-#   #undef BLAH
-#   #endif
-#   that should not cause ODR violations can be exempted with the ODR-SAFE
-#   marker recognized here.
-
-grep -nHE '^#if' -- "$@" | grep -vE 'ROCKSDB_NAMESPACE|ROCKSDB_ASSERT_STATUS_CHECKED|_WIN32|OS_WIN|ODR-SAFE|__cplusplus|ROCKSDB_DLL|ROCKSDB_LIBRARY_EXPORTS'
-if [ "$?" != "1" ]; then
-  echo "^^^^^ #if in public API could cause an ODR violation."
-  echo "      Add // ODR-SAFE if verified safe."
-  BAD=1
-fi
-
-if [ "$BAD" ]; then
-  exit 1
-fi
@@ -37,7 +37,7 @@ if [ "$?" != "1" ]; then
  BAD=1
 fi

-LC_ALL=C git grep -n $'[\x80-\xff]' -- ':!docs' ':!*.md' ':!.github'
+git grep -n -P "[\x80-\xFF]" -- ':!docs' ':!*.md'
 if [ "$?" != "1" ]; then
  echo '^^^^ Use only ASCII characters in source files'
  BAD=1
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-#
-# Validate GitHub Actions workflow YAML before it reaches CI runtime.
-
-set -euo pipefail
-
-if ! command -v ruby >/dev/null 2>&1; then
-  echo "ruby is required to validate GitHub Actions workflow YAML"
-  echo "On CentOS Stream: sudo dnf install ruby rubygems rubygem-psych"
-  exit 1
-fi
-
-if ! ruby -e 'require "psych"' 2>/dev/null; then
-  echo "ruby is installed but cannot load required library 'psych'"
-  echo "On CentOS Stream: sudo dnf install rubygems rubygem-psych"
-  exit 1
-fi
-
-ruby <<'RUBY'
-require "psych"
-
-bad = false
-workflow_files = Dir[".github/workflows/*.{yml,yaml}"].sort
-
-if workflow_files.empty?
-  warn "No workflow YAML files found under .github/workflows"
-  exit 1
-end
-
-workflow_files.each do |path|
-  begin
-    Psych.parse_file(path)
-    puts "OK #{path}"
-  rescue Psych::Exception => e
-    warn "Invalid YAML in #{path}: #{e.message}"
-    bad = true
-  end
-end
-
-exit(bad ? 1 : 0)
-RUBY
@@ -1,231 +0,0 @@
-#!/bin/bash
-# Output test progress in JSON format for machine parsing
-# Usage: build_tools/check_progress.sh
-
-LOG_FILE="LOG"
-T_DIR="t"
-SRC_MK="src.mk"
-
-# Maximum lines of test output to include per failed test
-MAX_OUTPUT_LINES=50
-
-# Helper to escape string for JSON (handles newlines, quotes, backslashes, tabs)
-json_escape() {
-    local str="$1"
-    # Use python for reliable JSON escaping if available, otherwise use sed
-    if command -v python3 &>/dev/null; then
-        printf '%s' "$str" | python3 -c 'import json,sys; print(json.dumps(sys.stdin.read())[1:-1], end="")'
-    else
-        printf '%s' "$str" | sed 's/\\/\\\\/g; s/"/\\"/g; s/\t/\\t/g; s/\r/\\r/g' | awk '{printf "%s\\n", $0}' | sed 's/\\n$//'
-    fi
-}
-
-# Helper to output JSON and exit
-output_json() {
-    local status="$1"
-    local completed="${2:-0}"
-    local total="${3:-0}"
-    local failed="${4:-0}"
-    local percent="${5:-0}"
-    local eta="${6:-0}"
-    local avg_time="${7:-0}"
-    local last_item="${8:-}"
-    local phase="${9:-}"
-    local failed_tests="${10:-}"
-
-    # Build JSON output
-    local json="{\"status\":\"$status\""
-
-    if [[ -n "$phase" ]]; then
-        json="$json,\"phase\":\"$phase\""
-    fi
-
-    json="$json,\"completed\":$completed,\"total\":$total,\"failed\":$failed,\"percent\":$percent"
-    json="$json,\"eta_seconds\":$eta,\"avg_time\":\"$avg_time\",\"last_item\":\"$(json_escape "$last_item")\""
-
-    if [[ -n "$failed_tests" ]]; then
-        json="$json,\"failed_tests\":[$failed_tests]"
-    fi
-
-    json="$json}"
-    echo "$json"
-}
-
-# Get failed test info with log output
-get_failed_tests_json() {
-    local log_file="$1"
-    local t_dir="$2"
-    local max_failures=10
-    local count=0
-    local first=true
-
-    # Get failed tests from LOG file
-    while IFS=$'\t' read -r seq host starttime runtime send recv exitval signal cmd; do
-        # Skip header line
-        [[ "$seq" == "Seq" ]] && continue
-
-        # Check if failed (exitval != 0 or signal != 0)
-        if [[ "$exitval" != "0" || "$signal" != "0" ]]; then
-            # Extract test name from command
-            test_name=$(echo "$cmd" | sed 's,.*/run-,,;s, .*,,')
-
-            # Get log file path
-            log_path="$t_dir/log-run-$test_name"
-
-            # Read test output (last N lines)
-            if [[ -f "$log_path" ]]; then
-                output=$(tail -n "$MAX_OUTPUT_LINES" "$log_path" 2>/dev/null)
-            else
-                output="(log file not found: $log_path)"
-            fi
-
-            # Escape output for JSON
-            escaped_output=$(json_escape "$output")
-
-            # Build JSON object for this failure
-            if [[ "$first" == "true" ]]; then
-                first=false
-            else
-                printf ","
-            fi
-            printf '{"test":"%s","exit_code":%d,"signal":%d,"output":"%s"}' \
-                "$test_name" "$exitval" "$signal" "$escaped_output"
-
-            ((count++))
-            if [[ $count -ge $max_failures ]]; then
-                break
-            fi
-        fi
-    done < "$log_file"
-}
-
-# Check if tests are running (LOG file exists)
-if [[ -f "$LOG_FILE" ]]; then
-    # Count total tests from t/run-* files
-    if [[ -d "$T_DIR" ]]; then
-        total=$(find "$T_DIR" -name 'run-*' -type f 2>/dev/null | wc -l)
-    else
-        total=0
-    fi
-
-    # If no parallel tests generated yet
-    if [[ "$total" -eq 0 ]]; then
-        output_json "running" 0 0 0 0 0 "0" "" "generating"
-        exit 0
-    fi
-
-    # Parse LOG file (skip header line)
-    # LOG format: Seq Host Starttime JobRuntime Send Receive Exitval Signal Command
-    completed=$(tail -n +2 "$LOG_FILE" 2>/dev/null | wc -l)
-
-    # Count failures
-    failed=$(awk -F'\t' 'NR>1 && ($7 != 0 || $8 != 0) {count++} END {print count+0}' "$LOG_FILE" 2>/dev/null)
-
-    # Get failed tests JSON with output (only if there are failures)
-    if [[ "$failed" -gt 0 ]]; then
-        failed_tests=$(get_failed_tests_json "$LOG_FILE" "$T_DIR")
-    else
-        failed_tests=""
-    fi
-
-    # Calculate percentage
-    if [[ "$total" -gt 0 ]]; then
-        percent=$((completed * 100 / total))
-    else
-        percent=0
-    fi
-
-    # Get last completed test name (extract from command column)
-    last_test=$(tail -1 "$LOG_FILE" 2>/dev/null | awk -F'\t' '{print $9}' | sed 's,.*/run-,,;s, .*,,;s,^./,,')
-
-    # Calculate ETA based on average time
-    if [[ "$completed" -gt 0 ]]; then
-        avg_time=$(awk -F'\t' 'NR>1 {sum+=$4; count++} END {if(count>0) printf "%.1f", sum/count; else print "0"}' "$LOG_FILE")
-        remaining=$((total - completed))
-        eta=$(awk "BEGIN {printf \"%.0f\", $avg_time * $remaining}")
-    else
-        avg_time="0"
-        eta="0"
-    fi
-
-    # Determine status
-    if [[ "$completed" -ge "$total" ]]; then
-        status="completed"
-    elif [[ "$completed" -gt 0 ]]; then
-        status="running"
-    else
-        status="starting"
-    fi
-
-    output_json "$status" "$completed" "$total" "$failed" "$percent" "$eta" "$avg_time" "$last_test" "testing" "$failed_tests"
-    exit 0
-fi
-
-# No LOG file - check if we're in compilation/linking phase
-# Count expected source files from src.mk
-if [[ -f "$SRC_MK" ]]; then
-    # Count LIB_SOURCES (library object files to compile)
-    expected_lib_objects=$(grep -E '\.cc\s*\\?$' "$SRC_MK" | grep -v '^#' | wc -l)
-
-    # Count TEST_MAIN_SOURCES (test binaries to link)
-    expected_test_binaries=$(sed -n '/^TEST_MAIN_SOURCES =/,/^[^ ]/p' "$SRC_MK" | grep -cE '\.cc\s*\\?$' 2>/dev/null || echo 0)
-else
-    expected_lib_objects=0
-    expected_test_binaries=0
-fi
-
-# Check for test generation phase (t/ directory being created)
-if [[ -d "$T_DIR" ]]; then
-    total=$(find "$T_DIR" -name 'run-*' -type f 2>/dev/null | wc -l)
-    if [[ "$total" -gt 0 ]]; then
-        output_json "running" 0 "$total" 0 0 0 "0" "" "generating"
-        exit 0
-    fi
-fi
-
-# Count compiled object files (in subdirectories matching source structure)
-# Object files are created as dir/file.o (e.g., cache/cache.o, db/db_impl.o)
-compiled_objects=0
-if [[ "$expected_lib_objects" -gt 0 ]]; then
-    # Count .o files in source directories
-    compiled_objects=$(find cache db env file logging memory memtable monitoring options port table test_util trace_replay util utilities -name '*.o' -type f 2>/dev/null | wc -l)
-fi
-
-# Count linked test binaries (test binaries are in current directory with _test suffix)
-linked_tests=0
-if [[ "$expected_test_binaries" -gt 0 ]]; then
-    linked_tests=$(find . -maxdepth 1 -name '*_test' -type f -executable 2>/dev/null | wc -l)
-fi
-
-# Determine phase based on what exists
-if [[ "$compiled_objects" -eq 0 && "$linked_tests" -eq 0 ]]; then
-    # Nothing compiled yet - not started or just beginning
-    output_json "not_started" 0 0 0 0 0 "0" ""
-    exit 0
-fi
-
-# Calculate total work units: compiling + linking
-total_work=$((expected_lib_objects + expected_test_binaries))
-completed_work=$((compiled_objects + linked_tests))
-
-if [[ "$total_work" -gt 0 ]]; then
-    percent=$((completed_work * 100 / total_work))
-else
-    percent=0
-fi
-
-# Determine phase
-if [[ "$compiled_objects" -lt "$expected_lib_objects" ]]; then
-    phase="compiling"
-    # Get most recently modified .o file as last_item
-    last_item=$(find cache db env file logging memory memtable monitoring options port table test_util trace_replay util utilities -name '*.o' -type f -printf '%T@ %p\n' 2>/dev/null | sort -rn | head -1 | cut -d' ' -f2- | sed 's,^\./,,;s,\.o$,,')
-elif [[ "$linked_tests" -lt "$expected_test_binaries" ]]; then
-    phase="linking"
-    # Get most recently modified test binary as last_item
-    last_item=$(find . -maxdepth 1 -name '*_test' -type f -executable -printf '%T@ %p\n' 2>/dev/null | sort -rn | head -1 | cut -d' ' -f2- | sed 's,^\./,,')
-else
-    phase="generating"
-    last_item=""
-fi
-
-output_json "running" "$completed_work" "$total_work" 0 "$percent" 0 "0" "$last_item" "$phase"
@@ -0,0 +1,26 @@
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+GCC_BASE=/mnt/gvfs/third-party2/gcc/1795efe5f06778c15a92c8f9a2aba5dc496d9d4d/9.x/centos7-native/3bed279
+CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/7318eaac22659b6ff2fe43918e4b69fd0772a8a7/9.0.0/platform009/651ee30
+LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/4959b39cfbe5965a37c861c4c327fa7c5c759b87/9.x/platform009/9202ce7
+GLIBC_BASE=/mnt/gvfs/third-party2/glibc/45ce3375cdc77ecb2520bbf8f0ecddd3f98efd7a/2.30/platform009/f259413
+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
+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
+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
+LIBURING_BASE=/mnt/gvfs/third-party2/liburing/70dbd9cfee63a25611417d09433a86d7711b3990/20200729/platform009/7f3b187
+KERNEL_HEADERS_BASE=/mnt/gvfs/third-party2/kernel-headers/32b8a2407b634df3f8f948ba373fc4acc6a18296/fb/platform009/da39a3e
+BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/08634589372fa5f237bfd374e8c644a8364e78c1/2.32/platform009/ba86d1f/
+VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/6ae525939ad02e5e676855082fbbc7828dbafeac/3.15.0/platform009/7f3b187
+LUA_BASE=/mnt/gvfs/third-party2/lua/162efd9561a3d21f6869f4814011e9cf1b3ff4dc/5.3.4/platform009/a6271c4
+BENCHMARK_BASE=/mnt/gvfs/third-party2/benchmark/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/
@@ -1,21 +1,22 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 # The file is generated using update_dependencies.sh.
-GCC_BASE=/mnt/gvfs/third-party2/gcc/62de5a92e5f23c661c3d4b9f322e04eb14e7a5bd/11.x/centos8-native/886b5eb
-CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/1f6edd1ff15c99c861afc8f3cd69054cd974dd64/15/platform010/72a2ff8
-LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/d1129753c8361ac8e9453c0f4291337a4507ebe6/11.x/platform010/5684a5a
-GLIBC_BASE=/mnt/gvfs/third-party2/glibc/fed6e93d87571fb162734c86636119d45a398963/2.34/platform010/f259413
-SNAPPY_BASE=/mnt/gvfs/third-party2/snappy/31a346126a1f3b64812c362511cb04cc1bd40855/1.1.8/platform010/76ebdda
-ZLIB_BASE=/mnt/gvfs/third-party2/zlib/0c65c05468b5a38cef1a106a1f526463e120c8dd/1.2.8/platform010/76ebdda
+GCC_BASE=/mnt/gvfs/third-party2/gcc/e40bde78650fa91b8405a857e3f10bf336633fb0/11.x/centos7-native/886b5eb
+CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/2043340983c032915adbb6f78903dc855b65aee8/12/platform010/9520e0f
+LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/c00dcc6a3e4125c7e8b248e9a79c14b78ac9e0ca/11.x/platform010/5684a5a
+GLIBC_BASE=/mnt/gvfs/third-party2/glibc/0b9c8e4b060eda62f3bc1c6127bbe1256697569b/2.34/platform010/f259413
+SNAPPY_BASE=/mnt/gvfs/third-party2/snappy/bc9647f7912b131315827d65cb6189c21f381d05/1.1.3/platform010/76ebdda
+ZLIB_BASE=/mnt/gvfs/third-party2/zlib/a6f5f3f1d063d2d00cd02fc12f0f05fc3ab3a994/1.2.11/platform010/76ebdda
 BZIP2_BASE=/mnt/gvfs/third-party2/bzip2/09703139cfc376bd8a82642385a0e97726b28287/1.0.6/platform010/76ebdda
-LZ4_BASE=/mnt/gvfs/third-party2/lz4/ff23d17b932725cc1734a14896a8b67c518ba169/1.9.4/platform010/76ebdda
-ZSTD_BASE=/mnt/gvfs/third-party2/zstd/576397d8b1d9cea7306ad1e454d5e55caaa2ff1c/1.4.x/platform010/64091f4
-GFLAGS_BASE=/mnt/gvfs/third-party2/gflags/fecac07861cb829f5e60dbeff0503d3272db73c0/2.2.0/platform010/76ebdda
-JEMALLOC_BASE=/mnt/gvfs/third-party2/jemalloc/0bb3f5756788ce26e2e16a1cb2f2af2c59b51abe/master/platform010/f57cc4a
-NUMA_BASE=/mnt/gvfs/third-party2/numa/5b602edd46fda54cdd7ea45f77dbe4061206e174/2.0.11/platform010/76ebdda
-LIBUNWIND_BASE=/mnt/gvfs/third-party2/libunwind/97cac22a149c2e202917e05d44e87e516b68216f/1.4/platform010/5074a48
-TBB_BASE=/mnt/gvfs/third-party2/tbb/53953ebc4e3eda85ad6fc3e429ba146035e97b90/2018_U5/platform010/76ebdda
+LZ4_BASE=/mnt/gvfs/third-party2/lz4/60220d6a5bf7722b9cc239a1368c596619b12060/1.9.1/platform010/76ebdda
+ZSTD_BASE=/mnt/gvfs/third-party2/zstd/50eace8143eaaea9473deae1f3283e0049e05633/1.4.x/platform010/64091f4
+GFLAGS_BASE=/mnt/gvfs/third-party2/gflags/5d27e5919771603da06000a027b12f799e58a4f7/2.2.0/platform010/76ebdda
+JEMALLOC_BASE=/mnt/gvfs/third-party2/jemalloc/b62912d333ef33f9760efa6219dbe3fe6abb3b0e/master/platform010/f57cc4a
+NUMA_BASE=/mnt/gvfs/third-party2/numa/6b412770957aa3c8a87e5e0dcd8cc2f45f393bc0/2.0.11/platform010/76ebdda
+LIBUNWIND_BASE=/mnt/gvfs/third-party2/libunwind/52f69816e936e147664ad717eb71a1a0e9dc973a/1.4/platform010/5074a48
+TBB_BASE=/mnt/gvfs/third-party2/tbb/c9cc192099fa84c0dcd0ffeedd44a373ad6e4925/2018_U5/platform010/76ebdda
 LIBURING_BASE=/mnt/gvfs/third-party2/liburing/a98e2d137007e3ebf7f33bd6f99c2c56bdaf8488/20210212/platform010/76ebdda
 BENCHMARK_BASE=/mnt/gvfs/third-party2/benchmark/780c7a0f9cf0967961e69ad08e61cddd85d61821/trunk/platform010/76ebdda
-KERNEL_HEADERS_BASE=/mnt/gvfs/third-party2/kernel-headers/624a2f8f6c93c3c1df8aa4a6255d8202631a6c80/fb/platform010/da39a3e
-BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/39579e8603b48b3540f8b0633f43adf29acccb8b/2.37/centos8-native/da39a3e
-VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/cd9cc656d49ecb53797ce4d055e49fde29fd57ff/3.19.0/platform010/76ebdda
+KERNEL_HEADERS_BASE=/mnt/gvfs/third-party2/kernel-headers/02d9f76aaaba580611cf75e741753c800c7fdc12/fb/platform010/da39a3e
+BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/938dc3f064ef3a48c0446f5b11d788d50b3eb5ee/2.37/centos7-native/da39a3e
+VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/429a6b3203eb415f1599bd15183659153129188e/3.15.0/platform010/76ebdda
+LUA_BASE=/mnt/gvfs/third-party2/lua/363787fa5cac2a8aa20638909210443278fa138e/5.3.4/platform010/9079c97
@@ -3,37 +3,40 @@
 #  COPYING file in the root directory) and Apache 2.0 License
 #  (found in the LICENSE.Apache file in the root directory).

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

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

 import re
 import sys


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


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

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

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


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

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


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


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


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


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


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


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


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


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


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


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

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


-if __name__ == "__main__":
+if __name__ == '__main__':
    sys.exit(main())
@@ -113,7 +113,7 @@ CLANG_LIB="$CLANG_BASE/lib"
 CLANG_SRC="$CLANG_BASE/../../src"

 CLANG_ANALYZER="$CLANG_BIN/clang++"
-CLANG_SCAN_BUILD="$CLANG_BIN/scan-build
+CLANG_SCAN_BUILD="$CLANG_SRC/llvm/tools/clang/tools/scan-build/bin/scan-build"

 if [ -z "$USE_CLANG" ]; then
  # gcc
@@ -147,7 +147,7 @@ else
 fi

 CFLAGS+=" $DEPS_INCLUDE"
-CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_SCHED_GETCPU_PRESENT"
+CFLAGS+=" -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_RANGESYNC_PRESENT -DROCKSDB_SCHED_GETCPU_PRESENT -DHAVE_SSE42"
 CXXFLAGS+=" $CFLAGS"

 EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $TBB_LIBS"
@@ -164,4 +164,12 @@ EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GF

 VALGRIND_VER="$VALGRIND_BASE/bin/"

-export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD
+LUA_PATH="$LUA_BASE"
+
+if test -z $PIC_BUILD; then
+  LUA_LIB=" $LUA_PATH/lib/liblua.a"
+else
+  LUA_LIB=" $LUA_PATH/lib/liblua_pic.a"
+fi
+
+export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB
@@ -0,0 +1,181 @@
+#!/bin/sh
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+#
+# Set environment variables so that we can compile rocksdb using
+# fbcode settings.  It uses the latest g++ and clang compilers and also
+# uses jemalloc
+# Environment variables that change the behavior of this script:
+# PIC_BUILD -- if true, it will only take pic versions of libraries from fbcode. libraries that don't have pic variant will not be included
+
+
+BASEDIR=`dirname $BASH_SOURCE`
+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_LIBS=" -L $LIBGCC_BASE/lib"
+
+# glibc
+GLIBC_INCLUDE="$GLIBC_BASE/include"
+GLIBC_LIBS=" -L $GLIBC_BASE/lib"
+
+if test -z $PIC_BUILD; then
+  MAYBE_PIC=
+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
+
+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
+
+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
+
+if ! test $ROCKSDB_DISABLE_LZ4; then
+  LZ4_INCLUDE=" -I $LZ4_BASE/include/"
+  LZ4_LIBS=" $LZ4_BASE/lib/liblz4${MAYBE_PIC}.a"
+  CFLAGS+=" -DLZ4"
+fi
+
+if ! test $ROCKSDB_DISABLE_ZSTD; then
+  ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
+  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd${MAYBE_PIC}.a"
+  CFLAGS+=" -DZSTD"
+fi
+
+# location of gflags headers and libraries
+GFLAGS_INCLUDE=" -I $GFLAGS_BASE/include/"
+GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags${MAYBE_PIC}.a"
+CFLAGS+=" -DGFLAGS=gflags"
+
+BENCHMARK_INCLUDE=" -I $BENCHMARK_BASE/include/"
+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"
+
+# location of numa
+NUMA_INCLUDE=" -I $NUMA_BASE/include/"
+NUMA_LIB=" $NUMA_BASE/lib/libnuma${MAYBE_PIC}.a"
+CFLAGS+=" -DNUMA"
+
+# location of libunwind
+LIBUNWIND="$LIBUNWIND_BASE/lib/libunwind${MAYBE_PIC}.a"
+
+# location of TBB
+TBB_INCLUDE=" -isystem $TBB_BASE/include/"
+TBB_LIBS="$TBB_BASE/lib/libtbb${MAYBE_PIC}.a"
+CFLAGS+=" -DTBB"
+
+# location of LIBURING
+LIBURING_INCLUDE=" -isystem $LIBURING_BASE/include/"
+LIBURING_LIBS="$LIBURING_BASE/lib/liburing${MAYBE_PIC}.a"
+CFLAGS+=" -DLIBURING"
+
+test "$USE_SSE" || USE_SSE=1
+export USE_SSE
+test "$PORTABLE" || PORTABLE=1
+export PORTABLE
+
+BINUTILS="$BINUTILS_BASE/bin"
+AR="$BINUTILS/ar"
+AS="$BINUTILS/as"
+
+DEPS_INCLUDE="$SNAPPY_INCLUDE $ZLIB_INCLUDE $BZIP_INCLUDE $LZ4_INCLUDE $ZSTD_INCLUDE $GFLAGS_INCLUDE $NUMA_INCLUDE $TBB_INCLUDE $LIBURING_INCLUDE $BENCHMARK_INCLUDE $BOOST_INCLUDE $GLOG_INCLUDE $FMT_INCLUDE $DBL_CONV_INCLUDE $LIBEVENT_INCLUDE"
+
+STDLIBS="-L $GCC_BASE/lib64"
+
+CLANG_BIN="$CLANG_BASE/bin"
+CLANG_LIB="$CLANG_BASE/lib"
+CLANG_SRC="$CLANG_BASE/../../src"
+
+CLANG_ANALYZER="$CLANG_BIN/clang++"
+CLANG_SCAN_BUILD="$CLANG_SRC/llvm/clang/tools/scan-build/bin/scan-build"
+
+if [ -z "$USE_CLANG" ]; then
+  # gcc
+  CC="$GCC_BASE/bin/gcc"
+  CXX="$GCC_BASE/bin/g++"
+  AR="$GCC_BASE/bin/gcc-ar"
+
+  CFLAGS+=" -B$BINUTILS"
+  CFLAGS+=" -isystem $LIBGCC_INCLUDE"
+  CFLAGS+=" -isystem $GLIBC_INCLUDE"
+  JEMALLOC=1
+else
+  # clang
+  CLANG_INCLUDE="$CLANG_LIB/clang/stable/include"
+  CC="$CLANG_BIN/clang"
+  CXX="$CLANG_BIN/clang++"
+  AR="$CLANG_BIN/llvm-ar"
+
+  KERNEL_HEADERS_INCLUDE="$KERNEL_HEADERS_BASE/include"
+
+  CFLAGS+=" -B$BINUTILS -nostdinc -nostdlib"
+  CFLAGS+=" -isystem $LIBGCC_BASE/include/c++/9.x "
+  CFLAGS+=" -isystem $LIBGCC_BASE/include/c++/9.x/x86_64-facebook-linux "
+  CFLAGS+=" -isystem $GLIBC_INCLUDE"
+  CFLAGS+=" -isystem $LIBGCC_INCLUDE"
+  CFLAGS+=" -isystem $CLANG_INCLUDE"
+  CFLAGS+=" -isystem $KERNEL_HEADERS_INCLUDE/linux "
+  CFLAGS+=" -isystem $KERNEL_HEADERS_INCLUDE "
+  CFLAGS+=" -Wno-expansion-to-defined "
+  CXXFLAGS="-nostdinc++"
+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"
+CXXFLAGS+=" $CFLAGS"
+
+EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $TBB_LIBS $LIBURING_LIBS $BENCHMARK_LIBS"
+EXEC_LDFLAGS+=" -Wl,--dynamic-linker,/usr/local/fbcode/platform009/lib/ld.so"
+EXEC_LDFLAGS+=" $LIBUNWIND"
+EXEC_LDFLAGS+=" -Wl,-rpath=/usr/local/fbcode/platform009/lib"
+EXEC_LDFLAGS+=" -Wl,-rpath=$GCC_BASE/lib64"
+# required by libtbb
+EXEC_LDFLAGS+=" -ldl"
+
+PLATFORM_LDFLAGS="$LIBGCC_LIBS $GLIBC_LIBS $STDLIBS -lgcc -lstdc++"
+PLATFORM_LDFLAGS+=" -B$BINUTILS"
+
+EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $TBB_LIBS $LIBURING_LIBS $BENCHMARK_LIBS"
+
+VALGRIND_VER="$VALGRIND_BASE/bin/"
+
+# lua not supported because it's on track for deprecation, I think
+LUA_PATH=
+LUA_LIB=
+
+export CC CXX AR AS CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB
@@ -59,7 +59,7 @@ fi
 if ! test $ROCKSDB_DISABLE_ZSTD; then
  ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd${MAYBE_PIC}.a"
-  CFLAGS+=" -DZSTD -DZSTD_STATIC_LINKING_ONLY"
+  CFLAGS+=" -DZSTD"
 fi

 # location of gflags headers and libraries
@@ -110,7 +110,7 @@ CLANG_LIB="$CLANG_BASE/lib"
 CLANG_SRC="$CLANG_BASE/../../src"

 CLANG_ANALYZER="$CLANG_BIN/clang++"
-CLANG_SCAN_BUILD="$CLANG_BIN/scan-build"
+CLANG_SCAN_BUILD="$CLANG_SRC/llvm/clang/tools/scan-build/bin/scan-build"

 if [ -z "$USE_CLANG" ]; then
  # gcc
@@ -154,7 +154,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 -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 -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"
@@ -172,4 +172,4 @@ EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GF

 VALGRIND_VER="$VALGRIND_BASE/bin/"

-export CC CXX AR AS CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD
+export CC CXX AR AS CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB
@@ -7,18 +7,14 @@ print_usage () {
  echo "Usage:"
  echo "format-diff.sh [OPTIONS]"
  echo "-c: check only."
-  echo "-y: auto-apply formatting without prompts (non-interactive mode)."
  echo "-h: print this message."
 }

-while getopts ':cyh' OPTION; do
+while getopts ':ch' OPTION; do
  case "$OPTION" in
    c)
      CHECK_ONLY=1
      ;;
-    y)
-      AUTO_APPLY=1
-      ;;
    h)
      print_usage
      exit 1
@@ -122,9 +118,6 @@ fi
 # fi
 set -e

-# Exclude third-party from formatting
-EXCLUDE=':!third-party/'
-
 uncommitted_code=`git diff HEAD`

 # If there's no uncommitted changes, we assume user are doing post-commit
@@ -144,85 +137,18 @@ then
  # should be relevant for formatting fixes.
  FORMAT_UPSTREAM_MERGE_BASE="$(git merge-base "$FORMAT_UPSTREAM" HEAD)"
  # Get the differences
-  diffs=$(git diff -U0 "$FORMAT_UPSTREAM_MERGE_BASE" -- $EXCLUDE | $CLANG_FORMAT_DIFF -p 1) || true
+  diffs=$(git diff -U0 "$FORMAT_UPSTREAM_MERGE_BASE" | $CLANG_FORMAT_DIFF -p 1)
  echo "Checking format of changes not yet in $FORMAT_UPSTREAM..."
 else
  # Check the format of uncommitted lines,
-  diffs=$(git diff -U0 HEAD -- $EXCLUDE | $CLANG_FORMAT_DIFF -p 1) || true
+  diffs=$(git diff -U0 HEAD | $CLANG_FORMAT_DIFF -p 1)
  echo "Checking format of uncommitted changes..."
 fi

-# Check for missing copyright in new files
-echo "Checking for copyright headers in new files..."
-
-# Get list of new files (added, not just modified)
-if [ -z "$uncommitted_code" ]; then
-  # Post-commit: check files added since merge base
-  new_files=$(git diff --name-only --diff-filter=A "$FORMAT_UPSTREAM_MERGE_BASE" -- '*.h' '*.cc' '*.py' $EXCLUDE)
-else
-  # Pre-commit: check staged new files
-  new_files=$(git diff --name-only --diff-filter=A --cached HEAD -- '*.h' '*.cc' '*.py' $EXCLUDE)
-fi
-
-if [ -n "$new_files" ]; then
-  files_missing_copyright=""
-
-  for file in $new_files; do
-    if [ -f "$file" ]; then
-      # Check if file is missing copyright
-      # For .py files, check for Python-style comment
-      # For .h and .cc files, check for C++-style comment
-      if [[ "$file" == *.py ]]; then
-        if ! grep -q "Copyright (c) Meta Platforms, Inc. and affiliates" "$file"; then
-          files_missing_copyright="$files_missing_copyright $file"
-          # Add copyright header to Python file
-          temp_file=$(mktemp)
-          {
-            echo "#  Copyright (c) Meta Platforms, Inc. and affiliates."
-            echo "#  This source code is licensed under both the GPLv2 (found in the COPYING file in the root directory)"
-            echo "#  and the Apache 2.0 License (found in the LICENSE.Apache file in the root directory)."
-            echo
-            cat "$file"
-          } > "$temp_file"
-          mv "$temp_file" "$file"
-          echo "Added copyright header to $file"
-        fi
-      elif [[ "$file" == *.h ]] || [[ "$file" == *.cc ]]; then
-        if ! grep -q "Copyright (c) Meta Platforms, Inc. and affiliates" "$file"; then
-          files_missing_copyright="$files_missing_copyright $file"
-          # Add copyright header to C++ file
-          temp_file=$(mktemp)
-          {
-            echo "//  Copyright (c) Meta Platforms, Inc. and affiliates. "
-            echo "//  This source code is licensed under both the GPLv2 (found in the "
-            echo "//  COPYING file in the root directory) and Apache 2.0 License "
-            echo "//  (found in the LICENSE.Apache file in the root directory)."
-            echo
-            cat "$file"
-          } > "$temp_file"
-          mv "$temp_file" "$file"
-          echo "Added copyright header to $file"
-        fi
-      fi
-    fi
-  done
-
-  if [ -n "$files_missing_copyright" ]; then
-    echo "Copyright headers were added to new files."
-  else
-    echo "All new files have copyright headers."
-  fi
-else
-  echo "No new files to check for copyright headers."
-fi
-
 if [ -z "$diffs" ]
 then
  echo "Nothing needs to be reformatted!"
  exit 0
-elif [ $? -ne 1 ]; then
-  # CLANG_FORMAT_DIFF will exit on 1 while there is suggested changes.
-  exit $?
 elif [ $CHECK_ONLY ]
 then
  echo "Your change has unformatted code. Please run make format!"
@@ -244,17 +170,17 @@ echo "$diffs" |
  sed -e "s/\(^-.*$\)/`echo -e \"$COLOR_RED\1$COLOR_END\"`/" |
  sed -e "s/\(^+.*$\)/`echo -e \"$COLOR_GREEN\1$COLOR_END\"`/"

-# Handle auto-apply mode (non-interactive)
-if [ "$AUTO_APPLY" ]; then
-  to_fix="y"
-else
-  echo -e "Would you like to fix the format automatically (y/n): \c"
-
-  # Make sure under any mode, we can read user input.
-  exec < /dev/tty
-  read to_fix
+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.
+exec < /dev/tty
+read to_fix
+
 if [ "$to_fix" != "y" ]
 then
  exit 1
@@ -263,15 +189,14 @@ fi
 # Do in-place format adjustment.
 if [ -z "$uncommitted_code" ]
 then
-  git diff -U0 "$FORMAT_UPSTREAM_MERGE_BASE" -- $EXCLUDE | $CLANG_FORMAT_DIFF -i -p 1
+  git diff -U0 "$FORMAT_UPSTREAM_MERGE_BASE" | $CLANG_FORMAT_DIFF -i -p 1
 else
-  git diff -U0 HEAD -- $EXCLUDE | $CLANG_FORMAT_DIFF -i -p 1
+  git diff -U0 HEAD | $CLANG_FORMAT_DIFF -i -p 1
 fi
 echo "Files reformatted!"

 # Amend to last commit if user do the post-commit format check
-# Skip amend prompt in auto-apply mode (user can amend manually if desired)
-if [ -z "$uncommitted_code" ] && [ -z "$AUTO_APPLY" ]; then
+if [ -z "$uncommitted_code" ]; then
  echo -e "Would you like to amend the changes to last commit (`git log HEAD --oneline | head -1`)? (y/n): \c"
  read to_amend

@@ -1,123 +0,0 @@
-#!/usr/bin/env python3
-"""
-Pre-download packages with unreliable mirrors using fallback mirrors.
-Reads package info from folly's getdeps manifest files.
-"""
-import sys
-import os
-import hashlib
-import subprocess
-import configparser
-
-def sha256_file(path):
-    """Calculate SHA256 hash of a file."""
-    h = hashlib.sha256()
-    try:
-        with open(path, 'rb') as f:
-            for chunk in iter(lambda: f.read(65536), b''):
-                h.update(chunk)
-        return h.hexdigest()
-    except Exception:
-        return None
-
-def parse_manifest(manifest_path):
-    """Parse a getdeps manifest file to extract download info."""
-    config = configparser.ConfigParser()
-    try:
-        config.read(manifest_path)
-        if 'download' in config:
-            return {
-                'url': config['download'].get('url', ''),
-                'sha256': config['download'].get('sha256', ''),
-            }
-    except Exception:
-        pass
-    return None
-
-def get_fallback_mirrors(url):
-    """Get fallback mirror URLs for a given URL."""
-    # Fallback mirror patterns for known unreliable hosts
-    mirror_fallbacks = {
-        "ftp.gnu.org/gnu/": [
-            "https://mirrors.kernel.org/gnu/",
-            "https://ftpmirror.gnu.org/gnu/",
-            "https://ftp.gnu.org/gnu/",
-        ],
-        "ftpmirror.gnu.org/gnu/": [
-            "https://mirrors.kernel.org/gnu/",
-            "https://ftpmirror.gnu.org/gnu/",
-            "https://ftp.gnu.org/gnu/",
-        ],
-    }
-
-    for pattern, mirrors in mirror_fallbacks.items():
-        if pattern in url:
-            # Extract the path after the pattern
-            path_start = url.find(pattern) + len(pattern)
-            path = url[path_start:]
-            return [mirror + path for mirror in mirrors]
-    return [url]  # No fallback, use original
-
-def main():
-    if len(sys.argv) != 4:
-        print(f"Usage: {sys.argv[0]} <download_dir> <cache_dir> <manifests_dir>")
-        sys.exit(1)
-
-    download_dir, cache_dir, manifests_dir = sys.argv[1], sys.argv[2], sys.argv[3]
-
-    # Packages known to have unreliable mirrors
-    packages_to_check = ["autoconf", "automake", "libtool"]
-
-    for package in packages_to_check:
-        manifest_path = os.path.join(manifests_dir, package)
-        if not os.path.exists(manifest_path):
-            continue
-
-        info = parse_manifest(manifest_path)
-        if not info or not info['url'] or not info['sha256']:
-            continue
-
-        # Determine filename from URL
-        url = info['url']
-        expected_sha256 = info['sha256']
-        url_filename = os.path.basename(url)
-
-        # getdeps uses format: {package}-{filename}
-        filename = f"{package}-{url_filename}"
-        filepath = os.path.join(download_dir, filename)
-        cache_path = os.path.join(cache_dir, filename)
-
-        # Check if already valid
-        if os.path.exists(filepath) and sha256_file(filepath) == expected_sha256:
-            print(f"  {filename}: OK (already downloaded)")
-            continue
-
-        # Check cache
-        if os.path.exists(cache_path) and sha256_file(cache_path) == expected_sha256:
-            print(f"  {filename}: OK (from cache)")
-            subprocess.run(['cp', cache_path, filepath], check=True)
-            continue
-
-        # Try fallback mirrors
-        mirrors = get_fallback_mirrors(url)
-        downloaded = False
-        for mirror_url in mirrors:
-            print(f"  {filename}: trying {mirror_url}...")
-            try:
-                subprocess.run(['wget', '-q', '-O', filepath, mirror_url], check=True, timeout=120)
-                if sha256_file(filepath) == expected_sha256:
-                    print(f"  {filename}: OK (downloaded)")
-                    subprocess.run(['cp', filepath, cache_path], check=False)
-                    downloaded = True
-                    break
-                else:
-                    os.remove(filepath)
-            except Exception:
-                if os.path.exists(filepath):
-                    os.remove(filepath)
-
-        if not downloaded:
-            print(f"  {filename}: WARNING - all mirrors failed")
-
-if __name__ == "__main__":
-    main()
@@ -1170,7 +1170,7 @@ sub parse_env_var {
    # Check if any variables contain \n
    if(my @v = map { s/BASH_FUNC_(.*)\(\)/$1/; $_ } grep { $ENV{$_}=~/\n/ } @vars) {
 	# \n is bad for csh and will cause it to fail.
-	$Global::envwarn = ::shell_quote_scalar(q{echo $SHELL | grep -E "/t?csh" > /dev/null && echo CSH/TCSH DO NOT SUPPORT newlines IN VARIABLES/FUNCTIONS. Unset }."@v".q{ && exec false;}."\n\n") . $Global::envwarn;
+	$Global::envwarn = ::shell_quote_scalar(q{echo $SHELL | egrep "/t?csh" > /dev/null && echo CSH/TCSH DO NOT SUPPORT newlines IN VARIABLES/FUNCTIONS. Unset }."@v".q{ && exec false;}."\n\n") . $Global::envwarn;
    }

    if(not @qcsh) { push @qcsh, "true"; }
@@ -1561,7 +1561,7 @@ sub save_stdin_stdout_stderr {
 	::die_bug("Can't dup STDERR: $!");
    open $Global::original_stdin, "<&", "STDIN" or
 	::die_bug("Can't dup STDIN: $!");
-    $Global::is_terminal = (-t $Global::original_stderr) && !$ENV{'CIRCLECI'}&& !$ENV{'GITHUB_ACTIONS'}  && !$ENV{'TRAVIS'};
+    $Global::is_terminal = (-t $Global::original_stderr) && !$ENV{'CIRCLECI'} && !$ENV{'TRAVIS'};
 }

 sub enough_file_handles {
@@ -1913,11 +1913,10 @@ sub drain_job_queue {
                    }
                    $last_progress_time = time();
                    $ps_reported = 0;
-                } elsif (not $ps_reported and (time() - $last_progress_time) >= 300) {
+                } elsif (not $ps_reported and (time() - $last_progress_time) >= 60) {
                    # No progress in at least 60 seconds: run ps
                    print $Global::original_stderr "\n";
-                    my $script_dir = ::dirname($0);
-                    system("$script_dir/ps_with_stack || ps -wwf");
+                    system("ps", "-wf");
                    $ps_reported = 1;
                }
                $last_left = $Global::left;
@@ -1,38 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-
-open(my $ps, "-|", "ps -wwf");
-my $cols_known = 0;
-my $cmd_col = 0;
-my $pid_col = 0;
-while (<$ps>) {
-  print;
-  my @cols = split(/\s+/);
-
-  if (!$cols_known && /CMD/) {
-    # Parse relevant ps column headers
-    for (my $i = 0; $i <= $#cols; $i++) {
-      if ($cols[$i] eq "CMD") {
-        $cmd_col = $i;
-      }
-      if ($cols[$i] eq "PID") {
-        $pid_col = $i;
-      }
-    }
-    $cols_known = 1;
-  } else {
-    my $pid = $cols[$pid_col];
-    my $cmd = $cols[$cmd_col];
-    # Match numeric PID and relative path command
-    # -> The intention is only to dump stack traces for hangs in code under
-    # test, which means we probably just built it and are executing by
-    # relative path (e.g. ./my_test or foo/bar_test) rather then by absolute
-    # path (e.g. /usr/bin/time) or PATH search (e.g. grep).
-    if ($pid =~ /^[0-9]+$/ && $cmd =~ /^[^\/ ]+[\/]/) {
-      print "Dumping stacks for $pid...\n";
-      system("pstack $pid || gdb -batch -p $pid -ex 'thread apply all bt'");
-    }
-  }
-}
-close $ps;
@@ -360,7 +360,7 @@ function send_to_ods {
    echo >&2 "ERROR: Key $key doesn't have a value."
    return
  fi
-  curl --silent "https://www.facebook.com/intern/agent/ods_set.php?entity=rocksdb_build&key=$key&value=$value" \
+  curl --silent "https://www.intern.facebook.com/intern/agent/ods_set.php?entity=rocksdb_build&key=$key&value=$value" \
    --connect-timeout 60
 }

@@ -1,57 +0,0 @@
-# from official ubuntu 20.04
-FROM ubuntu:20.04
-# update system
-RUN apt-get update && apt-get upgrade -y
-# install basic tools
-RUN apt-get install -y vim wget curl
-# install tzdata noninteractive
-RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-# install git and default compilers
-RUN apt-get install -y git gcc g++ clang clang-tools
-# install basic package
-RUN apt-get install -y lsb-release software-properties-common gnupg
-# install gflags, tbb
-RUN apt-get install -y libgflags-dev libtbb-dev
-# install compression libs
-RUN apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
-# install cmake
-RUN apt-get install -y cmake
-RUN apt-get install -y libssl-dev
-# install clang-13
-WORKDIR /root
-RUN wget https://apt.llvm.org/llvm.sh
-RUN chmod +x llvm.sh
-RUN ./llvm.sh 13 all
-# install gcc-7, 8, 10, 11, default is 9
-RUN apt-get install -y gcc-7 g++-7
-RUN apt-get install -y gcc-8 g++-8
-RUN apt-get install -y gcc-10 g++-10
-RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
-RUN apt-get install -y gcc-11 g++-11
-# install apt-get install -y valgrind
-RUN apt-get install -y valgrind
-# install folly depencencies
-RUN apt-get install -y libgoogle-glog-dev
-# install openjdk 8
-RUN apt-get install -y openjdk-8-jdk
-ENV JAVA_HOME /usr/lib/jvm/java-1.8.0-openjdk-amd64
-# install mingw
-RUN apt-get install -y mingw-w64
-
-# install gtest-parallel package
-RUN git clone --single-branch --branch master --depth 1 https://github.com/google/gtest-parallel.git ~/gtest-parallel
-ENV PATH $PATH:/root/gtest-parallel
-
-# install libprotobuf for fuzzers test
-RUN apt-get install -y ninja-build binutils liblzma-dev libz-dev pkg-config autoconf libtool
-RUN git clone --branch v1.0 https://github.com/google/libprotobuf-mutator.git ~/libprotobuf-mutator && cd ~/libprotobuf-mutator && git checkout ffd86a32874e5c08a143019aad1aaf0907294c9f && mkdir build && cd build && cmake .. -GNinja -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang++-13 -DCMAKE_BUILD_TYPE=Release -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON && ninja && ninja install
-ENV PKG_CONFIG_PATH /usr/local/OFF/:/root/libprotobuf-mutator/build/external.protobuf/lib/pkgconfig/
-ENV PROTOC_BIN /root/libprotobuf-mutator/build/external.protobuf/bin/protoc
-
-# install the latest google benchmark
-RUN git clone --depth 1 --branch v1.7.0 https://github.com/google/benchmark.git ~/benchmark
-RUN cd ~/benchmark && mkdir build && cd build && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=0 && ninja && ninja install
-
-# clean up
-RUN rm -rf /var/lib/apt/lists/*
-RUN rm -rf /root/benchmark
@@ -1,90 +0,0 @@
-# INSTRUCTIONS:
-# I was not able to build docker images on an isolated devserver because of
-# issues with proxy internet access. Use a public cloud or other Linux system.
-# (I used a Debian system after installing docker features, adding my user to
-# the docker and docker-registry groups, and logging out and back in to pick
-# those up.)
-#
-# Meta employees: see https://fburl.com/rocksdb-docker to build this on a devvm.
-#
-# Follow https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#authenticating-with-a-personal-access-token-classic
-# to login with your GitHub credentials, as in
-#
-# $ docker login ghcr.io -u pdillinger
-#
-# and paste the limited-purpose GitHub token into the terminal.
-#
-# Then in the build_tools/ubuntu22_image directory, (bump minor version for
-# random docker file updates, major version tracks Ubuntu release)
-#
-# $ docker build -t ghcr.io/facebook/rocksdb_ubuntu:22.2
-# $ docker push ghcr.io/facebook/rocksdb_ubuntu:22.2
-#
-# Might need to change visibility to public through
-# https://github.com/orgs/facebook/packages/container/rocksdb_ubuntu/settings
-# or similar.
-
-# from official ubuntu 22.04
-FROM ubuntu:22.04
-# update system
-RUN apt-get update
-RUN apt-get upgrade -y
-# install basic tools
-RUN apt-get install -y vim wget curl ccache
-# install tzdata noninteractive
-RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-# install git and default compilers
-RUN apt-get install -y git gcc g++ clang clang-tools
-# install basic package
-RUN apt-get install -y lsb-release software-properties-common gnupg
-# install gflags, tbb
-RUN apt-get install -y libgflags-dev libtbb-dev
-# install compression libs
-RUN apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
-# install cmake
-RUN apt-get install -y cmake
-RUN apt-get install -y libssl-dev
-# install clang-13
-WORKDIR /root
-RUN wget https://apt.llvm.org/llvm.sh
-RUN chmod +x llvm.sh
-RUN ./llvm.sh 13 all
-# There are incompatibilities between clang with -std=c++20 and libstdc++
-# provided by gcc, so we have to compile with clang-13 using -stdlib=libc++
-# and only one version of libc++ can be installed on the system at one time.
-# So to avoid confusion we remove unusable clang-14 also.
-RUN apt-get install libc++-13-dev libc++abi-13-dev
-RUN apt-get purge -y clang-14 && apt-get autoremove -y
-
-# install gcc-10 and more, default is 11
-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-13 g++-13
-# install apt-get install -y valgrind
-RUN apt-get install -y valgrind
-# install folly depencencies
-# Missing compatible libunwind: RUN apt-get install -y libgoogle-glog-dev
-# So instead install from source. This currently requires compiling with
-# -DGLOG_USE_GLOG_EXPORT
-RUN wget https://github.com/google/glog/archive/refs/tags/v0.7.1.tar.gz && tar xzf v0.7.1.tar.gz && cd glog-0.7.1/ && cmake -S . -B build -G "Unix Makefiles" && cmake --build build && cmake --build build --target install && cd .. && rm -rf v0.7.1.tar.gz glog-0.7.1
-# 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 && cd ~/benchmark && mkdir build && cd build && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=0 && ninja && ninja install && cd ~ && rm -rf /root/benchmark
-
-# clean up
-RUN rm -rf /var/lib/apt/lists/*
@@ -1,78 +0,0 @@
-# INSTRUCTIONS:
-# I was not able to build docker images on an isolated devserver because of
-# issues with proxy internet access. Use a public cloud or other Linux system.
-# (I used a Debian system after installing docker features, adding my user to
-# the docker and docker-registry groups, and logging out and back in to pick
-# those up.)
-#
-# Meta employees: see https://fburl.com/rocksdb-docker to build this on a devvm.
-#
-# Follow https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#authenticating-with-a-personal-access-token-classic
-# to login with your GitHub credentials, as in
-#
-# $ docker login ghcr.io -u pdillinger
-#
-# and paste the limited-purpose GitHub token into the terminal.
-#
-# Then in the build_tools/ubuntu24_image directory, (bump minor version for
-# random docker file updates, major version tracks Ubuntu release)
-#
-# $ docker build -t ghcr.io/facebook/rocksdb_ubuntu:24.1
-# $ docker push ghcr.io/facebook/rocksdb_ubuntu:24.1
-#
-# Might need to change visibility to public through
-# https://github.com/orgs/facebook/packages/container/rocksdb_ubuntu/settings
-# or similar.
-
-# from official ubuntu 24.04
-FROM ubuntu:24.04
-# update system
-RUN apt-get update
-RUN apt-get upgrade -y
-# install basic tools
-RUN apt-get install -y vim wget curl ccache
-# 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 clang-21 from LLVM snapshot repo
-RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/llvm.gpg && \
-    echo "deb https://apt.llvm.org/noble/ llvm-toolchain-noble-21 main" > /etc/apt/sources.list.d/llvm-21.list && \
-    apt-get update && apt-get install -y clang-21
-# install basic package
-RUN apt-get install -y lsb-release software-properties-common gnupg
-# install gflags, tbb
-RUN apt-get install -y libgflags-dev libtbb-dev
-# install compression libs
-RUN apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
-# install cmake
-RUN apt-get install -y cmake
-RUN apt-get install -y libssl-dev
-
-# install gcc-12 and more, default is 13
-RUN apt-get install -y gcc-12 g++-12 gcc-14 g++-14
-# 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 -DCMAKE_CXX_COMPILER=clang++ -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 && cd ~/benchmark && mkdir build && cd build && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_ENABLE_GTEST_TESTS=0 && ninja && ninja install && cd ~ && rm -rf /root/benchmark
-
-# clean up
-RUN rm -rf /var/lib/apt/lists/*
@@ -75,8 +75,8 @@ touch "$OUTPUT"
 echo "Writing dependencies to $OUTPUT"

 # Compilers locations
-GCC_BASE=`readlink -f $TP2_LATEST/gcc/11.x/centos8-native/*/`
-CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/15/platform010/*/`
+GCC_BASE=`readlink -f $TP2_LATEST/gcc/11.x/centos7-native/*/`
+CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/12/platform010/*/`

 log_header
 log_variable GCC_BASE
@@ -86,7 +86,7 @@ log_variable CLANG_BASE
 get_lib_base libgcc     11.x    platform010
 get_lib_base glibc      2.34    platform010
 get_lib_base snappy     LATEST  platform010
-get_lib_base zlib       1.2.8   platform010
+get_lib_base zlib       LATEST  platform010
 get_lib_base bzip2      LATEST  platform010
 get_lib_base lz4        LATEST  platform010
 get_lib_base zstd       LATEST  platform010
@@ -99,7 +99,51 @@ get_lib_base liburing   LATEST  platform010
 get_lib_base benchmark  LATEST  platform010

 get_lib_base kernel-headers fb platform010
-get_lib_base binutils   LATEST centos8-native
+get_lib_base binutils   LATEST centos7-native
 get_lib_base valgrind   LATEST platform010
+get_lib_base lua        5.3.4  platform010
+
+git diff $OUTPUT
+
+
+###########################################################
+#                platform009 dependencies                 #
+###########################################################
+
+OUTPUT="$BASEDIR/dependencies_platform009.sh"
+
+rm -f "$OUTPUT"
+touch "$OUTPUT"
+
+echo "Writing dependencies to $OUTPUT"
+
+# Compilers locations
+GCC_BASE=`readlink -f $TP2_LATEST/gcc/9.x/centos7-native/*/`
+CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/9.0.0/platform009/*/`
+
+log_header
+log_variable GCC_BASE
+log_variable CLANG_BASE
+
+# Libraries locations
+get_lib_base libgcc     9.x     platform009
+get_lib_base glibc      2.30    platform009
+get_lib_base snappy     LATEST  platform009
+get_lib_base zlib       LATEST  platform009
+get_lib_base bzip2      LATEST  platform009
+get_lib_base lz4        LATEST  platform009
+get_lib_base zstd       LATEST  platform009
+get_lib_base gflags     LATEST  platform009
+get_lib_base jemalloc   LATEST  platform009
+get_lib_base numa       LATEST  platform009
+get_lib_base libunwind  LATEST  platform009
+get_lib_base tbb        2018_U5 platform009
+get_lib_base liburing   LATEST  platform009
+get_lib_base benchmark  LATEST  platform009
+
+get_lib_base kernel-headers fb platform009
+get_lib_base binutils   LATEST centos7-native
+get_lib_base valgrind   LATEST platform009
+get_lib_base lua        5.3.4  platform009

 git diff $OUTPUT
@@ -16,8 +16,7 @@
 #include "util/string_util.h"

 namespace ROCKSDB_NAMESPACE {
-const Cache::CacheItemHelper kNoopCacheItemHelper{};
-
+#ifndef ROCKSDB_LITE
 static std::unordered_map<std::string, OptionTypeInfo>
    lru_cache_options_type_info = {
        {"capacity",
@@ -34,10 +33,6 @@ 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>
@@ -54,47 +49,13 @@ static std::unordered_map<std::string, OptionTypeInfo>
         {offsetof(struct CompressedSecondaryCacheOptions, compression_type),
          OptionType::kCompressionType, OptionVerificationType::kNormal,
          OptionTypeFlags::kMutable}},
-        {"enable_custom_split_merge",
+        {"compress_format_version",
         {offsetof(struct CompressedSecondaryCacheOptions,
-                   enable_custom_split_merge),
-          OptionType::kBoolean, OptionVerificationType::kNormal,
+                   compress_format_version),
+          OptionType::kUInt32T, OptionVerificationType::kNormal,
          OptionTypeFlags::kMutable}},
 };
-
-namespace {
-static void NoopDelete(Cache::ObjectPtr /*obj*/,
-                       MemoryAllocator* /*allocator*/) {
-  assert(false);
-}
-
-static size_t SliceSize(Cache::ObjectPtr obj) {
-  return static_cast<Slice*>(obj)->size();
-}
-
-static Status SliceSaveTo(Cache::ObjectPtr from_obj, size_t from_offset,
-                          size_t length, char* out) {
-  const Slice& slice = *static_cast<Slice*>(from_obj);
-  std::memcpy(out, slice.data() + from_offset, length);
-  return Status::OK();
-}
-
-static Status NoopCreate(const Slice& /*data*/, CompressionType /*type*/,
-                         CacheTier /*source*/, Cache::CreateContext* /*ctx*/,
-                         MemoryAllocator* /*allocator*/,
-                         Cache::ObjectPtr* /*out_obj*/,
-                         size_t* /*out_charge*/) {
-  assert(false);
-  return Status::NotSupported();
-}
-
-static Cache::CacheItemHelper kBasicCacheItemHelper(CacheEntryRole::kMisc,
-                                                    &NoopDelete);
-}  // namespace
-
-const Cache::CacheItemHelper kSliceCacheItemHelper{
-    CacheEntryRole::kMisc, &NoopDelete, &SliceSize,
-    &SliceSaveTo,          &NoopCreate, &kBasicCacheItemHelper,
-};
+#endif  // ROCKSDB_LITE

 Status SecondaryCache::CreateFromString(
    const ConfigOptions& config_options, const std::string& value,
@@ -105,6 +66,7 @@ Status SecondaryCache::CreateFromString(
    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, "",
@@ -113,12 +75,19 @@ Status SecondaryCache::CreateFromString(
      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, result);
+    return LoadSharedObject<SecondaryCache>(config_options, value, nullptr,
+                                            result);
  }
 }

@@ -127,67 +96,25 @@ Status Cache::CreateFromString(const ConfigOptions& config_options,
                               std::shared_ptr<Cache>* result) {
  Status status;
  std::shared_ptr<Cache> cache;
-  if (StartsWith(value, "null")) {
-    cache = nullptr;
-  } else if (value.find("://") == std::string::npos) {
-    if (value.find('=') == std::string::npos) {
-      cache = NewLRUCache(ParseSizeT(value));
-    } else {
-      LRUCacheOptions cache_opts;
-      status = OptionTypeInfo::ParseStruct(config_options, "",
-                                           &lru_cache_options_type_info, "",
-                                           value, &cache_opts);
-      if (status.ok()) {
-        cache = NewLRUCache(cache_opts);
-      }
-    }
-    if (status.ok()) {
-      result->swap(cache);
-    }
+  if (value.find('=') == std::string::npos) {
+    cache = NewLRUCache(ParseSizeT(value));
  } else {
-    status = LoadSharedObject<Cache>(config_options, value, result);
+#ifndef ROCKSDB_LITE
+    LRUCacheOptions cache_opts;
+    status = OptionTypeInfo::ParseStruct(config_options, "",
+                                         &lru_cache_options_type_info, "",
+                                         value, &cache_opts);
+    if (status.ok()) {
+      cache = NewLRUCache(cache_opts);
+    }
+#else
+    (void)config_options;
+    status = Status::NotSupported("Cannot load cache in LITE mode ", value);
+#endif  //! ROCKSDB_LITE
+  }
+  if (status.ok()) {
+    result->swap(cache);
  }
  return status;
 }
-
-bool Cache::AsyncLookupHandle::IsReady() {
-  return pending_handle == nullptr || pending_handle->IsReady();
-}
-
-bool Cache::AsyncLookupHandle::IsPending() { return pending_handle != nullptr; }
-
-Cache::Handle* Cache::AsyncLookupHandle::Result() {
-  assert(!IsPending());
-  return result_handle;
-}
-
-void Cache::StartAsyncLookup(AsyncLookupHandle& async_handle) {
-  async_handle.found_dummy_entry = false;  // in case re-used
-  assert(!async_handle.IsPending());
-  async_handle.result_handle =
-      Lookup(async_handle.key, async_handle.helper, async_handle.create_context,
-             async_handle.priority, async_handle.stats);
-}
-
-Cache::Handle* Cache::Wait(AsyncLookupHandle& async_handle) {
-  WaitAll(&async_handle, 1);
-  return async_handle.Result();
-}
-
-void Cache::WaitAll(AsyncLookupHandle* async_handles, size_t count) {
-  for (size_t i = 0; i < count; ++i) {
-    if (async_handles[i].IsPending()) {
-      // If a pending handle gets here, it should be marked at "to be handled
-      // by a caller" by that caller erasing the pending_cache on it.
-      assert(async_handles[i].pending_cache == nullptr);
-    }
-  }
-}
-
-void Cache::SetEvictionCallback(EvictionCallback&& fn) {
-  // Overwriting non-empty with non-empty could indicate a bug
-  assert(!eviction_callback_ || !fn);
-  eviction_callback_ = std::move(fn);
-}
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -3,6 +3,7 @@
 //  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>
@@ -12,13 +13,12 @@
 #include <set>
 #include <sstream>

-#include "cache/cache_key.h"
-#include "cache/sharded_cache.h"
+#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"
-#include "port/stack_trace.h"
-#include "rocksdb/advanced_cache.h"
+#include "rocksdb/cache.h"
 #include "rocksdb/convenience.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
@@ -33,7 +33,6 @@
 #include "util/hash.h"
 #include "util/mutexlock.h"
 #include "util/random.h"
-#include "util/stderr_logger.h"
 #include "util/stop_watch.h"
 #include "util/string_util.h"

@@ -46,45 +45,21 @@ static constexpr uint64_t GiB = MiB << 10;
 DEFINE_uint32(threads, 16, "Number of concurrent threads to run.");
 DEFINE_uint64(cache_size, 1 * GiB,
              "Number of bytes to use as a cache of uncompressed data.");
-DEFINE_int32(num_shard_bits, -1,
-             "ShardedCacheOptions::shard_bits. Default = auto");
-DEFINE_int32(
-    eviction_effort_cap,
-    ROCKSDB_NAMESPACE::HyperClockCacheOptions(1, 1).eviction_effort_cap,
-    "HyperClockCacheOptions::eviction_effort_cap");
+DEFINE_uint32(num_shard_bits, 6, "shard_bits.");

 DEFINE_double(resident_ratio, 0.25,
              "Ratio of keys fitting in cache to keyspace.");
 DEFINE_uint64(ops_per_thread, 2000000U, "Number of operations per thread.");
 DEFINE_uint32(value_bytes, 8 * KiB, "Size of each value added.");
-DEFINE_uint32(value_bytes_estimate, 0,
-              "If > 0, overrides estimated_entry_charge or "
-              "min_avg_entry_charge depending on cache_type.");
-DEFINE_double(compressible_to_ratio, 0.5,
-              "Approximate size ratio that values can be compressed to.");

-DEFINE_int32(
-    degenerate_hash_bits, 0,
-    "With HCC, fix this many hash bits to increase table hash collisions");
-DEFINE_uint32(skew, 5, "Degree of skew in key selection. 0 = no skew");
+DEFINE_uint32(skew, 5, "Degree of skew in key selection");
 DEFINE_bool(populate_cache, true, "Populate cache before operations");

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

 DEFINE_uint32(gather_stats_entries_per_lock, 256,
              "For Cache::ApplyToAllEntries");
-
-DEFINE_uint32(usleep, 0, "Sleep up to this many microseconds after each op.");
+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.");

-DEFINE_bool(early_exit, false,
-            "Exit before deallocating most memory. Good for malloc stats, e.g."
-            "MALLOC_CONF=\"stats_print:true\"");
-
-DEFINE_bool(histograms, true,
-            "Whether to track and print histogram statistics.");
-
-DEFINE_bool(report_problems, true, "Whether to ReportProblems() at the end.");
-
-DEFINE_uint32(seed, 0, "Hashing/random seed to use. 0 = choose at random");
-
+#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, "hyper_clock_cache", "Type of block cache.");
-
-DEFINE_bool(use_jemalloc_no_dump_allocator, false,
-            "Whether to use JemallocNoDumpAllocator");
-
-DEFINE_uint32(jemalloc_no_dump_allocator_num_arenas,
-              ROCKSDB_NAMESPACE::JemallocAllocatorOptions().num_arenas,
-              "JemallocNodumpAllocator::num_arenas");
-
-DEFINE_bool(jemalloc_no_dump_allocator_limit_tcache_size,
-            ROCKSDB_NAMESPACE::JemallocAllocatorOptions().limit_tcache_size,
-            "JemallocNodumpAllocator::limit_tcache_size");
+DEFINE_string(cache_type, "lru_cache", "Type of block cache.");

 // ## BEGIN stress_cache_key sub-tool options ##
 // See class StressCacheKey below.
@@ -159,8 +114,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)");
@@ -184,11 +137,6 @@ DEFINE_bool(sck_randomize, false,
 DEFINE_bool(sck_footer_unique_id, false,
            "(-stress_cache_key) Simulate using proposed footer unique id");
 // ## END stress_cache_key sub-tool options ##
-// ## BEGIN stress_cache_instances sub-tool options ##
-DEFINE_uint32(stress_cache_instances, 0,
-              "If > 0, run cache instance stress test instead");
-// Uses cache_size and cache_type, maybe more
-// ## END stress_cache_instance sub-tool options ##

 namespace ROCKSDB_NAMESPACE {

@@ -198,9 +146,13 @@ namespace {
 class SharedState {
 public:
  explicit SharedState(CacheBench* cache_bench)
-      : cv_(&mu_), cache_bench_(cache_bench) {}
+      : cv_(&mu_),
+        num_initialized_(0),
+        start_(false),
+        num_done_(0),
+        cache_bench_(cache_bench) {}

-  ~SharedState() = default;
+  ~SharedState() {}

  port::Mutex* GetMutex() { return &mu_; }

@@ -220,31 +172,15 @@ class SharedState {

  bool Started() const { return start_; }

-  void AddLookupStats(uint64_t hits, uint64_t misses, size_t pinned_count) {
-    MutexLock l(&mu_);
-    lookup_count_ += hits + misses;
-    lookup_hits_ += hits;
-    pinned_count_ += pinned_count;
-  }
-
-  double GetLookupHitRatio() const {
-    return 1.0 * lookup_hits_ / lookup_count_;
-  }
-
-  size_t GetPinnedCount() const { return pinned_count_; }
-
 private:
  port::Mutex mu_;
  port::CondVar cv_;

-  CacheBench* cache_bench_;
+  uint64_t num_initialized_;
+  bool start_;
+  uint64_t num_done_;

-  uint64_t num_initialized_ = 0;
-  bool start_ = false;
-  uint64_t num_done_ = 0;
-  uint64_t lookup_count_ = 0;
-  uint64_t lookup_hits_ = 0;
-  size_t pinned_count_ = 0;
+  CacheBench* cache_bench_;
 };

 // Per-thread state for concurrent executions of the same benchmark.
@@ -256,32 +192,26 @@ struct ThreadState {
  uint64_t duration_us = 0;

  ThreadState(uint32_t index, SharedState* _shared)
-      : tid(index), rnd(FLAGS_seed + 1 + index), shared(_shared) {}
+      : tid(index), rnd(1000 + index), shared(_shared) {}
 };

 struct KeyGen {
  char key_data[27];

-  Slice GetRand(Random64& rnd, uint64_t max_key, uint32_t skew) {
-    uint64_t raw = rnd.Next();
-    // Skew according to setting
-    for (uint32_t i = 0; i < skew; ++i) {
-      raw = std::min(raw, rnd.Next());
-    }
-    uint64_t key = FastRange64(raw, max_key);
-    if (FLAGS_degenerate_hash_bits) {
-      uint64_t key_hash =
-          Hash64(reinterpret_cast<const char*>(&key), sizeof(key));
-      // HCC uses the high 64 bits and a lower bit mask for starting probe
-      // location, so we fix hash bits starting at the bottom of that word.
-      auto hi_hash = uint64_t{0x9e3779b97f4a7c13U} ^
-                     (key_hash << 1 << (FLAGS_degenerate_hash_bits - 1));
-      uint64_t un_hi, un_lo;
-      BijectiveUnhash2x64(hi_hash, key_hash, &un_hi, &un_lo);
-      un_lo ^= BitwiseAnd(FLAGS_seed, INT32_MAX);
-      EncodeFixed64(key_data, un_lo);
-      EncodeFixed64(key_data + 8, un_hi);
-      return Slice(key_data, kCacheKeySize);
+  Slice GetRand(Random64& rnd, uint64_t max_key, int max_log) {
+    uint64_t key = 0;
+    if (!FLAGS_skewed) {
+      uint64_t raw = rnd.Next();
+      // Skew according to setting
+      for (uint32_t i = 0; i < FLAGS_skew; ++i) {
+        raw = std::min(raw, rnd.Next());
+      }
+      key = FastRange64(raw, max_key);
+    } else {
+      key = rnd.Skewed(max_log);
+      if (key > max_key) {
+        key -= max_key;
+      }
    }
    // Variable size and alignment
    size_t off = key % 8;
@@ -296,78 +226,38 @@ struct KeyGen {
  }
 };

-Cache::ObjectPtr createValue(Random64& rnd, MemoryAllocator* alloc) {
-  char* rv = AllocateBlock(FLAGS_value_bytes, alloc).release();
-  // Fill with some filler data, and take some CPU time, but add redundancy
-  // as requested for compressibility.
-  uint32_t random_fill_size = std::max(
-      uint32_t{1}, std::min(FLAGS_value_bytes,
-                            static_cast<uint32_t>(FLAGS_compressible_to_ratio *
-                                                  FLAGS_value_bytes)));
-  uint32_t i = 0;
-  for (; i < random_fill_size; i += 8) {
+char* createValue(Random64& rnd) {
+  char* rv = new char[FLAGS_value_bytes];
+  // Fill with some filler data, and take some CPU time
+  for (uint32_t i = 0; i < FLAGS_value_bytes; i += 8) {
    EncodeFixed64(rv + i, rnd.Next());
  }
-  for (; i < FLAGS_value_bytes; i++) {
-    rv[i] = rv[i % random_fill_size];
-  }
  return rv;
 }

 // Callbacks for secondary cache
-size_t SizeFn(Cache::ObjectPtr /*obj*/) { return FLAGS_value_bytes; }
+size_t SizeFn(void* /*obj*/) { return FLAGS_value_bytes; }

-Status SaveToFn(Cache::ObjectPtr from_obj, size_t /*from_offset*/,
-                size_t length, char* out) {
-  memcpy(out, from_obj, length);
+Status SaveToFn(void* obj, size_t /*offset*/, size_t size, void* out) {
+  memcpy(out, obj, size);
  return Status::OK();
 }

-Status CreateFn(const Slice& data, CompressionType /*type*/,
-                CacheTier /*source*/, Cache::CreateContext* /*context*/,
-                MemoryAllocator* alloc, Cache::ObjectPtr* out_obj,
-                size_t* out_charge) {
-  *out_obj = AllocateBlock(data.size(), alloc).release();
-  memcpy(*out_obj, data.data(), data.size());
-  *out_charge = data.size();
-  return Status::OK();
-};
-
-void DeleteFn(Cache::ObjectPtr value, MemoryAllocator* alloc) {
-  CacheAllocationDeleter{alloc}(static_cast<char*>(value));
+// Different deleters to simulate using deleter to gather
+// stats on the code origin and kind of cache entries.
+void deleter1(const Slice& /*key*/, void* value) {
+  delete[] static_cast<char*>(value);
+}
+void deleter2(const Slice& /*key*/, void* value) {
+  delete[] static_cast<char*>(value);
+}
+void deleter3(const Slice& /*key*/, void* value) {
+  delete[] static_cast<char*>(value);
 }

-Cache::CacheItemHelper helper1_wos(CacheEntryRole::kDataBlock, DeleteFn);
-Cache::CacheItemHelper helper1(CacheEntryRole::kDataBlock, DeleteFn, SizeFn,
-                               SaveToFn, CreateFn, &helper1_wos);
-Cache::CacheItemHelper helper2_wos(CacheEntryRole::kIndexBlock, DeleteFn);
-Cache::CacheItemHelper helper2(CacheEntryRole::kIndexBlock, DeleteFn, SizeFn,
-                               SaveToFn, CreateFn, &helper2_wos);
-Cache::CacheItemHelper helper3_wos(CacheEntryRole::kFilterBlock, DeleteFn);
-Cache::CacheItemHelper helper3(CacheEntryRole::kFilterBlock, DeleteFn, SizeFn,
-                               SaveToFn, CreateFn, &helper3_wos);
-
-void ConfigureSecondaryCache(ShardedCacheOptions& opts) {
-  if (!FLAGS_secondary_cache_uri.empty()) {
-    std::shared_ptr<SecondaryCache> secondary_cache;
-    Status s = SecondaryCache::CreateFromString(
-        ConfigOptions(), FLAGS_secondary_cache_uri, &secondary_cache);
-    if (secondary_cache == nullptr) {
-      fprintf(stderr,
-              "No secondary cache registered matching string: %s status=%s\n",
-              FLAGS_secondary_cache_uri.c_str(), s.ToString().c_str());
-      exit(1);
-    }
-    opts.secondary_cache = secondary_cache;
-  }
-}
-
-ShardedCacheBase* AsShardedCache(Cache* c) {
-  if (!FLAGS_secondary_cache_uri.empty()) {
-    c = static_cast_with_check<CacheWrapper>(c)->GetTarget().get();
-  }
-  return static_cast_with_check<ShardedCacheBase>(c);
-}
+Cache::CacheItemHelper helper1(SizeFn, SaveToFn, deleter1);
+Cache::CacheItemHelper helper2(SizeFn, SaveToFn, deleter2);
+Cache::CacheItemHelper helper3(SizeFn, SaveToFn, deleter3);
 }  // namespace

 class CacheBench {
@@ -382,115 +272,69 @@ class CacheBench {
                                 FLAGS_lookup_insert_percent),
        insert_threshold_(lookup_insert_threshold_ +
                          kHundredthUint64 * FLAGS_insert_percent),
-        blind_insert_threshold_(insert_threshold_ +
-                                kHundredthUint64 * FLAGS_blind_insert_percent),
-        lookup_threshold_(blind_insert_threshold_ +
+        lookup_threshold_(insert_threshold_ +
                          kHundredthUint64 * FLAGS_lookup_percent),
        erase_threshold_(lookup_threshold_ +
-                         kHundredthUint64 * FLAGS_erase_percent) {
+                         kHundredthUint64 * FLAGS_erase_percent),
+        skewed_(FLAGS_skewed) {
    if (erase_threshold_ != 100U * kHundredthUint64) {
      fprintf(stderr, "Percentages must add to 100.\n");
      exit(1);
    }
-    cache_ = MakeCache();
-  }

-  ~CacheBench() = default;
-
-  static std::shared_ptr<Cache> MakeCache() {
-    std::shared_ptr<MemoryAllocator> allocator;
-    if (FLAGS_use_jemalloc_no_dump_allocator) {
-      JemallocAllocatorOptions opts;
-      opts.num_arenas = FLAGS_jemalloc_no_dump_allocator_num_arenas;
-      opts.limit_tcache_size =
-          FLAGS_jemalloc_no_dump_allocator_limit_tcache_size;
-      Status s = NewJemallocNodumpAllocator(opts, &allocator);
-      assert(s.ok());
+    max_log_ = 0;
+    if (skewed_) {
+      uint64_t max_key = max_key_;
+      while (max_key >>= 1) max_log_++;
+      if (max_key > (static_cast<uint64_t>(1) << max_log_)) max_log_++;
    }
+
    if (FLAGS_cache_type == "clock_cache") {
-      fprintf(stderr, "Old clock cache implementation has been removed.\n");
-      exit(1);
-    } else if (EndsWith(FLAGS_cache_type, "hyper_clock_cache")) {
-      HyperClockCacheOptions opts(
-          FLAGS_cache_size, /*estimated_entry_charge=*/0, FLAGS_num_shard_bits);
-      opts.hash_seed = BitwiseAnd(FLAGS_seed, INT32_MAX);
-      opts.memory_allocator = allocator;
-      opts.eviction_effort_cap = FLAGS_eviction_effort_cap;
-      if (FLAGS_cache_type == "fixed_hyper_clock_cache") {
-        opts.estimated_entry_charge = FLAGS_value_bytes_estimate > 0
-                                          ? FLAGS_value_bytes_estimate
-                                          : FLAGS_value_bytes;
-      } else if (FLAGS_cache_type == "auto_hyper_clock_cache" ||
-                 FLAGS_cache_type == "hyper_clock_cache") {
-        if (FLAGS_value_bytes_estimate > 0) {
-          opts.min_avg_entry_charge = FLAGS_value_bytes_estimate;
-        }
-      } else {
-        fprintf(stderr, "Cache type not supported.\n");
+      cache_ = ExperimentalNewClockCache(
+          FLAGS_cache_size, FLAGS_value_bytes, FLAGS_num_shard_bits,
+          false /*strict_capacity_limit*/, kDefaultCacheMetadataChargePolicy);
+      if (!cache_) {
+        fprintf(stderr, "Clock cache not supported.\n");
        exit(1);
      }
-      ConfigureSecondaryCache(opts);
-      return opts.MakeSharedCache();
+    } else if (FLAGS_cache_type == "fast_lru_cache") {
+      cache_ = NewFastLRUCache(
+          FLAGS_cache_size, FLAGS_value_bytes, FLAGS_num_shard_bits,
+          false /*strict_capacity_limit*/, kDefaultCacheMetadataChargePolicy);
    } else if (FLAGS_cache_type == "lru_cache") {
-      LRUCacheOptions opts(FLAGS_cache_size, FLAGS_num_shard_bits,
-                           false /* strict_capacity_limit */,
-                           0.5 /* high_pri_pool_ratio */);
-      opts.hash_seed = BitwiseAnd(FLAGS_seed, INT32_MAX);
-      opts.memory_allocator = allocator;
-      ConfigureSecondaryCache(opts);
-      return NewLRUCache(opts);
+      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(
+            ConfigOptions(), FLAGS_secondary_cache_uri, &secondary_cache);
+        if (secondary_cache == nullptr) {
+          fprintf(
+              stderr,
+              "No secondary cache registered matching string: %s status=%s\n",
+              FLAGS_secondary_cache_uri.c_str(), s.ToString().c_str());
+          exit(1);
+        }
+        opts.secondary_cache = secondary_cache;
+      }
+#endif  // ROCKSDB_LITE
+
+      cache_ = NewLRUCache(opts);
    } else {
-      fprintf(stderr, "Cache type not supported.\n");
+      fprintf(stderr, "Cache type not supported.");
      exit(1);
    }
  }

+  ~CacheBench() {}
+
  void PopulateCache() {
-    Random64 rnd(FLAGS_seed);
+    Random64 rnd(1);
    KeyGen keygen;
-    size_t max_occ = 0;
-    size_t inserts_since_max_occ_increase = 0;
-    size_t keys_since_last_not_found = 0;
-
-    // Avoid redundant insertions by checking Lookup before Insert.
-    // Loop until insertions consistently fail to increase max occupancy or
-    // it becomes difficult to find keys not already inserted.
-    while (inserts_since_max_occ_increase < 100 &&
-           keys_since_last_not_found < 100) {
-      Slice key = keygen.GetRand(rnd, max_key_, FLAGS_skew);
-
-      Cache::Handle* handle = cache_->Lookup(key);
-      if (handle != nullptr) {
-        cache_->Release(handle);
-        ++keys_since_last_not_found;
-        continue;
-      }
-      keys_since_last_not_found = 0;
-
-      Status s =
-          cache_->Insert(key, createValue(rnd, cache_->memory_allocator()),
-                         &helper1, FLAGS_value_bytes);
+    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());
-
-      handle = cache_->Lookup(key);
-      if (!handle) {
-        fprintf(stderr, "Failed to lookup key just inserted.\n");
-        assert(false);
-        exit(42);
-      } else {
-        cache_->Release(handle);
-      }
-
-      size_t occ = cache_->GetOccupancyCount();
-      if (occ > max_occ) {
-        max_occ = occ;
-        inserts_since_max_occ_increase = 0;
-      } else {
-        ++inserts_since_max_occ_increase;
-      }
    }
-    printf("Population complete (%zu entries, %g average charge)\n", max_occ,
-           1.0 * FLAGS_cache_size / max_occ);
  }

  bool Run() {
@@ -498,7 +342,7 @@ class CacheBench {

    PrintEnv();
    SharedState shared(this);
-    std::vector<std::unique_ptr<ThreadState>> threads(FLAGS_threads);
+    std::vector<std::unique_ptr<ThreadState> > threads(FLAGS_threads);
    for (uint32_t i = 0; i < FLAGS_threads; i++) {
      threads[i].reset(new ThreadState(i, &shared));
      std::thread(ThreadBody, threads[i].get()).detach();
@@ -549,35 +393,19 @@ class CacheBench {
                                        FLAGS_ops_per_thread / elapsed_secs);
    printf("Thread ops/sec = %u\n", ops_per_sec);

-    printf("Lookup hit ratio: %g\n", shared.GetLookupHitRatio());
+    printf("\nOperation latency (ns):\n");
+    HistogramImpl combined;
+    for (uint32_t i = 0; i < FLAGS_threads; i++) {
+      combined.Merge(threads[i]->latency_ns_hist);
+    }
+    printf("%s", combined.ToString().c_str());

-    size_t occ = cache_->GetOccupancyCount();
-    size_t slot = cache_->GetTableAddressCount();
-    printf("Final load factor: %g (%zu / %zu)\n", 1.0 * occ / slot, occ, slot);
-
-    printf("Final pinned count: %zu\n", shared.GetPinnedCount());
-
-    if (FLAGS_histograms) {
-      printf("\nOperation latency (ns):\n");
-      HistogramImpl combined;
-      for (uint32_t i = 0; i < FLAGS_threads; i++) {
-        combined.Merge(threads[i]->latency_ns_hist);
-      }
-      printf("%s", combined.ToString().c_str());
-
-      if (FLAGS_gather_stats) {
-        printf("\nGather stats latency (us):\n");
-        printf("%s", stats_hist.ToString().c_str());
-      }
+    if (FLAGS_gather_stats) {
+      printf("\nGather stats latency (us):\n");
+      printf("%s", stats_hist.ToString().c_str());
    }

-    if (FLAGS_report_problems) {
-      printf("\n");
-      std::shared_ptr<Logger> logger =
-          std::make_shared<StderrLogger>(InfoLogLevel::DEBUG_LEVEL);
-      cache_->ReportProblems(logger);
-    }
-    printf("%s", stats_report.c_str());
+    printf("\n%s", stats_report.c_str());

    return true;
  }
@@ -588,9 +416,10 @@ class CacheBench {
  // Cumulative thresholds in the space of a random uint64_t
  const uint64_t lookup_insert_threshold_;
  const uint64_t insert_threshold_;
-  const uint64_t blind_insert_threshold_;
  const uint64_t lookup_threshold_;
  const uint64_t erase_threshold_;
+  const bool skewed_;
+  int max_log_;

  // A benchmark version of gathering stats on an active block cache by
  // iterating over it. The primary purpose is to measure the impact of
@@ -608,9 +437,7 @@ class CacheBench {
    uint64_t total_key_size = 0;
    uint64_t total_charge = 0;
    uint64_t total_entry_count = 0;
-    uint64_t table_occupancy = 0;
-    uint64_t table_size = 0;
-    std::set<const Cache::CacheItemHelper*> helpers;
+    std::set<Cache::DeleterFn> deleters;
    StopWatchNano timer(clock);

    for (;;) {
@@ -623,11 +450,8 @@ class CacheBench {
        for (;;) {
          if (shared->AllDone()) {
            std::ostringstream ostr;
-            ostr << "\nMost recent cache entry stats:\n"
+            ostr << "Most recent cache entry stats:\n"
                 << "Number of entries: " << total_entry_count << "\n"
-                 << "Table occupancy: " << table_occupancy << " / "
-                 << table_size << " = "
-                 << (100.0 * table_occupancy / table_size) << "%\n"
                 << "Total charge: " << BytesToHumanString(total_charge) << "\n"
                 << "Average key size: "
                 << (1.0 * total_key_size / total_entry_count) << "\n"
@@ -635,7 +459,7 @@ class CacheBench {
                 << BytesToHumanString(static_cast<uint64_t>(
                        1.0 * total_charge / total_entry_count))
                 << "\n"
-                 << "Unique helpers: " << helpers.size() << "\n";
+                 << "Unique deleters: " << deleters.size() << "\n";
            *stats_report = ostr.str();
            return;
          }
@@ -651,26 +475,20 @@ class CacheBench {
      total_key_size = 0;
      total_charge = 0;
      total_entry_count = 0;
-      helpers.clear();
-      auto fn = [&](const Slice& key, Cache::ObjectPtr /*value*/, size_t charge,
-                    const Cache::CacheItemHelper* helper) {
+      deleters.clear();
+      auto fn = [&](const Slice& key, void* /*value*/, size_t charge,
+                    Cache::DeleterFn deleter) {
        total_key_size += key.size();
        total_charge += charge;
        ++total_entry_count;
-        // Something slightly more expensive as in stats by category
-        helpers.insert(helper);
+        // Something slightly more expensive as in (future) stats by category
+        deleters.insert(deleter);
      };
-      if (FLAGS_histograms) {
-        timer.Start();
-      }
+      timer.Start();
      Cache::ApplyToAllEntriesOptions opts;
      opts.average_entries_per_lock = FLAGS_gather_stats_entries_per_lock;
      shared->GetCacheBench()->cache_->ApplyToAllEntries(fn, opts);
-      table_occupancy = shared->GetCacheBench()->cache_->GetOccupancyCount();
-      table_size = shared->GetCacheBench()->cache_->GetTableAddressCount();
-      if (FLAGS_histograms) {
-        stats_hist->Add(timer.ElapsedNanos() / 1000);
-      }
+      stats_hist->Add(timer.ElapsedNanos() / 1000);
    }
  }

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

    for (uint64_t i = 0; i < FLAGS_ops_per_thread; i++) {
-      Slice key = gen.GetRand(thread->rnd, max_key_, FLAGS_skew);
+      Slice key = gen.GetRand(thread->rnd, max_key_, max_log_);
      uint64_t random_op = thread->rnd.Next();
+      Cache::CreateCallback create_cb = [](const void* buf, size_t size,
+                                           void** out_obj,
+                                           size_t* charge) -> Status {
+        *out_obj = reinterpret_cast<void*>(new char[size]);
+        memcpy(*out_obj, buf, size);
+        *charge = size;
+        return Status::OK();
+      };

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

      if (random_op < lookup_insert_threshold_) {
-        // do lookup
-        auto handle = cache_->Lookup(key, &helper2, /*context*/ nullptr,
-                                     Cache::Priority::LOW);
        if (handle) {
-          ++lookup_hits;
+          cache_->Release(handle);
+          handle = nullptr;
+        }
+        // do lookup
+        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);
          }
-          pinned.push_back(handle);
        } else {
-          ++lookup_misses;
          // do insert
-          Status s = cache_->Insert(
-              key, createValue(thread->rnd, cache_->memory_allocator()),
-              &helper2, FLAGS_value_bytes, &pinned.emplace_back());
+          Status s = cache_->Insert(key, createValue(thread->rnd), &helper2,
+                                    FLAGS_value_bytes, &handle);
          assert(s.ok());
        }
      } else if (random_op < insert_threshold_) {
+        if (handle) {
+          cache_->Release(handle);
+          handle = nullptr;
+        }
        // do insert
-        Status s = cache_->Insert(
-            key, createValue(thread->rnd, cache_->memory_allocator()), &helper3,
-            FLAGS_value_bytes, &pinned.emplace_back());
-        assert(s.ok());
-      } else if (random_op < blind_insert_threshold_) {
-        // insert without keeping a handle
-        Status s = cache_->Insert(
-            key, createValue(thread->rnd, cache_->memory_allocator()), &helper3,
-            FLAGS_value_bytes);
+        Status s = cache_->Insert(key, createValue(thread->rnd), &helper3,
+                                  FLAGS_value_bytes, &handle);
        assert(s.ok());
      } else if (random_op < lookup_threshold_) {
-        // do lookup
-        auto handle = cache_->Lookup(key, &helper2, /*context*/ nullptr,
-                                     Cache::Priority::LOW);
        if (handle) {
-          ++lookup_hits;
+          cache_->Release(handle);
+          handle = nullptr;
+        }
+        // do lookup
+        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);
          }
-          pinned.push_back(handle);
-        } else {
-          ++lookup_misses;
        }
      } else if (random_op < erase_threshold_) {
        // do erase
@@ -792,27 +591,9 @@ class CacheBench {
        // Should be extremely unlikely (noop)
        assert(random_op >= kHundredthUint64 * 100U);
      }
-      if (FLAGS_histograms) {
-        thread->latency_ns_hist.Add(timer.ElapsedNanos());
-      }
-      if (FLAGS_usleep > 0) {
-        unsigned us =
-            static_cast<unsigned>(thread->rnd.Uniform(FLAGS_usleep + 1));
-        if (us > 0) {
-          system_clock->SleepForMicroseconds(us);
-        }
-      }
-      while (pinned.size() > pin_count) {
-        cache_->Release(pinned.front());
-        pinned.pop_front();
-      }
+      thread->latency_ns_hist.Add(timer.ElapsedNanos());
    }
-    if (FLAGS_early_exit) {
-      MutexLock l(thread->shared->GetMutex());
-      exit(0);
-    }
-    thread->shared->AddLookupStats(lookup_hits, lookup_misses, pinned.size());
-    for (auto handle : pinned) {
+    if (handle) {
      cache_->Release(handle);
      handle = nullptr;
    }
@@ -832,16 +613,13 @@ class CacheBench {
 #ifndef NDEBUG
    printf("WARNING: Assertions are enabled; benchmarks unnecessarily slow\n");
 #endif
-    printf("----------------------------\n");
    printf("RocksDB version     : %d.%d\n", kMajorVersion, kMinorVersion);
-    printf("Cache impl name     : %s\n", cache_->Name());
    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",
           BytesToHumanString(FLAGS_cache_size).c_str());
-    printf("Num shard bits      : %d\n",
-           AsShardedCache(cache_.get())->GetNumShardBits());
+    printf("Num shard bits      : %u\n", FLAGS_num_shard_bits);
    printf("Max key             : %" PRIu64 "\n", max_key_);
    printf("Resident ratio      : %g\n", FLAGS_resident_ratio);
    printf("Skew degree         : %u\n", FLAGS_skew);
@@ -1002,7 +780,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]{});
@@ -1019,13 +797,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;
@@ -1038,9 +816,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;
@@ -1053,7 +831,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.
@@ -1063,11 +842,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) {
@@ -1089,7 +870,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;
@@ -1107,11 +888,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);
      }
@@ -1119,27 +899,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
@@ -1154,67 +923,12 @@ 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_bench -stress_cache_instances is a partially independent embedded tool
-// for evaluating the time and space required to create and destroy many cache
-// instances, as this is considered important for a default cache implementation
-// which could see many throw-away instances in handling of Options, or created
-// in large numbers for many very small DBs with many CFs. Prefix command line
-// with /usr/bin/time to see max RSS memory.
-class StressCacheInstances {
- public:
-  void Run() {
-    const int kNumIterations = 10;
-    const auto clock = SystemClock::Default().get();
-    caches_.reserve(FLAGS_stress_cache_instances);
-
-    uint64_t total_create_time_us = 0;
-    uint64_t total_destroy_time_us = 0;
-
-    for (int iter = 0; iter < kNumIterations; ++iter) {
-      // Create many cache instances
-      uint64_t start_create = clock->NowMicros();
-      for (uint32_t i = 0; i < FLAGS_stress_cache_instances; ++i) {
-        caches_.emplace_back(CacheBench::MakeCache());
-      }
-      uint64_t end_create = clock->NowMicros();
-      uint64_t create_time = end_create - start_create;
-      total_create_time_us += create_time;
-
-      // Destroy them
-      uint64_t start_destroy = clock->NowMicros();
-      caches_.clear();
-      uint64_t end_destroy = clock->NowMicros();
-      uint64_t destroy_time = end_destroy - start_destroy;
-      total_destroy_time_us += destroy_time;
-
-      printf(
-          "Iteration %d: Created %u caches in %.3f ms, destroyed in %.3f ms\n",
-          iter + 1, FLAGS_stress_cache_instances, create_time / 1000.0,
-          destroy_time / 1000.0);
-    }
-
-    printf("Average creation time: %.3f ms (%.1f us per cache)\n",
-           static_cast<double>(total_create_time_us) / kNumIterations / 1000.0,
-           static_cast<double>(total_create_time_us) / kNumIterations /
-               FLAGS_stress_cache_instances);
-    printf("Average destruction time: %.3f ms (%.1f us per cache)\n",
-           static_cast<double>(total_destroy_time_us) / kNumIterations / 1000.0,
-           static_cast<double>(total_destroy_time_us) / kNumIterations /
-               FLAGS_stress_cache_instances);
-  }
-
- private:
-  std::vector<std::shared_ptr<Cache>> caches_;
-};
-
 int cache_bench_tool(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ParseCommandLineFlags(&argc, &argv, true);

  if (FLAGS_stress_cache_key) {
@@ -1223,24 +937,16 @@ int cache_bench_tool(int argc, char** argv) {
    return 0;
  }

-  if (FLAGS_stress_cache_instances > 0) {
-    StressCacheInstances().Run();
-    return 0;
-  }
-
  if (FLAGS_threads <= 0) {
    fprintf(stderr, "threads number <= 0\n");
    exit(1);
  }

-  if (FLAGS_seed == 0) {
-    FLAGS_seed = static_cast<uint32_t>(port::GetProcessID());
-    printf("Using seed = %" PRIu32 "\n", FLAGS_seed);
-  }
-
  ROCKSDB_NAMESPACE::CacheBench bench;
  if (FLAGS_populate_cache) {
    bench.PopulateCache();
+    printf("Population complete\n");
+    printf("----------------------------\n");
  }
  if (bench.Run()) {
    return 0;
@@ -23,8 +23,6 @@ std::array<std::string, kNumCacheEntryRoles> kCacheEntryRoleToCamelString{{
    "FilterConstruction",
    "BlockBasedTableReader",
    "FileMetadata",
-    "BlobValue",
-    "BlobCache",
    "Misc",
 }};

@@ -40,8 +38,6 @@ std::array<std::string, kNumCacheEntryRoles> kCacheEntryRoleToHyphenString{{
    "filter-construction",
    "block-based-table-reader",
    "file-metadata",
-    "blob-value",
-    "blob-cache",
    "misc",
 }};

@@ -101,4 +97,34 @@ std::string BlockCacheEntryStatsMapKeys::UsedPercent(CacheEntryRole role) {
  return GetPrefixedCacheEntryRoleName(kPrefix, role);
 }

+namespace {
+
+struct Registry {
+  std::mutex mutex;
+  UnorderedMap<Cache::DeleterFn, CacheEntryRole> role_map;
+  void Register(Cache::DeleterFn fn, CacheEntryRole role) {
+    std::lock_guard<std::mutex> lock(mutex);
+    role_map[fn] = role;
+  }
+  UnorderedMap<Cache::DeleterFn, CacheEntryRole> Copy() {
+    std::lock_guard<std::mutex> lock(mutex);
+    return role_map;
+  }
+};
+
+Registry& GetRegistry() {
+  STATIC_AVOID_DESTRUCTION(Registry, registry);
+  return registry;
+}
+
+}  // namespace
+
+void RegisterCacheDeleterRole(Cache::DeleterFn fn, CacheEntryRole role) {
+  GetRegistry().Register(fn, role);
+}
+
+UnorderedMap<Cache::DeleterFn, CacheEntryRole> CopyCacheDeleterRoleMap() {
+  return GetRegistry().Copy();
+}
+
 }  // namespace ROCKSDB_NAMESPACE
@@ -7,8 +7,11 @@

 #include <array>
 #include <cstdint>
+#include <memory>
+#include <type_traits>

 #include "rocksdb/cache.h"
+#include "util/hash_containers.h"

 namespace ROCKSDB_NAMESPACE {

@@ -17,4 +20,84 @@ extern std::array<std::string, kNumCacheEntryRoles>
 extern std::array<std::string, kNumCacheEntryRoles>
    kCacheEntryRoleToHyphenString;

+// To associate cache entries with their role, we use a hack on the
+// existing Cache interface. Because the deleter of an entry can authenticate
+// the code origin of an entry, we can elaborate the choice of deleter to
+// also encode role information, without inferring false role information
+// from entries not choosing to encode a role.
+//
+// The rest of this file is for handling mappings between deleters and
+// roles.
+
+// To infer a role from a deleter, the deleter must be registered. This
+// can be done "manually" with this function. This function is thread-safe,
+// and the registration mappings go into private but static storage. (Note
+// that DeleterFn is a function pointer, not std::function. Registrations
+// should not be too many.)
+void RegisterCacheDeleterRole(Cache::DeleterFn fn, CacheEntryRole role);
+
+// Gets a copy of the registered deleter -> role mappings. This is the only
+// function for reading the mappings made with RegisterCacheDeleterRole.
+// Why only this interface for reading?
+// * This function has to be thread safe, which could incur substantial
+// overhead. We should not pay this overhead for every deleter look-up.
+// * This is suitable for preparing for batch operations, like with
+// CacheEntryStatsCollector.
+// * The number of mappings should be sufficiently small (dozens).
+UnorderedMap<Cache::DeleterFn, CacheEntryRole> CopyCacheDeleterRoleMap();
+
+// ************************************************************** //
+// An automatic registration infrastructure. This enables code
+// to simply ask for a deleter associated with a particular type
+// and role, and registration is automatic. In a sense, this is
+// a small dependency injection infrastructure, because linking
+// in new deleter instantiations is essentially sufficient for
+// making stats collection (using CopyCacheDeleterRoleMap) aware
+// of them.
+
+namespace cache_entry_roles_detail {
+
+template <typename T, CacheEntryRole R>
+struct RegisteredDeleter {
+  RegisteredDeleter() { RegisterCacheDeleterRole(Delete, R); }
+
+  // These have global linkage to help ensure compiler optimizations do not
+  // break uniqueness for each <T,R>
+  static void Delete(const Slice& /* key */, void* value) {
+    // Supports T == Something[], unlike delete operator
+    std::default_delete<T>()(
+        static_cast<typename std::remove_extent<T>::type*>(value));
+  }
+};
+
+template <CacheEntryRole R>
+struct RegisteredNoopDeleter {
+  RegisteredNoopDeleter() { RegisterCacheDeleterRole(Delete, R); }
+
+  static void Delete(const Slice& /* key */, void* /* value */) {
+    // Here was `assert(value == nullptr);` but we can also put pointers
+    // to static data in Cache, for testing at least.
+  }
+};
+
+}  // namespace cache_entry_roles_detail
+
+// Get an automatically registered deleter for value type T and role R.
+// Based on C++ semantics, registration is invoked exactly once in a
+// thread-safe way on first call to this function, for each <T, R>.
+template <typename T, CacheEntryRole R>
+Cache::DeleterFn GetCacheEntryDeleterForRole() {
+  static cache_entry_roles_detail::RegisteredDeleter<T, R> reg;
+  return reg.Delete;
+}
+
+// Get an automatically registered no-op deleter (value should be nullptr)
+// and associated with role R. This is used for Cache "reservation" entries
+// such as for WriteBufferManager.
+template <CacheEntryRole R>
+Cache::DeleterFn GetNoopDeleterForRole() {
+  static cache_entry_roles_detail::RegisteredNoopDeleter<R> reg;
+  return reg.Delete;
+}
+
 }  // namespace ROCKSDB_NAMESPACE
@@ -10,8 +10,8 @@
 #include <memory>
 #include <mutex>

+#include "cache/cache_helpers.h"
 #include "cache/cache_key.h"
-#include "cache/typed_cache.h"
 #include "port/lang.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/status.h"
@@ -101,24 +101,21 @@ class CacheEntryStatsCollector {
  }

  // Gets saved stats, regardless of age
-  void GetStats(Stats* stats) {
+  void GetStats(Stats *stats) {
    std::lock_guard<std::mutex> lock(saved_mutex_);
    *stats = saved_stats_;
  }

-  Cache* GetCache() const { return cache_; }
+  Cache *GetCache() const { return cache_; }

  // Gets or creates a shared instance of CacheEntryStatsCollector in the
  // cache itself, and saves into `ptr`. This shared_ptr will hold the
  // entry in cache until all refs are destroyed.
-  static Status GetShared(Cache* raw_cache, SystemClock* clock,
-                          std::shared_ptr<CacheEntryStatsCollector>* ptr) {
-    assert(raw_cache);
-    BasicTypedCacheInterface<CacheEntryStatsCollector, CacheEntryRole::kMisc>
-        cache{raw_cache};
+  static Status GetShared(Cache *cache, SystemClock *clock,
+                          std::shared_ptr<CacheEntryStatsCollector> *ptr) {
+    const Slice &cache_key = GetCacheKey();

-    const Slice& cache_key = GetCacheKey();
-    auto h = cache.Lookup(cache_key);
+    Cache::Handle *h = cache->Lookup(cache_key);
    if (h == nullptr) {
      // Not yet in cache, but Cache doesn't provide a built-in way to
      // avoid racing insert. So we double-check under a shared mutex,
@@ -126,15 +123,15 @@ class CacheEntryStatsCollector {
      STATIC_AVOID_DESTRUCTION(std::mutex, static_mutex);
      std::lock_guard<std::mutex> lock(static_mutex);

-      h = cache.Lookup(cache_key);
+      h = cache->Lookup(cache_key);
      if (h == nullptr) {
-        auto new_ptr = new CacheEntryStatsCollector(cache.get(), clock);
+        auto new_ptr = new CacheEntryStatsCollector(cache, clock);
        // TODO: non-zero charge causes some tests that count block cache
        // usage to go flaky. Fix the problem somehow so we can use an
        // accurate charge.
        size_t charge = 0;
-        Status s =
-            cache.Insert(cache_key, new_ptr, charge, &h, Cache::Priority::HIGH);
+        Status s = cache->Insert(cache_key, new_ptr, charge, Deleter, &h,
+                                 Cache::Priority::HIGH);
        if (!s.ok()) {
          assert(h == nullptr);
          delete new_ptr;
@@ -143,16 +140,16 @@ class CacheEntryStatsCollector {
      }
    }
    // If we reach here, shared entry is in cache with handle `h`.
-    assert(cache.get()->GetCacheItemHelper(h) == cache.GetBasicHelper());
+    assert(cache->GetDeleter(h) == Deleter);

    // Build an aliasing shared_ptr that keeps `ptr` in cache while there
    // are references.
-    *ptr = cache.SharedGuard(h);
+    *ptr = MakeSharedCacheHandleGuard<CacheEntryStatsCollector>(cache, h);
    return Status::OK();
  }

 private:
-  explicit CacheEntryStatsCollector(Cache* cache, SystemClock* clock)
+  explicit CacheEntryStatsCollector(Cache *cache, SystemClock *clock)
      : saved_stats_(),
        working_stats_(),
        last_start_time_micros_(0),
@@ -160,7 +157,11 @@ class CacheEntryStatsCollector {
        cache_(cache),
        clock_(clock) {}

-  static const Slice& GetCacheKey() {
+  static void Deleter(const Slice &, void *value) {
+    delete static_cast<CacheEntryStatsCollector *>(value);
+  }
+
+  static const Slice &GetCacheKey() {
    // For each template instantiation
    static CacheKey ckey = CacheKey::CreateUniqueForProcessLifetime();
    static Slice ckey_slice = ckey.AsSlice();
@@ -175,8 +176,8 @@ class CacheEntryStatsCollector {
  uint64_t last_start_time_micros_;
  uint64_t last_end_time_micros_;

-  Cache* const cache_;
-  SystemClock* const clock_;
+  Cache *const cache_;
+  SystemClock *const clock_;
 };

 }  // namespace ROCKSDB_NAMESPACE
@@ -1,41 +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/cache_helpers.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-void ReleaseCacheHandleCleanup(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);
-}
-
-Status WarmInCache(Cache* cache, const Slice& key, const Slice& saved,
-                   Cache::CreateContext* create_context,
-                   const Cache::CacheItemHelper* helper,
-                   Cache::Priority priority, size_t* out_charge) {
-  assert(helper);
-  assert(helper->create_cb);
-  Cache::ObjectPtr value;
-  size_t charge;
-  Status st = helper->create_cb(saved, CompressionType::kNoCompression,
-                                CacheTier::kVolatileTier, create_context,
-                                cache->memory_allocator(), &value, &charge);
-  if (st.ok()) {
-    st =
-        cache->Insert(key, value, helper, charge, /*handle*/ nullptr, priority);
-    if (out_charge) {
-      *out_charge = charge;
-    }
-  }
-  return st;
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -7,7 +7,7 @@

 #include <cassert>

-#include "rocksdb/advanced_cache.h"
+#include "rocksdb/cache.h"
 #include "rocksdb/rocksdb_namespace.h"

 namespace ROCKSDB_NAMESPACE {
@@ -17,17 +17,22 @@ template <typename T>
 T* GetFromCacheHandle(Cache* cache, Cache::Handle* handle) {
  assert(cache);
  assert(handle);
+
  return static_cast<T*>(cache->Value(handle));
 }

+// Simple generic deleter for Cache (to be used with Cache::Insert).
+template <typename T>
+void DeleteCacheEntry(const Slice& /* key */, void* value) {
+  delete static_cast<T*>(value);
+}
+
 // Turns a T* into a Slice so it can be used as a key with Cache.
 template <typename T>
-Slice GetSliceForKey(const T* t) {
+Slice GetSlice(const T* t) {
  return Slice(reinterpret_cast<const char*>(t), sizeof(T));
 }

-void ReleaseCacheHandleCleanup(void* arg1, void* arg2);
-
 // Generic resource management object for cache handles that releases the handle
 // when destroyed. Has unique ownership of the handle, so copying it is not
 // allowed, while moving it transfers ownership.
@@ -83,7 +88,7 @@ class CacheHandleGuard {
    if (cleanable) {
      if (handle_ != nullptr) {
        assert(cache_);
-        cleanable->RegisterCleanup(&ReleaseCacheHandleCleanup, cache_, handle_);
+        cleanable->RegisterCleanup(&ReleaseCacheHandle, cache_, handle_);
      }
    }
    ResetFields();
@@ -110,6 +115,16 @@ 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;
@@ -124,16 +139,7 @@ template <typename T>
 std::shared_ptr<T> MakeSharedCacheHandleGuard(Cache* cache,
                                              Cache::Handle* handle) {
  auto wrapper = std::make_shared<CacheHandleGuard<T>>(cache, handle);
-  return std::shared_ptr<T>(wrapper, GetFromCacheHandle<T>(cache, handle));
+  return std::shared_ptr<T>(wrapper, static_cast<T*>(cache->Value(handle)));
 }

-// Given the persistable data (saved) for a block cache entry, parse that
-// into a cache entry object and insert it into the given cache. The charge
-// of the new entry can be returned to the caller through `out_charge`.
-Status WarmInCache(Cache* cache, const Slice& key, const Slice& saved,
-                   Cache::CreateContext* create_context,
-                   const Cache::CacheItemHelper* helper,
-                   Cache::Priority priority = Cache::Priority::LOW,
-                   size_t* out_charge = nullptr);
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <atomic>

-#include "rocksdb/advanced_cache.h"
+#include "rocksdb/cache.h"
 #include "table/unique_id_impl.h"
 #include "util/hash.h"
 #include "util/math.h"
@@ -17,14 +17,14 @@ 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
 //              0 |      >= 1<<63 | CreateUniqueForProcessLifetime
 //            > 0 |           any | OffsetableCacheKey.WithOffset

-CacheKey CacheKey::CreateUniqueForCacheLifetime(Cache* cache) {
+CacheKey CacheKey::CreateUniqueForCacheLifetime(Cache *cache) {
  // +1 so that we can reserve all zeros for "unset" cache key
  uint64_t id = cache->NewId() + 1;
  // Ensure we don't collide with CreateUniqueForProcessLifetime
@@ -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
@@ -297,68 +247,98 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 //
 // TODO: Nevertheless / regardless, an efficient way to detect (and thus
 // quantify) block cache corruptions, including collisions, should be added.
-OffsetableCacheKey::OffsetableCacheKey(const std::string& db_id,
-                                       const std::string& db_session_id,
-                                       uint64_t file_number) {
-  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];
-
+OffsetableCacheKey::OffsetableCacheKey(const std::string &db_id,
+                                       const std::string &db_session_id,
+                                       uint64_t file_number,
+                                       uint64_t max_offset) {
 #ifndef NDEBUG
-  bool is_empty = session_lower == 0 && file_num_etc == 0;
+  max_offset_ = max_offset;
 #endif
+  // Closely related to GetSstInternalUniqueId, but only need 128 bits and
+  // need to include an offset within the file.
+  // See also https://github.com/pdillinger/unique_id for background.
+  uint64_t session_upper = 0;  // Assignment to appease clang-analyze
+  uint64_t session_lower = 0;  // Assignment to appease clang-analyze
+  {
+    Status s = DecodeSessionId(db_session_id, &session_upper, &session_lower);
+    if (!s.ok()) {
+      // A reasonable fallback in case malformed
+      Hash2x64(db_session_id.data(), db_session_id.size(), &session_upper,
+               &session_lower);
+    }
+  }
+
+  // Hash the session upper (~39 bits entropy) and DB id (120+ bits entropy)
+  // for more global uniqueness entropy.
+  // (It is possible that many DBs descended from one common DB id are copied
+  // around and proliferate, in which case session id is critical, but it is
+  // more common for different DBs to have different DB ids.)
+  uint64_t db_hash = Hash64(db_id.data(), db_id.size(), session_upper);
+
+  // This establishes the db+session id part of the cache key.
+  //
+  // Exactly preserve (in common cases; see modifiers below) session lower to
+  // ensure that session ids generated during the same process lifetime are
+  // guaranteed unique.
+  //
+  // We put this first for CommonPrefixSlice(), so that a small-ish set of
+  // cache key prefixes to cover entries relevant to any DB.
+  session_etc64_ = session_lower;
+  // This provides extra entopy in case of different DB id or process
+  // generating a session id, but is also partly/variably obscured by
+  // file_number and offset (see below).
+  offset_etc64_ = db_hash;
+
+  // Into offset_etc64_ we are (eventually) going to pack & xor in an offset and
+  // a file_number, but we might need the file_number to overflow into
+  // session_etc64_. (There must only be one session_etc64_ value per
+  // file, and preferably shared among many files.)
+  //
+  // Figure out how many bytes of file_number we are going to be able to
+  // pack in with max_offset, though our encoding will only support packing
+  // in up to 3 bytes of file_number. (16M file numbers is enough for a new
+  // file number every second for half a year.)
+  int file_number_bytes_in_offset_etc =
+      (63 - FloorLog2(max_offset | 0x100000000U)) / 8;
+  int file_number_bits_in_offset_etc = file_number_bytes_in_offset_etc * 8;
+
+  // Assert two bits of metadata
+  assert(file_number_bytes_in_offset_etc >= 0 &&
+         file_number_bytes_in_offset_etc <= 3);
+  // Assert we couldn't have used a larger allowed number of bytes (shift
+  // would chop off bytes).
+  assert(file_number_bytes_in_offset_etc == 3 ||
+         (max_offset << (file_number_bits_in_offset_etc + 8) >>
+          (file_number_bits_in_offset_etc + 8)) != max_offset);
+
+  uint64_t mask = (uint64_t{1} << (file_number_bits_in_offset_etc)) - 1;
+  // Pack into high bits of etc so that offset can go in low bits of etc
+  // TODO: could be EndianSwapValue?
+  uint64_t offset_etc_modifier = ReverseBits(file_number & mask);
+  assert(offset_etc_modifier << file_number_bits_in_offset_etc == 0U);
+
+  // Overflow and 3 - byte count (likely both zero) go into session_id part
+  uint64_t session_etc_modifier =
+      (file_number >> file_number_bits_in_offset_etc << 2) |
+      static_cast<uint64_t>(3 - file_number_bytes_in_offset_etc);
+  // Packed into high bits to minimize interference with session id counter.
+  session_etc_modifier = ReverseBits(session_etc_modifier);
+
+  // Assert session_id part is only modified in extreme cases
+  assert(session_etc_modifier == 0 || file_number > /*3 bytes*/ 0xffffffU ||
+         max_offset > /*5 bytes*/ 0xffffffffffU);
+
+  // Xor in the modifiers
+  session_etc64_ ^= session_etc_modifier;
+  offset_etc64_ ^= offset_etc_modifier;

  // Although DBImpl guarantees (in recent versions) that session_lower is not
-  // zero, that's not entirely sufficient to guarantee that file_num_etc64_ is
+  // zero, that's not entirely sufficient to guarantee that session_etc64_ is
  // not zero (so that the 0 case can be used by CacheKey::CreateUnique*)
-  // However, if we are given an "empty" id as input, then we should produce
-  // "empty" as output.
-  // As a consequence, this function is only bijective assuming
-  // id[0] == 0 only if id[1] == 0.
-  if (session_lower == 0U) {
-    session_lower = file_num_etc;
+  if (session_etc64_ == 0U) {
+    session_etc64_ = session_upper | 1U;
  }
-
-  // See comments above for how DownwardInvolution and ReverseBits
-  // make this function invertible under various assumptions.
-  OffsetableCacheKey rv;
-  rv.file_num_etc64_ =
-      DownwardInvolution(session_lower) ^ ReverseBits(file_num_etc);
-  rv.offset_etc64_ = ReverseBits(session_lower);
-
-  // Because of these transformations and needing to allow arbitrary
-  // offset (thus, second 64 bits of cache key might be 0), we need to
-  // make some correction to ensure the first 64 bits is not 0.
-  // Fortunately, the transformation ensures the second 64 bits is not 0
-  // for non-empty base key, so we can swap in the case one is 0 without
-  // breaking bijectivity (assuming condition above).
-  assert(is_empty || rv.offset_etc64_ > 0);
-  if (rv.file_num_etc64_ == 0) {
-    std::swap(rv.file_num_etc64_, rv.offset_etc64_);
-  }
-  assert(is_empty || rv.file_num_etc64_ > 0);
-  return rv;
-}
-
-// Inverse of FromInternalUniqueId (assuming file_num_etc64 == 0 only if
-// offset_etc64 == 0)
-UniqueId64x2 OffsetableCacheKey::ToInternalUniqueId() {
-  uint64_t a = file_num_etc64_;
-  uint64_t b = offset_etc64_;
-  if (b == 0) {
-    std::swap(a, b);
-  }
-  UniqueId64x2 rv;
-  rv[0] = ReverseBits(b);
-  rv[1] = ReverseBits(a ^ DownwardInvolution(rv[0]));
-  return rv;
+  assert(session_etc64_ != 0);
 }

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

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

 namespace ROCKSDB_NAMESPACE {

@@ -34,23 +33,23 @@ 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)
  inline Slice AsSlice() const {
    static_assert(sizeof(*this) == 16, "Standardized on 16-byte cache key");
    assert(!IsEmpty());
-    return Slice(reinterpret_cast<const char*>(this), sizeof(*this));
+    return Slice(reinterpret_cast<const char *>(this), sizeof(*this));
  }

  // Create a CacheKey that is unique among others associated with this Cache
  // instance. Depends on Cache::NewId. This is useful for block cache
  // "reservations".
-  static CacheKey CreateUniqueForCacheLifetime(Cache* cache);
+  static CacheKey CreateUniqueForCacheLifetime(Cache *cache);

  // Create a CacheKey that is unique among others for the lifetime of this
  // process. This is useful for saving in a static data member so that
@@ -60,9 +59,9 @@ 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_;
 };

@@ -86,58 +85,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.
-  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();
+  // max_offset is based on file size (see WithOffset) and is required here to
+  // choose an appropriate (sub-)encoding. This constructor never generates an
+  // "empty" base key.
+  OffsetableCacheKey(const std::string &db_id, const std::string &db_session_id,
+                     uint64_t file_number, uint64_t max_offset);

  inline bool IsEmpty() const {
-    bool result = 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);
+    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
@@ -13,6 +13,7 @@
 #include <cstring>
 #include <memory>

+#include "cache/cache_entry_roles.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"
@@ -40,17 +41,17 @@ CacheReservationManagerImpl<
 template <CacheEntryRole R>
 CacheReservationManagerImpl<R>::CacheReservationManagerImpl(
    std::shared_ptr<Cache> cache, bool delayed_decrease)
-    : cache_(cache),
-      delayed_decrease_(delayed_decrease),
+    : delayed_decrease_(delayed_decrease),
      cache_allocated_size_(0),
      memory_used_(0) {
  assert(cache != nullptr);
+  cache_ = cache;
 }

 template <CacheEntryRole R>
 CacheReservationManagerImpl<R>::~CacheReservationManagerImpl() {
  for (auto* handle : dummy_handles_) {
-    cache_.ReleaseAndEraseIfLastRef(handle);
+    cache_->Release(handle, true);
  }
 }

@@ -114,7 +115,8 @@ Status CacheReservationManagerImpl<R>::IncreaseCacheReservation(
  Status return_status = Status::OK();
  while (new_mem_used > cache_allocated_size_.load(std::memory_order_relaxed)) {
    Cache::Handle* handle = nullptr;
-    return_status = cache_.Insert(GetNextCacheKey(), kSizeDummyEntry, &handle);
+    return_status = cache_->Insert(GetNextCacheKey(), nullptr, kSizeDummyEntry,
+                                   GetNoopDeleterForRole<R>(), &handle);

    if (return_status != Status::OK()) {
      return return_status;
@@ -139,7 +141,7 @@ Status CacheReservationManagerImpl<R>::DecreaseCacheReservation(
         cache_allocated_size_.load(std::memory_order_relaxed)) {
    assert(!dummy_handles_.empty());
    auto* handle = dummy_handles_.back();
-    cache_.ReleaseAndEraseIfLastRef(handle);
+    cache_->Release(handle, true);
    dummy_handles_.pop_back();
    cache_allocated_size_ -= kSizeDummyEntry;
  }
@@ -167,9 +169,8 @@ Slice CacheReservationManagerImpl<R>::GetNextCacheKey() {
 }

 template <CacheEntryRole R>
-const Cache::CacheItemHelper*
-CacheReservationManagerImpl<R>::TEST_GetCacheItemHelperForRole() {
-  return CacheInterface::GetHelper();
+Cache::DeleterFn CacheReservationManagerImpl<R>::TEST_GetNoopDeleterForRole() {
+  return GetNoopDeleterForRole<R>();
 }

 template class CacheReservationManagerImpl<
@@ -180,5 +181,4 @@ 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
@@ -18,7 +18,7 @@

 #include "cache/cache_entry_roles.h"
 #include "cache/cache_key.h"
-#include "cache/typed_cache.h"
+#include "rocksdb/cache.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"
 #include "util/coding.h"
@@ -44,8 +44,8 @@ class CacheReservationManager {
                                        bool increase) = 0;
  virtual Status MakeCacheReservation(
      std::size_t incremental_memory_used,
-      std::unique_ptr<CacheReservationManager::CacheReservationHandle>*
-          handle) = 0;
+      std::unique_ptr<CacheReservationManager::CacheReservationHandle>
+          *handle) = 0;
  virtual std::size_t GetTotalReservedCacheSize() = 0;
  virtual std::size_t GetTotalMemoryUsed() = 0;
 };
@@ -90,11 +90,11 @@ class CacheReservationManagerImpl
                                       bool delayed_decrease = false);

  // no copy constructor, copy assignment, move constructor, move assignment
-  CacheReservationManagerImpl(const CacheReservationManagerImpl&) = delete;
-  CacheReservationManagerImpl& operator=(const CacheReservationManagerImpl&) =
+  CacheReservationManagerImpl(const CacheReservationManagerImpl &) = delete;
+  CacheReservationManagerImpl &operator=(const CacheReservationManagerImpl &) =
      delete;
-  CacheReservationManagerImpl(CacheReservationManagerImpl&&) = delete;
-  CacheReservationManagerImpl& operator=(CacheReservationManagerImpl&&) =
+  CacheReservationManagerImpl(CacheReservationManagerImpl &&) = delete;
+  CacheReservationManagerImpl &operator=(CacheReservationManagerImpl &&) =
      delete;

  ~CacheReservationManagerImpl() override;
@@ -178,7 +178,7 @@ class CacheReservationManagerImpl
  // REQUIRES: handle != nullptr
  Status MakeCacheReservation(
      std::size_t incremental_memory_used,
-      std::unique_ptr<CacheReservationManager::CacheReservationHandle>* handle)
+      std::unique_ptr<CacheReservationManager::CacheReservationHandle> *handle)
      override;

  // Return the size of the cache (which is a multiple of kSizeDummyEntry)
@@ -197,10 +197,10 @@ class CacheReservationManagerImpl

  static constexpr std::size_t GetDummyEntrySize() { return kSizeDummyEntry; }

-  // For testing only - it is to help ensure the CacheItemHelperForRole<R>
+  // For testing only - it is to help ensure the NoopDeleterForRole<R>
  // accessed from CacheReservationManagerImpl and the one accessed from the
  // test are from the same translation units
-  static const Cache::CacheItemHelper* TEST_GetCacheItemHelperForRole();
+  static Cache::DeleterFn TEST_GetNoopDeleterForRole();

 private:
  static constexpr std::size_t kSizeDummyEntry = 256 * 1024;
@@ -211,12 +211,11 @@ class CacheReservationManagerImpl
  Status IncreaseCacheReservation(std::size_t new_mem_used);
  Status DecreaseCacheReservation(std::size_t new_mem_used);

-  using CacheInterface = PlaceholderSharedCacheInterface<R>;
-  CacheInterface cache_;
+  std::shared_ptr<Cache> cache_;
  bool delayed_decrease_;
  std::atomic<std::size_t> cache_allocated_size_;
  std::size_t memory_used_;
-  std::vector<Cache::Handle*> dummy_handles_;
+  std::vector<Cache::Handle *> dummy_handles_;
  CacheKey cache_key_;
 };

@@ -251,14 +250,14 @@ class ConcurrentCacheReservationManager
      std::shared_ptr<CacheReservationManager> cache_res_mgr) {
    cache_res_mgr_ = std::move(cache_res_mgr);
  }
-  ConcurrentCacheReservationManager(const ConcurrentCacheReservationManager&) =
+  ConcurrentCacheReservationManager(const ConcurrentCacheReservationManager &) =
      delete;
-  ConcurrentCacheReservationManager& operator=(
-      const ConcurrentCacheReservationManager&) = delete;
-  ConcurrentCacheReservationManager(ConcurrentCacheReservationManager&&) =
+  ConcurrentCacheReservationManager &operator=(
+      const ConcurrentCacheReservationManager &) = delete;
+  ConcurrentCacheReservationManager(ConcurrentCacheReservationManager &&) =
      delete;
-  ConcurrentCacheReservationManager& operator=(
-      ConcurrentCacheReservationManager&&) = delete;
+  ConcurrentCacheReservationManager &operator=(
+      ConcurrentCacheReservationManager &&) = delete;

  ~ConcurrentCacheReservationManager() override {}

@@ -273,10 +272,9 @@ class ConcurrentCacheReservationManager
    std::size_t total_mem_used = cache_res_mgr_->GetTotalMemoryUsed();
    Status s;
    if (!increase) {
-      s = cache_res_mgr_->UpdateCacheReservation(
-          (total_mem_used > memory_used_delta)
-              ? (total_mem_used - memory_used_delta)
-              : 0);
+      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);
@@ -286,7 +284,7 @@ class ConcurrentCacheReservationManager

  inline Status MakeCacheReservation(
      std::size_t incremental_memory_used,
-      std::unique_ptr<CacheReservationManager::CacheReservationHandle>* handle)
+      std::unique_ptr<CacheReservationManager::CacheReservationHandle> *handle)
      override {
    std::unique_ptr<CacheReservationManager::CacheReservationHandle>
        wrapped_handle;
@@ -48,13 +48,13 @@ TEST_F(CacheReservationManagerTest, GenerateCacheKey) {
  // Next unique Cache key
  CacheKey ckey = CacheKey::CreateUniqueForCacheLifetime(cache.get());
  // Get to the underlying values
-  uint64_t* ckey_data = reinterpret_cast<uint64_t*>(&ckey);
+  using PairU64 = std::array<uint64_t, 2>;
+  auto& ckey_pair = *reinterpret_cast<PairU64*>(&ckey);
  // Back it up to the one used by CRM (using CacheKey implementation details)
-  ckey_data[1]--;
+  ckey_pair[1]--;

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

  Cache::Handle* handle = cache->Lookup(ckey.AsSlice());
  EXPECT_NE(handle, nullptr)
@@ -129,6 +129,7 @@ TEST_F(CacheReservationManagerTest,

 TEST(CacheReservationManagerIncreaseReservcationOnFullCacheTest,
     IncreaseCacheReservationOnFullCache) {
+  ;
  constexpr std::size_t kSizeDummyEntry =
      CacheReservationManagerImpl<CacheEntryRole::kMisc>::GetDummyEntrySize();
  constexpr std::size_t kSmallCacheCapacity = 4 * kSizeDummyEntry;
@@ -462,7 +463,6 @@ TEST(CacheReservationHandleTest, HandleTest) {
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
  ::testing::InitGoogleTest(&argc, argv);
  return RUN_ALL_TESTS();
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Levi Tamasi	c2452696d9	Bump up version to 7.5.4	2022-11-03 13:51:23 -07:00
Levi Tamasi	d56ad2328b	Do not put blobs read during compaction into cache (#10457 ) Summary: During compaction, blobs are currently read using the default `ReadOptions`, which has the `fill_cache` flag set to true. Earlier, this didn't make any difference since we didn't have a blob cache; however, now we have to explicitly set this flag to false to avoid polluting the cache during compaction. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10457 Test Plan: `make check` Reviewed By: riversand963 Differential Revision: D38333528 Pulled By: ltamasi fbshipit-source-id: 5b4d49a1e39543bee73c7df2aa9194fb101875e2	2022-11-03 13:49:24 -07:00
sdong	540d5aae51	Bump version.h to 7.5.3	2022-08-24 15:36:30 -07:00
sdong	0e860cb42a	Fix regression issue of too large score (#10518 ) Summary: https://github.com/facebook/rocksdb/pull/10057 caused a regression bug: since the base level size is not adjusted based on L0 size anymore, L0 score might become very large. This makes compaction heavily favor L0->L1 compaction against L1->L2 compaction, and cause in some cases, data stuck in L1 without being moved down. We fix calculating a score of L0 by size(L0)/size(L1) in the case where L0 is large.. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10518 Test Plan: run db_bench against data on tmpfs and watch the behavior of data stuck in L1 goes away. Reviewed By: ajkr Differential Revision: D38603145 fbshipit-source-id: 4949e52dc28b54aacfe08417c6e6cc7e40a27225	2022-08-11 17:16:12 -07:00
Peter Dillinger	dcd4435c9f	Update HISTORY and version.h for 7.5.2	2022-08-02 12:34:32 -07:00
Peter Dillinger	b91628b4cb	Fix serious FSDirectory use-after-Close bug (missing fsync) (#10460 ) Summary: TL;DR: due to a recent change, if you drop a column family, often that DB will no longer fsync after writing new SST files to remaining or new column families, which could lead to data loss on power loss. More bug detail: The intent of https://github.com/facebook/rocksdb/issues/10049 was to Close FSDirectory objects at DB::Close time rather than waiting for DB object destruction. Unfortunately, it also closes shared FSDirectory objects on DropColumnFamily (& destroy remaining handles), which can lead to use-after-Close on FSDirectory shared with remaining column families. Those "uses" are only Fsyncs (or redundant Closes). In the default Posix filesystem, an Fsync on a closed FSDirectory is a quiet no-op. Consequently (under most configurations), if you drop a column family, that DB will no longer fsync after writing new SST files to column families sharing the same directory (true under most configurations). More fix detail: Basically, this removes unnecessary Close ops on destroying ColumnFamilyData. We let `shared_ptr` take care of calling the destructor at the right time. If the intent was to require Close be called before destroying FSDirectory, that was not made clear by the author of FileSystem and was not at all enforced by https://github.com/facebook/rocksdb/issues/10049, which could have added `assert(fd_ == -1)` to `~PosixDirectory()` but did not. To keep this fix simple, we relax the unit test for https://github.com/facebook/rocksdb/issues/10049 to allow timely destruction of FSDirectory to suffice as Close (in CountedFileSystem). Added a TODO to revisit that. Also in this PR: * Added a TODO to share FSDirectory instances between DB and its column families. (Already shared among column families.) * Made DB::Close attempt to close all its open FSDirectory objects even if there is a failure in closing one. Also code clean-up around this logic. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10460 Test Plan: add an assert to check for use-after-Close. With that existing tests can detect the misuse. With fix, tests pass (except noted relaxing of unit test for https://github.com/facebook/rocksdb/issues/10049) Reviewed By: ajkr Differential Revision: D38357922 Pulled By: pdillinger fbshipit-source-id: d42079cadbedf0a969f03389bf586b3b4e1f9137	2022-08-02 12:32:51 -07:00
gitbw95	be73bf1b02	Merge pull request #10459 from gitbw95/patch_7.5.1_1 Update History.md and version.h for 7.5.1	2022-08-01 19:49:50 -07:00
bowang	35bc98893d	Update History.md and version.h for 7.5.1	2022-08-01 17:00:09 -07:00
Bo Wang	7c138a6358	Update passing rate_limiter_priority for a PartitionedFilterBlockReader function to FS (#10438 ) Summary: Add param rate_limiter_parameter in PartitionedFilterBlockReader::GetFilterPartitionBlock . Pull Request resolved: https://github.com/facebook/rocksdb/pull/10438 Test Plan: Unit Tests. Reviewed By: anand1976 Differential Revision: D38266395 Pulled By: gitbw95 fbshipit-source-id: 3ed062a3b43d6df323371cb0d266f7fe869e9ad2	2022-08-01 16:58:18 -07:00
Jay Zhuang	354fa5f635	Fix seqno->time worker not scheduled with multi DB instances (#10383 ) Summary: `PeriodicWorkScheduler` is a global singleton, which were used to store per-instance setting `record_seqno_time_cadence_`. Move that to db_impl.h which is per-instance. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10383 Reviewed By: siying Differential Revision: D37928009 Pulled By: jay-zhuang fbshipit-source-id: e517754f4a9db98798ac04f72033d4b517f734e9	2022-07-18 21:02:42 -07:00
Andrew Kryczka	a58fae99c0	Make RateLimiter not Customizable (#10378 ) Summary: (PR created for informational/testing purposes only.) - Fixes lost dynamic updates to GenericRateLimiter bandwidth using `SetBytesPerSecond()` - Benefit over #10374 is eliminating race conditions with Configurable framework. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10378 Reviewed By: pdillinger Differential Revision: D37914865 fbshipit-source-id: d4f566d60ec9726d26932388c61671adf0ee0f30	2022-07-18 16:17:01 -07:00
Akanksha Mahajan	70ba7cbb28	Fix hang in MultiRead with O_DIRECT and io_uring (#10368 ) Summary: Fix bug in O_DIRECT and io_uring when its EOF and bytes_read = 0 because of wrong check, it got added into incomplete list and gets stuck in an infinite loop as it will always return bytes_read = 0. The bug was introduced by PR https://github.com/facebook/rocksdb/pull/10197 and that PR is not released yet in any release branch. Pull Request resolved: https://github.com/facebook/rocksdb/pull/10368 Test Plan: Added new unit test Reviewed By: siying Differential Revision: D37885184 Pulled By: akankshamahajan15 fbshipit-source-id: 35b36a44b696d29b2f6f25301aa1b19547b4e03b	2022-07-18 16:15:06 -07:00
sdong	dcc3eb3576	Remove unrelease section header in HISTORY.md	2022-07-16 21:02:44 -07:00