Update version and HISTORY.md for 11.5.2 release

Revert reverse-comparator handling in range tree lock manager (#14887 )
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/14887 This reverts two changes to the range-lock endpoint comparator and restores the prior, direction-agnostic behavior: - https://github.com/facebook/rocksdb/pull/14831 ("Fix range lock manager crash with reverse comparator"), which made RangeTreeLockManager::CompareDbtEndpoints reverse-aware, and - https://github.com/facebook/rocksdb/pull/14880 (a follow-up that only corrected the equal-length / point-range branch). Why: #14831 taught the endpoint comparator about reverse-ordered column families by flipping the suffix tie-break based on comparator direction. However, callers that use range locking on a reverse-ordered CF already flip the start/end endpoints themselves before calling lock_range() -- for example, MyRocks does this in ha_rocksdb::set_range_lock() (see its "RangeFlagsShouldBeFlippedForRevCF" comment). The two corrections stack and produce left > right again, which: (a) trips paranoid_invariant(compare(left, right) <= 0) in toku::locktree::try_acquire_lock() and aborts on equality/point locks, and (b) for range scans, mis-orders the endpoints and produces an incorrect lock range, leading to silent correctness issues under concurrency. #14880 only addressed (a) (the equal-length / point-range branch), not (b), so it was an incomplete fix at the wrong layer. Decision: keep CompareDbtEndpoints direction-agnostic and make it an explicit caller requirement to pass a flipped (swapped start/end, with negated infimum/supremum flags) range for range locking to work on a reverse-ordered column family. A function-level comment documenting this contract is added so reverse-awareness is not reintroduced here. Removes the RangeLockWithReverseComparator unit test added by #14831 (it asserts the reverted direction-flipped ordering). Keeps a regression test that a point range lock [infimum(K), supremum(K)] works on a reverse-comparator column family. Reviewed By: xingbowang Differential Revision: D109713989 fbshipit-source-id: 4ea0999c92645e1adc9cd1114d924cad142f2001
2026-11-07 11:32:34 -05:00 · 2026-06-25 14:52:45 -07:00 · 2026-06-25 14:26:31 -07:00 · 2026-06-24 16:25:47 -07:00 · 2026-06-24 16:23:13 -07:00 · 2026-06-24 16:23:04 -07:00
226 changed files with 4534 additions and 52601 deletions
@@ -0,0 +1,9 @@
+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,17 +0,0 @@
-name: setup-jdk-on-macos
-runs:
-  using: composite
-  steps:
-  - name: Set up JDK on macos
-    run: |-
-      set -euo pipefail
-
-      JAVA_HOME="$(/usr/libexec/java_home -v 21)"
-
-      echo "JAVA_HOME=${JAVA_HOME}" >> "$GITHUB_ENV"
-      echo "JAVAC_ARGS=--release 8" >> "$GITHUB_ENV"
-      echo "${JAVA_HOME}/bin" >> "$GITHUB_PATH"
-      echo "Using JDK at ${JAVA_HOME}"
-      "${JAVA_HOME}/bin/java" -version
-      "${JAVA_HOME}/bin/javac" -version
-    shell: bash
@@ -11,49 +11,8 @@ inputs:
 runs:
  using: composite
  steps:
-  - name: Detect Visual Studio generator
-    id: detect_vs
-    shell: pwsh
-    run: |
-      $ErrorActionPreference = "Stop"
-
-      $vswhere = Join-Path ([Environment]::GetFolderPath("ProgramFilesX86")) "Microsoft Visual Studio\Installer\vswhere.exe"
-      if (!(Test-Path $vswhere)) {
-        throw "vswhere.exe was not found at $vswhere"
-      }
-
-      $vsInstallationsJson = & $vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -format json -utf8
-      $vsInstallations = @($vsInstallationsJson | ConvertFrom-Json)
-      if ($vsInstallations.Count -eq 0) {
-        throw "No Visual Studio instance with C++ tools was found."
-      }
-
-      $vsInstallation = $vsInstallations[0]
-      $vsMajor = [int]$vsInstallation.catalog.productLineVersion
-      if ($vsMajor -eq 0) {
-        $vsMajor = [int]($vsInstallation.installationVersion.Split(".")[0])
-      }
-
-      $generatorLine = cmake --help | Where-Object {
-        $_ -match "^\*?\s*Visual Studio $vsMajor\s+\d{4}\s*="
-      } | Select-Object -First 1
-      if (!$generatorLine) {
-        throw "CMake does not support a Visual Studio generator for VS major version $vsMajor."
-      }
-
-      $cmakeGenerator = ($generatorLine -replace "^\*?\s*", "" -replace "\s*=.*$", "").Trim()
-      $vsVersionRange = "[{0}.0,{1}.0)" -f $vsMajor, ($vsMajor + 1)
-
-      echo "Detected Visual Studio at $($vsInstallation.installationPath)"
-      echo "Using CMake generator: $cmakeGenerator"
-      echo "Using setup-msbuild vs-version: $vsVersionRange"
-
-      "CMAKE_GENERATOR=$cmakeGenerator" >> $env:GITHUB_ENV
-      "vs_version=$vsVersionRange" >> $env:GITHUB_OUTPUT
  - name: Add msbuild to PATH
-    uses: microsoft/setup-msbuild@v2
-    with:
-      vs-version: ${{ steps.detect_vs.outputs.vs_version }}
+    uses: microsoft/setup-msbuild@v1.3.1
  - name: ccache
    uses: hendrikmuhs/ccache-action@v1.2
    with:
@@ -73,23 +32,15 @@ runs:
      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 =====================
-      if (!$env:JAVA_HOME -or !(Test-Path (Join-Path $env:JAVA_HOME "bin\javac.exe"))) {
-        $javac = Get-Command javac -ErrorAction SilentlyContinue
-        if (!$javac) {
-          Write-Error "javac was not found on PATH and JAVA_HOME is not set."
-          Exit 1
-        }
-        $env:JAVA_HOME = Split-Path (Split-Path $javac.Source -Parent) -Parent
-      }
-      echo "JAVA_HOME=$env:JAVA_HOME"
-      & "$env:JAVA_HOME\bin\java.exe" -version
-      & "$env:JAVA_HOME\bin\javac.exe" -version
+      choco install liberica8jdk -y
+      if(!$?) { Exit $LASTEXITCODE }
      mkdir $Env:THIRDPARTY_HOME
      cd $Env:THIRDPARTY_HOME
      echo "Building Snappy dependency..."
@@ -102,11 +53,11 @@ runs:
      cd build
      & cmake -G "$Env:CMAKE_GENERATOR" .. -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF
      if(!$?) { Exit $LASTEXITCODE }
-      cmake --build . --config Debug --parallel 32 -- /p:Platform=x64
+      msbuild Snappy.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
      if(!$?) { Exit $LASTEXITCODE }
      echo ======================== Build RocksDB =========================
      cd ${{ github.workspace }}
-      $env:Path = "$env:JAVA_HOME\bin;" + $env:Path
+      $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 ..
@@ -114,7 +65,7 @@ runs:
      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
-      cmake --build build --config Debug --parallel 32 -- /p:LinkIncremental=false /p:Platform=x64
+      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 }}"
@@ -714,6 +714,8 @@ jobs:
          CODEX_HOME: /tmp/codex-home
          CODEX_MODEL: ${{ inputs.default_model }}
          CODEX_REASONING_EFFORT: ${{ steps.budget_codex.outputs.effort }}
+          BASE_SHA: ${{ steps.pr_info.outputs.base_sha }}
+          PR_TITLE: ${{ steps.pr_info.outputs.pr_title }}
        run: |
          if [ -z "${OPENAI_API_KEY}" ]; then
            echo "OPENAI_API_KEY not configured, skipping Codex review"
@@ -721,7 +723,9 @@ jobs:
          fi
          mkdir -p "${CODEX_HOME}"
          set +e
-          codex exec \
+          codex exec review \
+            --base "${BASE_SHA}" \
+            --title "${PR_TITLE}" \
            -m "${CODEX_MODEL}" \
            -c model_reasoning_effort="${CODEX_REASONING_EFFORT}" \
            --dangerously-bypass-approvals-and-sandbox \
@@ -1336,6 +1340,8 @@ jobs:
          CODEX_HOME: /tmp/codex-home
          CODEX_MODEL: ${{ inputs.selected_model != '' && inputs.selected_model || inputs.default_model }}
          CODEX_REASONING_EFFORT: ${{ steps.manual_budget_codex.outputs.effort }}
+          BASE_SHA: ${{ steps.pr_info.outputs.base_sha }}
+          PR_TITLE: ${{ steps.pr_info.outputs.pr_title }}
          COMMAND_TYPE: ${{ steps.request.outputs.type }}
        run: |
          mkdir -p "${CODEX_HOME}"
@@ -1348,7 +1354,9 @@ jobs:
              --output-last-message codex-review-output.md \
              - < /tmp/prompt.txt > codex-review-execution.log 2>&1
          else
-            codex exec \
+            codex exec review \
+              --base "${BASE_SHA}" \
+              --title "${PR_TITLE}" \
              -m "${CODEX_MODEL}" \
              -c model_reasoning_effort="${CODEX_REASONING_EFFORT}" \
              --dangerously-bypass-approvals-and-sandbox \
@@ -40,7 +40,6 @@ jobs:
          name: ${{ inputs.result_artifact_name }}
          run-id: ${{ github.event.workflow_run.id }}
          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path: _artifact
        continue-on-error: true

      - name: Post or update PR comment
@@ -53,18 +52,8 @@ jobs:
        with:
          script: |
            const fs = require('fs');
-            const path = require('path');
-            const artifactDir = '_artifact';
-            const commentFile = path.join(
-              artifactDir,
-              process.env.COMMENT_FILE
-            );
-            const prNumberFile = path.join(artifactDir, 'pr_number.txt');
-            const triggerTypeFile = path.join(artifactDir, 'trigger_type.txt');
-            const headShaFile = path.join(artifactDir, 'head_sha.txt');
-
-            if (!fs.existsSync(commentFile) ||
-                !fs.existsSync(prNumberFile)) {
+            if (!fs.existsSync(process.env.COMMENT_FILE) ||
+                !fs.existsSync('pr_number.txt')) {
              core.info('No review results found; skipping.');
              return;
            }
@@ -72,16 +61,16 @@ jobs:
            const post = require('./.github/scripts/post-pr-comment.js');
            const provider = process.env.PROVIDER;
            const providerTitle = provider === 'codex' ? 'Codex' : 'Claude';
-            const body = fs.readFileSync(commentFile, 'utf8');
+            const body = fs.readFileSync(process.env.COMMENT_FILE, 'utf8');
            const prNumber = parseInt(
-              fs.readFileSync(prNumberFile, 'utf8').trim(),
+              fs.readFileSync('pr_number.txt', 'utf8').trim(),
              10
            );
-            const trigger = fs.existsSync(triggerTypeFile) ?
-              fs.readFileSync(triggerTypeFile, 'utf8').trim() :
+            const trigger = fs.existsSync('trigger_type.txt') ?
+              fs.readFileSync('trigger_type.txt', 'utf8').trim() :
              'auto';
-            const headSha = fs.existsSync(headShaFile) ?
-              fs.readFileSync(headShaFile, 'utf8').trim() :
+            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;
@@ -130,16 +119,12 @@ jobs:
        with:
          script: |
            const fs = require('fs');
-            const path = require('path');
-            const artifactDir = '_artifact';
-            const triggerTypeFile = path.join(artifactDir, 'trigger_type.txt');
-            const commentIdFile = path.join(artifactDir, 'comment_id.txt');
-            if (!fs.existsSync(triggerTypeFile)) return;
-            const trigger = fs.readFileSync(triggerTypeFile, 'utf8').trim();
+            if (!fs.existsSync('trigger_type.txt')) return;
+            const trigger = fs.readFileSync('trigger_type.txt', 'utf8').trim();
            if (trigger !== 'manual') return;
-            if (!fs.existsSync(commentIdFile)) return;
+            if (!fs.existsSync('comment_id.txt')) return;
            const commentId = parseInt(
-              fs.readFileSync(commentIdFile, 'utf8').trim(),
+              fs.readFileSync('comment_id.txt', 'utf8').trim(),
              10
            );
            if (!commentId) return;
@@ -162,7 +147,6 @@ jobs:
          name: ${{ inputs.result_artifact_name }}
          run-id: ${{ github.event.workflow_run.id }}
          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path: _artifact
        continue-on-error: true

      - name: React with failure
@@ -171,11 +155,9 @@ jobs:
        with:
          script: |
            const fs = require('fs');
-            const path = require('path');
-            const commentIdFile = path.join('_artifact', 'comment_id.txt');
-            if (!fs.existsSync(commentIdFile)) return;
+            if (!fs.existsSync('comment_id.txt')) return;
            const commentId = parseInt(
-              fs.readFileSync(commentIdFile, 'utf8').trim(),
+              fs.readFileSync('comment_id.txt', 'utf8').trim(),
              10
            );
            if (!commentId) return;
@@ -25,7 +25,6 @@ jobs:
        name: clang-tidy-result
        run-id: ${{ github.event.workflow_run.id }}
        github-token: ${{ secrets.GITHUB_TOKEN }}
-        path: _artifact
      continue-on-error: true

    - name: Post or update PR comment
@@ -34,19 +33,12 @@ jobs:
      with:
        script: |
          const fs = require('fs');
-          if (!fs.existsSync('_artifact/clang-tidy-comment.md') ||
-              !fs.existsSync('_artifact/pr_number.txt')) {
+          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(
-            '_artifact/clang-tidy-comment.md',
-            'utf8'
-          );
-          const prNumber = parseInt(
-            fs.readFileSync('_artifact/pr_number.txt', 'utf8').trim(),
-            10
-          );
+          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({
@@ -22,3 +22,4 @@ jobs:
      provider: claude
      result_artifact_name: claude-review-result
      comment_file: claude-review-comment.md
+    secrets: inherit
@@ -22,3 +22,4 @@ jobs:
      provider: codex
      result_artifact_name: codex-review-result
      comment_file: codex-review-comment.md
+    secrets: inherit
@@ -7,9 +7,14 @@
 name: Codex Code Review

 on:
-  # Automatic PR reviews are temporarily disabled while Codex authentication is
-  # repaired. Manual review requests remain available through issue comments
-  # and workflow_dispatch.
+  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]
@@ -113,10 +113,11 @@ jobs:
    - 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-msvc-avx2:
+  build-windows-vs2022-avx2:
    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on: windows-8-core
+    runs-on: windows-2022
    env:
+      CMAKE_GENERATOR: Visual Studio 17 2022
      CMAKE_PORTABLE: AVX2
    steps:
    - uses: actions/checkout@v4.1.0
@@ -314,23 +314,6 @@ jobs:
    - 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
-    - name: Install clang-format-21 for C API gen checks
-      run: apt-get update && apt-get install -y clang-format-21
-    - name: Check C API codegen (link-complete, backward-compatible, up to date)
-      # Run the make target in STRICT mode so this core CI job HARD-FAILS rather
-      # than silently skipping if a prerequisite (clang++, clang-format, or the
-      # compat baseline ref) is ever missing. See `make check-c-api-gen`.
-      run: |
-        # The container checkout is owned by a different user, so git refuses to
-        # operate on it ("dubious ownership") -- mark it safe for the `git fetch`
-        # and the `git show` the compat checker runs.
-        git config --global --add safe.directory "$GITHUB_WORKSPACE"
-        git config --global --add safe.directory '*'
-        git fetch --no-tags --depth=1 origin main
-        CXX=clang++-21 make check-c-api-gen \
-          CHECK_C_API_GEN_STRICT=1 \
-          API_COMPAT_REF=FETCH_HEAD \
-          CLANG_FORMAT_BINARY=clang-format-21
    - uses: "./.github/actions/teardown-ccache"
      if: always()
    - uses: "./.github/actions/post-steps"
@@ -542,8 +525,8 @@ jobs:
    - uses: "./.github/actions/post-steps"
  # ======================== Windows with Tests ======================= #
  # NOTE: some windows jobs are in "nightly" to save resources
-  build-windows-msvc:
-    if: needs.config.outputs.only_job == 'build-windows-msvc' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
+  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:
@@ -560,6 +543,7 @@ jobs:
          suite_run: ""
          run_java: "true"
    env:
+      CMAKE_GENERATOR: Visual Studio 17 2022
      CMAKE_PORTABLE: 1
    steps:
    - uses: actions/checkout@v4.1.0
@@ -619,6 +603,7 @@ jobs:
    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
@@ -630,7 +615,7 @@ jobs:
        cache-key-prefix: macos-java
    - uses: "./.github/actions/increase-max-open-files-on-macos"
    - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/setup-jdk-on-macos"
+    - uses: "./.github/actions/install-jdk8-on-macos"
    - uses: "./.github/actions/pre-steps-macos"
    - name: Set Java Environment
      run: |-
@@ -646,6 +631,8 @@ jobs:
    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
@@ -656,7 +643,7 @@ jobs:
        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/setup-jdk-on-macos"
+    - uses: "./.github/actions/install-jdk8-on-macos"
    - uses: "./.github/actions/pre-steps-macos"
    - name: Set Java Environment
      run: |-
@@ -672,6 +659,8 @@ jobs:
    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
@@ -682,7 +671,7 @@ jobs:
        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/setup-jdk-on-macos"
+    - uses: "./.github/actions/install-jdk8-on-macos"
    - uses: "./.github/actions/pre-steps-macos"
    - name: Set Java Environment
      run: |-
@@ -1,7 +1,5 @@
 make_config.mk
 rocksdb.pc
-.build_signature
-build_tools/__pycache__/

 *.a
 *.arc
@@ -90,8 +88,6 @@ fbcode/
 fbcode
 buckifier/*.pyc
 buckifier/__pycache__
-tools/__pycache__/
-tools/c_api_gen/__pycache__/
 .arcconfig

 compile_commands.json
@@ -35,7 +35,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "db/blob/blob_file_partition_manager.cc",
        "db/blob/blob_file_reader.cc",
        "db/blob/blob_garbage_meter.cc",
-        "db/blob/blob_gen2_format.cc",
        "db/blob/blob_log_format.cc",
        "db/blob/blob_log_sequential_reader.cc",
        "db/blob/blob_log_writer.cc",
@@ -5796,5 +5795,3 @@ cpp_unittest_wrapper(name="write_unprepared_transaction_test",


 export_file(name = "tools/db_crashtest.py")
-
-export_file(name = "tools/fault_injection_log_parser.py")
@@ -38,7 +38,7 @@ This document provides guidance for generating and reviewing code in the RocksDB

 **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, e.g. for error cases and other rare or otherwise costly cases, but NOT for predicting popular configurations. Consider branchless alternatives for simple conditionals. Order switch cases and if-else chains by frequency.
+**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.

@@ -243,21 +243,27 @@ from an implementation detail instead of an explicit option.
 * Don't manually edit BUCK file, after updating src.mk, run
    /usr/local/bin/python3 buckifier/buckify_rocksdb.py to update it
 * For -j in make command, use the number of CPU cores to decide it.
-* When searching for references to something (a symbol, library, etc.), do not
-  restrict or truncate your search based on presumed relevance or scope. It is
-  important and time-saving to keep the repo reasonably consistent across
-  different build systems, programming languages, and even between
-  documentation and implementation.

-### Avoiding mixed build modes with Make (use `AUTO_CLEAN=1`)
+### When to run `make clean` (avoid mixing build modes)

-Object files are written to the same paths regardless of build flags, so
-reusing objects from a prior build with different flags causes confusing
-linker errors, etc. This problem is essentially avoidable by ALWAYS using
-`AUTO_CLEAN=1 make -j<n> <something>` for manual make invocations. This
-will automatically clean object files if the build parameters/flavor have
-changed. The `build_tools/rockstest.sh` / `rocksptest.sh` helpers described
-below set `AUTO_CLEAN=1` for you.
+The Makefile does **not** track build mode, so object files from a prior
+build are silently reused even when compiled with different flags, leading
+to confusing linker errors, sanitizer false negatives, ODR violations, or
+"phantom" bugs.
+
+Run `make clean` before switching any of these:
+* **`ASSERT_STATUS_CHECKED=1` ↔ unset** — changes the `Status` class layout (ABI break).
+* **Sanitizer builds** — toggling any of `COMPILE_WITH_ASAN=1`,
+    `COMPILE_WITH_UBSAN=1`, `COMPILE_WITH_TSAN=1` on/off.
+* `DEBUG_LEVEL=0` (release) ↔ `DEBUG_LEVEL=1` (debug, default for `make dbg`).
+* Different compilers, `OPT` levels, or other flags affecting codegen/ABI.
+
+**Notable exception:** `DEBUG_LEVEL=2` can be safely mixed with
+`DEBUG_LEVEL=1` — rebuild a subset of files with `DEBUG_LEVEL=2` to get
+extra/more accurate runtime checks for those files without a full clean.
+
+When in doubt, `make clean` is cheap insurance compared to chasing a
+phantom bug.

 ### Source checks
 * Run `make check-sources` before committing. This catches non-ASCII
@@ -266,22 +272,6 @@ below set `AUTO_CLEAN=1` for you.
    smart quotes, etc.) in comments or strings -- use ASCII equivalents
    (`--` instead of em dash, `'` instead of smart quote, etc.).

-### License headers
-* Every new source file needs a license header. For a file that does **not**
-    carry an outside/third-party copyright, use the standard Meta dual-licensed
-    header (the dual-license designation is required -- a bare
-    "All Rights Reserved" copyright is not an acceptable open-source header):
-    ```
-    //  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).
-    ```
-    Use a `#` comment prefix instead of `//` for shell, Python, and Makefile
-    fragments.
-* Files derived from an external source (e.g. LevelDB) keep their original
-    upstream copyright line in addition to the header above.
-
 ### RTTI and dynamic_cast
 * Production code and `db_stress` must build in **release mode
    (`-fno-rtti`)**. Do not use `dynamic_cast` anywhere except unit tests.
@@ -298,7 +288,6 @@ build (and where noted, run tests) across:
 | Axis | Must support |
 |------|--------------|
 | OS | Linux (x86_64 + ARM), macOS, Windows |
-| Architecture | Little-endian and big-endian targets, including Linux on s390x |
 | Compiler | GCC, Clang (libstdc++ **and** libc++), AppleClang, **MSVC (VS2022)**, MinGW (Linux cross-compile, build-only, no gflags) |
 | Build system | Make, CMake, and BUCK (internal) -- keep all in sync (see "Build system" above) |
 | Config | release (`-fno-rtti`), `ASSERT_STATUS_CHECKED`, ASAN/UBSAN/TSAN, folly, unity build, JNI/Java |
@@ -313,12 +302,6 @@ abstractions; otherwise guard with `#ifdef OS_WIN` (POSIX `<unistd.h>` ->
 Windows `<process.h>`). Because libc++ is also tested, include what you use
 rather than relying on libstdc++ transitive includes.

-Do not use `static_assert` to reject a supported architecture for an optional
-feature. Check an existing `port::` capability such as `port::kLittleEndian`
-and disable only the unsupported feature so the rest of RocksDB still builds.
-Use a portable representation when the feature itself must work across
-architectures.
-
 ### 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
@@ -326,22 +309,13 @@ architectures.
 * 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.
-* To build and run unit tests locally, prefer these helper scripts:
-    * `build_tools/rocksptest.sh <test_binary> [more_binaries...] [args...]`
-        builds the binary(ies) with parallel make and `AUTO_CLEAN=1` and runs
-        them under gtest-parallel, sharding the test cases across CPUs. Prefer
-        this whenever running more than a couple of test cases, e.g.
-        `build_tools/rocksptest.sh table_test` or
-        `build_tools/rocksptest.sh db_test env_test --gtest_filter=*Foo*`.
-    * `build_tools/rockstest.sh <test_binary> [args...]` builds with parallel
-        make and `AUTO_CLEAN=1` and runs the binary directly (serially).
-        Use it only for a very small number of test cases, e.g.
-        `build_tools/rockstest.sh db_test --gtest_filter=*MixedSlowdown*`.
-* After writing a test, stress-test for flakiness (AUTO_CLEAN handles the
-    rebuild needed by the `COERCE_CONTEXT_SWITCH=1` flag change):
+* 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 build_tools/rockstest.sh {test_binary} -r100 \
-        --gtest_filter="*YourTestName*"
+    COERCE_CONTEXT_SWITCH=1 make {test_binary}
+    ./{test_binary} --gtest_filter="*YourTestName*" --gtest_repeat=5
    ```
 * For CI-style flaky tests that do not reproduce with `gtest_parallel.py`,
    `--gtest_repeat`, or normal coerce-mode runs, inspect
@@ -398,13 +372,12 @@ architectures.
 * Blog post authors must be defined in `docs/_data/authors.yml` to be displayed

 ### Final verification of the change
-* Execute `AUTO_CLEAN=1 make check` to build all of the changes and execute all
-    of the tests. `AUTO_CLEAN=1` ensures a clean rebuild if your previous build
-    used different parameters. Note that executing all of the tests could take
-    multiple minutes.
-* Run `AUTO_CLEAN=1 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.
+* 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
@@ -412,7 +385,7 @@ architectures.
    builds without timeout issues.
 * Run `make check` in background, then poll progress:
    ```bash
-    AUTO_CLEAN=1 make check &
+    make check &
    # Poll periodically:
    make check-progress
    ```
@@ -437,10 +410,9 @@ architectures.

 ### Executing benchmark using db_bench
 * Since the goal is to measure performance, we need to build a release binary
-    using `AUTO_CLEAN=1 DEBUG_LEVEL=0 make db_bench`. If there is an engine
-    crash due to a bug, switch back to a debug build with
-    `AUTO_CLEAN=1 make dbg`; `AUTO_CLEAN=1` handles the release<->debug rebuild
-    automatically.
+    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
@@ -420,6 +420,13 @@ if(WITH_NUMA)
  list(APPEND THIRDPARTY_LIBS NUMA::NUMA)
 endif()

+option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF)
+if(WITH_TBB)
+  find_package(TBB REQUIRED)
+  add_definitions(-DTBB)
+  list(APPEND THIRDPARTY_LIBS TBB::TBB)
+endif()
+
 # Stall notifications eat some performance from inserts
 option(DISABLE_STALL_NOTIF "Build with stall notifications" OFF)
 if(DISABLE_STALL_NOTIF)
@@ -698,19 +705,10 @@ if(USE_FOLLY)

    include(${FOLLY_INST_PATH}/lib/cmake/folly/folly-config.cmake)

-    # Fix gflags library name for debug builds. The getdeps gflags shared
-    # library is versioned (e.g. libgflags_debug.so.2.3), so resolve the
-    # actual file by glob rather than hard-coding a version.
+    # Fix gflags library name for debug builds
    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      file(GLOB GFLAGS_DEBUG_SHARED_LIBS
-        "${GFLAGS_INST_PATH}/lib/libgflags_debug.so.*")
-      if(NOT GFLAGS_DEBUG_SHARED_LIBS)
-        message(FATAL_ERROR
-          "Could not find getdeps libgflags_debug.so under ${GFLAGS_INST_PATH}/lib")
-      endif()
-      list(GET GFLAGS_DEBUG_SHARED_LIBS 0 GFLAGS_DEBUG_SHARED_LIB)
      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_DEBUG_SHARED_LIB}")
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GFLAGS_INST_PATH}/lib/libgflags_debug.so.2.2")
    endif()
  endif()

@@ -777,7 +775,6 @@ set(SOURCES
        db/blob/blob_file_meta.cc
        db/blob/blob_file_reader.cc
        db/blob/blob_garbage_meter.cc
-        db/blob/blob_gen2_format.cc
        db/blob/blob_log_format.cc
        db/blob/blob_log_sequential_reader.cc
        db/blob/blob_log_writer.cc
@@ -1,27 +1,12 @@
 # Rocksdb Change Log
 > NOTE: Entries for next release do not go here. Follow instructions in `unreleased_history/README.txt`

-## 11.7.0 (07/16/2026)
-### Public API Changes
-* Added `RangeLockManagerHandle::SetIsKilledCallback()`, a `std::function<bool()>` predicate polled during range-lock waits. When it returns true, a blocked `GetRangeLock()` wait returns promptly with `Status::Aborted()` instead of waiting for the lock timeout. Range-lock users that install no callback keep the original wait-until-grant-or-timeout behavior.
-* Added `MultiScanArgs::reverse` to support reverse MultiScan reads over bounded scan ranges.
-
-### Behavior Changes
-* When using `LockWAL()`, live-file capture APIs such as checkpoint and backup now flush WAL-disabled unpersisted data; they can block until `UnlockWAL()` or return `Aborted` when called from the same thread that holds `LockWAL()` to avoid deadlock. `UnlockWAL()` must now also be called from the same thread that called `LockWAL()`.
-
-### Performance Improvements
-* Fixed slow DB open with `best_efforts_recovery`, and slow catch-up of secondary and follower (read-only) instances, in which time and memory grew quadratically with the number of files in the DB (so the slowdown was worst for large DBs with long history).
-
-## 11.6.0 (07/02/2026)
-### New Features
-* Added EXPERIMENTAL embedded blob SST support through `SstFileWriter::OpenWithEmbeddedBlobs()`, storing eligible large values as same-file blob records in block-based SST files and resolving them transparently for reads. This niche feature currently supports uncompressed embedded blobs only; compression options are placeholders and compression support is deferred to follow-up work.
-
-### Public API Changes
-* Expanded the C API (`include/rocksdb/c.h`) with a large set of new `rocksdb_*` functions, mostly option getters/setters plus table-properties, job/event-listener, and metadata accessors, a WAL filter, a ReadOptions table filter, and a backup exclude-files callback. Many are now produced by a new semi-automated generator (`tools/c_api_gen/`) from the C++ headers; `include/rocksdb/c.h` remains a single self-contained header and the signatures of pre-existing functions are unchanged.
-
+## 11.5.2 (06/25/2026)
 ### Bug Fixes
 * Reverted PR14831 that made range_lock_manager aware of reverse-order CF
-* Fixed a bug in `RandomAccessFileReader::ReadAsync` where an already-aligned direct-IO read request with a null `scratch` and a caller-provided `aligned_buf` would take the "already aligned" fast path and submit the null buffer to the underlying async read (e.g. a null iovec base to io_uring, failing with EFAULT). This could surface as spurious iterator failures during async prefetch (MultiScan with async IO) on direct-IO databases. The async path now allocates a backing buffer in this case, matching the synchronous `Read` path.
+
+## 11.5.1 (06/24/2026)
+### Bug Fixes
 * Fixed a bug where closing a read-only DB instance could delete live SST files created by a concurrent read-write DB sharing the same directory.

 ## 11.5.0 (06/16/2026)
@@ -288,7 +288,7 @@ endif
 endif

 export JAVAC_ARGS
-CLEAN_FILES += rocksdb.pc
+CLEAN_FILES += make_config.mk rocksdb.pc

 ifeq ($(V), 1)
 $(info $(shell uname -a))
@@ -764,6 +764,7 @@ util/build_version.cc: $(filter-out $(OBJ_DIR)/util/build_version.o, $(LIB_OBJEC
 	$(AM_V_at)$(gen_build_version) > $@
 endif
 CLEAN_FILES += util/build_version.cc
+
 default: all

 #-----------------------------------------------
@@ -808,8 +809,7 @@ endif  # PLATFORM_SHARED_EXT
 .PHONY: check clean coverage ldb_tests package dbg gen-pc build_size \
 	release tags tags0 valgrind_check format static_lib shared_lib all \
 	rocksdbjavastatic rocksdbjava install install-static install-shared \
-	uninstall analyze tools tools_lib check-headers checkout_folly clang-tidy \
-	check-c-api-c_test
+	uninstall analyze tools tools_lib check-headers checkout_folly clang-tidy

 # Auto-configure git hooks on first build so developers do not need to run
 # "make install-hooks" manually. This is a no-op if already set.
@@ -1127,89 +1127,8 @@ ifndef SKIP_FORMAT_BUCK_CHECKS
 	$(MAKE) check-buck-targets
 	$(MAKE) check-sources
 	$(MAKE) check-workflow-yaml
-	$(MAKE) check-c-api-gen
 endif

-# Check that the auto-generated C API files are up to date. It regenerates the
-# fragments and the inlined c.h/c.cc and compares them against a snapshot of the
-# checked-in copies (no net change when everything is up to date). It requires
-# clang++ (libclang, used to parse the C++ headers) and clang-format. When those
-# are unavailable the staleness/compat sub-checks are SKIPPED with a message so
-# `make check` still works without the codegen toolchain; the link-completeness
-# sub-check always runs (it needs no toolchain).
-#
-# Pin the formatter to match CI by setting CLANG_FORMAT_BINARY, e.g.:
-#   make check-c-api-gen CLANG_FORMAT_BINARY=clang-format-21
-# This target is part of `make check` and is skipped by SKIP_FORMAT_BUCK_CHECKS.
-#
-# Set CHECK_C_API_GEN_STRICT=1 to turn every "skip" below into a hard error, so a
-# core CI job that runs this target cannot silently regress to a no-op if a
-# prerequisite (clang++, or the compat baseline ref) goes missing. The dedicated
-# build-linux-clang-21-no_test_run CI job runs this target with the flag set.
-# Any non-empty value other than 0/no/false enables strict mode.
-CLANG_FORMAT_BINARY ?=
-# Backward-compatibility baseline for the C API (signature-level) check. CI
-# overrides this with the PR's merge target; locally it falls back to main /
-# origin/main and is skipped if neither resolves.
-API_COMPAT_REF ?= main
-CHECK_C_API_GEN_STRICT ?=
-check-c-api-gen:
-	# Link-completeness is a property of the checked-in c.h/c.cc and needs no
-	# clang toolchain, so it always runs: every declared public C API function
-	# must have exactly one definition (guards against dropped wrappers that
-	# would break downstream language bindings at link time).
-	$(PYTHON) tools/c_api_gen/check_api_completeness.py
-	# Backward-compatibility: no public C function may be removed or have its
-	# signature changed vs the baseline. Skipped if the baseline ref is not
-	# resolvable locally (CI passes an explicit ref), unless CHECK_C_API_GEN_STRICT.
-	@strict=""; case "$(CHECK_C_API_GEN_STRICT)" in ""|0|no|NO|false|FALSE) ;; *) strict=1 ;; esac; \
-	ref=""; \
-	if git rev-parse --verify --quiet "$(API_COMPAT_REF)^{commit}" >/dev/null; then ref="$(API_COMPAT_REF)"; \
-	elif git rev-parse --verify --quiet "origin/$(API_COMPAT_REF)^{commit}" >/dev/null; then ref="origin/$(API_COMPAT_REF)"; fi; \
-	if [ -n "$$ref" ]; then \
-	  $(PYTHON) tools/c_api_gen/check_api_compatibility.py --ref "$$ref"; \
-	elif [ -n "$$strict" ]; then \
-	  echo "ERROR: C API compat baseline '$(API_COMPAT_REF)' not resolvable and CHECK_C_API_GEN_STRICT is set" >&2; exit 1; \
-	else \
-	  echo "Skipping C API backward-compatibility check ($(API_COMPAT_REF) not found; set API_COMPAT_REF)"; \
-	fi
-	# Staleness: regenerate and confirm the checked-in output is current. Needs a
-	# clang++ (the generator parses C++ ASTs); detect one the way the generator
-	# does (a clang in $(CXX) -- which may be ccache-prefixed/versioned -- else a
-	# bare/versioned clang++ on PATH) rather than testing $(CXX) verbatim.
-	@strict=""; case "$(CHECK_C_API_GEN_STRICT)" in ""|0|no|NO|false|FALSE) ;; *) strict=1 ;; esac; \
-	cf_arg=""; \
-	if [ -n "$(CLANG_FORMAT_BINARY)" ]; then cf_arg="--clang-format $(CLANG_FORMAT_BINARY)"; fi; \
-	have_clang=""; \
-	for c in $$(printf '%s\n' $(CXX) | grep -i clang) clang++ clang++-21 clang++-20 clang++-19 clang++-18 clang++-17 clang++-16 clang++-15 clang++-14 clang++-13; do \
-	  if command -v "$$c" >/dev/null 2>&1; then have_clang=1; break; fi; \
-	done; \
-	if [ -n "$$have_clang" ]; then \
-	  $(PYTHON) tools/c_api_gen/verify_generated_up_to_date.py $$cf_arg; \
-	elif [ -n "$$strict" ]; then \
-	  echo "ERROR: no clang++ found and CHECK_C_API_GEN_STRICT is set; cannot run the C API staleness check" >&2; exit 1; \
-	else \
-	  echo "Skipping C API codegen staleness check (no clang++ found; install clang++ or set CXX to a clang to enable)"; \
-	fi
-
-# Quick local validation for C API generation plus the focused C API test.
-# This verifies the checked-in generated fragments as well as the inlined
-# include/rocksdb/c.h and db/c.cc outputs, then runs c_test in an isolated
-# TEST_TMPDIR to avoid stale-state failures.
-check-c-api-c_test:
-	$(PYTHON) tools/c_api_gen/verify_generated_up_to_date.py
-	$(MAKE) c_test
-	@tmpdir=$$(mktemp -d); \
-	  trap 'rm -rf "$$tmpdir"' EXIT; \
-	  echo "===== Running c_test with TEST_TMPDIR=$$tmpdir"; \
-	  if command -v timeout >/dev/null 2>&1; then \
-	    TEST_TMPDIR="$$tmpdir" timeout 60 ./c_test; \
-	  elif command -v gtimeout >/dev/null 2>&1; then \
-	    TEST_TMPDIR="$$tmpdir" gtimeout 60 ./c_test; \
-	  else \
-	    TEST_TMPDIR="$$tmpdir" ./c_test; \
-	  fi
-
 # TODO add ldb_tests
 check_some: $(ROCKSDBTESTS_SUBSET)
 	for t in $(ROCKSDBTESTS_SUBSET); do echo "===== Running $$t (`date`)"; ./$$t || exit 1; done
@@ -1359,13 +1278,8 @@ rocksdb.h rocksdb.cc: build_tools/amalgamate.py Makefile $(LIB_SOURCES) unity.cc
 	build_tools/amalgamate.py -I. -i./include unity.cc -x include/rocksdb/c.h -H rocksdb.h -o rocksdb.cc

 clean: clean-ext-libraries-all clean-rocks clean-rocksjava
-# Removed here rather than in clean-rocks (via CLEAN_FILES) so the build-parameter
-# auto-clean, which runs clean-rocks, doesn't delete the make_config.mk already
-# included by the in-progress make.
-	@rm -f make_config.mk

 clean-not-downloaded: clean-ext-libraries-bin clean-rocks clean-not-downloaded-rocksjava
-	@rm -f make_config.mk

 clean-rocks:
 # Not practical to exactly match all versions/variants in naming (e.g. debug or not)
@@ -1380,11 +1294,6 @@ clean-rocks:
 	else \
 		$(FIND) . -name "*.[oda]" -exec rm -f {} \; ; \
 	fi
-# Remove the build signature(s) LAST. Done after the object files are gone so
-# that a Ctrl+C partway through clean leaves the old signature in place: it
-# still matches the leftover objects, so a later build with different
-# parameters is still detected (signature usefulness is preserved).
-	@rm -f $(BUILD_SIG_FILE) jl/.build_signature jls/.build_signature

 clean-rocksjava: clean-rocks
 	rm -rf jl jls
@@ -2418,101 +2327,6 @@ ifeq ($(PLATFORM), OS_OPENBSD)
 endif
 export SHA256_CMD

-# ----------------------------------------------------------------------------
-# Build parameter change detection
-# ----------------------------------------------------------------------------
-# RocksDB writes object files to the same $(OBJ_DIR) paths regardless of
-# DEBUG_LEVEL, sanitizers (ASAN/TSAN/UBSAN), ASSERT_STATUS_CHECKED, RTTI, LTO,
-# COERCE_CONTEXT_SWITCH, etc.  Most of those are applied in this Makefile after
-# `include make_config.mk` and are therefore NOT reflected in make_config.mk,
-# so switching them and rebuilding silently mixes incompatible object files.
-# To guard against that, we hash the fully-resolved compile/link parameters
-# (which already embed make_config.mk via PLATFORM_*) and compare against the
-# value recorded from the previous build.  On mismatch the build stops so the
-# user can `make clean`.  Knobs:
-#   AUTO_CLEAN=1
-#     run `make clean-rocks` automatically on mismatch
-#   ALLOW_BUILD_PARAMETER_CHANGE=1
-#     skip the check entirely (e.g. intentionally mixing DEBUG_LEVEL=1 and
-#     DEBUG_LEVEL=2)
-# The signature is stored per-$(OBJ_DIR), so Java (jl/jls) builds are tracked
-# independently from the default build.
-BUILD_SIG_FILE := $(OBJ_DIR)/.build_signature
-# NOTE: deliberately NOT added to CLEAN_FILES. The signature is removed as the
-# very last step of clean-rocks so that an interrupted clean keeps it (see
-# clean-rocks), preserving change detection across a Ctrl+C'd clean.
-
-# Goals that do not compile object files into the tree (pure utilities,
-# informational, source/config checks): the change check is irrelevant for them.
-BUILD_SIG_NONBUILD_GOALS := \
-	clean clean-rocks clean-not-downloaded clean-rocksjava \
-	clean-not-downloaded-rocksjava clean-ext-libraries-all \
-	clean-ext-libraries-bin \
-	format format-auto check-format check-buck-targets check-headers \
-	check-sources check-workflow-yaml check-progress clang-tidy \
-	tags tags0 package jclean checkout_folly build_folly \
-	watch-log dump-log suggest-slow-tests list_all_tests gen-pc \
-	gen_parallel_tests check-c-api-gen \
-	setup-hooks install-hooks uninstall-hooks uninstall db_crashtest_tests
-# Goals that clean before building (depend on or invoke `clean`): they manage
-# their own freshness, so the check must not block them (it would error before
-# their built-in clean runs).
-BUILD_SIG_NONBUILD_GOALS += \
-	release coverage build_size analyze analyze_incremental \
-	asan_check asan_crash_test asan_crash_test_with_atomic_flush \
-	asan_crash_test_with_txn asan_crash_test_with_best_efforts_recovery \
-	whitebox_asan_crash_test blackbox_asan_crash_test \
-	ubsan_check ubsan_crash_test ubsan_crash_test_with_atomic_flush \
-	ubsan_crash_test_with_txn ubsan_crash_test_with_best_efforts_recovery \
-	whitebox_ubsan_crash_test blackbox_ubsan_crash_test
-
-# Goals that explicitly clean; never trip the check when one is requested.
-BUILD_SIG_CLEAN_GOALS := \
-	clean clean-rocks clean-not-downloaded clean-rocksjava \
-	clean-not-downloaded-rocksjava clean-ext-libraries-all \
-	clean-ext-libraries-bin
-
-BUILD_SIG_GOALS := $(if $(MAKECMDGOALS),$(MAKECMDGOALS),all)
-BUILD_SIG_DO_BUILD := $(filter-out $(BUILD_SIG_NONBUILD_GOALS),$(BUILD_SIG_GOALS))
-BUILD_SIG_CLEANING := $(filter $(BUILD_SIG_CLEAN_GOALS),$(MAKECMDGOALS))
-# Dry runs (-n/--just-print) must not write the stamp, clean, or error; the
-# parse-time $(shell) below would otherwise run even under -n. Note that
-# actual options are canonicalized and shorted as possible such that all
-# short options are in the first word of MAKEFLAGS.
-BUILD_SIG_DRYRUN := $(findstring n,$(firstword -$(MAKEFLAGS)))
-
-# Only enforce at the top level. Sub-makes (e.g. `check` invokes
-# $(MAKE) gen_parallel_tests / check-c-api-gen / check_0) inherit the parent's
-# build flags, so the top-level check already covers them; re-checking inside a
-# sub-make only causes spurious failures.
-ifneq ($(ALLOW_BUILD_PARAMETER_CHANGE),1)
-ifeq ($(MAKELEVEL),0)
-ifeq ($(BUILD_SIG_DRYRUN),)
-ifeq ($(BUILD_SIG_CLEANING),)
-ifneq ($(BUILD_SIG_DO_BUILD),)
-  BUILD_SIG := $(shell printf '%s' '$(CC)|$(CXX)|$(CFLAGS)|$(CXXFLAGS)|$(LDFLAGS)|$(EXEC_LDFLAGS)' | $(SHA256_CMD) | cut -d ' ' -f 1)
-  BUILD_SIG_OLD := $(shell cat $(BUILD_SIG_FILE) 2>/dev/null)
-  ifneq ($(BUILD_SIG_OLD),)
-  ifneq ($(BUILD_SIG_OLD),$(BUILD_SIG))
-  ifeq ($(AUTO_CLEAN),1)
-    $(info *** Build parameters changed since last build (OBJ_DIR=$(OBJ_DIR)); running 'make clean-rocks' because AUTO_CLEAN=1)
-    BUILD_SIG_CLEAN_OUTPUT := $(shell $(MAKE) clean-rocks 1>&2)
-    ifneq ($(.SHELLSTATUS),0)
-      $(error AUTO_CLEAN: 'make clean-rocks' failed (exit $(.SHELLSTATUS)); not building against a partially-cleaned tree)
-    endif
-  else
-    $(error Build parameters changed since the last build (OBJ_DIR=$(OBJ_DIR)). Existing object files are stale and must be removed. Run 'make clean', or set AUTO_CLEAN=1 to clean automatically, or ALLOW_BUILD_PARAMETER_CHANGE=1 to build anyway)
-  endif
-  endif
-  endif
-  # Record the current signature for the next build.
-  BUILD_SIG_WRITE := $(shell mkdir -p $(OBJ_DIR) 2>/dev/null; printf '%s\n' '$(BUILD_SIG)' > $(BUILD_SIG_FILE))
-endif
-endif
-endif
-endif
-endif
-
 zlib-$(ZLIB_VER).tar.gz:
 	curl --fail --output zlib-$(ZLIB_VER).tar.gz --location ${ZLIB_DOWNLOAD_BASE}/zlib-$(ZLIB_VER).tar.gz
 	ZLIB_SHA256_ACTUAL=`$(SHA256_CMD) zlib-$(ZLIB_VER).tar.gz | cut -d ' ' -f 1`; \
@@ -360,7 +360,6 @@ def generate_buck(repo_path, deps_map):
                        extra_compiler_flags=json.dumps(deps["extra_compiler_flags"]),
                    )
    BUCK.export_file("tools/db_crashtest.py")
-    BUCK.export_file("tools/fault_injection_log_parser.py")

    print(ColorString.info("Generated BUCK Summary:"))
    print(ColorString.info("- %d libs" % BUCK.total_lib))
@@ -118,12 +118,6 @@ class TARGETSBuilder:
        self.total_bin = self.total_bin + 1

    def add_c_test(self):
-        # The actual c_test_bin target is defined by add_c_test_wrapper in the
-        # internal //rocks/buckifier:defs.bzl (not in this OSS repo). db/c_test.c
-        # #includes the generated c_api_gen/*.inc fragments, so under Buck's
-        # hermetic sandbox that wrapper must expose them as headers, e.g.
-        #   headers = native.glob(["c_api_gen/**/*.inc"])
-        # (Make/CMake resolve the include via -I. / PROJECT_SOURCE_DIR.)
        with open(self.path, "ab") as targets_file:
            targets_file.write(
                b"""
@@ -27,6 +27,7 @@
 #       -DLZ4                       if the LZ4 library is present
 #       -DZSTD                      if the ZSTD library is present
 #       -DNUMA                      if the NUMA library is present
+#       -DTBB                       if the TBB library is present
 #       -DMEMKIND                   if the memkind library is present
 #
 # Using gflags in rocksdb:
@@ -423,6 +424,19 @@ EOF
        fi
    fi

+    if ! test $ROCKSDB_DISABLE_TBB; then
+        # Test whether tbb is available
+        $CXX $PLATFORM_CXXFLAGS $LDFLAGS -x c++ - -o test.o -ltbb 2>/dev/null  <<EOF
+          #include <tbb/tbb.h>
+          int main() {}
+EOF
+        if [ "$?" = 0 ]; then
+            COMMON_FLAGS="$COMMON_FLAGS -DTBB"
+            PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -ltbb"
+            JAVA_LDFLAGS="$JAVA_LDFLAGS -ltbb"
+        fi
+    fi
+
    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 \
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-# This source code is licensed under both the GPLv2 (found in the
-# COPYING file in the root directory) and Apache 2.0 License
-# (found in the LICENSE.Apache file in the root directory).
+# Copyright (c) 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
@@ -1,20 +1,21 @@
 # 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/e9cb2d4550b5a95024125084420342d256b349cd/11.x/centos9-native/3bed279
-CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/4e46e6967e15412702e51960c69790a78933856f/21/platform010/72a2ff8
-LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/63c5179edc90fec473e53c1b2f92269c65c39e07/11.x/platform010/5684a5a
-GLIBC_BASE=/mnt/gvfs/third-party2/glibc/b4a6248a76a163bcccb1e4751e247712c535846e/2.34/platform010/f259413
-SNAPPY_BASE=/mnt/gvfs/third-party2/snappy/ef895164499fdfedb9d9b9c85520de10aa8ff9ca/1.1.8/platform010/76ebdda
-ZLIB_BASE=/mnt/gvfs/third-party2/zlib/643dbf0136f869562485cfcb2953f5cab60447ef/1.2.8/platform010/76ebdda
+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
 BZIP2_BASE=/mnt/gvfs/third-party2/bzip2/09703139cfc376bd8a82642385a0e97726b28287/1.0.6/platform010/76ebdda
-LZ4_BASE=/mnt/gvfs/third-party2/lz4/823bf8e000654abef784311296ffc8166d9d3986/1.9.4/platform010/76ebdda
-ZSTD_BASE=/mnt/gvfs/third-party2/zstd/0cda78647b5712bec7ec6d9ba2f0dcdabfb6f44f/1.4.x/platform010/64091f4
-GFLAGS_BASE=/mnt/gvfs/third-party2/gflags/a02e0de00945729ad553c187c64e86b57f45a33b/2.2.0/platform010/76ebdda
-JEMALLOC_BASE=/mnt/gvfs/third-party2/jemalloc/a1a50742bec7195bfafb594e174ea45dc197a420/master/platform010/779a252
+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/f3cce2e1a79ac8d64e102886603a6997d6e88640/1.8/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
 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/0883cccda758e68b47e4c04e4fa01142e1f60f32/fb/platform010/da39a3e
-BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/1d5d19135a406a941d3a441eb2bf506bb9d19210/2.43/centos9-native/be7139e
-VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/3e2b7ccc315c9a0f2b678ce6fd774f4970f9bf3b/3.22.0/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
@@ -87,6 +87,15 @@ if test -z $PIC_BUILD; then
  LIBUNWIND="$LIBUNWIND_BASE/lib/libunwind.a"
 fi

+# location of TBB
+TBB_INCLUDE=" -isystem $TBB_BASE/include/"
+if test -z $PIC_BUILD; then
+  TBB_LIBS="$TBB_BASE/lib/libtbb.a"
+else
+  TBB_LIBS="$TBB_BASE/lib/libtbb_pic.a"
+fi
+CFLAGS+=" -DTBB"
+
 test "$USE_SSE" || USE_SSE=1
 export USE_SSE
 test "$PORTABLE" || PORTABLE=1
@@ -95,7 +104,7 @@ export PORTABLE
 BINUTILS="$BINUTILS_BASE/bin"
 AR="$BINUTILS/ar"

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

 STDLIBS="-L $GCC_BASE/lib64"

@@ -141,17 +150,17 @@ 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"
 CXXFLAGS+=" $CFLAGS"

-EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB"
+EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $TBB_LIBS"
 EXEC_LDFLAGS+=" -B$BINUTILS/gold"
 EXEC_LDFLAGS+=" -Wl,--dynamic-linker,/usr/local/fbcode/gcc-5-glibc-2.23/lib/ld.so"
 EXEC_LDFLAGS+=" $LIBUNWIND"
 EXEC_LDFLAGS+=" -Wl,-rpath=/usr/local/fbcode/gcc-5-glibc-2.23/lib"
-# dynamic loading
+# required by libtbb
 EXEC_LDFLAGS+=" -ldl"

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

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

 VALGRIND_VER="$VALGRIND_BASE/bin/"

@@ -82,6 +82,11 @@ 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"
@@ -96,7 +101,7 @@ BINUTILS="$BINUTILS_BASE/bin"
 AR="$BINUTILS/ar"
 AS="$BINUTILS/as"

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

 STDLIBS="-L $GCC_BASE/lib64"

@@ -152,18 +157,18 @@ 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"
 CXXFLAGS+=" $CFLAGS"

-EXEC_LDFLAGS=" $SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $NUMA_LIB $LIBURING_LIBS $BENCHMARK_LIBS"
+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/platform010/lib/ld.so"
 EXEC_LDFLAGS+=" $LIBUNWIND"
 EXEC_LDFLAGS+=" -Wl,-rpath=/usr/local/fbcode/platform010/lib"
 EXEC_LDFLAGS+=" -Wl,-rpath=$GCC_BASE/lib64"
-# dynamic loading
+# 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 $LIBURING_LIBS $BENCHMARK_LIBS"
+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/"

@@ -1,18 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2017 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import gtest_parallel
-import sys
-
-sys.exit(gtest_parallel.main())
@@ -1,959 +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 the Apache 2.0 License (found in the LICENSE.Apache file in the root directory).
-
-# Copyright 2013 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import errno
-from functools import total_ordering
-import gzip
-import io
-import json
-import multiprocessing
-import optparse
-import os
-import re
-import shutil
-import signal
-import subprocess
-import sys
-import tempfile
-import threading
-import time
-
-if sys.version_info.major >= 3:
-  long = int
-  import _pickle as cPickle
-  import _thread as thread
-else:
-  import cPickle
-  import thread
-
-from pickle import HIGHEST_PROTOCOL as PICKLE_HIGHEST_PROTOCOL
-
-if sys.platform == 'win32':
-  import msvcrt
-else:
-  import fcntl
-
-
-# An object that catches SIGINT sent to the Python process and notices
-# if processes passed to wait() die by SIGINT (we need to look for
-# both of those cases, because pressing Ctrl+C can result in either
-# the main process or one of the subprocesses getting the signal).
-#
-# Before a SIGINT is seen, wait(p) will simply call p.wait() and
-# return the result. Once a SIGINT has been seen (in the main process
-# or a subprocess, including the one the current call is waiting for),
-# wait(p) will call p.terminate() and raise ProcessWasInterrupted.
-class SigintHandler(object):
-  class ProcessWasInterrupted(Exception):
-    pass
-
-  sigint_returncodes = {
-      -signal.SIGINT,  # Unix
-      -1073741510,  # Windows
-  }
-
-  def __init__(self):
-    self.__lock = threading.Lock()
-    self.__processes = set()
-    self.__got_sigint = False
-    signal.signal(signal.SIGINT, lambda signal_num, frame: self.interrupt())
-
-  def __on_sigint(self):
-    self.__got_sigint = True
-    while self.__processes:
-      try:
-        self.__processes.pop().terminate()
-      except OSError:
-        pass
-
-  def interrupt(self):
-    with self.__lock:
-      self.__on_sigint()
-
-  def got_sigint(self):
-    with self.__lock:
-      return self.__got_sigint
-
-  def wait(self, p, timeout_per_test):
-    with self.__lock:
-      if self.__got_sigint:
-        p.terminate()
-      self.__processes.add(p)
-    try:
-      code = p.wait(timeout_per_test)
-    except subprocess.TimeoutExpired :
-      p.terminate()
-      self.__processes.remove(p)
-      code = -errno.ETIME
-    with self.__lock:
-      self.__processes.discard(p)
-      if code in self.sigint_returncodes:
-        self.__on_sigint()
-      if self.__got_sigint:
-        raise self.ProcessWasInterrupted
-    return code
-
-
-sigint_handler = SigintHandler()
-
-
-# Return the width of the terminal, or None if it couldn't be
-# determined (e.g. because we're not being run interactively).
-def term_width(out):
-  if not out.isatty():
-    return None
-  try:
-    p = subprocess.Popen(["stty", "size"],
-                         stdout=subprocess.PIPE,
-                         stderr=subprocess.PIPE)
-    (out, err) = p.communicate()
-    if p.returncode != 0 or err:
-      return None
-    return int(out.split()[1])
-  except (IndexError, OSError, ValueError):
-    return None
-
-
-# Output transient and permanent lines of text. If several transient
-# lines are written in sequence, the new will overwrite the old. We
-# use this to ensure that lots of unimportant info (tests passing)
-# won't drown out important info (tests failing).
-class Outputter(object):
-  def __init__(self, out_file):
-    self.__out_file = out_file
-    self.__previous_line_was_transient = False
-    self.__width = term_width(out_file)  # Line width, or None if not a tty.
-
-  def transient_line(self, msg):
-    if self.__width is None:
-      self.__out_file.write(msg + "\n")
-      self.__out_file.flush()
-    else:
-      self.__out_file.write("\r" + msg[:self.__width].ljust(self.__width))
-      self.__previous_line_was_transient = True
-
-  def flush_transient_output(self):
-    if self.__previous_line_was_transient:
-      self.__out_file.write("\n")
-      self.__previous_line_was_transient = False
-
-  def permanent_line(self, msg):
-    self.flush_transient_output()
-    self.__out_file.write(msg + "\n")
-    if self.__width is None:
-      self.__out_file.flush()
-
-
-def get_save_file_path():
-  """Return path to file for saving transient data."""
-  if sys.platform == 'win32':
-    default_cache_path = os.path.join(os.path.expanduser('~'), 'AppData',
-                                      'Local')
-    cache_path = os.environ.get('LOCALAPPDATA', default_cache_path)
-  else:
-    # We don't use xdg module since it's not a standard.
-    default_cache_path = os.path.join(os.path.expanduser('~'), '.cache')
-    cache_path = os.environ.get('XDG_CACHE_HOME', default_cache_path)
-
-  if os.path.isdir(cache_path):
-    return os.path.join(cache_path, 'gtest-parallel')
-  else:
-    sys.stderr.write('Directory {} does not exist'.format(cache_path))
-    return os.path.join(os.path.expanduser('~'), '.gtest-parallel-times')
-
-
-@total_ordering
-class Task(object):
-  """Stores information about a task (single execution of a test).
-
-  This class stores information about the test to be executed (gtest binary and
-  test name), and its result (log file, exit code and runtime).
-  Each task is uniquely identified by the gtest binary, the test name and an
-  execution number that increases each time the test is executed.
-  Additionaly we store the last execution time, so that next time the test is
-  executed, the slowest tests are run first.
-  """
-
-  def __init__(self, test_binary, test_name, test_command, execution_number,
-               last_execution_time, output_dir):
-    self.test_name = test_name
-    self.output_dir = output_dir
-    self.test_binary = test_binary
-    self.test_command = test_command
-    self.execution_number = execution_number
-    self.last_execution_time = last_execution_time
-
-    self.exit_code = None
-    self.runtime_ms = None
-
-    self.test_id = (test_binary, test_name)
-    self.task_id = (test_binary, test_name, self.execution_number)
-
-    self.log_file = Task._logname(self.output_dir, self.test_binary, test_name,
-                                  self.execution_number)
-
-  def __sorting_key(self):
-    # Unseen or failing tests (both missing execution time) take precedence over
-    # execution time. Tests are greater (seen as slower) when missing times so
-    # that they are executed first.
-    return (1 if self.last_execution_time is None else 0,
-            self.last_execution_time)
-
-  def __eq__(self, other):
-    return self.__sorting_key() == other.__sorting_key()
-
-  def __ne__(self, other):
-    return not (self == other)
-
-  def __lt__(self, other):
-    return self.__sorting_key() < other.__sorting_key()
-
-  @staticmethod
-  def _normalize(string):
-    return re.sub('[^A-Za-z0-9]', '_', string)
-
-  @staticmethod
-  def _logname(output_dir, test_binary, test_name, execution_number):
-    # Store logs to temporary files if there is no output_dir.
-    if output_dir is None:
-      (log_handle, log_name) = tempfile.mkstemp(prefix='gtest_parallel_',
-                                                suffix=".log")
-      os.close(log_handle)
-      return log_name
-
-    log_name = '%s-%s-%d.log' % (Task._normalize(os.path.basename(test_binary)),
-                                 Task._normalize(test_name), execution_number)
-
-    return os.path.join(output_dir, log_name)
-
-  def run(self, timeout_per_test):
-    begin = time.time()
-    with open(self.log_file, 'w') as log:
-      task = subprocess.Popen(self.test_command, stdout=log, stderr=log)
-      try:
-        self.exit_code = sigint_handler.wait(task, timeout_per_test)
-      except sigint_handler.ProcessWasInterrupted:
-        thread.exit()
-    self.runtime_ms = int(1000 * (time.time() - begin))
-    self.last_execution_time = None if self.exit_code else self.runtime_ms
-
-
-class TaskManager(object):
-  """Executes the tasks and stores the passed, failed and interrupted tasks.
-
-  When a task is run, this class keeps track if it passed, failed or was
-  interrupted. After a task finishes it calls the relevant functions of the
-  Logger, TestResults and TestTimes classes, and in case of failure, retries the
-  test as specified by the --retry_failed flag.
-  """
-
-  def __init__(self, times, logger, test_results, task_factory, times_to_retry,
-               initial_execution_number):
-    self.times = times
-    self.logger = logger
-    self.test_results = test_results
-    self.task_factory = task_factory
-    self.times_to_retry = times_to_retry
-    self.initial_execution_number = initial_execution_number
-
-    self.global_exit_code = 0
-
-    self.passed = []
-    self.failed = []
-    self.started = {}
-    self.timed_out = []
-    self.execution_number = {}
-
-    self.lock = threading.Lock()
-
-  def __get_next_execution_number(self, test_id):
-    with self.lock:
-      next_execution_number = self.execution_number.setdefault(
-          test_id, self.initial_execution_number)
-      self.execution_number[test_id] += 1
-    return next_execution_number
-
-  def __register_start(self, task):
-    with self.lock:
-      self.started[task.task_id] = task
-
-  def register_exit(self, task):
-    self.logger.log_exit(task)
-    self.times.record_test_time(task.test_binary, task.test_name,
-                                task.last_execution_time)
-    if self.test_results:
-      self.test_results.log(task.test_name, task.runtime_ms / 1000.0,
-                            task.exit_code)
-
-    with self.lock:
-      self.started.pop(task.task_id)
-      if task.exit_code == 0:
-        self.passed.append(task)
-      elif task.exit_code == -errno.ETIME:
-        self.timed_out.append(task)
-      else:
-        self.failed.append(task)
-
-  def run_task(self, task, timeout_per_test):
-    for try_number in range(self.times_to_retry + 1):
-      self.__register_start(task)
-      task.run(timeout_per_test)
-      self.register_exit(task)
-
-      if task.exit_code == 0:
-        break
-
-      if try_number < self.times_to_retry:
-        execution_number = self.__get_next_execution_number(task.test_id)
-        # We need create a new Task instance. Each task represents a single test
-        # execution, with its own runtime, exit code and log file.
-        task = self.task_factory(task.test_binary, task.test_name,
-                                 task.test_command, execution_number,
-                                 task.last_execution_time, task.output_dir)
-
-    with self.lock:
-      if task.exit_code != 0:
-        self.global_exit_code = task.exit_code
-
-
-class FilterFormat(object):
-  def __init__(self, output_dir):
-    if sys.stdout.isatty():
-      # stdout needs to be unbuffered since the output is interactive.
-      if isinstance(sys.stdout, io.TextIOWrapper):
-        # workaround for https://bugs.python.org/issue17404
-        sys.stdout = io.TextIOWrapper(sys.stdout.detach(),
-                                      line_buffering=True,
-                                      write_through=True,
-                                      newline='\n')
-      else:
-        sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
-
-    self.output_dir = output_dir
-
-    self.total_tasks = 0
-    self.finished_tasks = 0
-    self.out = Outputter(sys.stdout)
-    self.stdout_lock = threading.Lock()
-
-  def move_to(self, destination_dir, tasks):
-    if self.output_dir is None:
-      return
-
-    destination_dir = os.path.join(self.output_dir, destination_dir)
-    os.makedirs(destination_dir)
-    for task in tasks:
-      shutil.move(task.log_file, destination_dir)
-
-  def print_tests(self, message, tasks, print_try_number, print_test_command):
-    self.out.permanent_line("%s (%s/%s):" %
-                            (message, len(tasks), self.total_tasks))
-    for task in sorted(tasks):
-      runtime_ms = 'Interrupted'
-      if task.runtime_ms is not None:
-        runtime_ms = '%d ms' % task.runtime_ms
-      if print_test_command:
-        try:
-          cmd_str = " ".join(task.test_command)
-        except TypeError:
-          cmd_str = task.test_command
-        self.out.permanent_line(
-            "%11s: %s%s" %
-            (runtime_ms, cmd_str,
-            (" (try #%d)" % task.execution_number) if print_try_number else ""))
-      else:
-        self.out.permanent_line(
-            "%11s: %s %s%s" %
-            (runtime_ms, task.test_binary, task.test_name,
-            (" (try #%d)" % task.execution_number) if print_try_number else ""))
-
-  def log_exit(self, task):
-    with self.stdout_lock:
-      self.finished_tasks += 1
-      self.out.transient_line("[%d/%d] %s (%d ms)" %
-                              (self.finished_tasks, self.total_tasks,
-                               task.test_name, task.runtime_ms))
-      if task.exit_code != 0:
-        signal_name = None
-        if task.exit_code < 0:
-          try:
-            signal_name = signal.Signals(-task.exit_code).name
-          except ValueError:
-            pass
-
-        with open(task.log_file) as f:
-          for line in f.readlines():
-            self.out.permanent_line(line.rstrip())
-        if task.exit_code is None:
-          self.out.permanent_line("[%d/%d] %s aborted after %d ms" %
-                                  (self.finished_tasks, self.total_tasks,
-                                   task.test_name, task.runtime_ms))
-        elif task.exit_code == -errno.ETIME:
-          self.out.permanent_line(
-            "\033[31m[  TIMEOUT ]\033[0m %s timed out after %d s"
-            % (task.test_name, task.runtime_ms/1000))
-        elif signal_name is not None:
-          self.out.permanent_line(
-              "[%d/%d] %s killed by signal %s (%d ms)" %
-              (self.finished_tasks, self.total_tasks, task.test_name,
-               signal_name, task.runtime_ms))
-        else:
-          self.out.permanent_line(
-              "[%d/%d] %s returned with exit code %d (%d ms)" %
-              (self.finished_tasks, self.total_tasks, task.test_name,
-               task.exit_code, task.runtime_ms))
-
-    if self.output_dir is None:
-      # Try to remove the file 100 times (sleeping for 0.1 second in between).
-      # This is a workaround for a process handle seemingly holding on to the
-      # file for too long inside os.subprocess. This workaround is in place
-      # until we figure out a minimal repro to report upstream (or a better
-      # suspect) to prevent os.remove exceptions.
-      num_tries = 100
-      for i in range(num_tries):
-        try:
-          os.remove(task.log_file)
-        except OSError as e:
-          if e.errno is not errno.ENOENT:
-            if i is num_tries - 1:
-              self.out.permanent_line('Could not remove temporary log file: ' +
-                                      str(e))
-            else:
-              time.sleep(0.1)
-            continue
-        break
-
-  def log_tasks(self, total_tasks):
-    self.total_tasks += total_tasks
-    self.out.transient_line("[0/%d] Running tests..." % self.total_tasks)
-
-  def summarize(self, passed_tasks, failed_tasks, interrupted_tasks):
-    stats = {}
-
-    def add_stats(stats, task, idx):
-      task_key = (task.test_binary, task.test_name)
-      if not task_key in stats:
-        # (passed, failed, interrupted) task_key is added as tie breaker to get
-        # alphabetic sorting on equally-stable tests
-        stats[task_key] = [0, 0, 0, task_key]
-      stats[task_key][idx] += 1
-
-    for task in passed_tasks:
-      add_stats(stats, task, 0)
-    for task in failed_tasks:
-      add_stats(stats, task, 1)
-    for task in interrupted_tasks:
-      add_stats(stats, task, 2)
-
-    self.out.permanent_line("SUMMARY:")
-    for task_key in sorted(stats, key=stats.__getitem__):
-      (num_passed, num_failed, num_interrupted, _) = stats[task_key]
-      (test_binary, task_name) = task_key
-      total_runs = num_passed + num_failed + num_interrupted
-      if num_passed == total_runs:
-        continue
-      self.out.permanent_line("  %s %s passed %d / %d times%s." %
-                              (test_binary, task_name, num_passed, total_runs,
-                               "" if num_interrupted == 0 else
-                               (" (%d interrupted)" % num_interrupted)))
-
-  def flush(self):
-    self.out.flush_transient_output()
-
-
-class CollectTestResults(object):
-  def __init__(self, json_dump_filepath):
-    self.test_results_lock = threading.Lock()
-    self.json_dump_file = open(json_dump_filepath, 'w')
-    self.test_results = {
-        "interrupted": False,
-        "path_delimiter": ".",
-        # Third version of the file format. See the link in the flag description
-        # for details.
-        "version": 3,
-        "seconds_since_epoch": int(time.time()),
-        "num_failures_by_type": {
-            "PASS": 0,
-            "FAIL": 0,
-            "TIMEOUT": 0,
-        },
-        "tests": {},
-    }
-
-  def log(self, test, runtime_seconds, exit_code):
-    if exit_code is None:
-      actual_result = "TIMEOUT"
-    elif exit_code == 0:
-      actual_result = "PASS"
-    else:
-      actual_result = "FAIL"
-    with self.test_results_lock:
-      self.test_results['num_failures_by_type'][actual_result] += 1
-      results = self.test_results['tests']
-      for name in test.split('.'):
-        results = results.setdefault(name, {})
-
-      if results:
-        results['actual'] += ' ' + actual_result
-        results['times'].append(runtime_seconds)
-      else:  # This is the first invocation of the test
-        results['actual'] = actual_result
-        results['times'] = [runtime_seconds]
-        results['time'] = runtime_seconds
-        results['expected'] = 'PASS'
-
-  def dump_to_file_and_close(self):
-    json.dump(self.test_results, self.json_dump_file)
-    self.json_dump_file.close()
-
-
-# Record of test runtimes. Has built-in locking.
-class TestTimes(object):
-  class LockedFile(object):
-    def __init__(self, filename, mode):
-      self._filename = filename
-      self._mode = mode
-      self._fo = None
-
-    def __enter__(self):
-      self._fo = open(self._filename, self._mode)
-
-      # Regardless of opening mode we always seek to the beginning of file.
-      # This simplifies code working with LockedFile and also ensures that
-      # we lock (and unlock below) always the same region in file on win32.
-      self._fo.seek(0)
-
-      try:
-        if sys.platform == 'win32':
-          # We are locking here fixed location in file to use it as
-          # an exclusive lock on entire file.
-          msvcrt.locking(self._fo.fileno(), msvcrt.LK_LOCK, 1)
-        else:
-          fcntl.flock(self._fo.fileno(), fcntl.LOCK_EX)
-      except IOError:
-        self._fo.close()
-        raise
-
-      return self._fo
-
-    def __exit__(self, exc_type, exc_value, traceback):
-      # Flush any buffered data to disk. This is needed to prevent race
-      # condition which happens from the moment of releasing file lock
-      # till closing the file.
-      self._fo.flush()
-
-      try:
-        if sys.platform == 'win32':
-          self._fo.seek(0)
-          msvcrt.locking(self._fo.fileno(), msvcrt.LK_UNLCK, 1)
-        else:
-          fcntl.flock(self._fo.fileno(), fcntl.LOCK_UN)
-      finally:
-        self._fo.close()
-
-      return exc_value is None
-
-  def __init__(self, save_file):
-    "Create new object seeded with saved test times from the given file."
-    self.__times = {}  # (test binary, test name) -> runtime in ms
-
-    # Protects calls to record_test_time(); other calls are not
-    # expected to be made concurrently.
-    self.__lock = threading.Lock()
-
-    try:
-      with TestTimes.LockedFile(save_file, 'rb') as fd:
-        times = TestTimes.__read_test_times_file(fd)
-    except IOError:
-      # We couldn't obtain the lock.
-      return
-
-    # Discard saved times if the format isn't right.
-    if type(times) is not dict:
-      return
-    for ((test_binary, test_name), runtime) in times.items():
-      if (type(test_binary) is not str or type(test_name) is not str
-          or type(runtime) not in {int, long, type(None)}):
-        return
-
-    self.__times = times
-
-  def get_test_time(self, binary, testname):
-    """Return the last duration for the given test as an integer number of
-    milliseconds, or None if the test failed or if there's no record for it."""
-    return self.__times.get((binary, testname), None)
-
-  def record_test_time(self, binary, testname, runtime_ms):
-    """Record that the given test ran in the specified number of
-    milliseconds. If the test failed, runtime_ms should be None."""
-    with self.__lock:
-      self.__times[(binary, testname)] = runtime_ms
-
-  def write_to_file(self, save_file):
-    "Write all the times to file."
-    try:
-      with TestTimes.LockedFile(save_file, 'a+b') as fd:
-        times = TestTimes.__read_test_times_file(fd)
-
-        if times is None:
-          times = self.__times
-        else:
-          times.update(self.__times)
-
-        # We erase data from file while still holding a lock to it. This
-        # way reading old test times and appending new ones are atomic
-        # for external viewer.
-        fd.seek(0)
-        fd.truncate()
-        with gzip.GzipFile(fileobj=fd, mode='wb') as gzf:
-          cPickle.dump(times, gzf, PICKLE_HIGHEST_PROTOCOL)
-    except IOError:
-      pass  # ignore errors---saving the times isn't that important
-
-  @staticmethod
-  def __read_test_times_file(fd):
-    try:
-      with gzip.GzipFile(fileobj=fd, mode='rb') as gzf:
-        times = cPickle.load(gzf)
-    except Exception:
-      # File doesn't exist, isn't readable, is malformed---whatever.
-      # Just ignore it.
-      return None
-    else:
-      return times
-
-
-def find_tests(binaries, additional_args, options, times):
-  test_count = 0
-  tasks = []
-  for test_binary in binaries:
-    command = [test_binary] + additional_args
-    if options.gtest_also_run_disabled_tests:
-      command += ['--gtest_also_run_disabled_tests']
-
-    list_command = command + ['--gtest_list_tests']
-    if options.gtest_filter != '':
-      list_command += ['--gtest_filter=' + options.gtest_filter]
-
-    try:
-      test_list = subprocess.check_output(list_command,
-                                          stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-      sys.exit("%s: %s\n%s" % (test_binary, str(e), e.output))
-
-    try:
-      test_list = test_list.split('\n')
-    except TypeError:
-      # subprocess.check_output() returns bytes in python3
-      test_list = test_list.decode(sys.stdout.encoding).split('\n')
-
-    command += ['--gtest_color=' + options.gtest_color]
-
-    test_group = ''
-    for line in test_list:
-      if not line.strip():
-        continue
-      if line[0] != " ":
-        # Remove comments for typed tests and strip whitespace.
-        test_group = line.split('#')[0].strip()
-        continue
-      # Remove comments for parameterized tests and strip whitespace.
-      line = line.split('#')[0].strip()
-      if not line:
-        continue
-
-      test_name = test_group + line
-      if not options.gtest_also_run_disabled_tests and 'DISABLED_' in test_name:
-        continue
-
-      # Skip PRE_ tests which are used by Chromium.
-      if '.PRE_' in test_name:
-        continue
-
-      last_execution_time = times.get_test_time(test_binary, test_name)
-      if options.failed and last_execution_time is not None:
-        continue
-
-      test_command = command + ['--gtest_filter=' + test_name]
-      if (test_count - options.shard_index) % options.shard_count == 0:
-        for execution_number in range(options.repeat):
-          tasks.append(
-              Task(test_binary, test_name, test_command, execution_number + 1,
-                   last_execution_time, options.output_dir))
-
-      test_count += 1
-
-  # Sort the tasks to run the slowest tests first, so that faster ones can be
-  # finished in parallel.
-  return sorted(tasks, reverse=True)
-
-
-def execute_tasks(tasks, pool_size, task_manager, timeout_seconds,
-                  timeout_per_test, serialize_test_cases):
-  class WorkerFn(object):
-    def __init__(self, tasks, running_groups, timeout_per_test):
-      self.tasks = tasks
-      self.running_groups = running_groups
-      self.timeout_per_test = timeout_per_test
-      self.task_lock = threading.Lock()
-
-    def __call__(self):
-      while True:
-        with self.task_lock:
-          for task_id in range(len(self.tasks)):
-            task = self.tasks[task_id]
-
-            if self.running_groups is not None:
-              test_group = task.test_name.split('.')[0]
-              if test_group in self.running_groups:
-                # Try to find other non-running test group.
-                continue
-              else:
-                self.running_groups.add(test_group)
-
-            del self.tasks[task_id]
-            break
-          else:
-            # Either there is no tasks left or number or remaining test
-            # cases (groups) is less than number or running threads.
-            return
-
-        task_manager.run_task(task, self.timeout_per_test)
-
-        if self.running_groups is not None:
-          with self.task_lock:
-            self.running_groups.remove(test_group)
-
-  def start_daemon(func):
-    t = threading.Thread(target=func)
-    t.daemon = True
-    t.start()
-    return t
-
-  timeout = None
-  try:
-    if timeout_seconds:
-      timeout = threading.Timer(timeout_seconds, sigint_handler.interrupt)
-      timeout.start()
-    running_groups = set() if serialize_test_cases else None
-    worker_fn = WorkerFn(tasks, running_groups, timeout_per_test)
-    workers = [start_daemon(worker_fn) for _ in range(pool_size)]
-    for worker in workers:
-      worker.join()
-  finally:
-    if timeout:
-      timeout.cancel()
-      for task in list(task_manager.started.values()):
-        task.runtime_ms = timeout_seconds * 1000
-        task_manager.register_exit(task)
-
-
-def default_options_parser():
-  parser = optparse.OptionParser(
-      usage='usage: %prog [options] binary [binary ...] -- [additional args]')
-
-  parser.add_option('-d',
-                    '--output_dir',
-                    type='string',
-                    default=None,
-                    help='Output directory for test logs. Logs will be '
-                    'available under gtest-parallel-logs/, so '
-                    '--output_dir=/tmp will results in all logs being '
-                    'available under /tmp/gtest-parallel-logs/.')
-  parser.add_option('-r',
-                    '--repeat',
-                    type='int',
-                    default=1,
-                    help='Number of times to execute all the tests.')
-  parser.add_option('--retry_failed',
-                    type='int',
-                    default=0,
-                    help='Number of times to repeat failed tests.')
-  parser.add_option('--failed',
-                    action='store_true',
-                    default=False,
-                    help='run only failed and new tests')
-  parser.add_option('-w',
-                    '--workers',
-                    type='int',
-                    default=multiprocessing.cpu_count(),
-                    help='number of workers to spawn')
-  parser.add_option('--gtest_color',
-                    type='string',
-                    default='yes',
-                    help='color output')
-  parser.add_option('--gtest_filter',
-                    type='string',
-                    default='',
-                    help='test filter')
-  parser.add_option('--gtest_also_run_disabled_tests',
-                    action='store_true',
-                    default=False,
-                    help='run disabled tests too')
-  parser.add_option(
-      '--print_test_times',
-      action='store_true',
-      default=False,
-      help='list the run time of each test at the end of execution')
-  parser.add_option(
-      '--print_test_command',
-      action='store_true',
-      default=False,
-      help='Print full test command instead of name')
-  parser.add_option('--shard_count',
-                    type='int',
-                    default=1,
-                    help='total number of shards (for sharding test execution '
-                    'between multiple machines)')
-  parser.add_option('--shard_index',
-                    type='int',
-                    default=0,
-                    help='zero-indexed number identifying this shard (for '
-                    'sharding test execution between multiple machines)')
-  parser.add_option(
-      '--dump_json_test_results',
-      type='string',
-      default=None,
-      help='Saves the results of the tests as a JSON machine-'
-      'readable file. The format of the file is specified at '
-      'https://www.chromium.org/developers/the-json-test-results-format')
-  parser.add_option('--timeout',
-                    type='int',
-                    default=None,
-                    help='Interrupt all remaining processes after the given '
-                    'time (in seconds).')
-  parser.add_option('--timeout_per_test',
-                    type='int',
-                    default=None,
-                    help='Interrupt single processes after the given '
-                    'time (in seconds).')
-  parser.add_option('--serialize_test_cases',
-                    action='store_true',
-                    default=False,
-                    help='Do not run tests from the same test '
-                    'case in parallel.')
-  return parser
-
-
-def main():
-  # Remove additional arguments (anything after --).
-  additional_args = []
-
-  for i in range(len(sys.argv)):
-    if sys.argv[i] == '--':
-      additional_args = sys.argv[i + 1:]
-      sys.argv = sys.argv[:i]
-      break
-
-  parser = default_options_parser()
-  (options, binaries) = parser.parse_args()
-
-  if (options.output_dir is not None and not os.path.isdir(options.output_dir)):
-    parser.error('--output_dir value must be an existing directory, '
-                 'current value is "%s"' % options.output_dir)
-
-  # Append gtest-parallel-logs to log output, this is to avoid deleting user
-  # data if an user passes a directory where files are already present. If a
-  # user specifies --output_dir=Docs/, we'll create Docs/gtest-parallel-logs
-  # and clean that directory out on startup, instead of nuking Docs/.
-  if options.output_dir:
-    options.output_dir = os.path.join(options.output_dir, 'gtest-parallel-logs')
-
-  if binaries == []:
-    parser.print_usage()
-    sys.exit(1)
-
-  if options.shard_count < 1:
-    parser.error("Invalid number of shards: %d. Must be at least 1." %
-                 options.shard_count)
-  if not (0 <= options.shard_index < options.shard_count):
-    parser.error("Invalid shard index: %d. Must be between 0 and %d "
-                 "(less than the number of shards)." %
-                 (options.shard_index, options.shard_count - 1))
-
-  # Check that all test binaries have an unique basename. That way we can ensure
-  # the logs are saved to unique files even when two different binaries have
-  # common tests.
-  unique_binaries = set(os.path.basename(binary) for binary in binaries)
-  assert len(unique_binaries) == len(binaries), (
-      "All test binaries must have an unique basename.")
-
-  if options.output_dir:
-    # Remove files from old test runs.
-    if os.path.isdir(options.output_dir):
-      shutil.rmtree(options.output_dir)
-    # Create directory for test log output.
-    try:
-      os.makedirs(options.output_dir)
-    except OSError as e:
-      # Ignore errors if this directory already exists.
-      if e.errno != errno.EEXIST or not os.path.isdir(options.output_dir):
-        raise e
-
-  test_results = None
-  if options.dump_json_test_results is not None:
-    test_results = CollectTestResults(options.dump_json_test_results)
-
-  save_file = get_save_file_path()
-
-  times = TestTimes(save_file)
-  logger = FilterFormat(options.output_dir)
-
-  task_manager = TaskManager(times, logger, test_results, Task,
-                             options.retry_failed, options.repeat + 1)
-
-  tasks = find_tests(binaries, additional_args, options, times)
-  logger.log_tasks(len(tasks))
-  execute_tasks(tasks, options.workers, task_manager, options.timeout,
-                options.timeout_per_test, options.serialize_test_cases)
-
-  print_try_number = options.retry_failed > 0 or options.repeat > 1
-  if task_manager.passed:
-    logger.move_to('passed', task_manager.passed)
-    if options.print_test_times:
-      logger.print_tests('PASSED TESTS', task_manager.passed, print_try_number, options.print_test_command)
-
-  if task_manager.failed:
-    logger.print_tests('FAILED TESTS', task_manager.failed, print_try_number, options.print_test_command)
-    logger.move_to('failed', task_manager.failed)
-
-  if task_manager.timed_out:
-    logger.print_tests('TIMED OUT TESTS', task_manager.timed_out, print_try_number, options.print_test_command)
-    logger.move_to('timed_out', task_manager.timed_out)
-
-  if task_manager.started:
-    logger.print_tests('INTERRUPTED TESTS', task_manager.started.values(),
-                       print_try_number, options.print_test_command)
-    logger.move_to('interrupted', task_manager.started.values())
-
-  if options.repeat > 1 and (task_manager.failed or task_manager.started):
-    logger.summarize(task_manager.passed, task_manager.failed,
-                     task_manager.started.values())
-
-  logger.flush()
-  times.write_to_file(save_file)
-  if test_results:
-    test_results.dump_to_file_and_close()
-
-  if sigint_handler.got_sigint():
-    return -signal.SIGINT
-
-  return task_manager.global_exit_code
-
-
-if __name__ == "__main__":
-  sys.exit(main())
@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-# 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).
-#
-# Build RocksDB unit test binaries and run them under gtest-parallel,
-# which shards the test cases across CPUs for faster execution.
-#
-# Hardened version of a simple `make <bin> && gtest-parallel ./<bin>` helper:
-#  * AUTO_CLEAN=1 so the Makefile automatically runs a clean when the build
-#    parameters (DEBUG_LEVEL, sanitizers, ASSERT_STATUS_CHECKED, RTTI, etc.)
-#    have changed since the last build, preventing stale/mixed object files.
-#  * Parallel build with -j<NCORES>, computed the same way the Makefile does.
-#  * Uses the gtest-parallel checked in alongside this script (build_tools/),
-#    so it works regardless of PATH.
-#  * `set -euo pipefail` so any failure stops the script.
-#
-# Run from the repository root.
-#
-# Accepts one or more test binaries (gtest-parallel pools all their test cases
-# into one shared worker queue). The leading non-option arguments are treated as
-# binaries; everything from the first option onward is forwarded to
-# gtest-parallel / the test binaries.
-#
-# Example usage:
-#   build_tools/rocksptest.sh db_test
-#   build_tools/rocksptest.sh db_test -r1000 --gtest_filter=*MixedSlowdown*
-#   build_tools/rocksptest.sh db_test env_test db_basic_test
-#   build_tools/rocksptest.sh db_test env_test --gtest_filter=*Foo*
-
-set -euo pipefail
-
-if [ "$#" -lt 1 ]; then
-  echo "usage: $0 <test_binary> [more_test_binaries...] [gtest-parallel/test args...]" >&2
-  echo "example: $0 db_test env_test -r1000 --gtest_filter=*MixedSlowdown*" >&2
-  exit 1
-fi
-
-# First argument must be a test binary, not an option (catches a forgotten name).
-if [ "${1#-}" != "$1" ]; then
-  echo "$0: first argument must be a test binary name, not an option ('$1')" >&2
-  exit 1
-fi
-
-# Collect the leading non-option arguments as test binaries; everything from the
-# first option onward is forwarded to gtest-parallel / the test binaries.
-BINS=()
-while [ "$#" -gt 0 ] && [ "${1#-}" = "$1" ]; do
-  BINS+=("$1")
-  shift
-done
-
-# Paths as gtest-parallel expects them (relative to the current directory).
-BIN_PATHS=()
-for b in "${BINS[@]}"; do
-  BIN_PATHS+=("./$b")
-done
-
-# Directory of this script, so we use the gtest-parallel checked in next to it.
-SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-
-# Compute parallelism the same way the Makefile computes NCORES.
-NCORES=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4)
-
-make AUTO_CLEAN=1 -j"$NCORES" "${BINS[@]}"
-"$SCRIPT_DIR/gtest-parallel" "${BIN_PATHS[@]}" "$@"
@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-# 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).
-#
-# Build a single RocksDB unit test binary and run it directly (serially).
-# Only recommended with --gtest_filter=... because of speed. See also
-# build_tools/rocksptest.sh
-#
-# Hardened version of a simple `make <bin> && ./<bin>` helper:
-#  * AUTO_CLEAN=1 so the Makefile automatically runs a clean when the build
-#    parameters (DEBUG_LEVEL, sanitizers, ASSERT_STATUS_CHECKED, RTTI, etc.)
-#    have changed since the last build, preventing stale/mixed object files.
-#  * Parallel build with -j<NCORES>, computed the same way the Makefile does.
-#  * `set -euo pipefail` so any failure stops the script.
-#
-# Run from the repository root.
-#
-# Example usage:
-#   build_tools/rockstest.sh db_test --gtest_filter=*MixedSlowdown*
-#   build_tools/rockstest.sh env_test # Slow to run many tests serially
-#
-# Install mode:
-#   build_tools/rockstest.sh install
-#     Creates ~/bin/rockstest and ~/bin/rocksptest shims that defer to
-#     build_tools/rockstest.sh / rocksptest.sh in whatever directory you run
-#     them from, so you can just type `rockstest db_test` from any rocksdb
-#     source root.
-
-set -euo pipefail
-
-# Install mode: write thin ~/bin shims that defer to the build_tools scripts in
-# the current directory.
-if [ "${1:-}" = "install" ]; then
-  mkdir -p "$HOME/bin"
-  for name in rockstest rocksptest; do
-    dest="$HOME/bin/$name"
-    cat > "$dest" <<EOF
-#!/usr/bin/env bash
-# Auto-generated by 'build_tools/rockstest.sh install'. Defers to
-# build_tools/$name.sh in the current rocksdb source root.
-if [ -x build_tools/$name.sh ]; then
-  exec build_tools/$name.sh "\$@"
-else
-  echo "build_tools/$name.sh not found (Not in a rocksdb source root directory?)" >&2
-  exit 1
-fi
-EOF
-    chmod +x "$dest"
-    echo "Installed $dest"
-  done
-  exit 0
-fi
-
-if [ "$#" -lt 1 ]; then
-  echo "usage: $0 <test_binary> [test args...]" >&2
-  echo "       $0 install   # create ~/bin/rockstest and ~/bin/rocksptest shims" >&2
-  echo "example: $0 db_test --gtest_filter=*MixedSlowdown*" >&2
-  exit 1
-fi
-
-# First argument must be a test binary, not an option (catches a forgotten name).
-if [ "${1#-}" != "$1" ]; then
-  echo "$0: first argument must be a test binary name, not an option ('$1')" >&2
-  exit 1
-fi
-
-BIN=$1
-shift
-
-# Compute parallelism the same way the Makefile computes NCORES.
-NCORES=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4)
-
-make AUTO_CLEAN=1 -j"$NCORES" "$BIN"
-./"$BIN" "$@"
@@ -32,7 +32,7 @@ function get_lib_base()
  local lib_platform=$3

  local result="$TP2_LATEST/$lib_name/"
-
+  
  # Lib Version
  if [ -z "$lib_version" ] || [ "$lib_version" = "LATEST" ]; then
    # version is not provided, use latest
@@ -40,7 +40,7 @@ function get_lib_base()
  else
    result="$result/$lib_version/"
  fi
-
+  
  # Lib Platform
  if [ -z "$lib_platform" ]; then
    # platform is not provided, use latest gcc
@@ -49,17 +49,17 @@ function get_lib_base()
    echo $lib_platform
    result="$result/$lib_platform/"
  fi
-
+  
  result=`ls -1d $result/*/ | head -n1`

  echo Finding link $result
-
+  
  # lib_name => LIB_NAME_BASE
  local __res_var=${lib_name^^}"_BASE"
  __res_var=`echo $__res_var | tr - _`
  # LIB_NAME_BASE=$result
  eval $__res_var=`readlink -f $result`
-
+  
  log_variable $__res_var
 }

@@ -75,33 +75,17 @@ touch "$OUTPUT"
 echo "Writing dependencies to $OUTPUT"

 # Compilers locations
-# GCC is pinned to 11.x because the only newer GCC in third-party2 (13.x) is
-# built for centos9/glibc>=2.35 -- its libgcc_s.so.1 has a hard reference
-# to _dl_find_object@GLIBC_2.35, but platform010 ships glibc 2.34. Bumping
-# GCC requires a platform with glibc >= 2.35.
-GCC_BASE=`readlink -f $TP2_LATEST/gcc/11.x/centos9-native/*/`
-# Clang is pinned to the latest tested major (21). Bump deliberately.
-CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/21/platform010/*/`
+GCC_BASE=`readlink -f $TP2_LATEST/gcc/11.x/centos8-native/*/`
+CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/15/platform010/*/`

 log_header
 log_variable GCC_BASE
 log_variable CLANG_BASE

 # Libraries locations
-# libgcc is pinned to 11.x to match the GCC 11 compiler above (libstdc++/
-# libgcc runtime, ABI, and C++ headers). Bump in lockstep with GCC_BASE.
 get_lib_base libgcc     11.x    platform010
-# glibc 2.34 is the platform010 ABI baseline (ld.so + libc); it is also the
-# only version available in third-party2, and defines the platform -- do
-# not bump independently.
 get_lib_base glibc      2.34    platform010
 get_lib_base snappy     LATEST  platform010
-# zlib is pinned to 1.2.8: it is the latest version with an x86_64
-# platform010 build (1.2.13 / 1.3.1 are centos9 / aarch64 only). At time of
-# writing, LATEST here doesn't work: get_lib_base picks the newest version
-# dir first and only then appends the platform, with no fallback -- so
-# LATEST would resolve to 1.3.1, find no platform010 build, and emit an
-# empty ZLIB_BASE.
 get_lib_base zlib       1.2.8   platform010
 get_lib_base bzip2      LATEST  platform010
 get_lib_base lz4        LATEST  platform010
@@ -110,11 +94,12 @@ get_lib_base gflags     LATEST  platform010
 get_lib_base jemalloc   LATEST  platform010
 get_lib_base numa       LATEST  platform010
 get_lib_base libunwind  LATEST  platform010
+get_lib_base tbb        2018_U5 platform010
 get_lib_base liburing   LATEST  platform010
 get_lib_base benchmark  LATEST  platform010

 get_lib_base kernel-headers fb platform010
-get_lib_base binutils   LATEST centos9-native
+get_lib_base binutils   LATEST centos8-native
 get_lib_base valgrind   LATEST platform010

 git diff $OUTPUT
@@ -1,39 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'BlockBasedOptions simple'
-//     --header-out
-//     c_api_gen/c_generated_block_based_options_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_block_based_options_subset.cc.inc
-
-/* BlockBasedOptions simple */
-
-void rocksdb_block_based_options_set_data_block_hash_ratio(
-    rocksdb_block_based_table_options_t* options, double v) {
-  options->rep.data_block_hash_table_util_ratio = v;
-}
-
-void rocksdb_block_based_options_set_top_level_index_pinning_tier(
-    rocksdb_block_based_table_options_t* options, int v) {
-  options->rep.metadata_cache_options.top_level_index_pinning =
-      static_cast<ROCKSDB_NAMESPACE::PinningTier>(v);
-}
-
-void rocksdb_block_based_options_set_partition_pinning_tier(
-    rocksdb_block_based_table_options_t* options, int v) {
-  options->rep.metadata_cache_options.partition_pinning =
-      static_cast<ROCKSDB_NAMESPACE::PinningTier>(v);
-}
-
-void rocksdb_block_based_options_set_unpartitioned_pinning_tier(
-    rocksdb_block_based_table_options_t* options, int v) {
-  options->rep.metadata_cache_options.unpartitioned_pinning =
-      static_cast<ROCKSDB_NAMESPACE::PinningTier>(v);
-}
@@ -1,32 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'BlockBasedOptions simple'
-//     --header-out
-//     c_api_gen/c_generated_block_based_options_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_block_based_options_subset.cc.inc
-
-/* BlockBasedOptions simple */
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_block_based_options_set_data_block_hash_ratio(
-    rocksdb_block_based_table_options_t* options, double v);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_block_based_options_set_top_level_index_pinning_tier(
-    rocksdb_block_based_table_options_t* options, int v);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_block_based_options_set_partition_pinning_tier(
-    rocksdb_block_based_table_options_t* options, int v);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_block_based_options_set_unpartitioned_pinning_tier(
-    rocksdb_block_based_table_options_t* options, int v);
@@ -1,21 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'CuckooOptions simple'
-//     --header-out
-//     c_api_gen/c_generated_cuckoo_options_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_cuckoo_options_subset.cc.inc
-
-/* CuckooOptions simple */
-
-void rocksdb_cuckoo_options_set_hash_ratio(
-    rocksdb_cuckoo_table_options_t* options, double v) {
-  options->rep.hash_table_ratio = v;
-}
@@ -1,19 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'CuckooOptions simple'
-//     --header-out
-//     c_api_gen/c_generated_cuckoo_options_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_cuckoo_options_subset.cc.inc
-
-/* CuckooOptions simple */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_cuckoo_options_set_hash_ratio(
-    rocksdb_cuckoo_table_options_t* options, double v);
@@ -1,189 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'DB data operations'
-//     --header-out
-//     c_api_gen/c_generated_db_simple_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_db_simple_subset.cc.inc
-
-/* DB data operations */
-
-void rocksdb_put(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                 const char* key, size_t keylen, const char* val, size_t vallen,
-                 char** errptr) {
-  SaveError(errptr,
-            db->rep->Put(options->rep, Slice(key, keylen), Slice(val, vallen)));
-}
-
-void rocksdb_put_cf(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                    rocksdb_column_family_handle_t* column_family,
-                    const char* key, size_t keylen, const char* val,
-                    size_t vallen, char** errptr) {
-  SaveError(errptr, db->rep->Put(options->rep, column_family->rep,
-                                 Slice(key, keylen), Slice(val, vallen)));
-}
-
-void rocksdb_delete(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                    const char* key, size_t keylen, char** errptr) {
-  SaveError(errptr, db->rep->Delete(options->rep, Slice(key, keylen)));
-}
-
-void rocksdb_delete_cf(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                       rocksdb_column_family_handle_t* column_family,
-                       const char* key, size_t keylen, char** errptr) {
-  SaveError(errptr, db->rep->Delete(options->rep, column_family->rep,
-                                    Slice(key, keylen)));
-}
-
-void rocksdb_merge(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                   const char* key, size_t keylen, const char* val,
-                   size_t vallen, char** errptr) {
-  SaveError(errptr, db->rep->Merge(options->rep, Slice(key, keylen),
-                                   Slice(val, vallen)));
-}
-
-void rocksdb_merge_cf(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                      rocksdb_column_family_handle_t* column_family,
-                      const char* key, size_t keylen, const char* val,
-                      size_t vallen, char** errptr) {
-  SaveError(errptr, db->rep->Merge(options->rep, column_family->rep,
-                                   Slice(key, keylen), Slice(val, vallen)));
-}
-
-void rocksdb_write(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                   rocksdb_writebatch_t* batch, char** errptr) {
-  SaveError(errptr, db->rep->Write(options->rep, &batch->rep));
-}
-
-void rocksdb_put_with_ts(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                         const char* key, size_t keylen, const char* ts,
-                         size_t tslen, const char* val, size_t vallen,
-                         char** errptr) {
-  SaveError(errptr, db->rep->Put(options->rep, Slice(key, keylen),
-                                 Slice(ts, tslen), Slice(val, vallen)));
-}
-
-void rocksdb_put_cf_with_ts(rocksdb_t* db,
-                            const rocksdb_writeoptions_t* options,
-                            rocksdb_column_family_handle_t* column_family,
-                            const char* key, size_t keylen, const char* ts,
-                            size_t tslen, const char* val, size_t vallen,
-                            char** errptr) {
-  SaveError(errptr,
-            db->rep->Put(options->rep, column_family->rep, Slice(key, keylen),
-                         Slice(ts, tslen), Slice(val, vallen)));
-}
-
-void rocksdb_delete_with_ts(rocksdb_t* db,
-                            const rocksdb_writeoptions_t* options,
-                            const char* key, size_t keylen, const char* ts,
-                            size_t tslen, char** errptr) {
-  SaveError(errptr, db->rep->Delete(options->rep, Slice(key, keylen),
-                                    Slice(ts, tslen)));
-}
-
-void rocksdb_delete_cf_with_ts(rocksdb_t* db,
-                               const rocksdb_writeoptions_t* options,
-                               rocksdb_column_family_handle_t* column_family,
-                               const char* key, size_t keylen, const char* ts,
-                               size_t tslen, char** errptr) {
-  SaveError(errptr, db->rep->Delete(options->rep, column_family->rep,
-                                    Slice(key, keylen), Slice(ts, tslen)));
-}
-
-void rocksdb_singledelete(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                          const char* key, size_t keylen, char** errptr) {
-  SaveError(errptr, db->rep->SingleDelete(options->rep, Slice(key, keylen)));
-}
-
-void rocksdb_singledelete_cf(rocksdb_t* db,
-                             const rocksdb_writeoptions_t* options,
-                             rocksdb_column_family_handle_t* column_family,
-                             const char* key, size_t keylen, char** errptr) {
-  SaveError(errptr, db->rep->SingleDelete(options->rep, column_family->rep,
-                                          Slice(key, keylen)));
-}
-
-void rocksdb_singledelete_with_ts(rocksdb_t* db,
-                                  const rocksdb_writeoptions_t* options,
-                                  const char* key, size_t keylen,
-                                  const char* ts, size_t tslen, char** errptr) {
-  SaveError(errptr, db->rep->SingleDelete(options->rep, Slice(key, keylen),
-                                          Slice(ts, tslen)));
-}
-
-void rocksdb_singledelete_cf_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr) {
-  SaveError(errptr,
-            db->rep->SingleDelete(options->rep, column_family->rep,
-                                  Slice(key, keylen), Slice(ts, tslen)));
-}
-
-void rocksdb_delete_range_cf(rocksdb_t* db,
-                             const rocksdb_writeoptions_t* options,
-                             rocksdb_column_family_handle_t* column_family,
-                             const char* start_key, size_t start_key_len,
-                             const char* end_key, size_t end_key_len,
-                             char** errptr) {
-  SaveError(errptr, db->rep->DeleteRange(options->rep, column_family->rep,
-                                         Slice(start_key, start_key_len),
-                                         Slice(end_key, end_key_len)));
-}
-
-void rocksdb_flush(rocksdb_t* db, const rocksdb_flushoptions_t* options,
-                   char** errptr) {
-  SaveError(errptr, db->rep->Flush(options->rep));
-}
-
-void rocksdb_flush_cf(rocksdb_t* db, const rocksdb_flushoptions_t* options,
-                      rocksdb_column_family_handle_t* column_family,
-                      char** errptr) {
-  SaveError(errptr, db->rep->Flush(options->rep, column_family->rep));
-}
-
-void rocksdb_flush_wal(rocksdb_t* db, unsigned char sync, char** errptr) {
-  SaveError(errptr, db->rep->FlushWAL(sync));
-}
-
-void rocksdb_pause_background_work(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->PauseBackgroundWork());
-}
-
-void rocksdb_continue_background_work(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->ContinueBackgroundWork());
-}
-
-void rocksdb_disable_file_deletions(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->DisableFileDeletions());
-}
-
-void rocksdb_enable_file_deletions(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->EnableFileDeletions());
-}
-
-void rocksdb_verify_checksum(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->VerifyChecksum());
-}
-
-void rocksdb_verify_file_checksums(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->VerifyFileChecksums(ReadOptions()));
-}
-
-void rocksdb_destroy_db(const rocksdb_options_t* options, const char* name,
-                        char** errptr) {
-  SaveError(errptr, DestroyDB(name, options->rep));
-}
-
-void rocksdb_repair_db(const rocksdb_options_t* options, const char* name,
-                       char** errptr) {
-  SaveError(errptr, RepairDB(name, options->rep));
-}
@@ -1,126 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'DB data operations'
-//     --header-out
-//     c_api_gen/c_generated_db_simple_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_db_simple_subset.cc.inc
-
-/* DB data operations */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_put(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_put_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_merge(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_merge_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_write(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_writebatch_t* batch, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_put_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* ts, size_t tslen, const char* val, size_t vallen,
-    char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_put_cf_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* ts, size_t tslen, const char* val, size_t vallen,
-    char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_cf_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_singledelete(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_singledelete_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_singledelete_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_singledelete_cf_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_range_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* start_key,
-    size_t start_key_len, const char* end_key, size_t end_key_len,
-    char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_flush(
-    rocksdb_t* db, const rocksdb_flushoptions_t* options, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_flush_cf(
-    rocksdb_t* db, const rocksdb_flushoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_flush_wal(rocksdb_t* db,
-                                                  unsigned char sync,
-                                                  char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_pause_background_work(rocksdb_t* db,
-                                                              char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_continue_background_work(rocksdb_t* db,
-                                                                 char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_disable_file_deletions(rocksdb_t* db,
-                                                               char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_enable_file_deletions(rocksdb_t* db,
-                                                              char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_verify_checksum(rocksdb_t* db,
-                                                        char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_verify_file_checksums(rocksdb_t* db,
-                                                              char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_destroy_db(
-    const rocksdb_options_t* options, const char* name, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_repair_db(
-    const rocksdb_options_t* options, const char* name, char** errptr);
@@ -1,255 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/auto_simple_bindings.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Sources:
-//   - include/rocksdb/listener.h
-//   - tools/c_api_gen/auto_simple_bindings_blocklist.json
-//   - include/rocksdb/c.h
-//   - tools/c_api_gen/c_base.cc
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/auto_simple_bindings.py
-
-// Output group: Auto-discovered JobInfo metadata simple
-
-/* FlushJobInfo */
-
-uint32_t rocksdb_flushjobinfo_cf_id(const rocksdb_flushjobinfo_t* info) {
-  return info->rep.cf_id;
-}
-
-const char* rocksdb_flushjobinfo_cf_name(const rocksdb_flushjobinfo_t* info,
-                                         size_t* size) {
-  *size = info->rep.cf_name.size();
-  return info->rep.cf_name.data();
-}
-
-const char* rocksdb_flushjobinfo_file_path(const rocksdb_flushjobinfo_t* info,
-                                           size_t* size) {
-  *size = info->rep.file_path.size();
-  return info->rep.file_path.data();
-}
-
-uint64_t rocksdb_flushjobinfo_file_number(const rocksdb_flushjobinfo_t* info) {
-  return info->rep.file_number;
-}
-
-uint64_t rocksdb_flushjobinfo_oldest_blob_file_number(
-    const rocksdb_flushjobinfo_t* info) {
-  return info->rep.oldest_blob_file_number;
-}
-
-uint64_t rocksdb_flushjobinfo_thread_id(const rocksdb_flushjobinfo_t* info) {
-  return info->rep.thread_id;
-}
-
-int rocksdb_flushjobinfo_job_id(const rocksdb_flushjobinfo_t* info) {
-  return info->rep.job_id;
-}
-
-unsigned char rocksdb_flushjobinfo_triggered_writes_slowdown(
-    const rocksdb_flushjobinfo_t* info) {
-  return info->rep.triggered_writes_slowdown;
-}
-
-unsigned char rocksdb_flushjobinfo_triggered_writes_stop(
-    const rocksdb_flushjobinfo_t* info) {
-  return info->rep.triggered_writes_stop;
-}
-
-uint64_t rocksdb_flushjobinfo_smallest_seqno(
-    const rocksdb_flushjobinfo_t* info) {
-  return info->rep.smallest_seqno;
-}
-
-uint64_t rocksdb_flushjobinfo_largest_seqno(
-    const rocksdb_flushjobinfo_t* info) {
-  return info->rep.largest_seqno;
-}
-
-uint32_t rocksdb_flushjobinfo_flush_reason(const rocksdb_flushjobinfo_t* info) {
-  return static_cast<uint32_t>(info->rep.flush_reason);
-}
-
-uint32_t rocksdb_flushjobinfo_blob_compression_type(
-    const rocksdb_flushjobinfo_t* info) {
-  return static_cast<uint32_t>(info->rep.blob_compression_type);
-}
-
-/* CompactionJobInfo */
-
-uint32_t rocksdb_compactionjobinfo_cf_id(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.cf_id;
-}
-
-const char* rocksdb_compactionjobinfo_cf_name(
-    const rocksdb_compactionjobinfo_t* info, size_t* size) {
-  *size = info->rep.cf_name.size();
-  return info->rep.cf_name.data();
-}
-
-void rocksdb_compactionjobinfo_status(const rocksdb_compactionjobinfo_t* info,
-                                      char** errptr) {
-  SaveError(errptr, info->rep.status);
-}
-
-uint64_t rocksdb_compactionjobinfo_thread_id(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.thread_id;
-}
-
-int rocksdb_compactionjobinfo_job_id(const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.job_id;
-}
-
-int rocksdb_compactionjobinfo_num_l0_files(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.num_l0_files;
-}
-
-int rocksdb_compactionjobinfo_base_input_level(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.base_input_level;
-}
-
-int rocksdb_compactionjobinfo_output_level(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.output_level;
-}
-
-uint32_t rocksdb_compactionjobinfo_compaction_reason(
-    const rocksdb_compactionjobinfo_t* info) {
-  return static_cast<uint32_t>(info->rep.compaction_reason);
-}
-
-uint32_t rocksdb_compactionjobinfo_compression(
-    const rocksdb_compactionjobinfo_t* info) {
-  return static_cast<uint32_t>(info->rep.compression);
-}
-
-uint32_t rocksdb_compactionjobinfo_blob_compression_type(
-    const rocksdb_compactionjobinfo_t* info) {
-  return static_cast<uint32_t>(info->rep.blob_compression_type);
-}
-
-unsigned char rocksdb_compactionjobinfo_aborted(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.aborted;
-}
-
-/* SubcompactionJobInfo */
-
-uint32_t rocksdb_subcompactionjobinfo_cf_id(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return info->rep.cf_id;
-}
-
-const char* rocksdb_subcompactionjobinfo_cf_name(
-    const rocksdb_subcompactionjobinfo_t* info, size_t* size) {
-  *size = info->rep.cf_name.size();
-  return info->rep.cf_name.data();
-}
-
-void rocksdb_subcompactionjobinfo_status(
-    const rocksdb_subcompactionjobinfo_t* info, char** errptr) {
-  SaveError(errptr, info->rep.status);
-}
-
-uint64_t rocksdb_subcompactionjobinfo_thread_id(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return info->rep.thread_id;
-}
-
-int rocksdb_subcompactionjobinfo_job_id(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return info->rep.job_id;
-}
-
-int rocksdb_subcompactionjobinfo_subcompaction_job_id(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return info->rep.subcompaction_job_id;
-}
-
-int rocksdb_subcompactionjobinfo_base_input_level(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return info->rep.base_input_level;
-}
-
-int rocksdb_subcompactionjobinfo_output_level(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return info->rep.output_level;
-}
-
-uint32_t rocksdb_subcompactionjobinfo_compaction_reason(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return static_cast<uint32_t>(info->rep.compaction_reason);
-}
-
-uint32_t rocksdb_subcompactionjobinfo_compression(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return static_cast<uint32_t>(info->rep.compression);
-}
-
-uint32_t rocksdb_subcompactionjobinfo_blob_compression_type(
-    const rocksdb_subcompactionjobinfo_t* info) {
-  return static_cast<uint32_t>(info->rep.blob_compression_type);
-}
-
-/* ExternalFileIngestionInfo */
-
-const char* rocksdb_externalfileingestioninfo_cf_name(
-    const rocksdb_externalfileingestioninfo_t* info, size_t* size) {
-  *size = info->rep.cf_name.size();
-  return info->rep.cf_name.data();
-}
-
-const char* rocksdb_externalfileingestioninfo_external_file_path(
-    const rocksdb_externalfileingestioninfo_t* info, size_t* size) {
-  *size = info->rep.external_file_path.size();
-  return info->rep.external_file_path.data();
-}
-
-const char* rocksdb_externalfileingestioninfo_internal_file_path(
-    const rocksdb_externalfileingestioninfo_t* info, size_t* size) {
-  *size = info->rep.internal_file_path.size();
-  return info->rep.internal_file_path.data();
-}
-
-uint64_t rocksdb_externalfileingestioninfo_global_seqno(
-    const rocksdb_externalfileingestioninfo_t* info) {
-  return info->rep.global_seqno;
-}
-
-/* MemTableInfo */
-
-const char* rocksdb_memtableinfo_cf_name(const rocksdb_memtableinfo_t* info,
-                                         size_t* size) {
-  *size = info->rep.cf_name.size();
-  return info->rep.cf_name.data();
-}
-
-uint64_t rocksdb_memtableinfo_first_seqno(const rocksdb_memtableinfo_t* info) {
-  return info->rep.first_seqno;
-}
-
-uint64_t rocksdb_memtableinfo_earliest_seqno(
-    const rocksdb_memtableinfo_t* info) {
-  return info->rep.earliest_seqno;
-}
-
-uint64_t rocksdb_memtableinfo_num_entries(const rocksdb_memtableinfo_t* info) {
-  return info->rep.num_entries;
-}
-
-uint64_t rocksdb_memtableinfo_num_deletes(const rocksdb_memtableinfo_t* info) {
-  return info->rep.num_deletes;
-}
-
-const char* rocksdb_memtableinfo_newest_udt(const rocksdb_memtableinfo_t* info,
-                                            size_t* size) {
-  *size = info->rep.newest_udt.size();
-  return info->rep.newest_udt.data();
-}
@@ -1,173 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/auto_simple_bindings.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Sources:
-//   - include/rocksdb/listener.h
-//   - tools/c_api_gen/auto_simple_bindings_blocklist.json
-//   - include/rocksdb/c.h
-//   - tools/c_api_gen/c_base.cc
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/auto_simple_bindings.py
-
-// Output group: Auto-discovered JobInfo metadata simple
-
-/* FlushJobInfo */
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_flushjobinfo_cf_id(const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_flushjobinfo_cf_name(
-    const rocksdb_flushjobinfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_flushjobinfo_file_path(
-    const rocksdb_flushjobinfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_flushjobinfo_file_number(const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_flushjobinfo_oldest_blob_file_number(
-    const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_flushjobinfo_thread_id(const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_flushjobinfo_job_id(
-    const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_flushjobinfo_triggered_writes_slowdown(
-    const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_flushjobinfo_triggered_writes_stop(const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_flushjobinfo_smallest_seqno(const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_flushjobinfo_largest_seqno(const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_flushjobinfo_flush_reason(const rocksdb_flushjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_flushjobinfo_blob_compression_type(const rocksdb_flushjobinfo_t* info);
-
-/* CompactionJobInfo */
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_compactionjobinfo_cf_id(const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_compactionjobinfo_cf_name(
-    const rocksdb_compactionjobinfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_compactionjobinfo_status(
-    const rocksdb_compactionjobinfo_t* info, char** errptr);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compactionjobinfo_thread_id(const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_compactionjobinfo_job_id(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_compactionjobinfo_num_l0_files(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_compactionjobinfo_base_input_level(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_compactionjobinfo_output_level(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint32_t rocksdb_compactionjobinfo_compaction_reason(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_compactionjobinfo_compression(const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_compactionjobinfo_blob_compression_type(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API unsigned char rocksdb_compactionjobinfo_aborted(
-    const rocksdb_compactionjobinfo_t* info);
-
-/* SubcompactionJobInfo */
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_subcompactionjobinfo_cf_id(const rocksdb_subcompactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_subcompactionjobinfo_cf_name(
-    const rocksdb_subcompactionjobinfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_subcompactionjobinfo_status(
-    const rocksdb_subcompactionjobinfo_t* info, char** errptr);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_subcompactionjobinfo_thread_id(
-    const rocksdb_subcompactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_subcompactionjobinfo_job_id(
-    const rocksdb_subcompactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int
-rocksdb_subcompactionjobinfo_subcompaction_job_id(
-    const rocksdb_subcompactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_subcompactionjobinfo_base_input_level(
-    const rocksdb_subcompactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_subcompactionjobinfo_output_level(
-    const rocksdb_subcompactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_subcompactionjobinfo_compaction_reason(
-    const rocksdb_subcompactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint32_t rocksdb_subcompactionjobinfo_compression(
-    const rocksdb_subcompactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint32_t
-rocksdb_subcompactionjobinfo_blob_compression_type(
-    const rocksdb_subcompactionjobinfo_t* info);
-
-/* ExternalFileIngestionInfo */
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_externalfileingestioninfo_cf_name(
-    const rocksdb_externalfileingestioninfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_externalfileingestioninfo_external_file_path(
-    const rocksdb_externalfileingestioninfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_externalfileingestioninfo_internal_file_path(
-    const rocksdb_externalfileingestioninfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_externalfileingestioninfo_global_seqno(
-    const rocksdb_externalfileingestioninfo_t* info);
-
-/* MemTableInfo */
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_memtableinfo_cf_name(
-    const rocksdb_memtableinfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_memtableinfo_first_seqno(const rocksdb_memtableinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_memtableinfo_earliest_seqno(const rocksdb_memtableinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_memtableinfo_num_entries(const rocksdb_memtableinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_memtableinfo_num_deletes(const rocksdb_memtableinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_memtableinfo_newest_udt(
-    const rocksdb_memtableinfo_t* info, size_t* size);
@@ -1,84 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'JobInfo metadata simple'
-//     --header-out
-//     c_api_gen/c_generated_jobinfo_metadata_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_jobinfo_metadata_subset.cc.inc
-
-/* JobInfo metadata simple */
-
-size_t rocksdb_compactionjobinfo_input_files_count(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.input_files.size();
-}
-
-size_t rocksdb_compactionjobinfo_output_files_count(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.output_files.size();
-}
-
-uint64_t rocksdb_compactionjobinfo_elapsed_micros(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.stats.elapsed_micros;
-}
-
-uint64_t rocksdb_compactionjobinfo_num_corrupt_keys(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.stats.num_corrupt_keys;
-}
-
-uint64_t rocksdb_compactionjobinfo_input_records(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.stats.num_input_records;
-}
-
-uint64_t rocksdb_compactionjobinfo_output_records(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.stats.num_output_records;
-}
-
-uint64_t rocksdb_compactionjobinfo_total_input_bytes(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.stats.total_input_bytes;
-}
-
-uint64_t rocksdb_compactionjobinfo_total_output_bytes(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.stats.total_output_bytes;
-}
-
-size_t rocksdb_compactionjobinfo_num_input_files(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.stats.num_input_files;
-}
-
-size_t rocksdb_compactionjobinfo_num_input_files_at_output_level(
-    const rocksdb_compactionjobinfo_t* info) {
-  return info->rep.stats.num_input_files_at_output_level;
-}
-
-const char* rocksdb_writestallinfo_cf_name(const rocksdb_writestallinfo_t* info,
-                                           size_t* size) {
-  *size = info->rep.cf_name.size();
-  return info->rep.cf_name.data();
-}
-
-const rocksdb_writestallcondition_t* rocksdb_writestallinfo_cur(
-    const rocksdb_writestallinfo_t* info) {
-  return reinterpret_cast<const rocksdb_writestallcondition_t*>(
-      &info->rep.condition.cur);
-}
-
-const rocksdb_writestallcondition_t* rocksdb_writestallinfo_prev(
-    const rocksdb_writestallinfo_t* info) {
-  return reinterpret_cast<const rocksdb_writestallcondition_t*>(
-      &info->rep.condition.prev);
-}
@@ -1,57 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'JobInfo metadata simple'
-//     --header-out
-//     c_api_gen/c_generated_jobinfo_metadata_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_jobinfo_metadata_subset.cc.inc
-
-/* JobInfo metadata simple */
-
-extern ROCKSDB_LIBRARY_API size_t rocksdb_compactionjobinfo_input_files_count(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API size_t rocksdb_compactionjobinfo_output_files_count(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compactionjobinfo_elapsed_micros(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compactionjobinfo_num_corrupt_keys(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compactionjobinfo_input_records(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compactionjobinfo_output_records(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compactionjobinfo_total_input_bytes(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compactionjobinfo_total_output_bytes(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API size_t rocksdb_compactionjobinfo_num_input_files(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API size_t
-rocksdb_compactionjobinfo_num_input_files_at_output_level(
-    const rocksdb_compactionjobinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_writestallinfo_cf_name(
-    const rocksdb_writestallinfo_t* info, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const rocksdb_writestallcondition_t*
-rocksdb_writestallinfo_cur(const rocksdb_writestallinfo_t* info);
-
-extern ROCKSDB_LIBRARY_API const rocksdb_writestallcondition_t*
-rocksdb_writestallinfo_prev(const rocksdb_writestallinfo_t* info);
@@ -1,501 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/auto_simple_bindings.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Sources:
-//   - include/rocksdb/compaction_job_stats.h
-//   - include/rocksdb/listener.h
-//   - include/rocksdb/table_properties.h
-//   - tools/c_api_gen/auto_simple_bindings_blocklist.json
-//   - include/rocksdb/c.h
-//   - tools/c_api_gen/c_base.cc
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/auto_simple_bindings.py
-
-// Output group: Auto-discovered metadata view structs simple
-
-/* TableProperties */
-
-uint64_t rocksdb_table_properties_orig_file_number(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.orig_file_number;
-}
-
-uint64_t rocksdb_table_properties_data_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.data_size;
-}
-
-uint64_t rocksdb_table_properties_uncompressed_data_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.uncompressed_data_size;
-}
-
-uint64_t rocksdb_table_properties_index_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.index_size;
-}
-
-uint64_t rocksdb_table_properties_index_partitions(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.index_partitions;
-}
-
-uint64_t rocksdb_table_properties_top_level_index_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.top_level_index_size;
-}
-
-uint64_t rocksdb_table_properties_index_key_is_user_key(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.index_key_is_user_key;
-}
-
-uint64_t rocksdb_table_properties_index_value_is_delta_encoded(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.index_value_is_delta_encoded;
-}
-
-uint64_t rocksdb_table_properties_udi_is_primary_index(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.udi_is_primary_index;
-}
-
-uint64_t rocksdb_table_properties_filter_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.filter_size;
-}
-
-uint64_t rocksdb_table_properties_raw_key_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.raw_key_size;
-}
-
-uint64_t rocksdb_table_properties_raw_value_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.raw_value_size;
-}
-
-uint64_t rocksdb_table_properties_num_data_blocks(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_data_blocks;
-}
-
-uint64_t rocksdb_table_properties_num_data_blocks_compression_rejected(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_data_blocks_compression_rejected;
-}
-
-uint64_t rocksdb_table_properties_num_data_blocks_compression_bypassed(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_data_blocks_compression_bypassed;
-}
-
-uint64_t rocksdb_table_properties_num_uniform_blocks(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_uniform_blocks;
-}
-
-uint64_t rocksdb_table_properties_num_entries(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_entries;
-}
-
-uint64_t rocksdb_table_properties_num_filter_entries(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_filter_entries;
-}
-
-uint64_t rocksdb_table_properties_num_deletions(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_deletions;
-}
-
-uint64_t rocksdb_table_properties_num_merge_operands(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_merge_operands;
-}
-
-uint64_t rocksdb_table_properties_num_range_deletions(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.num_range_deletions;
-}
-
-uint64_t rocksdb_table_properties_format_version(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.format_version;
-}
-
-uint64_t rocksdb_table_properties_fixed_key_len(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.fixed_key_len;
-}
-
-uint64_t rocksdb_table_properties_column_family_id(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.column_family_id;
-}
-
-uint64_t rocksdb_table_properties_creation_time(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.creation_time;
-}
-
-uint64_t rocksdb_table_properties_oldest_key_time(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.oldest_key_time;
-}
-
-uint64_t rocksdb_table_properties_newest_key_time(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.newest_key_time;
-}
-
-uint64_t rocksdb_table_properties_file_creation_time(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.file_creation_time;
-}
-
-uint64_t rocksdb_table_properties_slow_compression_estimated_data_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.slow_compression_estimated_data_size;
-}
-
-uint64_t rocksdb_table_properties_fast_compression_estimated_data_size(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.fast_compression_estimated_data_size;
-}
-
-uint64_t rocksdb_table_properties_external_sst_file_global_seqno_offset(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.external_sst_file_global_seqno_offset;
-}
-
-uint64_t rocksdb_table_properties_tail_start_offset(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.tail_start_offset;
-}
-
-uint64_t rocksdb_table_properties_user_defined_timestamps_persisted(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.user_defined_timestamps_persisted;
-}
-
-uint64_t rocksdb_table_properties_key_largest_seqno(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.key_largest_seqno;
-}
-
-uint64_t rocksdb_table_properties_key_smallest_seqno(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.key_smallest_seqno;
-}
-
-uint64_t rocksdb_table_properties_data_block_restart_interval(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.data_block_restart_interval;
-}
-
-uint64_t rocksdb_table_properties_index_block_restart_interval(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.index_block_restart_interval;
-}
-
-uint64_t rocksdb_table_properties_separate_key_value_in_data_block(
-    const rocksdb_table_properties_t* props) {
-  return props->rep.separate_key_value_in_data_block;
-}
-
-const char* rocksdb_table_properties_db_id(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.db_id.size();
-  return props->rep.db_id.data();
-}
-
-const char* rocksdb_table_properties_db_session_id(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.db_session_id.size();
-  return props->rep.db_session_id.data();
-}
-
-const char* rocksdb_table_properties_db_host_id(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.db_host_id.size();
-  return props->rep.db_host_id.data();
-}
-
-const char* rocksdb_table_properties_column_family_name(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.column_family_name.size();
-  return props->rep.column_family_name.data();
-}
-
-const char* rocksdb_table_properties_filter_policy_name(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.filter_policy_name.size();
-  return props->rep.filter_policy_name.data();
-}
-
-const char* rocksdb_table_properties_comparator_name(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.comparator_name.size();
-  return props->rep.comparator_name.data();
-}
-
-const char* rocksdb_table_properties_merge_operator_name(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.merge_operator_name.size();
-  return props->rep.merge_operator_name.data();
-}
-
-const char* rocksdb_table_properties_prefix_extractor_name(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.prefix_extractor_name.size();
-  return props->rep.prefix_extractor_name.data();
-}
-
-const char* rocksdb_table_properties_property_collectors_names(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.property_collectors_names.size();
-  return props->rep.property_collectors_names.data();
-}
-
-const char* rocksdb_table_properties_compression_name(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.compression_name.size();
-  return props->rep.compression_name.data();
-}
-
-const char* rocksdb_table_properties_compression_options(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.compression_options.size();
-  return props->rep.compression_options.data();
-}
-
-const char* rocksdb_table_properties_seqno_to_time_mapping(
-    const rocksdb_table_properties_t* props, size_t* size) {
-  *size = props->rep.seqno_to_time_mapping.size();
-  return props->rep.seqno_to_time_mapping.data();
-}
-
-/* CompactionJobStats */
-
-uint64_t rocksdb_compaction_job_stats_elapsed_micros(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.elapsed_micros;
-}
-
-uint64_t rocksdb_compaction_job_stats_cpu_micros(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.cpu_micros;
-}
-
-unsigned char rocksdb_compaction_job_stats_has_accurate_num_input_records(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.has_accurate_num_input_records;
-}
-
-uint64_t rocksdb_compaction_job_stats_num_input_records(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_input_records;
-}
-
-uint64_t rocksdb_compaction_job_stats_num_blobs_read(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_blobs_read;
-}
-
-size_t rocksdb_compaction_job_stats_num_input_files(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_input_files;
-}
-
-size_t rocksdb_compaction_job_stats_num_input_files_trivially_moved(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_input_files_trivially_moved;
-}
-
-size_t rocksdb_compaction_job_stats_num_input_files_at_output_level(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_input_files_at_output_level;
-}
-
-size_t rocksdb_compaction_job_stats_num_filtered_input_files(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_filtered_input_files;
-}
-
-size_t rocksdb_compaction_job_stats_num_filtered_input_files_at_output_level(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_filtered_input_files_at_output_level;
-}
-
-uint64_t rocksdb_compaction_job_stats_num_output_records(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_output_records;
-}
-
-size_t rocksdb_compaction_job_stats_num_output_files(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_output_files;
-}
-
-size_t rocksdb_compaction_job_stats_num_output_files_blob(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_output_files_blob;
-}
-
-unsigned char rocksdb_compaction_job_stats_is_full_compaction(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.is_full_compaction;
-}
-
-unsigned char rocksdb_compaction_job_stats_is_manual_compaction(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.is_manual_compaction;
-}
-
-unsigned char rocksdb_compaction_job_stats_is_remote_compaction(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.is_remote_compaction;
-}
-
-uint64_t rocksdb_compaction_job_stats_total_input_bytes(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.total_input_bytes;
-}
-
-uint64_t rocksdb_compaction_job_stats_total_blob_bytes_read(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.total_blob_bytes_read;
-}
-
-uint64_t rocksdb_compaction_job_stats_total_output_bytes(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.total_output_bytes;
-}
-
-uint64_t rocksdb_compaction_job_stats_total_output_bytes_blob(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.total_output_bytes_blob;
-}
-
-uint64_t rocksdb_compaction_job_stats_total_skipped_input_bytes(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.total_skipped_input_bytes;
-}
-
-uint64_t rocksdb_compaction_job_stats_num_records_replaced(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_records_replaced;
-}
-
-uint64_t rocksdb_compaction_job_stats_total_input_raw_key_bytes(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.total_input_raw_key_bytes;
-}
-
-uint64_t rocksdb_compaction_job_stats_total_input_raw_value_bytes(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.total_input_raw_value_bytes;
-}
-
-uint64_t rocksdb_compaction_job_stats_num_input_deletion_records(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_input_deletion_records;
-}
-
-uint64_t rocksdb_compaction_job_stats_num_expired_deletion_records(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_expired_deletion_records;
-}
-
-uint64_t rocksdb_compaction_job_stats_num_corrupt_keys(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_corrupt_keys;
-}
-
-uint64_t rocksdb_compaction_job_stats_file_write_nanos(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.file_write_nanos;
-}
-
-uint64_t rocksdb_compaction_job_stats_file_range_sync_nanos(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.file_range_sync_nanos;
-}
-
-uint64_t rocksdb_compaction_job_stats_file_fsync_nanos(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.file_fsync_nanos;
-}
-
-uint64_t rocksdb_compaction_job_stats_file_prepare_write_nanos(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.file_prepare_write_nanos;
-}
-
-const char* rocksdb_compaction_job_stats_smallest_output_key_prefix(
-    const rocksdb_compaction_job_stats_t* stats, size_t* size) {
-  *size = stats->rep.smallest_output_key_prefix.size();
-  return stats->rep.smallest_output_key_prefix.data();
-}
-
-const char* rocksdb_compaction_job_stats_largest_output_key_prefix(
-    const rocksdb_compaction_job_stats_t* stats, size_t* size) {
-  *size = stats->rep.largest_output_key_prefix.size();
-  return stats->rep.largest_output_key_prefix.data();
-}
-
-uint64_t rocksdb_compaction_job_stats_num_single_del_fallthru(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_single_del_fallthru;
-}
-
-uint64_t rocksdb_compaction_job_stats_num_single_del_mismatch(
-    const rocksdb_compaction_job_stats_t* stats) {
-  return stats->rep.num_single_del_mismatch;
-}
-
-/* CompactionFileInfo */
-
-int rocksdb_compaction_file_info_level(
-    const rocksdb_compaction_file_info_t* info) {
-  return info->rep.level;
-}
-
-uint64_t rocksdb_compaction_file_info_file_number(
-    const rocksdb_compaction_file_info_t* info) {
-  return info->rep.file_number;
-}
-
-uint64_t rocksdb_compaction_file_info_oldest_blob_file_number(
-    const rocksdb_compaction_file_info_t* info) {
-  return info->rep.oldest_blob_file_number;
-}
-
-/* BlobFileAdditionInfo */
-
-uint64_t rocksdb_blob_file_addition_info_total_blob_count(
-    const rocksdb_blob_file_addition_info_t* info) {
-  return info->rep.total_blob_count;
-}
-
-uint64_t rocksdb_blob_file_addition_info_total_blob_bytes(
-    const rocksdb_blob_file_addition_info_t* info) {
-  return info->rep.total_blob_bytes;
-}
-
-/* BlobFileGarbageInfo */
-
-uint64_t rocksdb_blob_file_garbage_info_garbage_blob_count(
-    const rocksdb_blob_file_garbage_info_t* info) {
-  return info->rep.garbage_blob_count;
-}
-
-uint64_t rocksdb_blob_file_garbage_info_garbage_blob_bytes(
-    const rocksdb_blob_file_garbage_info_t* info) {
-  return info->rep.garbage_blob_bytes;
-}
@@ -1,361 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/auto_simple_bindings.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Sources:
-//   - include/rocksdb/compaction_job_stats.h
-//   - include/rocksdb/listener.h
-//   - include/rocksdb/table_properties.h
-//   - tools/c_api_gen/auto_simple_bindings_blocklist.json
-//   - include/rocksdb/c.h
-//   - tools/c_api_gen/c_base.cc
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/auto_simple_bindings.py
-
-// Output group: Auto-discovered metadata view structs simple
-
-/* TableProperties */
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_orig_file_number(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_data_size(const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_uncompressed_data_size(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_index_size(const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_index_partitions(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_top_level_index_size(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_index_key_is_user_key(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_index_value_is_delta_encoded(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_udi_is_primary_index(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_filter_size(const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_raw_key_size(const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_raw_value_size(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_num_data_blocks(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_num_data_blocks_compression_rejected(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_num_data_blocks_compression_bypassed(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_num_uniform_blocks(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_num_entries(const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_num_filter_entries(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_num_deletions(const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_num_merge_operands(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_num_range_deletions(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_format_version(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_fixed_key_len(const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_column_family_id(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_creation_time(const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_oldest_key_time(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_newest_key_time(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_file_creation_time(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_slow_compression_estimated_data_size(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_fast_compression_estimated_data_size(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_external_sst_file_global_seqno_offset(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_tail_start_offset(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_user_defined_timestamps_persisted(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_key_largest_seqno(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_table_properties_key_smallest_seqno(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_data_block_restart_interval(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_index_block_restart_interval(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_table_properties_separate_key_value_in_data_block(
-    const rocksdb_table_properties_t* props);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_table_properties_db_id(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_table_properties_db_session_id(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_table_properties_db_host_id(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_table_properties_column_family_name(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_table_properties_filter_policy_name(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char* rocksdb_table_properties_comparator_name(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_table_properties_merge_operator_name(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_table_properties_prefix_extractor_name(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_table_properties_property_collectors_names(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_table_properties_compression_name(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_table_properties_compression_options(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_table_properties_seqno_to_time_mapping(
-    const rocksdb_table_properties_t* props, size_t* size);
-
-/* CompactionJobStats */
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compaction_job_stats_elapsed_micros(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compaction_job_stats_cpu_micros(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_compaction_job_stats_has_accurate_num_input_records(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_num_input_records(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compaction_job_stats_num_blobs_read(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API size_t rocksdb_compaction_job_stats_num_input_files(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API size_t
-rocksdb_compaction_job_stats_num_input_files_trivially_moved(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API size_t
-rocksdb_compaction_job_stats_num_input_files_at_output_level(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API size_t
-rocksdb_compaction_job_stats_num_filtered_input_files(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API size_t
-rocksdb_compaction_job_stats_num_filtered_input_files_at_output_level(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_num_output_records(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API size_t rocksdb_compaction_job_stats_num_output_files(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API size_t
-rocksdb_compaction_job_stats_num_output_files_blob(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_compaction_job_stats_is_full_compaction(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_compaction_job_stats_is_manual_compaction(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_compaction_job_stats_is_remote_compaction(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_total_input_bytes(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_total_blob_bytes_read(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_total_output_bytes(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_total_output_bytes_blob(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_total_skipped_input_bytes(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_num_records_replaced(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_total_input_raw_key_bytes(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_total_input_raw_value_bytes(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_num_input_deletion_records(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_num_expired_deletion_records(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_num_corrupt_keys(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_file_write_nanos(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_file_range_sync_nanos(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_file_fsync_nanos(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_file_prepare_write_nanos(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_compaction_job_stats_smallest_output_key_prefix(
-    const rocksdb_compaction_job_stats_t* stats, size_t* size);
-
-extern ROCKSDB_LIBRARY_API const char*
-rocksdb_compaction_job_stats_largest_output_key_prefix(
-    const rocksdb_compaction_job_stats_t* stats, size_t* size);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_num_single_del_fallthru(
-    const rocksdb_compaction_job_stats_t* stats);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_job_stats_num_single_del_mismatch(
-    const rocksdb_compaction_job_stats_t* stats);
-
-/* CompactionFileInfo */
-
-extern ROCKSDB_LIBRARY_API int rocksdb_compaction_file_info_level(
-    const rocksdb_compaction_file_info_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t rocksdb_compaction_file_info_file_number(
-    const rocksdb_compaction_file_info_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_compaction_file_info_oldest_blob_file_number(
-    const rocksdb_compaction_file_info_t* info);
-
-/* BlobFileAdditionInfo */
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_blob_file_addition_info_total_blob_count(
-    const rocksdb_blob_file_addition_info_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_blob_file_addition_info_total_blob_bytes(
-    const rocksdb_blob_file_addition_info_t* info);
-
-/* BlobFileGarbageInfo */
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_blob_file_garbage_info_garbage_blob_count(
-    const rocksdb_blob_file_garbage_info_t* info);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_blob_file_garbage_info_garbage_blob_bytes(
-    const rocksdb_blob_file_garbage_info_t* info);
@@ -1,84 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'Options simple'
-//     --header-out
-//     c_api_gen/c_generated_options_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_options_subset.cc.inc
-
-/* Options simple */
-
-void rocksdb_options_set_compression_options_zstd_max_train_bytes(
-    rocksdb_options_t* opt, int zstd_max_train_bytes) {
-  opt->rep.compression_opts.zstd_max_train_bytes = zstd_max_train_bytes;
-}
-
-int rocksdb_options_get_compression_options_zstd_max_train_bytes(
-    rocksdb_options_t* opt) {
-  return opt->rep.compression_opts.zstd_max_train_bytes;
-}
-
-void rocksdb_options_set_compression_options_use_zstd_dict_trainer(
-    rocksdb_options_t* opt, unsigned char use_zstd_dict_trainer) {
-  opt->rep.compression_opts.use_zstd_dict_trainer = use_zstd_dict_trainer;
-}
-
-unsigned char rocksdb_options_get_compression_options_use_zstd_dict_trainer(
-    rocksdb_options_t* opt) {
-  return opt->rep.compression_opts.use_zstd_dict_trainer;
-}
-
-void rocksdb_options_set_compression_options_parallel_threads(
-    rocksdb_options_t* opt, int value) {
-  opt->rep.compression_opts.parallel_threads = value;
-}
-
-int rocksdb_options_get_compression_options_parallel_threads(
-    rocksdb_options_t* opt) {
-  return opt->rep.compression_opts.parallel_threads;
-}
-
-void rocksdb_options_set_compression_options_max_dict_buffer_bytes(
-    rocksdb_options_t* opt, uint64_t max_dict_buffer_bytes) {
-  opt->rep.compression_opts.max_dict_buffer_bytes = max_dict_buffer_bytes;
-}
-
-uint64_t rocksdb_options_get_compression_options_max_dict_buffer_bytes(
-    rocksdb_options_t* opt) {
-  return opt->rep.compression_opts.max_dict_buffer_bytes;
-}
-
-unsigned char
-rocksdb_options_get_bottommost_compression_options_use_zstd_dict_trainer(
-    rocksdb_options_t* opt) {
-  return opt->rep.bottommost_compression_opts.use_zstd_dict_trainer;
-}
-
-void rocksdb_options_set_use_fsync(rocksdb_options_t* opt, int use_fsync) {
-  opt->rep.use_fsync = use_fsync;
-}
-
-int rocksdb_options_get_use_fsync(rocksdb_options_t* opt) {
-  return opt->rep.use_fsync;
-}
-
-void rocksdb_options_set_disable_auto_compactions(rocksdb_options_t* opt,
-                                                  int disable) {
-  opt->rep.disable_auto_compactions = disable;
-}
-
-void rocksdb_options_set_optimize_filters_for_hits(rocksdb_options_t* opt,
-                                                   int v) {
-  opt->rep.optimize_filters_for_hits = v;
-}
-
-void rocksdb_options_set_report_bg_io_stats(rocksdb_options_t* opt, int v) {
-  opt->rep.report_bg_io_stats = v;
-}
@@ -1,67 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'Options simple'
-//     --header-out
-//     c_api_gen/c_generated_options_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_options_subset.cc.inc
-
-/* Options simple */
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_options_set_compression_options_zstd_max_train_bytes(
-    rocksdb_options_t* opt, int zstd_max_train_bytes);
-
-extern ROCKSDB_LIBRARY_API int
-rocksdb_options_get_compression_options_zstd_max_train_bytes(
-    rocksdb_options_t* opt);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_options_set_compression_options_use_zstd_dict_trainer(
-    rocksdb_options_t* opt, unsigned char use_zstd_dict_trainer);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_options_get_compression_options_use_zstd_dict_trainer(
-    rocksdb_options_t* opt);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_options_set_compression_options_parallel_threads(rocksdb_options_t* opt,
-                                                         int value);
-
-extern ROCKSDB_LIBRARY_API int
-rocksdb_options_get_compression_options_parallel_threads(
-    rocksdb_options_t* opt);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_options_set_compression_options_max_dict_buffer_bytes(
-    rocksdb_options_t* opt, uint64_t max_dict_buffer_bytes);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_options_get_compression_options_max_dict_buffer_bytes(
-    rocksdb_options_t* opt);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_options_get_bottommost_compression_options_use_zstd_dict_trainer(
-    rocksdb_options_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_options_set_use_fsync(
-    rocksdb_options_t* opt, int use_fsync);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_options_get_use_fsync(
-    rocksdb_options_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_options_set_disable_auto_compactions(
-    rocksdb_options_t* opt, int disable);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_options_set_optimize_filters_for_hits(
-    rocksdb_options_t* opt, int v);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_options_set_report_bg_io_stats(
-    rocksdb_options_t* opt, int v);
@@ -1,236 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/auto_simple_bindings.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Sources:
-//   - include/rocksdb/options.h
-//   - tools/c_api_gen/auto_simple_bindings_blocklist.json
-//   - include/rocksdb/c.h
-//   - tools/c_api_gen/c_base.cc
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/auto_simple_bindings.py
-
-// Output group: Auto-discovered ReadOptions simple
-
-/* ReadOptions */
-
-void rocksdb_readoptions_set_deadline(rocksdb_readoptions_t* opt,
-                                      uint64_t microseconds) {
-  opt->rep.deadline = std::chrono::microseconds(microseconds);
-}
-
-uint64_t rocksdb_readoptions_get_deadline(rocksdb_readoptions_t* opt) {
-  return opt->rep.deadline.count();
-}
-
-void rocksdb_readoptions_set_io_timeout(rocksdb_readoptions_t* opt,
-                                        uint64_t microseconds) {
-  opt->rep.io_timeout = std::chrono::microseconds(microseconds);
-}
-
-uint64_t rocksdb_readoptions_get_io_timeout(rocksdb_readoptions_t* opt) {
-  return opt->rep.io_timeout.count();
-}
-
-void rocksdb_readoptions_set_read_tier(rocksdb_readoptions_t* opt, int v) {
-  opt->rep.read_tier = static_cast<decltype(opt->rep.read_tier)>(v);
-}
-
-int rocksdb_readoptions_get_read_tier(rocksdb_readoptions_t* opt) {
-  return static_cast<int>(opt->rep.read_tier);
-}
-
-void rocksdb_readoptions_set_rate_limiter_priority(rocksdb_readoptions_t* opt,
-                                                   int v) {
-  opt->rep.rate_limiter_priority =
-      static_cast<decltype(opt->rep.rate_limiter_priority)>(v);
-}
-
-int rocksdb_readoptions_get_rate_limiter_priority(rocksdb_readoptions_t* opt) {
-  return static_cast<int>(opt->rep.rate_limiter_priority);
-}
-
-void rocksdb_readoptions_set_value_size_soft_limit(rocksdb_readoptions_t* opt,
-                                                   uint64_t v) {
-  opt->rep.value_size_soft_limit = v;
-}
-
-uint64_t rocksdb_readoptions_get_value_size_soft_limit(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.value_size_soft_limit;
-}
-
-void rocksdb_readoptions_set_verify_checksums(rocksdb_readoptions_t* opt,
-                                              unsigned char v) {
-  opt->rep.verify_checksums = v;
-}
-
-unsigned char rocksdb_readoptions_get_verify_checksums(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.verify_checksums;
-}
-
-void rocksdb_readoptions_set_fill_cache(rocksdb_readoptions_t* opt,
-                                        unsigned char v) {
-  opt->rep.fill_cache = v;
-}
-
-unsigned char rocksdb_readoptions_get_fill_cache(rocksdb_readoptions_t* opt) {
-  return opt->rep.fill_cache;
-}
-
-void rocksdb_readoptions_set_ignore_range_deletions(rocksdb_readoptions_t* opt,
-                                                    unsigned char v) {
-  opt->rep.ignore_range_deletions = v;
-}
-
-unsigned char rocksdb_readoptions_get_ignore_range_deletions(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.ignore_range_deletions;
-}
-
-void rocksdb_readoptions_set_async_io(rocksdb_readoptions_t* opt,
-                                      unsigned char v) {
-  opt->rep.async_io = v;
-}
-
-unsigned char rocksdb_readoptions_get_async_io(rocksdb_readoptions_t* opt) {
-  return opt->rep.async_io;
-}
-
-void rocksdb_readoptions_set_optimize_multiget_for_io(
-    rocksdb_readoptions_t* opt, unsigned char v) {
-  opt->rep.optimize_multiget_for_io = v;
-}
-
-unsigned char rocksdb_readoptions_get_optimize_multiget_for_io(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.optimize_multiget_for_io;
-}
-
-void rocksdb_readoptions_set_readahead_size(rocksdb_readoptions_t* opt,
-                                            size_t v) {
-  opt->rep.readahead_size = v;
-}
-
-size_t rocksdb_readoptions_get_readahead_size(rocksdb_readoptions_t* opt) {
-  return opt->rep.readahead_size;
-}
-
-void rocksdb_readoptions_set_max_skippable_internal_keys(
-    rocksdb_readoptions_t* opt, uint64_t v) {
-  opt->rep.max_skippable_internal_keys = v;
-}
-
-uint64_t rocksdb_readoptions_get_max_skippable_internal_keys(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.max_skippable_internal_keys;
-}
-
-void rocksdb_readoptions_set_tailing(rocksdb_readoptions_t* opt,
-                                     unsigned char v) {
-  opt->rep.tailing = v;
-}
-
-unsigned char rocksdb_readoptions_get_tailing(rocksdb_readoptions_t* opt) {
-  return opt->rep.tailing;
-}
-
-void rocksdb_readoptions_set_total_order_seek(rocksdb_readoptions_t* opt,
-                                              unsigned char v) {
-  opt->rep.total_order_seek = v;
-}
-
-unsigned char rocksdb_readoptions_get_total_order_seek(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.total_order_seek;
-}
-
-void rocksdb_readoptions_set_auto_prefix_mode(rocksdb_readoptions_t* opt,
-                                              unsigned char v) {
-  opt->rep.auto_prefix_mode = v;
-}
-
-unsigned char rocksdb_readoptions_get_auto_prefix_mode(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.auto_prefix_mode;
-}
-
-void rocksdb_readoptions_set_prefix_same_as_start(rocksdb_readoptions_t* opt,
-                                                  unsigned char v) {
-  opt->rep.prefix_same_as_start = v;
-}
-
-unsigned char rocksdb_readoptions_get_prefix_same_as_start(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.prefix_same_as_start;
-}
-
-void rocksdb_readoptions_set_pin_data(rocksdb_readoptions_t* opt,
-                                      unsigned char v) {
-  opt->rep.pin_data = v;
-}
-
-unsigned char rocksdb_readoptions_get_pin_data(rocksdb_readoptions_t* opt) {
-  return opt->rep.pin_data;
-}
-
-void rocksdb_readoptions_set_adaptive_readahead(rocksdb_readoptions_t* opt,
-                                                unsigned char v) {
-  opt->rep.adaptive_readahead = v;
-}
-
-unsigned char rocksdb_readoptions_get_adaptive_readahead(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.adaptive_readahead;
-}
-
-void rocksdb_readoptions_set_background_purge_on_iterator_cleanup(
-    rocksdb_readoptions_t* opt, unsigned char v) {
-  opt->rep.background_purge_on_iterator_cleanup = v;
-}
-
-unsigned char rocksdb_readoptions_get_background_purge_on_iterator_cleanup(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.background_purge_on_iterator_cleanup;
-}
-
-void rocksdb_readoptions_set_auto_readahead_size(rocksdb_readoptions_t* opt,
-                                                 unsigned char v) {
-  opt->rep.auto_readahead_size = v;
-}
-
-unsigned char rocksdb_readoptions_get_auto_readahead_size(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.auto_readahead_size;
-}
-
-void rocksdb_readoptions_set_allow_unprepared_value(rocksdb_readoptions_t* opt,
-                                                    unsigned char v) {
-  opt->rep.allow_unprepared_value = v;
-}
-
-unsigned char rocksdb_readoptions_get_allow_unprepared_value(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.allow_unprepared_value;
-}
-
-void rocksdb_readoptions_set_auto_refresh_iterator_with_snapshot(
-    rocksdb_readoptions_t* opt, unsigned char v) {
-  opt->rep.auto_refresh_iterator_with_snapshot = v;
-}
-
-unsigned char rocksdb_readoptions_get_auto_refresh_iterator_with_snapshot(
-    rocksdb_readoptions_t* opt) {
-  return opt->rep.auto_refresh_iterator_with_snapshot;
-}
-
-void rocksdb_readoptions_set_io_activity(rocksdb_readoptions_t* opt, int v) {
-  opt->rep.io_activity = static_cast<decltype(opt->rep.io_activity)>(v);
-}
-
-int rocksdb_readoptions_get_io_activity(rocksdb_readoptions_t* opt) {
-  return static_cast<int>(opt->rep.io_activity);
-}
@@ -1,161 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/auto_simple_bindings.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Sources:
-//   - include/rocksdb/options.h
-//   - tools/c_api_gen/auto_simple_bindings_blocklist.json
-//   - include/rocksdb/c.h
-//   - tools/c_api_gen/c_base.cc
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/auto_simple_bindings.py
-
-// Output group: Auto-discovered ReadOptions simple
-
-/* ReadOptions */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_deadline(
-    rocksdb_readoptions_t* opt, uint64_t microseconds);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_readoptions_get_deadline(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_io_timeout(
-    rocksdb_readoptions_t* opt, uint64_t microseconds);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_readoptions_get_io_timeout(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_read_tier(
-    rocksdb_readoptions_t* opt, int v);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_readoptions_get_read_tier(
-    rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_rate_limiter_priority(
-    rocksdb_readoptions_t* opt, int v);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_readoptions_get_rate_limiter_priority(
-    rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_value_size_soft_limit(
-    rocksdb_readoptions_t* opt, uint64_t v);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_readoptions_get_value_size_soft_limit(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_verify_checksums(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_verify_checksums(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_fill_cache(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char rocksdb_readoptions_get_fill_cache(
-    rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_ignore_range_deletions(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_ignore_range_deletions(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_async_io(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char rocksdb_readoptions_get_async_io(
-    rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_readoptions_set_optimize_multiget_for_io(rocksdb_readoptions_t* opt,
-                                                 unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_optimize_multiget_for_io(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_readahead_size(
-    rocksdb_readoptions_t* opt, size_t v);
-
-extern ROCKSDB_LIBRARY_API size_t
-rocksdb_readoptions_get_readahead_size(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_readoptions_set_max_skippable_internal_keys(rocksdb_readoptions_t* opt,
-                                                    uint64_t v);
-
-extern ROCKSDB_LIBRARY_API uint64_t
-rocksdb_readoptions_get_max_skippable_internal_keys(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_tailing(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char rocksdb_readoptions_get_tailing(
-    rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_total_order_seek(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_total_order_seek(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_auto_prefix_mode(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_auto_prefix_mode(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_prefix_same_as_start(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_prefix_same_as_start(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_pin_data(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char rocksdb_readoptions_get_pin_data(
-    rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_adaptive_readahead(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_adaptive_readahead(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_readoptions_set_background_purge_on_iterator_cleanup(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_background_purge_on_iterator_cleanup(
-    rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_auto_readahead_size(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_auto_readahead_size(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_allow_unprepared_value(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_allow_unprepared_value(rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void
-rocksdb_readoptions_set_auto_refresh_iterator_with_snapshot(
-    rocksdb_readoptions_t* opt, unsigned char v);
-
-extern ROCKSDB_LIBRARY_API unsigned char
-rocksdb_readoptions_get_auto_refresh_iterator_with_snapshot(
-    rocksdb_readoptions_t* opt);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_readoptions_set_io_activity(
-    rocksdb_readoptions_t* opt, int v);
-
-extern ROCKSDB_LIBRARY_API int rocksdb_readoptions_get_io_activity(
-    rocksdb_readoptions_t* opt);
@@ -1,371 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'DB data operations'
-//     --section 'WriteBatch' --section 'Transaction'
-//     --section 'TransactionDB simple'
-//     --header-out
-//     c_api_gen/c_generated_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_subset.cc.inc
-
-/* DB data operations */
-
-void rocksdb_put(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                 const char* key, size_t keylen, const char* val, size_t vallen,
-                 char** errptr) {
-  SaveError(errptr,
-            db->rep->Put(options->rep, Slice(key, keylen), Slice(val, vallen)));
-}
-
-void rocksdb_put_cf(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                    rocksdb_column_family_handle_t* column_family,
-                    const char* key, size_t keylen, const char* val,
-                    size_t vallen, char** errptr) {
-  SaveError(errptr, db->rep->Put(options->rep, column_family->rep,
-                                 Slice(key, keylen), Slice(val, vallen)));
-}
-
-void rocksdb_delete(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                    const char* key, size_t keylen, char** errptr) {
-  SaveError(errptr, db->rep->Delete(options->rep, Slice(key, keylen)));
-}
-
-void rocksdb_delete_cf(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                       rocksdb_column_family_handle_t* column_family,
-                       const char* key, size_t keylen, char** errptr) {
-  SaveError(errptr, db->rep->Delete(options->rep, column_family->rep,
-                                    Slice(key, keylen)));
-}
-
-void rocksdb_merge(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                   const char* key, size_t keylen, const char* val,
-                   size_t vallen, char** errptr) {
-  SaveError(errptr, db->rep->Merge(options->rep, Slice(key, keylen),
-                                   Slice(val, vallen)));
-}
-
-void rocksdb_merge_cf(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                      rocksdb_column_family_handle_t* column_family,
-                      const char* key, size_t keylen, const char* val,
-                      size_t vallen, char** errptr) {
-  SaveError(errptr, db->rep->Merge(options->rep, column_family->rep,
-                                   Slice(key, keylen), Slice(val, vallen)));
-}
-
-void rocksdb_write(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                   rocksdb_writebatch_t* batch, char** errptr) {
-  SaveError(errptr, db->rep->Write(options->rep, &batch->rep));
-}
-
-void rocksdb_put_with_ts(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                         const char* key, size_t keylen, const char* ts,
-                         size_t tslen, const char* val, size_t vallen,
-                         char** errptr) {
-  SaveError(errptr, db->rep->Put(options->rep, Slice(key, keylen),
-                                 Slice(ts, tslen), Slice(val, vallen)));
-}
-
-void rocksdb_put_cf_with_ts(rocksdb_t* db,
-                            const rocksdb_writeoptions_t* options,
-                            rocksdb_column_family_handle_t* column_family,
-                            const char* key, size_t keylen, const char* ts,
-                            size_t tslen, const char* val, size_t vallen,
-                            char** errptr) {
-  SaveError(errptr,
-            db->rep->Put(options->rep, column_family->rep, Slice(key, keylen),
-                         Slice(ts, tslen), Slice(val, vallen)));
-}
-
-void rocksdb_delete_with_ts(rocksdb_t* db,
-                            const rocksdb_writeoptions_t* options,
-                            const char* key, size_t keylen, const char* ts,
-                            size_t tslen, char** errptr) {
-  SaveError(errptr, db->rep->Delete(options->rep, Slice(key, keylen),
-                                    Slice(ts, tslen)));
-}
-
-void rocksdb_delete_cf_with_ts(rocksdb_t* db,
-                               const rocksdb_writeoptions_t* options,
-                               rocksdb_column_family_handle_t* column_family,
-                               const char* key, size_t keylen, const char* ts,
-                               size_t tslen, char** errptr) {
-  SaveError(errptr, db->rep->Delete(options->rep, column_family->rep,
-                                    Slice(key, keylen), Slice(ts, tslen)));
-}
-
-void rocksdb_singledelete(rocksdb_t* db, const rocksdb_writeoptions_t* options,
-                          const char* key, size_t keylen, char** errptr) {
-  SaveError(errptr, db->rep->SingleDelete(options->rep, Slice(key, keylen)));
-}
-
-void rocksdb_singledelete_cf(rocksdb_t* db,
-                             const rocksdb_writeoptions_t* options,
-                             rocksdb_column_family_handle_t* column_family,
-                             const char* key, size_t keylen, char** errptr) {
-  SaveError(errptr, db->rep->SingleDelete(options->rep, column_family->rep,
-                                          Slice(key, keylen)));
-}
-
-void rocksdb_singledelete_with_ts(rocksdb_t* db,
-                                  const rocksdb_writeoptions_t* options,
-                                  const char* key, size_t keylen,
-                                  const char* ts, size_t tslen, char** errptr) {
-  SaveError(errptr, db->rep->SingleDelete(options->rep, Slice(key, keylen),
-                                          Slice(ts, tslen)));
-}
-
-void rocksdb_singledelete_cf_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr) {
-  SaveError(errptr,
-            db->rep->SingleDelete(options->rep, column_family->rep,
-                                  Slice(key, keylen), Slice(ts, tslen)));
-}
-
-void rocksdb_delete_range_cf(rocksdb_t* db,
-                             const rocksdb_writeoptions_t* options,
-                             rocksdb_column_family_handle_t* column_family,
-                             const char* start_key, size_t start_key_len,
-                             const char* end_key, size_t end_key_len,
-                             char** errptr) {
-  SaveError(errptr, db->rep->DeleteRange(options->rep, column_family->rep,
-                                         Slice(start_key, start_key_len),
-                                         Slice(end_key, end_key_len)));
-}
-
-void rocksdb_flush(rocksdb_t* db, const rocksdb_flushoptions_t* options,
-                   char** errptr) {
-  SaveError(errptr, db->rep->Flush(options->rep));
-}
-
-void rocksdb_flush_cf(rocksdb_t* db, const rocksdb_flushoptions_t* options,
-                      rocksdb_column_family_handle_t* column_family,
-                      char** errptr) {
-  SaveError(errptr, db->rep->Flush(options->rep, column_family->rep));
-}
-
-void rocksdb_flush_wal(rocksdb_t* db, unsigned char sync, char** errptr) {
-  SaveError(errptr, db->rep->FlushWAL(sync));
-}
-
-void rocksdb_pause_background_work(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->PauseBackgroundWork());
-}
-
-void rocksdb_continue_background_work(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->ContinueBackgroundWork());
-}
-
-void rocksdb_disable_file_deletions(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->DisableFileDeletions());
-}
-
-void rocksdb_enable_file_deletions(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->EnableFileDeletions());
-}
-
-void rocksdb_verify_checksum(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->VerifyChecksum());
-}
-
-void rocksdb_verify_file_checksums(rocksdb_t* db, char** errptr) {
-  SaveError(errptr, db->rep->VerifyFileChecksums(ReadOptions()));
-}
-
-void rocksdb_destroy_db(const rocksdb_options_t* options, const char* name,
-                        char** errptr) {
-  SaveError(errptr, DestroyDB(name, options->rep));
-}
-
-void rocksdb_repair_db(const rocksdb_options_t* options, const char* name,
-                       char** errptr) {
-  SaveError(errptr, RepairDB(name, options->rep));
-}
-
-/* WriteBatch */
-
-void rocksdb_writebatch_clear(rocksdb_writebatch_t* b) { b->rep.Clear(); }
-
-void rocksdb_writebatch_put(rocksdb_writebatch_t* b, const char* key,
-                            size_t klen, const char* val, size_t vlen) {
-  b->rep.Put(Slice(key, klen), Slice(val, vlen));
-}
-
-void rocksdb_writebatch_put_cf(rocksdb_writebatch_t* b,
-                               rocksdb_column_family_handle_t* column_family,
-                               const char* key, size_t klen, const char* val,
-                               size_t vlen) {
-  b->rep.Put(column_family->rep, Slice(key, klen), Slice(val, vlen));
-}
-
-void rocksdb_writebatch_delete(rocksdb_writebatch_t* b, const char* key,
-                               size_t klen) {
-  b->rep.Delete(Slice(key, klen));
-}
-
-void rocksdb_writebatch_put_log_data(rocksdb_writebatch_t* b, const char* blob,
-                                     size_t len) {
-  b->rep.PutLogData(Slice(blob, len));
-}
-
-void rocksdb_writebatch_set_save_point(rocksdb_writebatch_t* b) {
-  b->rep.SetSavePoint();
-}
-
-void rocksdb_writebatch_rollback_to_save_point(rocksdb_writebatch_t* b,
-                                               char** errptr) {
-  SaveError(errptr, b->rep.RollbackToSavePoint());
-}
-
-void rocksdb_writebatch_pop_save_point(rocksdb_writebatch_t* b, char** errptr) {
-  SaveError(errptr, b->rep.PopSavePoint());
-}
-
-void rocksdb_writebatch_verify_checksum(rocksdb_writebatch_t* b,
-                                        char** errptr) {
-  SaveError(errptr, b->rep.VerifyChecksum());
-}
-
-/* Transaction */
-
-void rocksdb_transaction_put(rocksdb_transaction_t* txn, const char* key,
-                             size_t klen, const char* val, size_t vlen,
-                             char** errptr) {
-  SaveError(errptr, txn->rep->Put(Slice(key, klen), Slice(val, vlen)));
-}
-
-void rocksdb_transaction_put_cf(rocksdb_transaction_t* txn,
-                                rocksdb_column_family_handle_t* column_family,
-                                const char* key, size_t klen, const char* val,
-                                size_t vlen, char** errptr) {
-  SaveError(errptr, txn->rep->Put(column_family->rep, Slice(key, klen),
-                                  Slice(val, vlen)));
-}
-
-void rocksdb_transaction_merge(rocksdb_transaction_t* txn, const char* key,
-                               size_t klen, const char* val, size_t vlen,
-                               char** errptr) {
-  SaveError(errptr, txn->rep->Merge(Slice(key, klen), Slice(val, vlen)));
-}
-
-void rocksdb_transaction_merge_cf(rocksdb_transaction_t* txn,
-                                  rocksdb_column_family_handle_t* column_family,
-                                  const char* key, size_t klen, const char* val,
-                                  size_t vlen, char** errptr) {
-  SaveError(errptr, txn->rep->Merge(column_family->rep, Slice(key, klen),
-                                    Slice(val, vlen)));
-}
-
-void rocksdb_transaction_delete(rocksdb_transaction_t* txn, const char* key,
-                                size_t klen, char** errptr) {
-  SaveError(errptr, txn->rep->Delete(Slice(key, klen)));
-}
-
-void rocksdb_transaction_delete_cf(
-    rocksdb_transaction_t* txn, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, char** errptr) {
-  SaveError(errptr, txn->rep->Delete(column_family->rep, Slice(key, klen)));
-}
-
-void rocksdb_transaction_commit(rocksdb_transaction_t* txn, char** errptr) {
-  SaveError(errptr, txn->rep->Commit());
-}
-
-void rocksdb_transaction_rollback(rocksdb_transaction_t* txn, char** errptr) {
-  SaveError(errptr, txn->rep->Rollback());
-}
-
-void rocksdb_transaction_put_log_data(rocksdb_transaction_t* txn,
-                                      const char* blob, size_t len) {
-  txn->rep->PutLogData(Slice(blob, len));
-}
-
-void rocksdb_transaction_set_savepoint(rocksdb_transaction_t* txn) {
-  txn->rep->SetSavePoint();
-}
-
-void rocksdb_transaction_rollback_to_savepoint(rocksdb_transaction_t* txn,
-                                               char** errptr) {
-  SaveError(errptr, txn->rep->RollbackToSavePoint());
-}
-
-/* TransactionDB simple */
-
-void rocksdb_transactiondb_put(rocksdb_transactiondb_t* txn_db,
-                               const rocksdb_writeoptions_t* options,
-                               const char* key, size_t klen, const char* val,
-                               size_t vlen, char** errptr) {
-  SaveError(errptr,
-            txn_db->rep->Put(options->rep, Slice(key, klen), Slice(val, vlen)));
-}
-
-void rocksdb_transactiondb_put_cf(rocksdb_transactiondb_t* txn_db,
-                                  const rocksdb_writeoptions_t* options,
-                                  rocksdb_column_family_handle_t* column_family,
-                                  const char* key, size_t keylen,
-                                  const char* val, size_t vallen,
-                                  char** errptr) {
-  SaveError(errptr, txn_db->rep->Put(options->rep, column_family->rep,
-                                     Slice(key, keylen), Slice(val, vallen)));
-}
-
-void rocksdb_transactiondb_write(rocksdb_transactiondb_t* db,
-                                 const rocksdb_writeoptions_t* options,
-                                 rocksdb_writebatch_t* batch, char** errptr) {
-  SaveError(errptr, db->rep->Write(options->rep, &batch->rep));
-}
-
-void rocksdb_transactiondb_merge(rocksdb_transactiondb_t* txn_db,
-                                 const rocksdb_writeoptions_t* options,
-                                 const char* key, size_t klen, const char* val,
-                                 size_t vlen, char** errptr) {
-  SaveError(errptr, txn_db->rep->Merge(options->rep, Slice(key, klen),
-                                       Slice(val, vlen)));
-}
-
-void rocksdb_transactiondb_merge_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key, size_t klen,
-    const char* val, size_t vlen, char** errptr) {
-  SaveError(errptr, txn_db->rep->Merge(options->rep, column_family->rep,
-                                       Slice(key, klen), Slice(val, vlen)));
-}
-
-void rocksdb_transactiondb_delete(rocksdb_transactiondb_t* txn_db,
-                                  const rocksdb_writeoptions_t* options,
-                                  const char* key, size_t klen, char** errptr) {
-  SaveError(errptr, txn_db->rep->Delete(options->rep, Slice(key, klen)));
-}
-
-void rocksdb_transactiondb_delete_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, char** errptr) {
-  SaveError(errptr, txn_db->rep->Delete(options->rep, column_family->rep,
-                                        Slice(key, keylen)));
-}
-
-void rocksdb_transactiondb_flush_wal(rocksdb_transactiondb_t* txn_db,
-                                     unsigned char sync, char** errptr) {
-  SaveError(errptr, txn_db->rep->FlushWAL(sync));
-}
-
-void rocksdb_transactiondb_flush(rocksdb_transactiondb_t* txn_db,
-                                 const rocksdb_flushoptions_t* options,
-                                 char** errptr) {
-  SaveError(errptr, txn_db->rep->Flush(options->rep));
-}
-
-void rocksdb_transactiondb_flush_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_flushoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, char** errptr) {
-  SaveError(errptr, txn_db->rep->Flush(options->rep, column_family->rep));
-}
@@ -1,245 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'DB data operations'
-//     --section 'WriteBatch' --section 'Transaction'
-//     --section 'TransactionDB simple'
-//     --header-out
-//     c_api_gen/c_generated_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_subset.cc.inc
-
-/* DB data operations */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_put(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_put_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_merge(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_merge_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_write(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_writebatch_t* batch, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_put_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* ts, size_t tslen, const char* val, size_t vallen,
-    char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_put_cf_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* ts, size_t tslen, const char* val, size_t vallen,
-    char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_cf_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_singledelete(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_singledelete_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_singledelete_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_singledelete_cf_with_ts(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* ts, size_t tslen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_delete_range_cf(
-    rocksdb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* start_key,
-    size_t start_key_len, const char* end_key, size_t end_key_len,
-    char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_flush(
-    rocksdb_t* db, const rocksdb_flushoptions_t* options, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_flush_cf(
-    rocksdb_t* db, const rocksdb_flushoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_flush_wal(rocksdb_t* db,
-                                                  unsigned char sync,
-                                                  char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_pause_background_work(rocksdb_t* db,
-                                                              char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_continue_background_work(rocksdb_t* db,
-                                                                 char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_disable_file_deletions(rocksdb_t* db,
-                                                               char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_enable_file_deletions(rocksdb_t* db,
-                                                              char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_verify_checksum(rocksdb_t* db,
-                                                        char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_verify_file_checksums(rocksdb_t* db,
-                                                              char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_destroy_db(
-    const rocksdb_options_t* options, const char* name, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_repair_db(
-    const rocksdb_options_t* options, const char* name, char** errptr);
-
-/* WriteBatch */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_clear(
-    rocksdb_writebatch_t* b);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_put(rocksdb_writebatch_t* b,
-                                                       const char* key,
-                                                       size_t klen,
-                                                       const char* val,
-                                                       size_t vlen);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_put_cf(
-    rocksdb_writebatch_t* b, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, const char* val, size_t vlen);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_delete(
-    rocksdb_writebatch_t* b, const char* key, size_t klen);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_put_log_data(
-    rocksdb_writebatch_t* b, const char* blob, size_t len);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_set_save_point(
-    rocksdb_writebatch_t* b);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_rollback_to_save_point(
-    rocksdb_writebatch_t* b, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_pop_save_point(
-    rocksdb_writebatch_t* b, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_verify_checksum(
-    rocksdb_writebatch_t* b, char** errptr);
-
-/* Transaction */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_put(
-    rocksdb_transaction_t* txn, const char* key, size_t klen, const char* val,
-    size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_put_cf(
-    rocksdb_transaction_t* txn, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_merge(
-    rocksdb_transaction_t* txn, const char* key, size_t klen, const char* val,
-    size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_merge_cf(
-    rocksdb_transaction_t* txn, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_delete(
-    rocksdb_transaction_t* txn, const char* key, size_t klen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_delete_cf(
-    rocksdb_transaction_t* txn, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_commit(
-    rocksdb_transaction_t* txn, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_rollback(
-    rocksdb_transaction_t* txn, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_put_log_data(
-    rocksdb_transaction_t* txn, const char* blob, size_t len);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_set_savepoint(
-    rocksdb_transaction_t* txn);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_rollback_to_savepoint(
-    rocksdb_transaction_t* txn, char** errptr);
-
-/* TransactionDB simple */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_put(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    const char* key, size_t klen, const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_put_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_write(
-    rocksdb_transactiondb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_writebatch_t* batch, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_merge(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    const char* key, size_t klen, const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_merge_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key, size_t klen,
-    const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_delete(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    const char* key, size_t klen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_delete_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_flush_wal(
-    rocksdb_transactiondb_t* txn_db, unsigned char sync, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_flush(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_flushoptions_t* options,
-    char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_flush_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_flushoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, char** errptr);
@@ -1,77 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'Transaction'
-//     --header-out
-//     c_api_gen/c_generated_transaction_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_transaction_subset.cc.inc
-
-/* Transaction */
-
-void rocksdb_transaction_put(rocksdb_transaction_t* txn, const char* key,
-                             size_t klen, const char* val, size_t vlen,
-                             char** errptr) {
-  SaveError(errptr, txn->rep->Put(Slice(key, klen), Slice(val, vlen)));
-}
-
-void rocksdb_transaction_put_cf(rocksdb_transaction_t* txn,
-                                rocksdb_column_family_handle_t* column_family,
-                                const char* key, size_t klen, const char* val,
-                                size_t vlen, char** errptr) {
-  SaveError(errptr, txn->rep->Put(column_family->rep, Slice(key, klen),
-                                  Slice(val, vlen)));
-}
-
-void rocksdb_transaction_merge(rocksdb_transaction_t* txn, const char* key,
-                               size_t klen, const char* val, size_t vlen,
-                               char** errptr) {
-  SaveError(errptr, txn->rep->Merge(Slice(key, klen), Slice(val, vlen)));
-}
-
-void rocksdb_transaction_merge_cf(rocksdb_transaction_t* txn,
-                                  rocksdb_column_family_handle_t* column_family,
-                                  const char* key, size_t klen, const char* val,
-                                  size_t vlen, char** errptr) {
-  SaveError(errptr, txn->rep->Merge(column_family->rep, Slice(key, klen),
-                                    Slice(val, vlen)));
-}
-
-void rocksdb_transaction_delete(rocksdb_transaction_t* txn, const char* key,
-                                size_t klen, char** errptr) {
-  SaveError(errptr, txn->rep->Delete(Slice(key, klen)));
-}
-
-void rocksdb_transaction_delete_cf(
-    rocksdb_transaction_t* txn, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, char** errptr) {
-  SaveError(errptr, txn->rep->Delete(column_family->rep, Slice(key, klen)));
-}
-
-void rocksdb_transaction_commit(rocksdb_transaction_t* txn, char** errptr) {
-  SaveError(errptr, txn->rep->Commit());
-}
-
-void rocksdb_transaction_rollback(rocksdb_transaction_t* txn, char** errptr) {
-  SaveError(errptr, txn->rep->Rollback());
-}
-
-void rocksdb_transaction_put_log_data(rocksdb_transaction_t* txn,
-                                      const char* blob, size_t len) {
-  txn->rep->PutLogData(Slice(blob, len));
-}
-
-void rocksdb_transaction_set_savepoint(rocksdb_transaction_t* txn) {
-  txn->rep->SetSavePoint();
-}
-
-void rocksdb_transaction_rollback_to_savepoint(rocksdb_transaction_t* txn,
-                                               char** errptr) {
-  SaveError(errptr, txn->rep->RollbackToSavePoint());
-}
@@ -1,54 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'Transaction'
-//     --header-out
-//     c_api_gen/c_generated_transaction_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_transaction_subset.cc.inc
-
-/* Transaction */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_put(
-    rocksdb_transaction_t* txn, const char* key, size_t klen, const char* val,
-    size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_put_cf(
-    rocksdb_transaction_t* txn, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_merge(
-    rocksdb_transaction_t* txn, const char* key, size_t klen, const char* val,
-    size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_merge_cf(
-    rocksdb_transaction_t* txn, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_delete(
-    rocksdb_transaction_t* txn, const char* key, size_t klen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_delete_cf(
-    rocksdb_transaction_t* txn, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_commit(
-    rocksdb_transaction_t* txn, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_rollback(
-    rocksdb_transaction_t* txn, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_put_log_data(
-    rocksdb_transaction_t* txn, const char* blob, size_t len);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_set_savepoint(
-    rocksdb_transaction_t* txn);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transaction_rollback_to_savepoint(
-    rocksdb_transaction_t* txn, char** errptr);
@@ -1,87 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'TransactionDB simple'
-//     --header-out
-//     c_api_gen/c_generated_transactiondb_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_transactiondb_subset.cc.inc
-
-/* TransactionDB simple */
-
-void rocksdb_transactiondb_put(rocksdb_transactiondb_t* txn_db,
-                               const rocksdb_writeoptions_t* options,
-                               const char* key, size_t klen, const char* val,
-                               size_t vlen, char** errptr) {
-  SaveError(errptr,
-            txn_db->rep->Put(options->rep, Slice(key, klen), Slice(val, vlen)));
-}
-
-void rocksdb_transactiondb_put_cf(rocksdb_transactiondb_t* txn_db,
-                                  const rocksdb_writeoptions_t* options,
-                                  rocksdb_column_family_handle_t* column_family,
-                                  const char* key, size_t keylen,
-                                  const char* val, size_t vallen,
-                                  char** errptr) {
-  SaveError(errptr, txn_db->rep->Put(options->rep, column_family->rep,
-                                     Slice(key, keylen), Slice(val, vallen)));
-}
-
-void rocksdb_transactiondb_write(rocksdb_transactiondb_t* db,
-                                 const rocksdb_writeoptions_t* options,
-                                 rocksdb_writebatch_t* batch, char** errptr) {
-  SaveError(errptr, db->rep->Write(options->rep, &batch->rep));
-}
-
-void rocksdb_transactiondb_merge(rocksdb_transactiondb_t* txn_db,
-                                 const rocksdb_writeoptions_t* options,
-                                 const char* key, size_t klen, const char* val,
-                                 size_t vlen, char** errptr) {
-  SaveError(errptr, txn_db->rep->Merge(options->rep, Slice(key, klen),
-                                       Slice(val, vlen)));
-}
-
-void rocksdb_transactiondb_merge_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key, size_t klen,
-    const char* val, size_t vlen, char** errptr) {
-  SaveError(errptr, txn_db->rep->Merge(options->rep, column_family->rep,
-                                       Slice(key, klen), Slice(val, vlen)));
-}
-
-void rocksdb_transactiondb_delete(rocksdb_transactiondb_t* txn_db,
-                                  const rocksdb_writeoptions_t* options,
-                                  const char* key, size_t klen, char** errptr) {
-  SaveError(errptr, txn_db->rep->Delete(options->rep, Slice(key, klen)));
-}
-
-void rocksdb_transactiondb_delete_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, char** errptr) {
-  SaveError(errptr, txn_db->rep->Delete(options->rep, column_family->rep,
-                                        Slice(key, keylen)));
-}
-
-void rocksdb_transactiondb_flush_wal(rocksdb_transactiondb_t* txn_db,
-                                     unsigned char sync, char** errptr) {
-  SaveError(errptr, txn_db->rep->FlushWAL(sync));
-}
-
-void rocksdb_transactiondb_flush(rocksdb_transactiondb_t* txn_db,
-                                 const rocksdb_flushoptions_t* options,
-                                 char** errptr) {
-  SaveError(errptr, txn_db->rep->Flush(options->rep));
-}
-
-void rocksdb_transactiondb_flush_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_flushoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, char** errptr) {
-  SaveError(errptr, txn_db->rep->Flush(options->rep, column_family->rep));
-}
@@ -1,58 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'TransactionDB simple'
-//     --header-out
-//     c_api_gen/c_generated_transactiondb_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_transactiondb_subset.cc.inc
-
-/* TransactionDB simple */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_put(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    const char* key, size_t klen, const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_put_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, const char* val, size_t vallen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_write(
-    rocksdb_transactiondb_t* db, const rocksdb_writeoptions_t* options,
-    rocksdb_writebatch_t* batch, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_merge(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    const char* key, size_t klen, const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_merge_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key, size_t klen,
-    const char* val, size_t vlen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_delete(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    const char* key, size_t klen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_delete_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_writeoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, const char* key,
-    size_t keylen, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_flush_wal(
-    rocksdb_transactiondb_t* txn_db, unsigned char sync, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_flush(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_flushoptions_t* options,
-    char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_transactiondb_flush_cf(
-    rocksdb_transactiondb_t* txn_db, const rocksdb_flushoptions_t* options,
-    rocksdb_column_family_handle_t* column_family, char** errptr);
@@ -1,58 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'WriteBatch'
-//     --header-out
-//     c_api_gen/c_generated_writebatch_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_writebatch_subset.cc.inc
-
-/* WriteBatch */
-
-void rocksdb_writebatch_clear(rocksdb_writebatch_t* b) { b->rep.Clear(); }
-
-void rocksdb_writebatch_put(rocksdb_writebatch_t* b, const char* key,
-                            size_t klen, const char* val, size_t vlen) {
-  b->rep.Put(Slice(key, klen), Slice(val, vlen));
-}
-
-void rocksdb_writebatch_put_cf(rocksdb_writebatch_t* b,
-                               rocksdb_column_family_handle_t* column_family,
-                               const char* key, size_t klen, const char* val,
-                               size_t vlen) {
-  b->rep.Put(column_family->rep, Slice(key, klen), Slice(val, vlen));
-}
-
-void rocksdb_writebatch_delete(rocksdb_writebatch_t* b, const char* key,
-                               size_t klen) {
-  b->rep.Delete(Slice(key, klen));
-}
-
-void rocksdb_writebatch_put_log_data(rocksdb_writebatch_t* b, const char* blob,
-                                     size_t len) {
-  b->rep.PutLogData(Slice(blob, len));
-}
-
-void rocksdb_writebatch_set_save_point(rocksdb_writebatch_t* b) {
-  b->rep.SetSavePoint();
-}
-
-void rocksdb_writebatch_rollback_to_save_point(rocksdb_writebatch_t* b,
-                                               char** errptr) {
-  SaveError(errptr, b->rep.RollbackToSavePoint());
-}
-
-void rocksdb_writebatch_pop_save_point(rocksdb_writebatch_t* b, char** errptr) {
-  SaveError(errptr, b->rep.PopSavePoint());
-}
-
-void rocksdb_writebatch_verify_checksum(rocksdb_writebatch_t* b,
-                                        char** errptr) {
-  SaveError(errptr, b->rep.VerifyChecksum());
-}
@@ -1,47 +0,0 @@
-// @generated
-// -----------------------------------------------------------------------------
-// Auto-generated by tools/c_api_gen/generate_c_api.py.
-// DO NOT EDIT THIS FILE DIRECTLY.
-// Source: tools/c_api_gen/spec.json
-// -----------------------------------------------------------------------------
-
-// To regenerate this file:
-//   python3 tools/c_api_gen/generate_c_api.py
-//     --spec tools/c_api_gen/spec.json --section 'WriteBatch'
-//     --header-out
-//     c_api_gen/c_generated_writebatch_subset.h.inc
-//     --source-out
-//     c_api_gen/c_generated_writebatch_subset.cc.inc
-
-/* WriteBatch */
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_clear(
-    rocksdb_writebatch_t* b);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_put(rocksdb_writebatch_t* b,
-                                                       const char* key,
-                                                       size_t klen,
-                                                       const char* val,
-                                                       size_t vlen);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_put_cf(
-    rocksdb_writebatch_t* b, rocksdb_column_family_handle_t* column_family,
-    const char* key, size_t klen, const char* val, size_t vlen);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_delete(
-    rocksdb_writebatch_t* b, const char* key, size_t klen);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_put_log_data(
-    rocksdb_writebatch_t* b, const char* blob, size_t len);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_set_save_point(
-    rocksdb_writebatch_t* b);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_rollback_to_save_point(
-    rocksdb_writebatch_t* b, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_pop_save_point(
-    rocksdb_writebatch_t* b, char** errptr);
-
-extern ROCKSDB_LIBRARY_API void rocksdb_writebatch_verify_checksum(
-    rocksdb_writebatch_t* b, char** errptr);
@@ -127,24 +127,6 @@ class OffsetableCacheKey : private CacheKey {
    return CacheKey(file_num_etc64_, offset_etc64_ ^ offset);
  }

-  // Construct a CacheKey for a record located at byte `offset` within a file in
-  // which every distinct cached region is at least 5 bytes long. The low two
-  // offset bits are dropped, which is collision-free under that >= 5-byte (>= 4
-  // would suffice) guarantee and lets different kinds of records in the same
-  // file share a single keyspace without colliding.
-  //
-  // This is the canonical cache-key scheme for byte-offset records that carry
-  // the block-based "min 5 byte" guarantee: block-based SST blocks (see
-  // BlockBasedTable::GetCacheKey) and SimpleGen2Blob records (which always
-  // include a >= 5-byte trailer; see db/blob/blob_gen2_format.h). Because both
-  // use this same function, an SST's data blocks and its embedded blob records
-  // never collide even when the block cache and blob cache are the same cache.
-  // Keeping a single implementation here avoids a divergence bug that would
-  // silently alias the two keyspaces.
-  inline CacheKey WithOffsetForMinSizeRecord(uint64_t offset) const {
-    return WithOffset(offset >> 2);
-  }
-
  // 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.
  static constexpr size_t kCommonPrefixSize = 8;
@@ -3108,7 +3108,7 @@ AutoHyperClockTable::HandleImpl* AutoHyperClockTable::Lookup(
  HandleImpl* const arr = array_.Get();
  NextWithShift next_with_shift = arr[home].head_next_with_shift.LoadRelaxed();
  for (size_t i = 0; !next_with_shift.IsEnd() && i < 10; ++i) {
-    HandleImpl* h = &arr[next_with_shift.GetNext()];
+    HandleImpl* h = &arr[next_with_shift.IsEnd()];
    // Attempt cheap key match without acquiring a read ref. This could give a
    // false positive, which is re-checked after acquiring read ref, or false
    // negative, which is re-checked in the full Lookup. Also, this is a
@@ -421,30 +421,6 @@ Example reference: commit `429b36c22d76403d275dd0e6877b08d4cea2bc90` (block_alig

 If an option already exists but needs C API support:

-**First decide whether the option is auto-managed.**
-
-Many simple option fields are no longer maintained by hand in
-`include/rocksdb/c.h` and `db/c.cc`. Before adding a manual wrapper:
-
- Check whether the option belongs to a family handled by
-  `tools/c_api_gen/auto_simple_bindings.py`.
- If it is a simple scalar/enum/string field in an auto-managed family, run
-  `python3 tools/c_api_gen/regen_all.py` and let the generator add the C API.
- After regenerating, run
-  `python3 tools/c_api_gen/verify_generated_up_to_date.py` to confirm the
-  checked-in generated fragments stay stable.
- Do not edit generated `.inc` files under `c_api_gen/` by hand.
- If the new field is not ready for C API support yet, add an entry to
-  `tools/c_api_gen/auto_simple_bindings_blocklist.json` with
-  `"policy": "deferred"` and a concrete reason so the build stays intentional
-  rather than silently drifting.
- If the field needs custom ownership, callback, vector, or nested-struct
-  marshalling, keep it manual or move it into `tools/c_api_gen/spec.json`
-  depending on the API shape.
-
-If the option is not auto-managed, or the C API really is a custom/manual case,
-the traditional hand-written pattern still applies:
-
 **File: `db/c.cc`**

 ```cpp
@@ -533,3 +509,4 @@ Common option types used in serialization:
 - [ ] unreleased_history markdown file
 - [ ] Java API (for BlockBasedTableOptions)
 - [ ] C API (if needed)
+
@@ -168,18 +168,9 @@ Status YourNewAPI(const YourAPIOptions& /*options*/,

 ### Step 5: Add C API Bindings

-> **Important:** `include/rocksdb/c.h` and `db/c.cc` are `@generated` and must
-> NOT be edited by hand — your changes would be overwritten on the next
-> regeneration. Choose the right path first (see "Before writing C API code by
-> hand" below). For hand-written (manual) wrappers, edit the source templates
-> `tools/c_api_gen/c_base.h` (declarations) and `tools/c_api_gen/c_base.cc`
-> (implementations), then run `python3 tools/c_api_gen/regen_all.py` to produce
-> `c.h` / `c.cc`. The snippets below show the *declaration* and *implementation*
-> you would add to those templates.
+**Header:** `include/rocksdb/c.h`

-**Header (declaration → `tools/c_api_gen/c_base.h`):**
-
-```c
+\`\`\`c
 // Basic version
 extern ROCKSDB_LIBRARY_API void rocksdb_your_new_api(
    rocksdb_t* db,
@@ -200,7 +191,7 @@ extern ROCKSDB_LIBRARY_API void rocksdb_your_new_api_opt(
    char** errptr);
 \`\`\`

-**Implementation (→ `tools/c_api_gen/c_base.cc`):**
+**Implementation:** `db/c.cc`

 \`\`\`cpp
 void rocksdb_your_new_api(rocksdb_t* db, const char* start_key,
@@ -226,38 +217,6 @@ void rocksdb_your_new_api_cf(rocksdb_t* db,
 }
 \`\`\`

-**Before writing C API code by hand, choose the right path:**
-
- **Auto-managed simple struct fields:** If you added a new field to a managed
-  public struct such as `ReadOptions`, selected option structs, or managed
-  metadata structs, first check `tools/c_api_gen/auto_simple_bindings.py`.
-  Simple scalar/enum/string fields should be regenerated with
-  `python3 tools/c_api_gen/regen_all.py` rather than hand-editing
-  `include/rocksdb/c.h` / `db/c.cc`.
-  After regenerating, run
-  `python3 tools/c_api_gen/verify_generated_up_to_date.py` to confirm the
-  checked-in generated fragments are stable.
- **Spec-driven wrappers:** If the API is still mechanically generated but needs
-  an explicit C shape, naming, or `Status`/`char** errptr` policy, add it to
-  `tools/c_api_gen/spec.json`.
- **Fully manual wrappers:** If the API uses callbacks, ownership transfer,
-  vectors/maps, open flows, or otherwise irregular marshalling, keep the C API
-  hand-written.
-
-**Temporary deferral for auto-managed families:**
-
-If a new field lands in an auto-managed family but the C API shape is not ready
-yet, add a checked-in entry to
-`tools/c_api_gen/auto_simple_bindings_blocklist.json` with:
-
- `policy: "manual"` when the field is intentionally outside simple auto-gen
- `policy: "deferred"` when the field should be revisited later
- a concrete `reason`
- `tracking_issue` when available
-
-If a field in an auto-managed family is not supported by the generator and is
-not covered by the blocklist, regeneration should fail. That is intentional.
-
 **If you have options, also add:**

 \`\`\`cpp
@@ -523,8 +482,8 @@ public class YourAPIOptionsTest {
 | StackableDB | `include/rocksdb/utilities/stackable_db.h` | ✓ |
 | Secondary DB | `db/db_impl/db_impl_secondary.h` | If not supported |
 | Compacted DB | `db/db_impl/compacted_db_impl.h` | If not supported |
-| C API Header (manual wrappers) | `tools/c_api_gen/c_base.h` → regen → `include/rocksdb/c.h` (`@generated`) | ✓ |
-| C API Implementation (manual wrappers) | `tools/c_api_gen/c_base.cc` → regen → `db/c.cc` (`@generated`) | ✓ |
+| C API Header | `include/rocksdb/c.h` | ✓ |
+| C API Implementation | `db/c.cc` | ✓ |
 | Java API | `java/src/main/java/org/rocksdb/RocksDB.java` | ✓ |
 | Java Options | `java/src/main/java/org/rocksdb/YourAPIOptions.java` | If needed |
 | JNI Implementation | `java/rocksjni/rocksjni.cc` | ✓ |
@@ -44,6 +44,10 @@ if(@WITH_NUMA@)
  find_dependency(NUMA)
 endif()

+if(@WITH_TBB@)
+  find_dependency(TBB)
+endif()
+
 find_dependency(Threads)

 include("${CMAKE_CURRENT_LIST_DIR}/RocksDBTargets.cmake")
@@ -0,0 +1,33 @@
+# - Find TBB
+# Find the Thread Building Blocks library and includes
+#
+# TBB_INCLUDE_DIRS - where to find tbb.h, etc.
+# TBB_LIBRARIES - List of libraries when using TBB.
+# TBB_FOUND - True if TBB found.
+
+if(NOT DEFINED TBB_ROOT_DIR)
+  set(TBB_ROOT_DIR "$ENV{TBBROOT}")
+endif()
+
+find_path(TBB_INCLUDE_DIRS
+  NAMES tbb/tbb.h
+  HINTS ${TBB_ROOT_DIR}/include)
+
+find_library(TBB_LIBRARIES
+  NAMES tbb
+  HINTS ${TBB_ROOT_DIR}/lib ENV LIBRARY_PATH)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(TBB DEFAULT_MSG TBB_LIBRARIES TBB_INCLUDE_DIRS)
+
+mark_as_advanced(
+  TBB_LIBRARIES
+  TBB_INCLUDE_DIRS)
+
+if(TBB_FOUND AND NOT (TARGET TBB::TBB))
+  add_library (TBB::TBB UNKNOWN IMPORTED)
+  set_target_properties(TBB::TBB
+    PROPERTIES
+      IMPORTED_LOCATION ${TBB_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIRS})
+endif()
@@ -11,24 +11,6 @@

 namespace ROCKSDB_NAMESPACE {

-// WARNING: This value is == kCurrentFileBlobIndexFileNumber.
-// Use this name only where file number zero means "no valid blob file" or
-// "current file" is not understood/supported.
 constexpr uint64_t kInvalidBlobFileNumber = 0;

-// WARNING: This value is == kInvalidBlobFileNumber.
-// Use this name only for BlobIndex references to the same physical file as what
-// is currently being read; generic blob-file metadata must treat zero as
-// invalid. (Using a distinct value like 1 was found to be more problematic,
-// e.g. because of legacy "stackable" blob implementation.)
-//
-// This "zero is invalid unless you are the embedded reader/writer" contract is
-// enforced by integrity checks that reject file number zero on generic paths;
-// see FileMetaData::UpdateBoundaries (write/output path) and Version::GetBlob /
-// Version::MultiGetBlob (read path). Same-file references must be resolved (by
-// EmbeddedBlobResolvingIterator) before they reach those paths. Do not weaken
-// those checks -- they catch leaks/corruption closer to the root cause.
-constexpr uint64_t kCurrentFileBlobIndexFileNumber = kInvalidBlobFileNumber;
-static_assert(kCurrentFileBlobIndexFileNumber == kInvalidBlobFileNumber);
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -32,9 +32,6 @@ Status BlobGarbageMeter::GetBlobReferenceDetails(const ParsedInternalKey& ikey,
  if (blob_index.IsInlined() || blob_index.HasTTL()) {
    return Status::Corruption("Unexpected TTL/inlined blob index");
  }
-  if (blob_index.IsSameFile()) {
-    return Status::OK();
-  }

  *blob_file_number = blob_index.file_number();
  *bytes =
@@ -128,9 +125,7 @@ Status BlobGarbageMeter::ProcessEntityBlobReferences(
            !s.ok()) {
          return s;
        }
-        if (file_number != kInvalidBlobFileNumber) {
-          AddFlow(file_number, blob_bytes, is_inflow);
-        }
+        AddFlow(file_number, blob_bytes, is_inflow);
        return Status::OK();
      });
 }
@@ -151,24 +151,6 @@ TEST(BlobGarbageMeterTest, PlainValue) {
  ASSERT_TRUE(blob_garbage_meter.flows().empty());
 }

-TEST(BlobGarbageMeterTest, SameFileBlobIndex) {
-  constexpr char user_key[] = "user_key";
-  constexpr SequenceNumber seq = 123;
-
-  const InternalKey key(user_key, seq, kTypeBlobIndex);
-  const Slice key_slice = key.Encode();
-
-  std::string value;
-  BlobIndex::EncodeBlob(&value, kCurrentFileBlobIndexFileNumber,
-                        /*offset=*/123, /*size=*/456, kNoCompression);
-
-  BlobGarbageMeter blob_garbage_meter;
-
-  ASSERT_OK(blob_garbage_meter.ProcessInFlow(key_slice, value));
-  ASSERT_OK(blob_garbage_meter.ProcessOutFlow(key_slice, value));
-  ASSERT_TRUE(blob_garbage_meter.flows().empty());
-}
-
 TEST(BlobGarbageMeterTest, CorruptInternalKey) {
  constexpr char corrupt_key[] = "i_am_corrupt";
  const Slice key_slice(corrupt_key);
@@ -1,111 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#include "db/blob/blob_gen2_format.h"
-
-#include <array>
-#include <cstring>
-#include <string>
-
-#include "file/random_access_file_reader.h"
-#include "file/writable_file_writer.h"
-#include "rocksdb/options.h"
-#include "rocksdb/slice.h"
-#include "table/format.h"
-#include "util/cast_util.h"
-#include "util/coding.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-Status ReadAndVerifySimpleGen2BlobRecord(
-    const ReadOptions& read_options, RandomAccessFileReader* file,
-    uint64_t record_offset, size_t payload_size, size_t record_size,
-    ChecksumType checksum_type, uint32_t base_context_checksum,
-    CompressionType expected_compression, char* buf) {
-  assert(file != nullptr);
-  assert(buf != nullptr);
-  assert(record_size == payload_size + kSimpleGen2BlobTrailerSize);
-
-  Slice result;
-  IOOptions opts;
-  IODebugContext dbg;
-  Status s = file->PrepareIOOptions(read_options, opts, &dbg);
-  if (s.ok()) {
-    s = file->Read(opts, record_offset, record_size, &result, buf, nullptr,
-                   &dbg);
-  }
-  if (!s.ok()) {
-    return s;
-  }
-  if (result.size() != record_size) {
-    return Status::Corruption("Could not read complete blob record");
-  }
-  // With mmap reads the data lands outside `buf`; copy it in so the caller can
-  // rely on `buf` owning the bytes (this is the only copy on the mmap path).
-  // TODO: fix this extra memcpy in the mmap case
-  if (result.data() != buf) {
-    memcpy(buf, result.data(), record_size);
-  }
-
-  const char* record = buf;
-  const CompressionType compression =
-      static_cast<CompressionType>(record[payload_size]);
-  if (compression != expected_compression) {
-    return Status::Corruption(
-        "Blob record compression does not match blob index");
-  }
-
-  if (read_options.verify_checksums) {
-    uint32_t stored = DecodeFixed32(record + payload_size + 1);
-    stored -= ChecksumModifierForContext(base_context_checksum, record_offset);
-    const uint32_t computed = ComputeBuiltinChecksumWithLastByte(
-        checksum_type, record, payload_size, record[payload_size]);
-    if (stored != computed) {
-      return Status::Corruption("Blob record checksum mismatch in " +
-                                file->file_name() + " offset " +
-                                std::to_string(record_offset) + " size " +
-                                std::to_string(payload_size));
-    }
-  }
-
-  if (compression != kNoCompression) {
-    return Status::Corruption("Blob record compression is not supported");
-  }
-  return Status::OK();
-}
-
-IOStatus WriteSimpleGen2BlobRecord(WritableFileWriter* file,
-                                   const WriteOptions& write_options,
-                                   ChecksumType checksum_type,
-                                   uint32_t base_context_checksum,
-                                   uint64_t record_offset, const Slice& payload,
-                                   CompressionType compression) {
-  assert(file != nullptr);
-  // Placeholder for future embedded blob compression support; only
-  // uncompressed payloads are currently written.
-  assert(compression == kNoCompression);
-
-  std::array<char, kSimpleGen2BlobTrailerSize> trailer;
-  trailer[0] = lossless_cast<char>(compression);
-  uint32_t checksum = ComputeBuiltinChecksumWithLastByte(
-      checksum_type, payload.data(), payload.size(), /*last_byte=*/trailer[0]);
-  checksum += ChecksumModifierForContext(base_context_checksum, record_offset);
-  EncodeFixed32(trailer.data() + 1, checksum);
-
-  IOOptions opts;
-  IOStatus io_s = WritableFileWriter::PrepareIOOptions(write_options, opts);
-  if (!io_s.ok()) {
-    return io_s;
-  }
-  if (!payload.empty()) {
-    io_s = file->Append(opts, payload);
-    if (!io_s.ok()) {
-      return io_s;
-    }
-  }
-  return file->Append(opts, Slice(trailer.data(), trailer.size()));
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,92 +0,0 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#pragma once
-
-#include <cstddef>
-#include <cstdint>
-
-#include "cache/cache_key.h"
-#include "rocksdb/compression_type.h"
-#include "rocksdb/io_status.h"
-#include "rocksdb/rocksdb_namespace.h"
-#include "rocksdb/status.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-struct ReadOptions;
-struct WriteOptions;
-class RandomAccessFileReader;
-class WritableFileWriter;
-class Slice;
-enum ChecksumType : char;
-
-// "SimpleGen2Blob" is the second-generation on-disk format for a blob payload
-// referenced by a same-file / context-relative blob index. A record is just the
-// payload bytes followed by a small block-style trailer:
-//
-//   <payload bytes> <1-byte compression marker> <4-byte checksum>
-//
-// The checksum is a builtin block checksum over (payload + compression marker),
-// context-modified by the record's absolute file offset (see
-// ChecksumModifierForContext / ComputeBuiltinChecksumWithLastByte in
-// table/format.h) so that an identical payload at a different offset gets a
-// different stored checksum. Payloads are currently uncompressed only.
-//
-// This format is deliberately decoupled from any particular file type: the same
-// record shape is read out of SST files (embedded blobs) and is intended to be
-// reused by other blob-bearing files. The only file-type-specific inputs are
-// the byte source (a RandomAccessFileReader) and the checksum context (checksum
-// type + base context checksum), both passed in by the caller.
-inline constexpr size_t kSimpleGen2BlobTrailerSize = 5;
-
-// Cache key for the SimpleGen2Blob record at byte `record_offset` within a file
-// whose base cache key is `base_cache_key`. Delegates to the shared
-// OffsetableCacheKey::WithOffsetForMinSizeRecord scheme -- the exact same
-// scheme block-based SST data blocks use via BlockBasedTable::GetCacheKey --
-// which is valid because a SimpleGen2Blob record always carries a >= 5-byte
-// trailer. As a result the cache key is collision-free with the file's data
-// blocks even when the blob cache and block cache are the same cache, with no
-// separately maintained algorithm to drift out of sync.
-inline CacheKey GetSimpleGen2BlobCacheKey(
-    const OffsetableCacheKey& base_cache_key, uint64_t record_offset) {
-  return base_cache_key.WithOffsetForMinSizeRecord(record_offset);
-}
-
-// Reads a SimpleGen2Blob record of `record_size` bytes (which must equal
-// `payload_size + kSimpleGen2BlobTrailerSize`) from `file` at `record_offset`
-// into `buf` (capacity >= record_size) and verifies its compression marker and,
-// when read_options.verify_checksums is set, its context-modified checksum.
-//
-// `checksum_type` and `base_context_checksum` are the file's checksum context
-// (e.g. from the SST footer). `expected_compression` is the compression type
-// the caller expects the record to carry (from the blob index); it must match
-// the record's marker, and currently must be kNoCompression.
-//
-// On success, buf[0, payload_size) holds the verified, uncompressed payload
-// (the trailer remains at the tail of `buf` and can be ignored).
-Status ReadAndVerifySimpleGen2BlobRecord(
-    const ReadOptions& read_options, RandomAccessFileReader* file,
-    uint64_t record_offset, size_t payload_size, size_t record_size,
-    ChecksumType checksum_type, uint32_t base_context_checksum,
-    CompressionType expected_compression, char* buf);
-
-// Writes a SimpleGen2Blob record for `payload` at the current end of `file`,
-// which the caller asserts is byte offset `record_offset`. Appends the payload
-// bytes followed by the 5-byte trailer (compression marker + context-modified
-// builtin checksum), mirroring ReadAndVerifySimpleGen2BlobRecord so the on-disk
-// record format lives in one module.
-//
-// `checksum_type` and `base_context_checksum` are the file's checksum context
-// (e.g. from the SST footer). `compression` is the payload's compression type,
-// which currently must be kNoCompression.
-IOStatus WriteSimpleGen2BlobRecord(WritableFileWriter* file,
-                                   const WriteOptions& write_options,
-                                   ChecksumType checksum_type,
-                                   uint32_t base_context_checksum,
-                                   uint64_t record_offset, const Slice& payload,
-                                   CompressionType compression);
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -7,7 +7,6 @@
 #include <sstream>
 #include <string>

-#include "db/blob/blob_constants.h"
 #include "rocksdb/compression_type.h"
 #include "util/coding.h"
 #include "util/compression.h"
@@ -58,14 +57,6 @@ class BlobIndex {

  bool IsInlined() const { return type_ == Type::kInlinedTTL; }

-  // True for a blob record stored in the same physical file as the table entry.
-  // Only embedded-blob SST reader/writer paths should interpret file number
-  // zero this way; generic blob metadata treats it as invalid.
-  bool IsSameFile() const {
-    return (type_ == Type::kBlob || type_ == Type::kBlobTTL) &&
-           file_number_ == kCurrentFileBlobIndexFileNumber;
-  }
-
  bool HasTTL() const {
    return type_ == Type::kInlinedTTL || type_ == Type::kBlobTTL;
  }
@@ -134,13 +125,8 @@ class BlobIndex {
    if (IsInlined()) {
      oss << "[inlined blob] value:" << value_.ToString(output_hex);
    } else {
-      oss << "[blob ref] file:";
-      if (IsSameFile()) {
-        oss << "same";
-      } else {
-        oss << file_number_;
-      }
-      oss << " offset:" << offset_ << " size:" << size_
+      oss << "[blob ref] file:" << file_number_ << " offset:" << offset_
+          << " size:" << size_
          << " compression: " << CompressionTypeToString(compression_);
    }

@@ -12,10 +12,7 @@
 #include "cache/charged_cache.h"
 #include "db/blob/blob_contents.h"
 #include "db/blob/blob_file_reader.h"
-#include "db/blob/blob_gen2_format.h"
 #include "db/blob/blob_log_format.h"
-#include "file/random_access_file_reader.h"
-#include "memory/memory_allocator_impl.h"
 #include "monitoring/statistics_impl.h"
 #include "options/cf_options.h"
 #include "table/get_context.h"
@@ -308,96 +305,6 @@ Status BlobSource::GetBlob(const ReadOptions& read_options,
  return s;
 }

-Status BlobSource::GetSimpleGen2Blob(
-    const ReadOptions& read_options, const OffsetableCacheKey& base_cache_key,
-    RandomAccessFileReader* file, uint64_t record_offset, uint64_t payload_size,
-    ChecksumType checksum_type, uint32_t base_context_checksum,
-    CompressionType expected_compression, PinnableSlice* value,
-    uint64_t* bytes_read) {
-  assert(value);
-  assert(file);
-
-  const uint64_t record_size = payload_size + kSimpleGen2BlobTrailerSize;
-
-  // The cache key is derived from the SimpleGen2Blob format (shared scheme with
-  // block-based SST blocks); see GetSimpleGen2BlobCacheKey.
-  const CacheKey cache_key =
-      GetSimpleGen2BlobCacheKey(base_cache_key, record_offset);
-
-  Status s;
-
-  CacheHandleGuard<BlobContents> blob_handle;
-
-  // First, try to get the blob from the cache.
-  if (blob_cache_) {
-    Slice key = cache_key.AsSlice();
-    s = GetBlobFromCache(key, &blob_handle);
-    if (s.ok()) {
-      PinCachedBlob(&blob_handle, value);
-
-      // For consistency, the on-disk record size is assigned to bytes_read on
-      // both cache hits and misses.
-      if (bytes_read) {
-        *bytes_read = record_size;
-      }
-      return s;
-    }
-  }
-
-  assert(blob_handle.IsEmpty());
-
-  const bool no_io = read_options.read_tier == kBlockCacheTier;
-  if (no_io) {
-    return Status::Incomplete("Cannot read blob(s): no disk I/O allowed");
-  }
-
-  // Cache miss (or no cache configured). Read the record into a buffer
-  // allocated from the blob cache's memory allocator when we intend to insert
-  // it, exposing the uncompressed payload as BlobContents (the trailer just
-  // sits unused at the tail of the buffer).
-  MemoryAllocator* const allocator = (blob_cache_ && read_options.fill_cache)
-                                         ? blob_cache_.get()->memory_allocator()
-                                         : nullptr;
-
-  CacheAllocationPtr buf =
-      AllocateBlock(static_cast<size_t>(record_size), allocator);
-  s = ReadAndVerifySimpleGen2BlobRecord(
-      read_options, file, record_offset, static_cast<size_t>(payload_size),
-      static_cast<size_t>(record_size), checksum_type, base_context_checksum,
-      expected_compression, buf.get());
-  if (!s.ok()) {
-    return s;
-  }
-
-  std::unique_ptr<BlobContents> blob_contents(
-      new BlobContents(std::move(buf), static_cast<size_t>(payload_size)));
-
-  // Record the per-read statistics (mirrors BlobFileReader::GetBlob).
-  RecordTick(statistics_, BLOB_DB_BLOB_FILE_BYTES_READ, record_size);
-  PERF_COUNTER_ADD(blob_read_count, 1);
-  PERF_COUNTER_ADD(blob_read_byte, record_size);
-  if (bytes_read) {
-    *bytes_read = record_size;
-  }
-
-  if (blob_cache_ && read_options.fill_cache) {
-    // If filling cache is allowed and a cache is configured, try to put the
-    // blob into the cache.
-    Slice key = cache_key.AsSlice();
-    s = PutBlobIntoCache(key, &blob_contents, &blob_handle);
-    if (!s.ok()) {
-      return s;
-    }
-
-    PinCachedBlob(&blob_handle, value);
-  } else {
-    PinOwnedBlob(&blob_contents, value);
-  }
-
-  assert(s.ok());
-  return s;
-}
-
 void BlobSource::MultiGetBlob(const ReadOptions& read_options,
                              autovector<BlobFileReadRequests>& blob_reqs,
                              uint64_t* bytes_read) {
@@ -25,8 +25,6 @@ struct MutableCFOptions;
 class Status;
 class FilePrefetchBuffer;
 class Slice;
-class RandomAccessFileReader;
-enum ChecksumType : char;

 // BlobSource is a class that provides universal access to blobs, regardless of
 // whether they are in the blob cache, secondary cache, or (remote) storage.
@@ -61,41 +59,6 @@ class BlobSource {
                 FilePrefetchBuffer* prefetch_buffer, PinnableSlice* value,
                 uint64_t* bytes_read);

-  // Reads a SimpleGen2Blob payload (see db/blob/blob_gen2_format.h) through the
-  // blob value cache and BLOB_DB_* statistics. This is the counterpart to
-  // GetBlob() for the second-generation blob record format, which is read
-  // directly from a RandomAccessFileReader rather than from a traditional blob
-  // file.
-  //
-  // The cache key is derived from the SimpleGen2Blob format itself, not chosen
-  // by the caller: it is GetSimpleGen2BlobCacheKey(base_cache_key,
-  // record_offset), the same offset scheme block-based SST blocks use. The
-  // caller supplies only its file's `base_cache_key` (db_id / db_session_id /
-  // file_number). This keeps blob records collision-free with the file's data
-  // blocks even when the blob cache and block cache are the same cache.
-  //
-  // `file`, `record_offset`, `payload_size`, `checksum_type`,
-  // `base_context_checksum`, and `expected_compression` are the inputs to the
-  // SimpleGen2Blob reader used on a cache miss (see
-  // ReadAndVerifySimpleGen2BlobRecord). The on-disk record size (payload +
-  // trailer) is reported via `*bytes_read` (when non-null) and the
-  // BLOB_DB_BLOB_FILE_BYTES_READ / blob_read_byte counters, consistently on
-  // both cache hits and misses.
-  //
-  // On a cache hit, pins the cached value into `*value` (no copy). On a miss,
-  // reads + verifies the record into a cache-allocator buffer, records the
-  // per-read stats, inserts it into the cache (when configured and fill_cache
-  // is set), and pins it into `*value`. If blob_cache_ is not configured, the
-  // record is still read and read stats recorded, just without a cache
-  // lookup/insert.
-  Status GetSimpleGen2Blob(const ReadOptions& read_options,
-                           const OffsetableCacheKey& base_cache_key,
-                           RandomAccessFileReader* file, uint64_t record_offset,
-                           uint64_t payload_size, ChecksumType checksum_type,
-                           uint32_t base_context_checksum,
-                           CompressionType expected_compression,
-                           PinnableSlice* value, uint64_t* bytes_read);
-
  // Read multiple blobs from the underlying cache or blob file(s).
  //
  // If successful, returns ok and sets "result" in the elements of "blob_reqs"
@@ -25,9 +25,6 @@
 #include "file/filename.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
-#include "rocksdb/perf_context.h"
-#include "rocksdb/sst_file_writer.h"
-#include "rocksdb/table.h"
 #include "util/string_util.h"
 #include "utilities/merge_operators.h"

@@ -44,18 +41,6 @@ void CorruptPinnedBlobIndexOnCleanup(void* arg1, void* /*arg2*/) {

 }  // namespace

-TEST(BlobIndexTest, SameFileBlobIndex) {
-  std::string encoded;
-  BlobIndex::EncodeBlob(&encoded, kCurrentFileBlobIndexFileNumber,
-                        /*offset=*/123, /*size=*/456, kNoCompression);
-
-  BlobIndex blob_index;
-  ASSERT_OK(blob_index.DecodeFrom(encoded));
-  EXPECT_TRUE(blob_index.IsSameFile());
-  EXPECT_EQ(blob_index.file_number(), kCurrentFileBlobIndexFileNumber);
-  EXPECT_NE(blob_index.DebugString(false).find("file:same"), std::string::npos);
-}
-
 // kTypeBlobIndex is a value type used by BlobDB only. The base rocksdb
 // should accept the value type on write, and report not supported value
 // for reads, unless caller request for it explicitly. The base rocksdb
@@ -345,436 +330,6 @@ TEST_F(DBBlobIndexTest, ReadOnlyGetImplReturnsBlobIndexWhenRequested) {
  ASSERT_TRUE(is_blob_index);
 }

-// Regression test for a same-file (embedded) BlobIndex being exposed
-// unresolved through an iterator. With index_type=kBinarySearchWithFirstKey
-// and allow_unprepared_value (the default for DB iterators), the block-based
-// table iterator can sit in the is_at_first_key_from_index_ state and return
-// the raw kTypeBlobIndex internal key from the index, while value() resolves
-// the same-file blob to its plain payload. DBIter then reads the stale
-// kTypeBlobIndex type and routes the already-resolved plain value through the
-// blob-index path, corrupting/misreading it.
-//
-// Forcing one entry per data block makes every embedded blob the first key of
-// a block, reliably triggering the deferred-first-key state on both SeekToFirst
-// and forward block transitions.
-TEST_F(DBBlobIndexTest, EmbeddedBlobIteratorWithFirstKeyIndex) {
-  Options options = GetTestOptions();
-  options.create_if_missing = true;
-  BlockBasedTableOptions bbto;
-  bbto.index_type =
-      BlockBasedTableOptions::IndexType::kBinarySearchWithFirstKey;
-  // Soft limit of 1 byte starts a new data block after every entry.
-  bbto.block_size = 1;
-  options.table_factory.reset(NewBlockBasedTableFactory(bbto));
-  DestroyAndReopen(options);
-
-  // Build an embedded-blob SST whose large values are stored as same-file blob
-  // records (table entries become same-file BlobIndex references).
-  const std::string sst_path = dbname_ + "/embedded_first_key.sst";
-  SstFileWriterEmbeddedBlobOptions embedded_blob_options;
-  embedded_blob_options.min_blob_size = 8;
-
-  const std::string big1(1024, 'x');
-  const std::string big2(1024, 'y');
-  const std::string big3(1024, 'z');
-
-  SstFileWriter writer(EnvOptions(), options);
-  ASSERT_OK(writer.OpenWithEmbeddedBlobs(sst_path, embedded_blob_options));
-  ASSERT_OK(writer.Put("k1", big1));
-  ASSERT_OK(writer.Put("k2", big2));
-  ASSERT_OK(writer.Put("k3", big3));
-  ASSERT_OK(writer.Finish());
-
-  ASSERT_OK(db_->IngestExternalFile({sst_path}, IngestExternalFileOptions()));
-
-  // Point lookups resolve same-file blobs before exposing them, so Get works.
-  ASSERT_EQ(Get("k1"), big1);
-  ASSERT_EQ(Get("k2"), big2);
-  ASSERT_EQ(Get("k3"), big3);
-
-  // Iterator path: the bug manifests here.
-  std::unique_ptr<Iterator> iter(db_->NewIterator(ReadOptions()));
-  iter->SeekToFirst();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k1");
-  EXPECT_EQ(iter->value(), big1);
-
-  iter->Next();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k2");
-  EXPECT_EQ(iter->value(), big2);
-
-  iter->Next();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k3");
-  EXPECT_EQ(iter->value(), big3);
-
-  iter->Next();
-  ASSERT_FALSE(iter->Valid());
-  ASSERT_OK(iter->status());
-
-  // Seek directly to a block whose first key is an embedded blob.
-  iter->Seek("k2");
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k2");
-  EXPECT_EQ(iter->value(), big2);
-}
-
-// Backward iteration (Prev / SeekForPrev) over an embedded-blob SST must work,
-// including for wide-column entities whose same-file blob columns are resolved
-// into an iterator-owned buffer. DBIter requires the underlying iterator's
-// value to be pinned for backward iteration; EmbeddedBlobResolvingIterator
-// therefore pins resolved values -- both whole-value blob payloads and rebuilt
-// wide-column values -- and hands their cleanup to the PinnedIteratorsManager
-// across repositioning. Before that, backward iteration over the wide-column
-// entity returned NotSupported (or tripped the IsValuePinned() assertion).
-TEST_F(DBBlobIndexTest, EmbeddedBlobBackwardIteration) {
-  Options options = GetTestOptions();
-  options.create_if_missing = true;
-  DestroyAndReopen(options);
-
-  const std::string sst_path = dbname_ + "/embedded_backward.sst";
-  SstFileWriterEmbeddedBlobOptions embedded_blob_options;
-  embedded_blob_options.min_blob_size = 8;
-
-  // Whole-value same-file blobs.
-  const std::string big1(1024, 'x');
-  const std::string big3(1024, 'z');
-  // Wide-column entity: a small (inline) default column plus a large
-  // (embedded, same-file blob) non-default column -- the mixed wide-column
-  // path whose resolved value lands in an iterator-owned buffer.
-  const std::string k2_default(2, 'd');
-  const std::string k2_big_col(1024, 'c');
-  const WideColumns k2_columns{{kDefaultWideColumnName, k2_default},
-                               {"big", k2_big_col}};
-
-  SstFileWriter writer(EnvOptions(), options);
-  ASSERT_OK(writer.OpenWithEmbeddedBlobs(sst_path, embedded_blob_options));
-  ASSERT_OK(writer.Put("k1", big1));
-  ASSERT_OK(writer.PutEntity("k2", k2_columns));
-  ASSERT_OK(writer.Put("k3", big3));
-  ASSERT_OK(writer.Finish());
-
-  ASSERT_OK(db_->IngestExternalFile({sst_path}, IngestExternalFileOptions()));
-
-  std::unique_ptr<Iterator> iter(db_->NewIterator(ReadOptions()));
-
-  // Backward scan via SeekToLast + Prev.
-  iter->SeekToLast();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k3");
-  EXPECT_EQ(iter->value(), big3);
-
-  iter->Prev();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k2");
-  EXPECT_EQ(iter->value(), k2_default);
-  EXPECT_EQ(iter->columns(), k2_columns);
-
-  iter->Prev();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k1");
-  EXPECT_EQ(iter->value(), big1);
-
-  iter->Prev();
-  ASSERT_FALSE(iter->Valid());
-  ASSERT_OK(iter->status());
-
-  // SeekForPrev directly onto the wide-column entity, then step back.
-  iter->SeekForPrev("k2");
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k2");
-  EXPECT_EQ(iter->value(), k2_default);
-  EXPECT_EQ(iter->columns(), k2_columns);
-
-  iter->Prev();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k1");
-  EXPECT_EQ(iter->value(), big1);
-}
-
-// Regression test for T277566778. If resolving a same-file ("embedded") blob
-// fails during compaction (e.g. a blob-region read fault), the error must be
-// surfaced as-is. It must NOT be masked by feeding the raw, unresolved
-// same-file BlobIndex downstream, where FileMetaData::UpdateBoundaries would
-// (correctly) reject file number 0 and report a misleading "Invalid blob file
-// number" corruption. The EmbeddedBlobResolvingIterator must not expose an
-// unresolved same-file value on error: for eager (compaction) callers it
-// resolves during positioning so the error is visible via status()/Valid()
-// before value().
-TEST_F(DBBlobIndexTest, EmbeddedBlobResolveErrorDuringCompactionNotMasked) {
-  Options options = GetTestOptions();
-  options.create_if_missing = true;
-  options.disable_auto_compactions = true;
-  DestroyAndReopen(options);
-
-  const std::string sst_path = dbname_ + "/embedded_resolve_err.sst";
-  SstFileWriterEmbeddedBlobOptions embedded_blob_options;
-  embedded_blob_options.min_blob_size = 8;
-
-  // Wide-column entity with a large (embedded, same-file blob) column: the
-  // mixed path whose resolution reads the blob region during compaction.
-  const std::string big_col(1024, 'c');
-  const WideColumns columns{{kDefaultWideColumnName, "d"}, {"big", big_col}};
-
-  SstFileWriter writer(EnvOptions(), options);
-  ASSERT_OK(writer.OpenWithEmbeddedBlobs(sst_path, embedded_blob_options));
-  ASSERT_OK(writer.PutEntity("k2", columns));
-  ASSERT_OK(writer.Finish());
-  ASSERT_OK(db_->IngestExternalFile({sst_path}, IngestExternalFileOptions()));
-
-  // Add keys straddling the entity so a real compaction (not a trivial move)
-  // reads and resolves the embedded entity.
-  ASSERT_OK(Put("k1", "v1"));
-  ASSERT_OK(Put("k3", "v3"));
-  ASSERT_OK(Flush());
-
-  // Inject a resolution failure only during the compaction below, simulating a
-  // blob-region read fault.
-  const Status kInjected = Status::IOError("injected embedded blob read error");
-  SyncPoint::GetInstance()->SetCallBack(
-      "BlockBasedTable::MaybeResolveEmbeddedValue:InjectError",
-      [&](void* arg) { *static_cast<Status*>(arg) = kInjected; });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  const Status s = db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  // The compaction must fail with the injected read error, NOT a masked
-  // "Invalid blob file number" corruption.
-  ASSERT_NOK(s);
-  EXPECT_TRUE(s.IsIOError()) << s.ToString();
-  EXPECT_EQ(s.ToString().find("Invalid blob file number"), std::string::npos)
-      << s.ToString();
-}
-
-// Regression test for T277310719, the whole-value (kTypeBlobIndex) sibling of
-// the wide-column-entity case above (T277566778). Both share one root cause: on
-// a blob-region resolution error during compaction, the
-// EmbeddedBlobResolvingIterator must not fall back to exposing the raw,
-// unresolved same-file value.
-//
-// The whole-value variant is more dangerous than the entity variant because it
-// escapes the FileMetaData::UpdateBoundaries tripwire: ResolveKeyType()
-// rewrites the key type kTypeBlobIndex -> kTypeValue (no I/O, always succeeds),
-// so on a masked resolution error the emitted entry is {kTypeValue, raw
-// BlobIndex bytes}. UpdateBoundaries only scans kTypeBlobIndex/entity types, so
-// unlike the entity variant it does NOT reject it -- the masked error slips
-// through, a corrupt {kTypeValue, BlobIndex} record is written to the
-// compaction output, and a later point lookup reads those raw BlobIndex bytes
-// back as the value (in db_stress this surfaced as the
-// ExpectedValue::IsValueBaseValid assertion, not "Invalid blob file number").
-// The eager (compaction) resolver must surface the error via status()/Valid()
-// before value() is consumed.
-TEST_F(DBBlobIndexTest,
-       EmbeddedBlobResolveErrorWholeValueDuringCompactionNotMasked) {
-  Options options = GetTestOptions();
-  options.create_if_missing = true;
-  options.disable_auto_compactions = true;
-  DestroyAndReopen(options);
-
-  const std::string sst_path = dbname_ + "/embedded_resolve_err_wholevalue.sst";
-  SstFileWriterEmbeddedBlobOptions embedded_blob_options;
-  embedded_blob_options.min_blob_size = 8;
-
-  // A large whole value is stored as a same-file blob, so the table entry
-  // becomes a same-file (file number 0) BlobIndex (kTypeBlobIndex) -- the
-  // whole-value path whose resolution reads the blob region during compaction.
-  const std::string big_val(1024, 'b');
-
-  SstFileWriter writer(EnvOptions(), options);
-  ASSERT_OK(writer.OpenWithEmbeddedBlobs(sst_path, embedded_blob_options));
-  ASSERT_OK(writer.Put("k2", big_val));
-  ASSERT_OK(writer.Finish());
-  ASSERT_OK(db_->IngestExternalFile({sst_path}, IngestExternalFileOptions()));
-
-  // Add keys straddling the embedded blob so a real compaction (not a trivial
-  // move) reads and resolves it.
-  ASSERT_OK(Put("k1", "v1"));
-  ASSERT_OK(Put("k3", "v3"));
-  ASSERT_OK(Flush());
-
-  // Inject a resolution failure only during the compaction below, simulating a
-  // blob-region read fault.
-  const Status kInjected = Status::IOError("injected embedded blob read error");
-  SyncPoint::GetInstance()->SetCallBack(
-      "BlockBasedTable::MaybeResolveEmbeddedValue:InjectError",
-      [&](void* arg) { *static_cast<Status*>(arg) = kInjected; });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  const Status s = db_->CompactRange(CompactRangeOptions(), nullptr, nullptr);
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  // The compaction must fail with the injected read error. Before the fix it
-  // instead succeeded (masking the error) and persisted a {kTypeValue, raw
-  // BlobIndex} record; it must not do that, and it must not report a misleading
-  // "Invalid blob file number" corruption either.
-  ASSERT_NOK(s);
-  EXPECT_TRUE(s.IsIOError()) << s.ToString();
-  EXPECT_EQ(s.ToString().find("Invalid blob file number"), std::string::npos)
-      << s.ToString();
-}
-
-// When a blob cache is configured, same-file ("embedded") blob reads should go
-// through BlobSource: the first read misses + inserts + does a disk read, and
-// the second read of the same blob is served from the blob cache. This holds on
-// both the Get() and the iterator paths.
-TEST_F(DBBlobIndexTest, EmbeddedBlobBlobCacheHitMiss) {
-  Options options = GetTestOptions();
-  options.create_if_missing = true;
-  options.statistics = CreateDBStatistics();
-
-  LRUCacheOptions co;
-  co.capacity = 8 << 20;
-  options.blob_cache = NewLRUCache(co);
-
-  DestroyAndReopen(options);
-
-  const std::string sst_path = dbname_ + "/embedded_cache.sst";
-  SstFileWriterEmbeddedBlobOptions embedded_blob_options;
-  embedded_blob_options.min_blob_size = 8;
-
-  const std::string big1(1024, 'x');
-  const std::string big2(1024, 'y');
-
-  SstFileWriter writer(EnvOptions(), options);
-  ASSERT_OK(writer.OpenWithEmbeddedBlobs(sst_path, embedded_blob_options));
-  ASSERT_OK(writer.Put("k1", big1));
-  ASSERT_OK(writer.Put("k2", big2));
-  ASSERT_OK(writer.Finish());
-
-  ASSERT_OK(db_->IngestExternalFile({sst_path}, IngestExternalFileOptions()));
-
-  Statistics* const stats = options.statistics.get();
-
-  // First Get: blob cache miss -> disk read -> cache insert.
-  ASSERT_OK(stats->Reset());
-  get_perf_context()->Reset();
-  SetPerfLevel(kEnableCount);
-  ASSERT_EQ(Get("k1"), big1);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_MISS), 1);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_HIT), 0);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_ADD), 1);
-  EXPECT_GT(stats->getTickerCount(BLOB_DB_BLOB_FILE_BYTES_READ), 0);
-  EXPECT_EQ(get_perf_context()->blob_read_count, 1);
-
-  // Second Get of the same key: blob cache hit, no disk read, no insert.
-  ASSERT_OK(stats->Reset());
-  get_perf_context()->Reset();
-  ASSERT_EQ(Get("k1"), big1);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_HIT), 1);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_MISS), 0);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_ADD), 0);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_BLOB_FILE_BYTES_READ), 0);
-  EXPECT_EQ(get_perf_context()->blob_read_count, 0);
-  EXPECT_EQ(get_perf_context()->blob_cache_hit_count, 1);
-
-  // Iterator path: first read of a fresh key misses + inserts.
-  ASSERT_OK(stats->Reset());
-  {
-    std::unique_ptr<Iterator> iter(db_->NewIterator(ReadOptions()));
-    iter->Seek("k2");
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    EXPECT_EQ(iter->value(), big2);
-  }
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_MISS), 1);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_ADD), 1);
-
-  // Iterator path: second read of the same key hits the blob cache.
-  ASSERT_OK(stats->Reset());
-  {
-    std::unique_ptr<Iterator> iter(db_->NewIterator(ReadOptions()));
-    iter->Seek("k2");
-    ASSERT_TRUE(iter->Valid());
-    ASSERT_OK(iter->status());
-    EXPECT_EQ(iter->value(), big2);
-  }
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_HIT), 1);
-  EXPECT_EQ(stats->getTickerCount(BLOB_DB_CACHE_ADD), 0);
-
-  SetPerfLevel(kDisable);
-}
-
-// With the blob cache and block cache pointing at the same Cache, the SST-like
-// cache-key scheme (offset >> 2 on the SST's base key) keeps embedded blob
-// records disjoint from the SST's data blocks. Reading embedded blobs must not
-// alias or evict data blocks, and values must remain correct.
-TEST_F(DBBlobIndexTest, EmbeddedBlobSharedBlockAndBlobCache) {
-  Options options = GetTestOptions();
-  options.create_if_missing = true;
-  options.statistics = CreateDBStatistics();
-
-  LRUCacheOptions co;
-  co.capacity = 16 << 20;
-  auto shared_cache = NewLRUCache(co);
-  options.blob_cache = shared_cache;
-
-  BlockBasedTableOptions bbto;
-  bbto.block_cache = shared_cache;
-  bbto.cache_index_and_filter_blocks = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(bbto));
-
-  DestroyAndReopen(options);
-
-  const std::string sst_path = dbname_ + "/embedded_shared.sst";
-  SstFileWriterEmbeddedBlobOptions embedded_blob_options;
-  embedded_blob_options.min_blob_size = 8;
-
-  const std::string big1(1024, 'x');
-  const std::string big2(1024, 'y');
-
-  SstFileWriter writer(EnvOptions(), options);
-  ASSERT_OK(writer.OpenWithEmbeddedBlobs(sst_path, embedded_blob_options));
-  ASSERT_OK(writer.Put("k1", big1));
-  ASSERT_OK(writer.Put("k2", big2));
-  ASSERT_OK(writer.Finish());
-
-  ASSERT_OK(db_->IngestExternalFile({sst_path}, IngestExternalFileOptions()));
-
-  Statistics* const stats = options.statistics.get();
-
-  // Values are correct with a shared cache, and re-reads hit both the block
-  // cache (data blocks) and the blob cache (embedded payloads) independently.
-  ASSERT_EQ(Get("k1"), big1);
-  ASSERT_EQ(Get("k2"), big2);
-  ASSERT_EQ(Get("k1"), big1);
-  ASSERT_EQ(Get("k2"), big2);
-  EXPECT_GT(stats->getTickerCount(BLOB_DB_CACHE_HIT), 0);
-  EXPECT_GT(stats->getTickerCount(BLOCK_CACHE_HIT), 0);
-
-  // Iterator yields correct values too.
-  std::unique_ptr<Iterator> iter(db_->NewIterator(ReadOptions()));
-  iter->SeekToFirst();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k1");
-  EXPECT_EQ(iter->value(), big1);
-
-  iter->Next();
-  ASSERT_TRUE(iter->Valid());
-  ASSERT_OK(iter->status());
-  EXPECT_EQ(iter->key(), "k2");
-  EXPECT_EQ(iter->value(), big2);
-
-  iter->Next();
-  ASSERT_FALSE(iter->Valid());
-  ASSERT_OK(iter->status());
-}
-
 class PlainBlobValueFilterV3 : public CompactionFilter {
 public:
  PlainBlobValueFilterV3(std::atomic<int>* filter_call_count,
@@ -678,9 +678,6 @@ ColumnFamilyData::ColumnFamilyData(
                          internal_stats_->GetBlobFileReadHist(), io_tracer));
    blob_source_.reset(new BlobSource(ioptions_, mutable_cf_options_, db_id,
                                      db_session_id, blob_file_cache_.get()));
-    // Let the table cache route same-file ("embedded") blob reads through the
-    // blob value cache + stats. Both objects share this CFD's lifetime.
-    table_cache_->SetBlobSource(blob_source_.get());

    if (ioptions_.compaction_style == kCompactionStyleLevel) {
      compaction_picker_.reset(
@@ -777,40 +777,6 @@ static std::unordered_map<std::string, OptionTypeInfo>
          OptionTypeFlags::kNone}},
 };

-namespace {
-
-// Like OptionTypeInfo::Array<T, kSize> but deserialization tolerates
-// size mismatches: extra elements beyond kSize are silently ignored,
-// missing elements are zero-filled. Serialization and comparison are
-// inherited from Array<T, kSize> unchanged; only the parse
-// (deserialize) callback is overridden.
-template <typename T, size_t kSize>
-OptionTypeInfo SizeTolerantDeserializeArray(int offset,
-                                            OptionVerificationType verification,
-                                            OptionTypeFlags flags,
-                                            const OptionTypeInfo& elem_info,
-                                            char separator = ':') {
-  return OptionTypeInfo::Array<T, kSize>(offset, verification, flags, elem_info,
-                                         separator)
-      .SetParseFunc([elem_info, separator](
-                        const ConfigOptions& opts, const std::string& name,
-                        const std::string& value, void* addr) {
-        std::vector<T> parsed;
-        Status s =
-            ParseVector<T>(opts, elem_info, separator, name, value, &parsed);
-        if (!s.ok()) {
-          return Status(std::move(s));
-        }
-        auto* arr = static_cast<std::array<T, kSize>*>(addr);
-        for (size_t i = 0; i < kSize; ++i) {
-          (*arr)[i] = (i < parsed.size()) ? parsed[i] : T{};
-        }
-        return Status::OK();
-      });
-}
-
-}  // namespace
-
 static std::unordered_map<std::string, OptionTypeInfo>
    compaction_stats_type_info = {
        {"micros",
@@ -902,20 +868,12 @@ static std::unordered_map<std::string, OptionTypeInfo>
         {offsetof(struct InternalStats::CompactionStats, count),
          OptionType::kUInt64T, OptionVerificationType::kNormal,
          OptionTypeFlags::kNone}},
-        // The remote worker may serialize a different number of
-        // CompactionReason counts than this primary expects (RocksDB versions
-        // can disagree on kNumOfReasons). Deserialization tolerates the
-        // mismatch: extra trailing elements are dropped, missing ones are
-        // zero-filled.
-        //
-        // The serialized width is intentionally kept at kNumOfReasons - 1 (the
-        // reduced width) so this change does NOT alter what is written -- only
-        // the read path becomes tolerant. Widening the serialized width to the
-        // full kNumOfReasons is a separate, later change that must not land
-        // until this tolerant read has been deployed to every primary,
-        // including rollback targets.
        {"counts",
-         SizeTolerantDeserializeArray<
+         OptionTypeInfo::Array<
+             /* In release 11.2, a new compaction reason was added. This broken
+              * the reader and writer. To unblock release 11.1, we temporarily
+              * reduce the count array size to the old one. TODO add a proper
+              * serialization and deserialization method. */
             int, static_cast<int>(CompactionReason::kNumOfReasons) - 1>(
             offsetof(struct InternalStats::CompactionStats, counts),
             OptionVerificationType::kNormal, OptionTypeFlags::kNone,
@@ -3,8 +3,6 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include <memory>
-
 #include "db/db_test_util.h"
 #include "file/file_util.h"
 #include "port/stack_trace.h"
@@ -14,71 +12,6 @@

 namespace ROCKSDB_NAMESPACE {

-namespace {
-
-// Append ":extra_value" to every "counts=...;" field in a serialized
-// CompactionServiceResult string to simulate a worker with more
-// CompactionReason enums than the reader. Loops because the serialized
-// result contains multiple CompactionStats structs (output_level_stats,
-// proximal_level_stats), each with its own "counts=" field.
-void AppendToCountsFields(std::string* s, const std::string& extra_value) {
-  const std::string prefix = "counts=";
-  size_t pos = s->find(prefix);
-  while (pos != std::string::npos) {
-    // Find the semicolon that terminates this field's value.
-    size_t semi = s->find(';', pos + prefix.size());
-    assert(semi != std::string::npos);
-    // Insert ":extra_value" just before the semicolon.
-    s->insert(semi, ":" + extra_value);
-    // Advance past the inserted text to find the next occurrence.
-    pos = s->find(prefix, semi + extra_value.size() + 2);
-  }
-}
-
-// Remove the last colon-separated element from every "counts=...;" field
-// to simulate a worker with fewer CompactionReason enums than the reader.
-// Loops for the same reason as AppendToCountsFields (multiple counts fields).
-void RemoveLastFromCountsFields(std::string* s) {
-  const std::string prefix = "counts=";
-  size_t pos = s->find(prefix);
-  while (pos != std::string::npos) {
-    size_t val_begin = pos + prefix.size();
-    size_t semi = s->find(';', val_begin);
-    assert(semi != std::string::npos);
-    // Find the last ':' separator within the value.
-    size_t last_sep = s->rfind(':', semi - 1);
-    assert(last_sep != std::string::npos && last_sep >= val_begin);
-    // Erase from the last ':' up to (not including) the ';'.
-    // e.g. "counts=0:3:5;" -> erase ":5" -> "counts=0:3;"
-    s->erase(last_sep, semi - last_sep);
-    pos = s->find(prefix, last_sep);
-  }
-}
-
-// Count the colon-separated elements in the first "counts=...;" field of a
-// serialized CompactionServiceResult. Used to assert the serialized width
-// (how many CompactionReason counts this binary writes).
-size_t CountFirstCountsFieldElements(const std::string& s) {
-  const std::string prefix = "counts=";
-  size_t pos = s.find(prefix);
-  assert(pos != std::string::npos);
-  size_t val_begin = pos + prefix.size();
-  size_t semi = s.find(';', val_begin);
-  assert(semi != std::string::npos);
-  if (semi == val_begin) {
-    return 0;
-  }
-  size_t count = 1;
-  for (size_t i = val_begin; i < semi; ++i) {
-    if (s[i] == ':') {
-      ++count;
-    }
-  }
-  return count;
-}
-
-}  // namespace
-
 class MyTestCompactionService : public CompactionService {
 public:
  MyTestCompactionService(
@@ -1676,68 +1609,6 @@ TEST_F(CompactionServiceTest, InvalidResultFallsBackToLocal) {
            my_cs->GetFinalCompactionServiceJobStatus());
 }

-TEST_F(CompactionServiceTest, CompatCheckCountsWidthTolerance) {
-  // Number of per-CompactionReason counts this binary serializes and expects.
-  constexpr size_t kExpected =
-      static_cast<size_t>(CompactionReason::kNumOfReasons) - 1;
-  constexpr size_t kLastIndex = kExpected - 1;
-  constexpr int kFirstCount = 3;
-  constexpr int kLastCount = 5;
-
-  CompactionServiceResult result;
-  result.status = Status::OK();
-  result.output_level = 2;
-  result.output_path = "/tmp/output";
-  result.internal_stats.output_level_stats.counts[0] = kFirstCount;
-  result.internal_stats.output_level_stats.counts[kLastIndex] = kLastCount;
-  std::string serialized;
-  ASSERT_OK(result.Write(&serialized));
-
-  // Guard the produced format: this binary writes exactly kExpected counts.
-  // That element count is what a remote worker hands to the primary to read,
-  // so pinning it catches an accidental change to what is written.
-  ASSERT_EQ(CountFirstCountsFieldElements(serialized), kExpected);
-
-  // Peer agrees on kNumOfReasons: every written count is read back unchanged.
-  {
-    CompactionServiceResult parsed;
-    ASSERT_OK(CompactionServiceResult::Read(serialized, &parsed));
-    ASSERT_OK(parsed.status);
-    const auto& counts = parsed.internal_stats.output_level_stats.counts;
-    ASSERT_EQ(counts[0], kFirstCount);
-    ASSERT_EQ(counts[kLastIndex], kLastCount);
-  }
-
-  // Peer serialized one more count than this binary knows (a worker with an
-  // extra CompactionReason): the surplus trailing count is ignored, and the
-  // counts this binary understands are read unchanged.
-  {
-    std::string from_wider_peer = serialized;
-    AppendToCountsFields(&from_wider_peer, "7");
-    ASSERT_EQ(CountFirstCountsFieldElements(from_wider_peer), kExpected + 1);
-    CompactionServiceResult parsed;
-    ASSERT_OK(CompactionServiceResult::Read(from_wider_peer, &parsed));
-    ASSERT_OK(parsed.status);
-    const auto& counts = parsed.internal_stats.output_level_stats.counts;
-    ASSERT_EQ(counts[0], kFirstCount);
-    ASSERT_EQ(counts[kLastIndex], kLastCount);
-  }
-
-  // Peer serialized one fewer count than this binary knows (a worker missing
-  // the newest CompactionReason): the absent trailing count reads as zero.
-  {
-    std::string from_narrower_peer = serialized;
-    RemoveLastFromCountsFields(&from_narrower_peer);
-    ASSERT_EQ(CountFirstCountsFieldElements(from_narrower_peer), kExpected - 1);
-    CompactionServiceResult parsed;
-    ASSERT_OK(CompactionServiceResult::Read(from_narrower_peer, &parsed));
-    ASSERT_OK(parsed.status);
-    const auto& counts = parsed.internal_stats.output_level_stats.counts;
-    ASSERT_EQ(counts[0], kFirstCount);
-    ASSERT_EQ(counts[kLastIndex], 0);
-  }
-}
-
 TEST_F(CompactionServiceTest, SubCompaction) {
  Options options = CurrentOptions();
  options.max_subcompactions = 10;
@@ -207,9 +207,8 @@ TEST_F(DBBasicTest, OptimizeManifestForRecoveryEmitsPerCFWhenLogAdvances) {
  ASSERT_EQ("v", Get("k"));
 }

-// With track_and_verify_wals_in_manifest=true and a clean close, the
-// close-time code already advances WalSet markers. Recovery's
-// DeleteWalsBefore is redundant and should be skipped.
+// With track_and_verify_wals_in_manifest=true, the wal_deletion edit
+// must STILL be emitted (the DeleteWalsBefore record is required).
 TEST_F(DBBasicTest, OptimizeManifestForRecoveryPreservesWalTracking) {
  Options options = CurrentOptions();
  options.create_if_missing = true;
@@ -225,7 +224,7 @@ TEST_F(DBBasicTest, OptimizeManifestForRecoveryPreservesWalTracking) {
  Reopen(options);
  counters.Uninstall();

-  ASSERT_EQ(1, counters.wal_deletion.load());
+  ASSERT_EQ(0, counters.wal_deletion.load());
 }

 // best_efforts_recovery requires a fresh MANIFEST + CURRENT to be
@@ -498,60 +497,11 @@ TEST_F(DBBasicTest, OptimizeManifestForRecoveryEmitsWalDeletionWhenTracking) {
  counters.Uninstall();

  ASSERT_GT(counters.per_cf.load(), 0);
-  ASSERT_EQ(0, records.load());
+  ASSERT_EQ(1, records.load());
  ASSERT_GT(dbfull()->GetVersionSet()->GetWalSet().GetMinWalNumberToKeep(), 0u);
  ASSERT_EQ("v", Get("k"));
 }

-// Zero MANIFEST growth on clean reopen with optimize_manifest_for_recovery=1,
-// reuse_manifest_on_open=1, and track_and_verify_wals_in_manifest=1.
-// Regression test for the stress test failure where a redundant
-// DeleteWalsBefore edit was written during recovery.
-TEST_F(DBBasicTest, OptimizeManifestForRecoveryZeroGrowthOnCleanReopen) {
-  Options options = CurrentOptions();
-  options.create_if_missing = true;
-  options.optimize_manifest_for_recovery = true;
-  options.reuse_manifest_on_open = true;
-  options.track_and_verify_wals_in_manifest = true;
-  options.avoid_flush_during_recovery = true;
-  options.write_dbid_to_manifest = false;
-  DestroyAndReopen(options);
-  ASSERT_OK(Put("k", "v"));
-  ASSERT_OK(Flush());
-  Close();
-
-  // Get MANIFEST size after close
-  std::vector<std::string> files;
-  ASSERT_OK(env_->GetChildren(dbname_, &files));
-  uint64_t manifest_size_before = 0;
-  for (const auto& f : files) {
-    if (f.find("MANIFEST-") == 0) {
-      ASSERT_OK(env_->GetFileSize(dbname_ + "/" + f, &manifest_size_before));
-      break;
-    }
-  }
-  ASSERT_GT(manifest_size_before, 0u);
-
-  // Reopen - should not grow MANIFEST at all
-  Reopen(options);
-
-  // Get MANIFEST size after reopen
-  files.clear();
-  ASSERT_OK(env_->GetChildren(dbname_, &files));
-  uint64_t manifest_size_after = 0;
-  for (const auto& f : files) {
-    if (f.find("MANIFEST-") == 0) {
-      ASSERT_OK(env_->GetFileSize(dbname_ + "/" + f, &manifest_size_after));
-      break;
-    }
-  }
-
-  ASSERT_EQ(manifest_size_before, manifest_size_after)
-      << "MANIFEST grew by " << (manifest_size_after - manifest_size_before)
-      << " bytes on clean reopen; expected zero growth";
-  ASSERT_EQ("v", Get("k"));
-}
-
 // Regression for the close-time marker path: if a new WAL is created while an
 // otherwise-empty user CF stays empty, Close() must reserve the next file
 // number before persisting SetLogNumber(cur_wal + 1) for that CF.
@@ -5509,9 +5459,9 @@ class DBBasicTestMultiGet : public DBTestBase {
  std::vector<std::string> cf_names_;
 };

-class DBBasicTestWithParallelIO : public testing::WithParamInterface<
-                                      std::tuple<bool, bool, bool, uint32_t>>,
-                                  public DBBasicTestMultiGet {
+class DBBasicTestWithParallelIO : public DBBasicTestMultiGet,
+                                  public testing::WithParamInterface<
+                                      std::tuple<bool, bool, bool, uint32_t>> {
 public:
  DBBasicTestWithParallelIO()
      : DBBasicTestMultiGet("/db_basic_test_with_parallel_io", 1,
@@ -330,8 +330,6 @@ class DBTestSharedWriteBufferAcrossCFs

 TEST_P(DBTestSharedWriteBufferAcrossCFs, SharedWriteBufferAcrossCFs) {
  Options options = CurrentOptions();
-  options.statistics = CreateDBStatistics();
-  options.statistics->set_stats_level(StatsLevel::kAll);
  options.arena_block_size = 4096;
  auto flush_listener = std::make_shared<FlushCounterListener>();
  options.listeners.push_back(flush_listener);
@@ -499,29 +497,6 @@ TEST_P(DBTestSharedWriteBufferAcrossCFs, SharedWriteBufferAcrossCFs) {
    ASSERT_EQ(GetNumberOfSstFilesForColumnFamily(db_.get(), "nikitich"),
              static_cast<uint64_t>(2));
  }
-  const uint64_t wbm_flushes =
-      TestGetTickerCount(options, FLUSH_REASON_WRITE_BUFFER_MANAGER);
-  ASSERT_GT(wbm_flushes, 0);
-  EXPECT_EQ(0, TestGetTickerCount(options, FLUSH_REASON_WRITE_BUFFER_FULL));
-
-  HistogramData all_memtable_memory;
-  options.statistics->histogramData(FLUSH_MEMTABLE_MEMORY_BYTES,
-                                    &all_memtable_memory);
-  EXPECT_GE(all_memtable_memory.count, wbm_flushes);
-  EXPECT_GT(all_memtable_memory.sum, 0);
-
-  HistogramData all_memtable_data_size;
-  options.statistics->histogramData(FLUSH_MEMTABLE_TOTAL_DATA_SIZE,
-                                    &all_memtable_data_size);
-  EXPECT_GE(all_memtable_data_size.count, wbm_flushes);
-  EXPECT_GT(all_memtable_data_size.sum, 0);
-
-  HistogramData wbm_memtable_memory;
-  options.statistics->histogramData(
-      FLUSH_WRITE_BUFFER_MANAGER_MEMTABLE_MEMORY_BYTES, &wbm_memtable_memory);
-  EXPECT_EQ(wbm_flushes, wbm_memtable_memory.count);
-  EXPECT_GT(wbm_memtable_memory.sum, 0);
-
  if (cost_cache_) {
    ASSERT_GE(cache->GetUsage(), 256 * 1024);
    Close();
@@ -252,7 +252,7 @@ Status DBImpl::GetLiveFilesStorageInfo(
        "capturing live files. Retry with flush enabled.");
  }
  if (flush_memtable) {
-    wal_locked = !lock_wal_owner_thread_id_counts_.empty();
+    wal_locked = lock_wal_count_ > 0;
    if (wal_locked) {
      if (needs_blob_direct_write_flush) {
        mutex_.Unlock();
@@ -260,12 +260,8 @@ Status DBImpl::GetLiveFilesStorageInfo(
            "Blob direct write requires flushing active blob files before "
            "capturing live files. Retry with WAL unlocked.");
      }
-    }
-    if (wal_locked && !has_unpersisted_data_.load(std::memory_order_relaxed)) {
-      ROCKS_LOG_INFO(
-          immutable_db_options_.info_log,
-          "Skipping FlushForGetLiveFiles while WAL is locked and all data is "
-          "already persisted");
+      ROCKS_LOG_INFO(immutable_db_options_.info_log,
+                     "Can't FlushForGetLiveFiles while WAL is locked");
    } else {
      Status status = FlushForGetLiveFiles(opts.atomic_flush);
      if (!status.ok()) {
@@ -473,61 +473,6 @@ TEST_F(DBFlushTest, StatisticsGarbageBasic) {
  Close();
 }

-TEST_F(DBFlushTest, FlushReasonStatsWriteBufferFull) {
-  Options options = CurrentOptions();
-  options.statistics = CreateDBStatistics();
-  options.statistics->set_stats_level(StatsLevel::kAll);
-  options.create_if_missing = true;
-  options.compression = kNoCompression;
-  options.disable_auto_compactions = true;
-  options.avoid_flush_during_shutdown = true;
-  options.write_buffer_size = 16 * 1024;
-  options.max_write_buffer_number = 8;
-
-  auto flush_listener = std::make_shared<FlushCounterListener>();
-  flush_listener->expected_flush_reason = FlushReason::kWriteBufferFull;
-  options.listeners.push_back(flush_listener);
-
-  ASSERT_OK(TryReopen(options));
-
-  WriteOptions write_options;
-  write_options.disableWAL = true;
-  for (int i = 0; i < 20; ++i) {
-    ASSERT_OK(Put(Key(i), DummyString(10 * 1024), write_options));
-  }
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-  ASSERT_OK(dbfull()->TEST_WaitForBackgroundWork());
-
-  const uint64_t write_buffer_full_flushes =
-      TestGetTickerCount(options, FLUSH_REASON_WRITE_BUFFER_FULL);
-  ASSERT_GT(write_buffer_full_flushes, 0);
-  EXPECT_EQ(0, TestGetTickerCount(options, FLUSH_REASON_WRITE_BUFFER_MANAGER));
-
-  HistogramData all_memtable_memory;
-  options.statistics->histogramData(FLUSH_MEMTABLE_MEMORY_BYTES,
-                                    &all_memtable_memory);
-  EXPECT_GE(all_memtable_memory.count, write_buffer_full_flushes);
-  EXPECT_GT(all_memtable_memory.sum, 0);
-
-  HistogramData all_memtable_data_size;
-  options.statistics->histogramData(FLUSH_MEMTABLE_TOTAL_DATA_SIZE,
-                                    &all_memtable_data_size);
-  EXPECT_GE(all_memtable_data_size.count, write_buffer_full_flushes);
-  EXPECT_GT(all_memtable_data_size.sum, 0);
-
-  HistogramData write_buffer_full_memtable_memory;
-  options.statistics->histogramData(
-      FLUSH_WRITE_BUFFER_FULL_MEMTABLE_MEMORY_BYTES,
-      &write_buffer_full_memtable_memory);
-  EXPECT_EQ(write_buffer_full_flushes, write_buffer_full_memtable_memory.count);
-  EXPECT_GT(write_buffer_full_memtable_memory.sum, 0);
-
-  HistogramData wbm_memtable_memory;
-  options.statistics->histogramData(
-      FLUSH_WRITE_BUFFER_MANAGER_MEMTABLE_MEMORY_BYTES, &wbm_memtable_memory);
-  EXPECT_EQ(0, wbm_memtable_memory.count);
-}
-
 TEST_F(DBFlushTest, StatisticsGarbageInsertAndDeletes) {
  Options options = CurrentOptions();
  options.statistics = CreateDBStatistics();
@@ -2802,8 +2747,6 @@ TEST_P(DBAtomicFlushTest, ManualAtomicFlush) {
  Options options = CurrentOptions();
  options.create_if_missing = true;
  options.atomic_flush = GetParam();
-  options.statistics = CreateDBStatistics();
-  options.statistics->set_stats_level(StatsLevel::kAll);
  options.write_buffer_size = (static_cast<size_t>(64) << 20);
  auto flush_listener = std::make_shared<FlushCounterListener>();
  flush_listener->expected_flush_reason = FlushReason::kManualFlush;
@@ -2830,16 +2773,6 @@ TEST_P(DBAtomicFlushTest, ManualAtomicFlush) {
  }
  ASSERT_OK(Flush(cf_ids));

-  EXPECT_EQ(options.atomic_flush ? 1 : 0,
-            TestGetTickerCount(options, ATOMIC_FLUSH_REQUEST_REASON_OTHER));
-  EXPECT_EQ(0, TestGetTickerCount(
-                   options, ATOMIC_FLUSH_REQUEST_REASON_WRITE_BUFFER_FULL));
-  EXPECT_EQ(0, TestGetTickerCount(
-                   options, ATOMIC_FLUSH_REQUEST_REASON_WRITE_BUFFER_MANAGER));
-  EXPECT_EQ(0, TestGetTickerCount(
-                   options,
-                   ATOMIC_FLUSH_REQUEST_REASON_MEMTABLE_MAX_RANGE_DELETIONS));
-
  for (size_t i = 0; i != num_cfs; ++i) {
    auto cfh = static_cast<ColumnFamilyHandleImpl*>(handles_[i]);
    ASSERT_EQ(0, cfh->cfd()->imm()->NumNotFlushed());
@@ -334,21 +334,12 @@ Status DBImpl::ResumeImpl(DBRecoverContext context) {
  // FetchAddLastAllocatedSequence() before writes complete, but only
  // published via SetLastSequence() after success. If we're recovering from
  // an error, there may be allocated-but-not-published sequence numbers.
-  // Start recovery from a published sequence number that covers writers which
-  // were already in flight. Recovery flushes repeat this sync at the actual
-  // memtable-switch fence, after FlushAllColumnFamilies() has dropped and
-  // re-acquired the DB mutex.
-  if (two_write_queues_) {
-    WriteThread::Writer w;
-    write_thread_.EnterUnbatched(&w, &mutex_);
-    WriteThread::Writer nonmem_w;
-    nonmem_write_thread_.EnterUnbatched(&nonmem_w, &mutex_);
-    WaitForPendingWrites();
-
+  // We must sync last_sequence_ with last_allocated_sequence_ before creating
+  // any new memtables/WALs, otherwise the new WAL could start with a sequence
+  // number lower than what was already written, causing "sequence number
+  // going backwards" corruption on subsequent recovery.
+  if (immutable_db_options_.two_write_queues) {
    versions_->SyncLastSequenceWithAllocated();
-
-    nonmem_write_thread_.ExitUnbatched(&nonmem_w);
-    write_thread_.ExitUnbatched(&w);
  }

  TEST_SYNC_POINT("DBImpl::ResumeImpl:AfterSyncSeq");
@@ -2169,12 +2160,11 @@ Status DBImpl::ApplyWALToManifest(const ReadOptions& read_options,
 }

 Status DBImpl::LockWAL() {
-  const uint64_t thread_id = env_->GetThreadID();
  {
    InstrumentedMutexLock lock(&mutex_);
-    if (!lock_wal_owner_thread_id_counts_.empty()) {
+    if (lock_wal_count_ > 0) {
      assert(lock_wal_write_token_);
-      ++lock_wal_owner_thread_id_counts_[thread_id];
+      ++lock_wal_count_;
    } else {
      // NOTE: this will "unnecessarily" wait for other non-LockWAL() write
      // stalls to clear before LockWAL returns, however fixing that would
@@ -2192,13 +2182,12 @@ Status DBImpl::LockWAL() {
      }

      // NOTE: releasing mutex in EnterUnbatched might mean we are actually
-      // now locked by another thread.
-      if (lock_wal_owner_thread_id_counts_.empty()) {
+      // now lock_wal_count > 0
+      if (lock_wal_count_ == 0) {
        assert(!lock_wal_write_token_);
        lock_wal_write_token_ = write_controller_.GetStopToken();
      }
-      assert(lock_wal_write_token_);
-      ++lock_wal_owner_thread_id_counts_[thread_id];
+      ++lock_wal_count_;

      if (two_write_queues_) {
        nonmem_write_thread_.ExitUnbatched(&nonmem_w);
@@ -2209,27 +2198,23 @@ Status DBImpl::LockWAL() {
  // NOTE: avoid I/O holding DB mutex
  Status s = FlushWAL(/*sync=*/false);
  if (!s.ok()) {
-    // Undo this LockWAL().
+    // Non-OK return should not be in locked state
    UnlockWAL().PermitUncheckedError();
  }
  return s;
 }

 Status DBImpl::UnlockWAL() {
-  const uint64_t thread_id = env_->GetThreadID();
  bool signal = false;
  uint64_t maybe_stall_begun_count = 0;
  uint64_t nonmem_maybe_stall_begun_count = 0;
  {
    InstrumentedMutexLock lock(&mutex_);
-    const auto owner = lock_wal_owner_thread_id_counts_.find(thread_id);
-    if (owner == lock_wal_owner_thread_id_counts_.end()) {
-      return Status::Aborted("No LockWAL() held by current thread");
+    if (lock_wal_count_ == 0) {
+      return Status::Aborted("No LockWAL() in effect");
    }
-    if (--owner->second == 0) {
-      lock_wal_owner_thread_id_counts_.erase(owner);
-    }
-    if (lock_wal_owner_thread_id_counts_.empty()) {
+    --lock_wal_count_;
+    if (lock_wal_count_ == 0) {
      lock_wal_write_token_.reset();
      signal = true;
      // For the last UnlockWAL, we don't want to return from UnlockWAL()
@@ -3767,7 +3752,6 @@ void DBImpl::MultiGetCommon(const ReadOptions& read_options,
  }

  autovector<KeyContext, MultiGetContext::MAX_BATCH_SIZE> key_context;
-  key_context.reserve(num_keys);
  autovector<KeyContext*, MultiGetContext::MAX_BATCH_SIZE> sorted_keys;
  sorted_keys.resize(num_keys);
  for (size_t i = 0; i < num_keys; ++i) {
@@ -3958,7 +3942,6 @@ void DBImpl::MultiGetCommon(const ReadOptions& read_options,
    }
  }
  autovector<KeyContext, MultiGetContext::MAX_BATCH_SIZE> key_context;
-  key_context.reserve(num_keys);
  autovector<KeyContext*, MultiGetContext::MAX_BATCH_SIZE> sorted_keys;
  sorted_keys.resize(num_keys);
  for (size_t i = 0; i < num_keys; ++i) {
@@ -1215,8 +1215,6 @@ class DBImpl : public DB {

  bool TEST_IsRecoveryInProgress();

-  Status TEST_ResumeImpl(DBRecoverContext context);
-
  // Return the maximum overlapping data (in bytes) at next level for any
  // file at a level >= 1.
  uint64_t TEST_MaxNextLevelOverlappingBytes(
@@ -2485,10 +2483,6 @@ class DBImpl : public DB {
      const autovector<ColumnFamilyData*>& provided_candidate_cfds = {},
      bool entered_write_thread = false);

-  // REQUIRES: mutex locked and write queues drained up to the recovery flush
-  // fence that is about to switch memtables.
-  void MaybeSyncLastSequenceWithAllocatedForRecovery(FlushReason flush_reason);
-
  Status RetryFlushesForErrorRecovery(FlushReason flush_reason, bool wait);

  // Wait until flushing this column family won't stall writes
@@ -2541,7 +2535,7 @@ class DBImpl : public DB {
    }

    // Wait for any LockWAL to clear
-    while (!lock_wal_owner_thread_id_counts_.empty()) {
+    while (lock_wal_count_ > 0) {
      bg_cv_.Wait();
    }
  }
@@ -3600,13 +3594,12 @@ class DBImpl : public DB {

  // Stop write token that is acquired when first LockWAL() is called.
  // Destroyed when last UnlockWAL() is called. Controlled by DB mutex.
-  // See lock_wal_owner_thread_id_counts_
+  // See lock_wal_count_
  std::unique_ptr<WriteControllerToken> lock_wal_write_token_;

-  // Thread IDs of valid LockWAL() owners and their recursive lock counts. Each
-  // owning thread must call UnlockWAL() the same number of times before writes
-  // can resume.
-  std::unordered_map<uint64_t, uint32_t> lock_wal_owner_thread_id_counts_;
+  // The number of LockWAL called without matching UnlockWAL call.
+  // See also lock_wal_write_token_
+  uint32_t lock_wal_count_ = 0;
 };

 class GetWithTimestampReadCallback : public ReadCallback {
@@ -35,32 +35,6 @@

 namespace ROCKSDB_NAMESPACE {

-namespace {
-
-void RecordAtomicFlushRequestReason(Statistics* stats,
-                                    FlushReason flush_reason) {
-  // Keep this aligned with the existing rocksdb.flush.reason.* counters: they
-  // cover automatic flush triggers used for write-stall debugging. Other
-  // FlushReason values are counted by the catch-all other ticker.
-  switch (flush_reason) {
-    case FlushReason::kWriteBufferFull:
-      RecordTick(stats, ATOMIC_FLUSH_REQUEST_REASON_WRITE_BUFFER_FULL);
-      break;
-    case FlushReason::kWriteBufferManager:
-      RecordTick(stats, ATOMIC_FLUSH_REQUEST_REASON_WRITE_BUFFER_MANAGER);
-      break;
-    case FlushReason::kMemtableMaxRangeDeletions:
-      RecordTick(stats,
-                 ATOMIC_FLUSH_REQUEST_REASON_MEMTABLE_MAX_RANGE_DELETIONS);
-      break;
-    default:
-      RecordTick(stats, ATOMIC_FLUSH_REQUEST_REASON_OTHER);
-      break;
-  }
-}
-
-}  // namespace
-
 bool DBImpl::EnoughRoomForCompaction(
    ColumnFamilyData* cfd, const std::vector<CompactionInputFiles>& inputs,
    bool* sfm_reserved_compact_space, LogBuffer* log_buffer) {
@@ -2261,8 +2235,6 @@ Status DBImpl::FlushAllColumnFamilies(const FlushOptions& flush_options,
  Status status;
  if (immutable_db_options_.atomic_flush || flush_options.force_atomic_flush) {
    mutex_.Unlock();
-    TEST_SYNC_POINT(
-        "DBImpl::FlushAllColumnFamilies:BeforeAtomicFlushMemTables");
    status = AtomicFlushMemTables(flush_options, flush_reason);
    if (status.IsColumnFamilyDropped()) {
      status = Status::OK();
@@ -2274,7 +2246,6 @@ Status DBImpl::FlushAllColumnFamilies(const FlushOptions& flush_options,
        continue;
      }
      mutex_.Unlock();
-      TEST_SYNC_POINT("DBImpl::FlushAllColumnFamilies:BeforeFlushMemTable");
      status = FlushMemTable(cfd, flush_options, flush_reason);
      TEST_SYNC_POINT("DBImpl::FlushAllColumnFamilies:1");
      TEST_SYNC_POINT("DBImpl::FlushAllColumnFamilies:2");
@@ -2629,14 +2600,6 @@ void DBImpl::NotifyOnManualFlushScheduled(autovector<ColumnFamilyData*> cfds,
  }
 }

-void DBImpl::MaybeSyncLastSequenceWithAllocatedForRecovery(
-    FlushReason flush_reason) {
-  mutex_.AssertHeld();
-  if (two_write_queues_ && IsRecoveryFlush(flush_reason)) {
-    versions_->SyncLastSequenceWithAllocated();
-  }
-}
-
 Status DBImpl::FlushMemTable(ColumnFamilyData* cfd,
                             const FlushOptions& flush_options,
                             FlushReason flush_reason,
@@ -2649,13 +2612,6 @@ Status DBImpl::FlushMemTable(ColumnFamilyData* cfd,
           "Please try again later after writes are resumed";
    return Status::TryAgain(oss.str());
  }
-  if (flush_options.wait) {
-    InstrumentedMutexLock lock(&mutex_);
-    if (lock_wal_owner_thread_id_counts_.count(env_->GetThreadID()) > 0) {
-      return Status::Aborted(
-          "Likely deadlock as the same thread called LockWAL()");
-    }
-  }
  Status s;
  if (!flush_options.allow_write_stall) {
    bool flush_needed = true;
@@ -2683,12 +2639,6 @@ Status DBImpl::FlushMemTable(ColumnFamilyData* cfd,
    }
    WaitForPendingWrites();

-    // Recovery may have released `mutex_` after the earlier `ResumeImpl()`
-    // sync. Refresh sequence state at the actual memtable-switch fence, after
-    // both write queues are drained and before `SwitchMemtable()` consumes
-    // `LastSequence()`.
-    MaybeSyncLastSequenceWithAllocatedForRecovery(flush_reason);
-
    if (!cfd->mem()->IsEmpty() || !cached_recoverable_state_empty_.load() ||
        IsRecoveryFlush(flush_reason)) {
      s = SwitchMemtable(cfd, &context);
@@ -2814,13 +2764,6 @@ Status DBImpl::AtomicFlushMemTables(
           "Please try again later after writes are resumed";
    return Status::TryAgain(oss.str());
  }
-  if (flush_options.wait) {
-    InstrumentedMutexLock lock(&mutex_);
-    if (lock_wal_owner_thread_id_counts_.count(env_->GetThreadID()) > 0) {
-      return Status::Aborted(
-          "Likely deadlock as the same thread called LockWAL()");
-    }
-  }
  Status s;
  autovector<ColumnFamilyData*> candidate_cfds;
  if (provided_candidate_cfds.empty()) {
@@ -2885,11 +2828,6 @@ Status DBImpl::AtomicFlushMemTables(
    }
    WaitForPendingWrites();

-    // Keep atomic recovery flushes consistent with the single-CF path: the
-    // sequence sync must happen after both write queues are drained and before
-    // any recovery memtable switch reads `LastSequence()`.
-    MaybeSyncLastSequenceWithAllocatedForRecovery(flush_reason);
-
    SelectColumnFamiliesForAtomicFlush(&cfds, candidate_cfds, flush_reason);

    // Unref the newly generated candidate cfds (when not provided) in
@@ -3593,7 +3531,6 @@ bool DBImpl::EnqueuePendingFlush(const FlushRequest& flush_req) {
    }
    ++unscheduled_flushes_;
    flush_queue_.push_back(flush_req);
-    RecordAtomicFlushRequestReason(stats_, flush_req.flush_reason);
    enqueued = true;
  }
  return enqueued;
@@ -35,11 +35,6 @@ Status DBImpl::TEST_SwitchWAL() {
  return s;
 }

-Status DBImpl::TEST_ResumeImpl(DBRecoverContext context) {
-  InstrumentedMutexLock l(&mutex_);
-  return ResumeImpl(context);
-}
-
 uint64_t DBImpl::TEST_MaxNextLevelOverlappingBytes(
    ColumnFamilyHandle* column_family) {
  ColumnFamilyData* cfd;
@@ -1941,8 +1941,10 @@ Status DBImpl::MaybeFlushFinalMemtableOrRestoreActiveLogFiles(
        const uint64_t new_min_log = max_wal_number + 1;
        VersionEdit wal_deletion;
        bool emit_wal_deletion = false;
-        if (immutable_db_options_.track_and_verify_wals_in_manifest &&
-            new_min_log > versions_->GetWalSet().GetMinWalNumberToKeep()) {
+        if (immutable_db_options_.track_and_verify_wals_in_manifest) {
+          // Determining whether DeleteWalsBefore actually shrinks WalSet
+          // membership requires WalSet state outside this site, so emit
+          // unconditionally (pre-existing behavior).
          wal_deletion.DeleteWalsBefore(new_min_log);
          emit_wal_deletion = true;
        }
@@ -3029,23 +3029,12 @@ Status DBImpl::TrimMemtableHistory(WriteContext* context) {

 Status DBImpl::ScheduleFlushes(WriteContext* context) {
  autovector<ColumnFamilyData*> cfds;
-  FlushReason atomic_flush_reason = FlushReason::kWriteBufferFull;
  if (immutable_db_options_.atomic_flush) {
-    // Atomic flush has one request-level reason. Derive it only from CFs that
-    // scheduled the flush, not from every CF selected into the atomic cut.
-    ColumnFamilyData* trigger_cfd;
-    while ((trigger_cfd = flush_scheduler_.TakeNextColumnFamily()) != nullptr) {
-      if (!trigger_cfd->mem()->IsEmpty() &&
-          trigger_cfd->mem()->GetFlushReason() ==
-              FlushReason::kMemtableMaxRangeDeletions) {
-        atomic_flush_reason = FlushReason::kMemtableMaxRangeDeletions;
-      }
-      trigger_cfd->UnrefAndTryDelete();
-    }
    SelectColumnFamiliesForAtomicFlush(&cfds);
    for (auto cfd : cfds) {
      cfd->Ref();
    }
+    flush_scheduler_.Clear();
  } else {
    ColumnFamilyData* tmp_cfd;
    while ((tmp_cfd = flush_scheduler_.TakeNextColumnFamily()) != nullptr) {
@@ -3061,15 +3050,10 @@ Status DBImpl::ScheduleFlushes(WriteContext* context) {

  TEST_SYNC_POINT_CALLBACK("DBImpl::ScheduleFlushes:PreSwitchMemtable",
                           nullptr);
-  autovector<FlushReason> flush_reasons;
-  flush_reasons.reserve(cfds.size());
  for (auto& cfd : cfds) {
-    FlushReason flush_reason = FlushReason::kWriteBufferFull;
    if (status.ok() && !cfd->mem()->IsEmpty()) {
-      flush_reason = cfd->mem()->GetFlushReason();
      status = SwitchMemtable(cfd, context);
    }
-    flush_reasons.push_back(flush_reason);
    if (cfd->UnrefAndTryDelete()) {
      cfd = nullptr;
    }
@@ -3084,13 +3068,12 @@ Status DBImpl::ScheduleFlushes(WriteContext* context) {
      AssignAtomicFlushSeq(cfds);
      FlushRequest flush_req;
      flush_req.atomic_flush = true;
-      GenerateFlushRequest(cfds, atomic_flush_reason, &flush_req);
+      GenerateFlushRequest(cfds, FlushReason::kWriteBufferFull, &flush_req);
      EnqueuePendingFlush(flush_req);
    } else {
-      assert(flush_reasons.size() == cfds.size());
-      for (size_t i = 0; i < cfds.size(); ++i) {
+      for (auto* cfd : cfds) {
        FlushRequest flush_req;
-        GenerateFlushRequest({cfds[i]}, flush_reasons[i], &flush_req);
+        GenerateFlushRequest({cfd}, FlushReason::kWriteBufferFull, &flush_req);
        EnqueuePendingFlush(flush_req);
      }
    }
@@ -3119,7 +3102,7 @@ Status DBImpl::SwitchMemtable(ColumnFamilyData* cfd, WriteContext* context,
                              ReadOnlyMemTable* new_imm,
                              SequenceNumber last_seqno) {
  mutex_.AssertHeld();
-  assert(lock_wal_owner_thread_id_counts_.empty());
+  assert(lock_wal_count_ == 0);

  // TODO: plumb Env::IOActivity, Env::IOPriority
  const WriteOptions write_options;
@@ -1921,9 +1921,6 @@ Status DBIter::ValidateScanOptions(const MultiScanArgs& multiscan_opts) const {

  const std::vector<ScanOptions>& scan_opts = multiscan_opts.GetScanRanges();
  const bool has_limit = scan_opts.front().range.limit.has_value();
-  if (multiscan_opts.reverse && !has_limit) {
-    return Status::InvalidArgument("Reverse MultiScan requires limit");
-  }
  if (!has_limit && scan_opts.size() > 1) {
    return Status::InvalidArgument("Scan has no upper bound");
  }
@@ -2007,12 +2004,6 @@ void DBIter::Seek(const Slice& target) {
  StopWatch sw(clock_, statistics_, DB_SEEK);

  if (scan_opts_.has_value()) {
-    if (scan_opts_->reverse) {
-      status_ = Status::InvalidArgument("Seek called on reverse MultiScan");
-      valid_ = false;
-      return;
-    }
-
    // Validate the seek target is as expected in the previously prepared range
    auto const& scan_ranges = scan_opts_.value().GetScanRanges();
    if (scan_index_ >= scan_ranges.size()) {
@@ -2119,61 +2110,6 @@ void DBIter::SeekForPrev(const Slice& target) {
  PERF_CPU_TIMER_GUARD(iter_seek_cpu_nanos, clock_);
  StopWatch sw(clock_, statistics_, DB_SEEK);

-  if (scan_opts_.has_value()) {
-    if (!scan_opts_->reverse) {
-      status_ =
-          Status::InvalidArgument("SeekForPrev called on forward MultiScan");
-      valid_ = false;
-      return;
-    }
-
-    auto const& scan_ranges = scan_opts_.value().GetScanRanges();
-    if (scan_index_ >= scan_ranges.size()) {
-      status_ = Status::InvalidArgument(
-          "SeekForPrev called after exhausting all of the scan ranges");
-      valid_ = false;
-      return;
-    }
-
-    auto const& range = scan_ranges[scan_index_];
-    auto const& limit = range.range.limit;
-    assert(limit.has_value());
-    if (!limit.has_value() ||
-        user_comparator_.CompareWithoutTimestamp(target, *limit) != 0) {
-      status_ = Status::InvalidArgument(
-          "SeekForPrev target does not match the limit of the next prepared "
-          "range at index " +
-          std::to_string(scan_index_));
-      valid_ = false;
-      return;
-    }
-
-    auto const& start = range.range.start;
-    assert(start.has_value());
-    if (iterate_lower_bound_ == nullptr ||
-        user_comparator_.CompareWithoutTimestamp(start.value(),
-                                                 *iterate_lower_bound_) != 0) {
-      status_ = Status::InvalidArgument(
-          "Lower bound is not set to the same start value of the next "
-          "prepared range at index " +
-          std::to_string(scan_index_));
-      valid_ = false;
-      return;
-    }
-    if (iterate_upper_bound_ == nullptr ||
-        user_comparator_.CompareWithoutTimestamp(limit.value(),
-                                                 *iterate_upper_bound_) != 0) {
-      status_ = Status::InvalidArgument(
-          "Upper bound is not set to the same limit value of the next "
-          "prepared range at index " +
-          std::to_string(scan_index_));
-      valid_ = false;
-      return;
-    }
-
-    scan_index_++;
-  }
-
  if (has_trace_state_) {
    // TODO: What do we do if this returns an error?
    Slice lower_bound, upper_bound;
@@ -5418,157 +5418,6 @@ TEST_P(DBMultiScanIteratorTest, AsyncPrefetchAcrossMultipleFiles) {
  iter.reset();
 }

-TEST_P(DBMultiScanIteratorTest, ReversePrefetchAcrossMultipleRanges) {
-  auto options = CurrentOptions();
-  options.target_file_size_base = 1 << 15;  // 32KiB
-  options.compaction_style = kCompactionStyleUniversal;
-  options.num_levels = 50;
-  options.compression = kNoCompression;
-  DestroyAndReopen(options);
-
-  Random rnd(303);
-  for (int i = 0; i < 1000; ++i) {
-    ASSERT_OK(Put(Key(i), rnd.RandomString(1 << 10)));
-  }
-  ASSERT_OK(Flush());
-  ASSERT_OK(db_->CompactRange({}, nullptr, nullptr));
-  ASSERT_GT(NumTableFilesAtLevel(49), 3);
-
-  ReadOptions ro;
-  ro.fill_cache = GetParam();
-  ColumnFamilyHandle* cfh = dbfull()->DefaultColumnFamily();
-  auto tracking_dispatcher = std::make_shared<TrackingIODispatcher>();
-
-  MultiScanArgs scan_options(BytewiseComparator());
-  scan_options.use_async_io = false;
-  scan_options.reverse = true;
-  scan_options.io_dispatcher = tracking_dispatcher;
-  std::vector<std::string> key_ranges(
-      {Key(100), Key(200), Key(500), Key(600), Key(800), Key(900)});
-  scan_options.insert(key_ranges[0], key_ranges[1]);
-  scan_options.insert(key_ranges[2], key_ranges[3]);
-  scan_options.insert(key_ranges[4], key_ranges[5]);
-
-  std::unique_ptr<MultiScan> iter =
-      dbfull()->NewMultiScan(ro, cfh, scan_options);
-  ASSERT_NE(iter, nullptr);
-
-  std::vector<std::string> actual_keys;
-  try {
-    for (auto range : *iter) {
-      for (auto it : range) {
-        actual_keys.push_back(it.first.ToString());
-      }
-    }
-  } catch (MultiScanException& ex) {
-    FAIL() << "Iterator returned status " << ex.what();
-  } catch (std::logic_error& ex) {
-    FAIL() << "Iterator returned logic error " << ex.what();
-  }
-
-  std::vector<std::string> expected_keys;
-  for (int i = 199; i >= 100; --i) {
-    expected_keys.push_back(Key(i));
-  }
-  for (int i = 599; i >= 500; --i) {
-    expected_keys.push_back(Key(i));
-  }
-  for (int i = 899; i >= 800; --i) {
-    expected_keys.push_back(Key(i));
-  }
-  ASSERT_EQ(actual_keys, expected_keys);
-  ASSERT_GT(tracking_dispatcher->GetReadSets().size(), 0);
-}
-
-TEST_P(DBMultiScanIteratorTest, ReverseUnreleasedPrefetchBlocksCountAsWasted) {
-  auto options = CurrentOptions();
-  options.compression = kNoCompression;
-  options.disable_auto_compactions = true;
-  options.statistics = CreateDBStatistics();
-
-  BlockBasedTableOptions table_options;
-  table_options.flush_block_policy_factory =
-      std::make_shared<FlushBlockEveryKeyPolicyFactory>();
-  table_options.block_cache = NewLRUCache(10 * 1024 * 1024);
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  DestroyAndReopen(options);
-
-  constexpr int kNumKeys = 40;
-  const std::string value(100, 'v');
-  for (int i = 0; i < kNumKeys; ++i) {
-    ASSERT_OK(Put(Key(i), value));
-  }
-  ASSERT_OK(Flush());
-  ASSERT_OK(db_->CompactRange({}, nullptr, nullptr));
-
-  ReadOptions ro;
-  ro.fill_cache = GetParam();
-  ColumnFamilyHandle* cfh = dbfull()->DefaultColumnFamily();
-  auto tracking_dispatcher = std::make_shared<TrackingIODispatcher>();
-
-  MultiScanArgs scan_options(BytewiseComparator());
-  scan_options.use_async_io = false;
-  scan_options.reverse = true;
-  scan_options.io_dispatcher = tracking_dispatcher;
-  const std::string start_key = Key(0);
-  const std::string limit_key = Key(kNumKeys);
-  scan_options.insert(start_key, limit_key);
-
-  {
-    std::unique_ptr<MultiScan> iter =
-        dbfull()->NewMultiScan(ro, cfh, scan_options);
-    ASSERT_NE(iter, nullptr);
-
-    try {
-      auto range_it = iter->begin();
-      ASSERT_NE(range_it, iter->end());
-      auto range = *range_it;
-      auto row_it = range.begin();
-      ASSERT_NE(row_it, range.end());
-      ASSERT_EQ((*row_it).first.ToString(), Key(kNumKeys - 1));
-    } catch (MultiScanException& ex) {
-      FAIL() << "Iterator returned status " << ex.what();
-    } catch (std::logic_error& ex) {
-      FAIL() << "Iterator returned logic error " << ex.what();
-    }
-
-    ASSERT_GT(tracking_dispatcher->GetReadSets().size(), 0);
-  }
-
-  ASSERT_GT(
-      options.statistics->getTickerCount(MULTISCAN_PREFETCH_BLOCKS_WASTED), 0);
-}
-
-TEST_P(DBMultiScanIteratorTest, ReverseRequiresLimits) {
-  auto options = CurrentOptions();
-  options.compression = kNoCompression;
-  DestroyAndReopen(options);
-
-  ASSERT_OK(Put("a", "va"));
-  ASSERT_OK(Put("b", "vb"));
-  ASSERT_OK(Flush());
-
-  ReadOptions ro;
-  ro.fill_cache = GetParam();
-  ColumnFamilyHandle* cfh = dbfull()->DefaultColumnFamily();
-
-  MultiScanArgs scan_options(BytewiseComparator());
-  scan_options.reverse = true;
-  scan_options.insert("a");
-  scan_options.insert("b", "c");
-
-  std::unique_ptr<MultiScan> iter =
-      dbfull()->NewMultiScan(ro, cfh, scan_options);
-  ASSERT_NE(iter, nullptr);
-  try {
-    (void)iter->begin();
-    FAIL() << "Expected reverse MultiScan without an upper bound to fail";
-  } catch (MultiScanException& ex) {
-    ASSERT_NOK(ex.status());
-    ASSERT_TRUE(ex.status().IsInvalidArgument());
-  }
-}
-
 // Wrapper filesystem that does not support async IO.
 // Used to verify that MultiScan gracefully falls back to sync IO.
 class NoAsyncIOFS : public FileSystemWrapper {
@@ -6265,7 +6114,13 @@ TEST_P(DBMultiScanIteratorTest, WastedBlocksTracking) {
  uint64_t wasted =
      options.statistics->getTickerCount(MULTISCAN_PREFETCH_BLOCKS_WASTED);

-  ASSERT_GT(wasted, 0);
+  // We expect some wasted blocks due to the gap between ranges
+  // The exact number depends on prefetch behavior, but should be > 0
+  // if blocks between k020-k050 were prefetched
+  std::cout << "Wasted blocks: " << wasted << std::endl;
+
+  // Note: The test verifies the tracking mechanism works.
+  // The actual count depends on prefetch heuristics which may vary.
 }

 class ReadPathRangeTombstoneTest : public DBIteratorBaseTest,
@@ -3559,79 +3559,6 @@ TEST_F(DBRangeDelTest, MemtableMaxRangeDeletions) {
  ASSERT_EQ(3, NumTableFilesAtLevel(0));
 }

-TEST_F(DBRangeDelTest, FlushReasonStatsMemtableMaxRangeDeletions) {
-  Options options = CurrentOptions();
-  options.statistics = CreateDBStatistics();
-  options.statistics->set_stats_level(StatsLevel::kAll);
-  options.disable_auto_compactions = true;
-  options.memtable_max_range_deletions = 1;
-
-  auto flush_listener = std::make_shared<FlushCounterListener>();
-  flush_listener->expected_flush_reason =
-      FlushReason::kMemtableMaxRangeDeletions;
-  options.listeners.push_back(flush_listener);
-
-  DestroyAndReopen(options);
-
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
-                             Key(10)));
-  // The next write observes the pending flush request.
-  ASSERT_OK(Put(Key(0), "value"));
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-  ASSERT_OK(dbfull()->TEST_WaitForBackgroundWork());
-
-  const uint64_t range_delete_flushes =
-      TestGetTickerCount(options, FLUSH_REASON_MEMTABLE_MAX_RANGE_DELETIONS);
-  ASSERT_GT(range_delete_flushes, 0);
-  EXPECT_EQ(0, TestGetTickerCount(options, FLUSH_REASON_WRITE_BUFFER_FULL));
-  EXPECT_EQ(0, TestGetTickerCount(options, FLUSH_REASON_WRITE_BUFFER_MANAGER));
-  EXPECT_EQ(0, TestGetTickerCount(
-                   options,
-                   ATOMIC_FLUSH_REQUEST_REASON_MEMTABLE_MAX_RANGE_DELETIONS));
-  EXPECT_EQ(0, TestGetTickerCount(options, ATOMIC_FLUSH_REQUEST_REASON_OTHER));
-  EXPECT_EQ(range_delete_flushes,
-            static_cast<uint64_t>(flush_listener->count.load()));
-}
-
-TEST_F(DBRangeDelTest, AtomicFlushReasonStatsMemtableMaxRangeDeletions) {
-  Options options = CurrentOptions();
-  options.statistics = CreateDBStatistics();
-  options.statistics->set_stats_level(StatsLevel::kAll);
-  options.atomic_flush = true;
-  options.disable_auto_compactions = true;
-  options.memtable_max_range_deletions = 1;
-
-  auto flush_listener = std::make_shared<FlushCounterListener>();
-  flush_listener->expected_flush_reason =
-      FlushReason::kMemtableMaxRangeDeletions;
-  options.listeners.push_back(flush_listener);
-
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  ASSERT_OK(Put(1, Key(0), "value"));
-  ASSERT_OK(db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), Key(0),
-                             Key(10)));
-  // The next write observes the pending flush request.
-  ASSERT_OK(Put(Key(0), "value"));
-  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-  ASSERT_OK(dbfull()->TEST_WaitForBackgroundWork());
-
-  const uint64_t range_delete_flushes =
-      TestGetTickerCount(options, FLUSH_REASON_MEMTABLE_MAX_RANGE_DELETIONS);
-  ASSERT_GE(range_delete_flushes, 2);
-  EXPECT_EQ(1, TestGetTickerCount(
-                   options,
-                   ATOMIC_FLUSH_REQUEST_REASON_MEMTABLE_MAX_RANGE_DELETIONS));
-  EXPECT_EQ(0, TestGetTickerCount(options, FLUSH_REASON_WRITE_BUFFER_FULL));
-  EXPECT_EQ(0, TestGetTickerCount(
-                   options, ATOMIC_FLUSH_REQUEST_REASON_WRITE_BUFFER_FULL));
-  EXPECT_EQ(0, TestGetTickerCount(
-                   options, ATOMIC_FLUSH_REQUEST_REASON_WRITE_BUFFER_MANAGER));
-  EXPECT_EQ(0, TestGetTickerCount(options, ATOMIC_FLUSH_REQUEST_REASON_OTHER));
-  EXPECT_EQ(range_delete_flushes,
-            static_cast<uint64_t>(flush_listener->count.load()));
-}
-
 TEST_F(DBRangeDelTest, RangeDelReseekAfterFileReadError) {
  // This is to test a bug that is fixed in
  // https://github.com/facebook/rocksdb/pull/11786.
@@ -782,30 +782,19 @@ TEST_P(DBWriteTest, LockWALConcurrentRecursive) {
    ASSERT_OK(db_->GetLiveFilesStorageInfo({lf_opts}, &files));
  }

-  SyncPoint::GetInstance()->LoadDependency(
-      {{"DBWriteTest::LockWALConcurrentRecursive:ParallelLockAcquired",
-        "DBWriteTest::LockWALConcurrentRecursive:MainUnlocks"},
-       {"DBWriteTest::LockWALConcurrentRecursive:MainAllowsParallelUnlock",
-        "DBWriteTest::LockWALConcurrentRecursive:ParallelUnlocks"}});
-  SyncPoint::GetInstance()->EnableProcessing();
-
  port::Thread parallel_lock_wal{[&]() {
-    ASSERT_OK(db_->LockWAL());  // 2 -> 3
-    TEST_SYNC_POINT(
-        "DBWriteTest::LockWALConcurrentRecursive:ParallelLockAcquired");
-    TEST_SYNC_POINT("DBWriteTest::LockWALConcurrentRecursive:ParallelUnlocks");
-    ASSERT_OK(db_->UnlockWAL());
+    ASSERT_OK(db_->LockWAL());  // 2 -> 3 or 1 -> 2
  }};
-  TEST_SYNC_POINT("DBWriteTest::LockWALConcurrentRecursive:MainUnlocks");

-  ASSERT_OK(db_->UnlockWAL());  // 3 -> 2
+  ASSERT_OK(db_->UnlockWAL());  // 2 -> 1 or 3 -> 2
  // Give parallel_put an extra chance to jump in case of bug
  std::this_thread::yield();
+  parallel_lock_wal.join();
  ASSERT_FALSE(parallel_put_completed.Load());
  ASSERT_FALSE(parallel_ingest_completed.Load());
  ASSERT_FALSE(flush_completed.Load());

-  // Should still have 2 outstanding LockWAL().
+  // Should now have 2 outstanding LockWAL
  ASSERT_EQ(Get("k1"), "k1_orig");

  ASSERT_OK(db_->UnlockWAL());  // 2 -> 1
@@ -818,11 +807,26 @@ TEST_P(DBWriteTest, LockWALConcurrentRecursive) {
  ASSERT_EQ(Get("k2"), "NOT_FOUND");
  ASSERT_EQ(frozen_seqno, db_->GetLatestSequenceNumber());

-  TEST_SYNC_POINT(
-      "DBWriteTest::LockWALConcurrentRecursive:MainAllowsParallelUnlock");
-  parallel_lock_wal.join();
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->LoadDependency({});
+  // Ensure final Unlock is concurrency safe and extra Unlock is safe but
+  // non-OK
+  std::atomic<int> unlock_ok{0};
+  port::Thread parallel_stuff{[&]() {
+    if (db_->UnlockWAL().ok()) {
+      unlock_ok++;
+    }
+    ASSERT_OK(db_->LockWAL());
+    if (db_->UnlockWAL().ok()) {
+      unlock_ok++;
+    }
+  }};
+
+  if (db_->UnlockWAL().ok()) {
+    unlock_ok++;
+  }
+  parallel_stuff.join();
+
+  // There was one extra unlock, so just one non-ok
+  ASSERT_EQ(unlock_ok.load(), 2);

  // Write can proceed
  parallel_put.join();
@@ -33,7 +33,6 @@
 #include "logging/logging.h"
 #include "monitoring/iostats_context_imp.h"
 #include "monitoring/perf_context_imp.h"
-#include "monitoring/statistics_impl.h"
 #include "monitoring/thread_status_util.h"
 #include "port/port.h"
 #include "rocksdb/db.h"
@@ -83,8 +82,6 @@ const char* GetFlushReasonString(FlushReason flush_reason) {
      return "WAL Full";
    case FlushReason::kCatchUpAfterErrorRecovery:
      return "Catch Up After Error Recovery";
-    case FlushReason::kMemtableMaxRangeDeletions:
-      return "Memtable Max Range Deletions";
    default:
      return "Invalid";
  }
@@ -962,21 +959,9 @@ Status FlushJob::WriteLevel0Table() {
      total_num_range_deletes += m->NumRangeDeletion();
    }

-    RecordInHistogram(stats_, FLUSH_MEMTABLE_MEMORY_BYTES, total_memory_usage);
-    RecordInHistogram(stats_, FLUSH_MEMTABLE_TOTAL_DATA_SIZE, total_data_size);
-    if (flush_reason_ == FlushReason::kWriteBufferFull) {
-      RecordTick(stats_, FLUSH_REASON_WRITE_BUFFER_FULL);
-      RecordInHistogram(stats_, FLUSH_WRITE_BUFFER_FULL_MEMTABLE_MEMORY_BYTES,
-                        total_memory_usage);
-    } else if (flush_reason_ == FlushReason::kWriteBufferManager) {
-      RecordTick(stats_, FLUSH_REASON_WRITE_BUFFER_MANAGER);
-      RecordInHistogram(stats_,
-                        FLUSH_WRITE_BUFFER_MANAGER_MEMTABLE_MEMORY_BYTES,
-                        total_memory_usage);
-    } else if (flush_reason_ == FlushReason::kMemtableMaxRangeDeletions) {
-      RecordTick(stats_, FLUSH_REASON_MEMTABLE_MAX_RANGE_DELETIONS);
-    }
-
+    // TODO(cbi): when memtable is flushed due to number of range deletions
+    //  hitting limit memtable_max_range_deletions, flush_reason_ is still
+    //  "Write Buffer Full", should make update flush_reason_ accordingly.
    event_logger_->Log() << "job" << job_context_->job_id << "event"
                         << "flush_started" << "num_memtables" << mems_.size()
                         << "total_num_input_entries" << total_num_input_entries
@@ -390,15 +390,6 @@ bool MemTable::ShouldFlushNow() {
  return arena_.AllocatedAndUnused() < kArenaBlockSize / 4;
 }

-FlushReason MemTable::GetFlushReason() const {
-  if (memtable_max_range_deletions_ > 0 &&
-      num_range_deletes_.LoadRelaxed() >=
-          static_cast<uint64_t>(memtable_max_range_deletions_)) {
-    return FlushReason::kMemtableMaxRangeDeletions;
-  }
-  return FlushReason::kWriteBufferFull;
-}
-
 void MemTable::UpdateFlushState() {
  auto state = flush_state_.load(std::memory_order_relaxed);
  if (state == FLUSH_NOT_REQUESTED && ShouldFlushNow()) {
@@ -858,10 +858,6 @@ class MemTable final : public ReadOnlyMemTable {
  // Returns a heuristic flush decision
  bool ShouldFlushNow();

-  // Returns the reason for a flush scheduled because this memtable decided it
-  // should stop accepting more writes.
-  FlushReason GetFlushReason() const;
-
  // Updates `fragmented_range_tombstone_list_` that will be used to serve reads
  // when this memtable becomes an immutable memtable (in some
  // MemtableListVersion::memlist_). Should be called when this memtable is
@@ -3,56 +3,14 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include <string>
-#include <vector>
-
 #include "file/file_util.h"
 #include "rocksdb/db.h"
 #include "rocksdb/file_system.h"
-#include "rocksdb/iterator.h"

 namespace ROCKSDB_NAMESPACE {

 using MultiScanIterator = MultiScan::MultiScanIterator;

-namespace {
-
-Status ValidateScanOptionsForMultiScan(const MultiScanArgs& multiscan_opts) {
-  if (multiscan_opts.empty()) {
-    return Status::InvalidArgument("Empty MultiScanArgs");
-  }
-
-  const Comparator* comparator = multiscan_opts.GetComparator();
-  if (comparator == nullptr) {
-    return Status::InvalidArgument("MultiScanArgs requires comparator");
-  }
-
-  const std::vector<ScanOptions>& scan_opts = multiscan_opts.GetScanRanges();
-  for (size_t i = 0; i < scan_opts.size(); ++i) {
-    const auto& scan_range = scan_opts[i].range;
-    if (!scan_range.start.has_value()) {
-      return Status::InvalidArgument("Scan has no start key at index " +
-                                     std::to_string(i));
-    }
-    if (multiscan_opts.reverse && !scan_range.limit.has_value()) {
-      return Status::InvalidArgument(
-          "Reverse MultiScan requires limit at index " + std::to_string(i));
-    }
-    if (scan_range.limit.has_value() &&
-        comparator->CompareWithoutTimestamp(
-            scan_range.start.value(), /*a_has_ts=*/false,
-            scan_range.limit.value(), /*b_has_ts=*/false) >= 0) {
-      return Status::InvalidArgument(
-          "Scan start key is large or equal than limit at index " +
-          std::to_string(i));
-    }
-  }
-
-  return Status::OK();
-}
-
-}  // namespace
-
 MultiScan::MultiScan(const ReadOptions& read_options,
                     const MultiScanArgs& scan_opts, DB* db,
                     ColumnFamilyHandle* cfh)
@@ -70,28 +28,14 @@ MultiScan::MultiScan(const ReadOptions& read_options,
      }()),
      db_(db),
      cfh_(cfh) {
-  Status validate_status = ValidateScanOptionsForMultiScan(scan_opts_);
-  if (!validate_status.ok()) {
-    db_iter_.reset(NewErrorIterator(validate_status));
-    return;
-  }
-
  bool slow_path = false;
-  // Setup read_options bounds based on the first scan. Subsequent scans will
-  // update the bounds and allocate a new DB iterator as necessary.
-  {
-    const ScanOptions& first_scan = scan_opts_.GetScanRanges()[0];
-    if (scan_opts_.reverse) {
-      lower_bound_ = *first_scan.range.start;
-      read_options_.iterate_lower_bound = &lower_bound_;
-      upper_bound_ = *first_scan.range.limit;
-      read_options_.iterate_upper_bound = &upper_bound_;
-    } else if (first_scan.range.limit) {
-      upper_bound_ = *first_scan.range.limit;
-      read_options_.iterate_upper_bound = &upper_bound_;
-    } else {
-      read_options_.iterate_upper_bound = nullptr;
-    }
+  // Setup read_options with iterate_uuper_bound based on the first scan.
+  // Subsequent scans will update and allocate a new DB iterator as necessary
+  if (scan_opts_.GetScanRanges()[0].range.limit) {
+    upper_bound_ = *scan_opts_.GetScanRanges()[0].range.limit;
+    read_options_.iterate_upper_bound = &upper_bound_;
+  } else {
+    read_options_.iterate_upper_bound = nullptr;
  }
  for (const auto& opts : scan_opts_.GetScanRanges()) {
    // Check that all the ScanOptions either specify an upper bound or not. If
@@ -110,55 +54,36 @@ MultiScan::MultiScan(const ReadOptions& read_options,
  }
 }

-void MultiScanIterator::SeekCurrentRange() {
-  const ScanOptions& scan_opt = scan_opts_[idx_];
-  if (scan_opt.range.limit) {
-    *upper_bound_ = *scan_opt.range.limit;
-    read_options_.iterate_upper_bound = upper_bound_;
-  } else {
-    read_options_.iterate_upper_bound = nullptr;
-  }
-
-  if (reverse_) {
-    *lower_bound_ = *scan_opt.range.start;
-    read_options_.iterate_lower_bound = lower_bound_;
-    assert(scan_opt.range.limit.has_value());
-    db_iter_->SeekForPrev(*scan_opt.range.limit);
-  } else {
-    db_iter_->Seek(*scan_opt.range.start);
-  }
-}
-
 MultiScanIterator& MultiScanIterator::operator++() {
  status_ = db_iter_->status();
  if (!status_.ok()) {
    throw MultiScanException(status_);
  }

-  if (!valid_) {
-    throw std::logic_error("Incrementing exhausted MultiScan iterator");
-  }
-  ++idx_;
  if (idx_ >= scan_opts_.size()) {
-    valid_ = false;
-    return *this;
+    throw std::logic_error("Index out of range");
  }
-
-  // Check if we need to update read_options_
-  if (scan_opts_[idx_].range.limit.has_value() !=
-      (read_options_.iterate_upper_bound != nullptr)) {
-    if (scan_opts_[idx_].range.limit) {
-      read_options_.iterate_upper_bound = upper_bound_;
-    } else {
-      read_options_.iterate_upper_bound = nullptr;
+  idx_++;
+  if (idx_ < scan_opts_.size()) {
+    // Check if we need to update read_options_
+    if (scan_opts_[idx_].range.limit.has_value() !=
+        (read_options_.iterate_upper_bound != nullptr)) {
+      if (scan_opts_[idx_].range.limit) {
+        *upper_bound_ = *scan_opts_[idx_].range.limit;
+        read_options_.iterate_upper_bound = upper_bound_;
+      } else {
+        read_options_.iterate_upper_bound = nullptr;
+      }
+      db_iter_.reset(db_->NewIterator(read_options_, cfh_));
+      scan_.Reset(db_iter_.get());
+    } else if (scan_opts_[idx_].range.limit) {
+      *upper_bound_ = *scan_opts_[idx_].range.limit;
+    }
+    db_iter_->Seek(*scan_opts_[idx_].range.start);
+    status_ = db_iter_->status();
+    if (!status_.ok()) {
+      throw MultiScanException(status_);
    }
-    db_iter_.reset(db_->NewIterator(read_options_, cfh_));
-    scan_.Reset(db_iter_.get(), reverse_);
-  }
-  SeekCurrentRange();
-  status_ = db_iter_->status();
-  if (!status_.ok()) {
-    throw MultiScanException(status_);
  }
  return *this;
 }
@@ -1,4 +1,4 @@
-//  Copyright (c) Meta Platforms, Inc. and affiliates.
+//  Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
 //  This source code is licensed under both the GPLv2 (found in the
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
@@ -179,22 +179,20 @@ Status TableCache::GetTableReader(
    } else {
      expected_unique_id = kNullUniqueId64x2;  // null ID == no verification
    }
-    TableReaderOptions table_reader_options(
-        ioptions_, mutable_cf_options.prefix_extractor,
-        mutable_cf_options.compression_manager.get(), file_options,
-        internal_comparator, mutable_cf_options.block_protection_bytes_per_key,
-        skip_filters, immortal_tables_, false /* force_direct_prefetch */,
-        level, block_cache_tracer_, max_file_size_for_l0_meta_pin,
-        db_session_id_, file_meta.fd.GetNumber(), expected_unique_id,
-        file_meta.fd.largest_seqno, file_meta.tail_size,
-        file_meta.user_defined_timestamps_persisted,
-        avoid_shared_metadata_cache);
-    // Route same-file ("embedded") blob reads through the CFD's BlobSource for
-    // caching + stats. nullptr in non-DB contexts (e.g. repair).
-    table_reader_options.blob_source = blob_source_;
    s = mutable_cf_options.table_factory->NewTableReader(
-        ro, table_reader_options, std::move(file_reader),
-        file_meta.fd.GetFileSize(), table_reader,
+        ro,
+        TableReaderOptions(
+            ioptions_, mutable_cf_options.prefix_extractor,
+            mutable_cf_options.compression_manager.get(), file_options,
+            internal_comparator,
+            mutable_cf_options.block_protection_bytes_per_key, skip_filters,
+            immortal_tables_, false /* force_direct_prefetch */, level,
+            block_cache_tracer_, max_file_size_for_l0_meta_pin, db_session_id_,
+            file_meta.fd.GetNumber(), expected_unique_id,
+            file_meta.fd.largest_seqno, file_meta.tail_size,
+            file_meta.user_defined_timestamps_persisted,
+            avoid_shared_metadata_cache),
+        std::move(file_reader), file_meta.fd.GetFileSize(), table_reader,
        prefetch_index_and_filter_in_cache);
    TEST_SYNC_POINT("TableCache::GetTableReader:0");
  }
@@ -34,7 +34,6 @@ class Arena;
 struct FileDescriptor;
 class GetContext;
 class HistogramImpl;
-class BlobSource;

 struct TableCacheOpenOptions {
  // Open a new TableReader owned by the returned iterator instead of reusing
@@ -70,15 +69,6 @@ class TableCache {
             const std::string& db_session_id, bool fast_sst_open = false);
  ~TableCache();

-  // Sets the BlobSource used to route same-file ("embedded") blob reads of SSTs
-  // opened through this cache via the blob value cache + BLOB_DB_* statistics.
-  // Both the TableCache and the BlobSource are owned by the same
-  // ColumnFamilyData and share its lifetime, so the raw pointer is safe.
-  // Called once at CFD setup, after the BlobSource is constructed. Left unset
-  // (nullptr) in non-DB contexts (e.g. repair), where embedded reads fall back
-  // to a direct (uncached) read.
-  void SetBlobSource(BlobSource* blob_source) { blob_source_ = blob_source; }
-
  // Cache interface for table cache
  using CacheInterface =
      BasicTypedCacheInterface<TableReader, CacheEntryRole::kMisc>;
@@ -363,9 +353,6 @@ class TableCache {
  Striped<CacheAlignedWrapper<port::Mutex>> loader_mutex_;
  std::shared_ptr<IOTracer> io_tracer_;
  std::string db_session_id_;
-  // Owned by the same ColumnFamilyData; see SetBlobSource(). nullptr in non-DB
-  // contexts (e.g. repair).
-  BlobSource* blob_source_ = nullptr;
 };

 }  // namespace ROCKSDB_NAMESPACE
@@ -15,7 +15,6 @@
 #include <functional>
 #include <map>
 #include <memory>
-#include <optional>
 #include <set>
 #include <sstream>
 #include <thread>
@@ -37,46 +36,11 @@
 #include "port/port.h"
 #include "table/table_reader.h"
 #include "test_util/sync_point.h"
-#include "util/cast_util.h"
-#include "util/hash_containers.h"
 #include "util/string_util.h"

 namespace ROCKSDB_NAMESPACE {

-// Scalar/flag state that a VersionEdit can mutate while being applied. Factored
-// into a small struct so the single-edit undo (VersionBuilder::Rep::EditUndo)
-// can snapshot and restore all of it with a single copy/swap, and so the field
-// list is defined once rather than duplicated between the live state and its
-// undo record. VersionBuilder::Rep inherits this (as does EditUndo) so the
-// scalar state can be snapshotted/restored via up_cast<MutableScalars> with a
-// single copy/swap; Rep is a file-local implementation class, so exposing the
-// base is inconsequential.
-struct MutableScalars {
-  // Whether there are invalid new files or invalid deletions on levels larger
-  // than num_levels_.
-  bool has_invalid_levels_ = false;
-
-  // The fields below are only meaningful when track_found_and_missing_files_ is
-  // enabled.
-
-  // The highest file number among all missing blob files, or
-  // kInvalidBlobFileNumber if none are missing. Useful to check whether a
-  // complete Version is available.
-  uint64_t missing_blob_files_high_ = kInvalidBlobFileNumber;
-  // Cached result of the last validity check: true if all the files making up
-  // the Version can be found. Or, when allow_incomplete_valid_version_ is true
-  // and the version was never edited in an atomic group, true if only a suffix
-  // of L0 SST files and their associated blob files are missing.
-  bool valid_version_available_ = false;
-  // True if the version was ever edited in an atomic group.
-  bool edited_in_atomic_group_ = false;
-  // True if the Version was updated since the last validity check, so the
-  // cached `valid_version_available_` must be recomputed on the next check
-  // rather than reused.
-  bool version_updated_since_last_check_ = false;
-};
-
-class VersionBuilder::Rep : public MutableScalars {
+class VersionBuilder::Rep {
  class NewestFirstBySeqNo {
   public:
    bool operator()(const FileMetaData* lhs, const FileMetaData* rhs) const {
@@ -301,13 +265,17 @@ class VersionBuilder::Rep : public MutableScalars {
  // on invalid levels. The version is not consistent if in the end the files
  // on invalid levels don't cancel out.
  std::unordered_map<int, size_t> invalid_level_sizes_;
+  // Whether there are invalid new files or invalid deletion on levels larger
+  // than num_levels_.
+  bool has_invalid_levels_;
  // Current levels of table files affected by additions/deletions.
  std::unordered_map<uint64_t, int> table_file_levels_;
  // Current compact cursors that should be changed after the last compaction
  std::unordered_map<int, InternalKey> updated_compact_cursors_;
-  const NewestFirstByEpochNumber level_zero_cmp_by_epochno_;
-  const NewestFirstBySeqNo level_zero_cmp_by_seqno_;
-  const BySmallestKey level_nonzero_cmp_;
+  const std::shared_ptr<const NewestFirstByEpochNumber>
+      level_zero_cmp_by_epochno_;
+  const std::shared_ptr<const NewestFirstBySeqNo> level_zero_cmp_by_seqno_;
+  const std::shared_ptr<const BySmallestKey> level_nonzero_cmp_;

  // Mutable metadata objects for all blob files affected by the series of
  // version edits.
@@ -334,88 +302,30 @@ class VersionBuilder::Rep : public MutableScalars {
  std::unordered_set<uint64_t> non_l0_missing_files_;
  // Intermediate SST files (blob files not included yet)
  std::vector<std::string> intermediate_files_;
+  // The highest file number for all the missing blob files, useful to check
+  // if a complete Version is available.
+  uint64_t missing_blob_files_high_ = kInvalidBlobFileNumber;
  // Missing blob files, useful to check if only the missing L0 files'
  // associated blob files are missing.
  std::unordered_set<uint64_t> missing_blob_files_;
+  // True if all files consisting the Version can be found. Or if
+  // `allow_incomplete_valid_version_` is true and the version history is not
+  // ever edited in an atomic group, this will be true if only a
+  // suffix of L0 SST files and their associated blob files are missing.
+  bool valid_version_available_;
+  // True if version is ever edited in an atomic group.
+  bool edited_in_atomic_group_;

-  // Note: additional scalar/flag state mutated while applying edits
-  // (has_invalid_levels_, missing_blob_files_high_, valid_version_available_,
-  // edited_in_atomic_group_, version_updated_since_last_check_) lives in the
-  // MutableScalars base so the single-edit undo can snapshot/restore it in one
-  // copy/swap.
+  // Flag to indicate if the Version is updated since last validity check. If no
+  // `Apply` call is made between a `Rep`'s construction and a
+  // `ValidVersionAvailable` check or between two `ValidVersionAvailable` calls.
+  // This flag will be true to indicate the cached validity value can be
+  // directly used without a recheck.
+  bool version_updated_since_last_check_;

  // End of fields that are only tracked when `track_found_and_missing_files_`
  // is enabled.

-  // Records how to undo (and redo) the most recent `Apply()` so that
-  // VersionEditHandlerPointInTime can build a `Version` reflecting the state
-  // *before* an edit (on a valid->invalid negative edge) without copying the
-  // whole `Rep` on every edit. Only populated when
-  // `track_found_and_missing_files_` is true.
-  //
-  // Each recorded map/set entry stores the "other side" value (the value not
-  // currently live). Applying `ToggleUndo()` swaps every recorded slot with the
-  // live state, so it is self-inverse: one call rolls back to the pre-edit
-  // state, a second call redoes to the post-edit state. Objects momentarily
-  // removed from the live state (e.g. blob metadata) are held inside these
-  // records via value/shared_ptr, so nothing referenced by the pre-edit state
-  // is destroyed during the tentative window. `FileMetaData` removed from
-  // `added_files` by a deletion is instead kept alive via `deferred_unref` and
-  // only released by `CommitLastApply()`.
-  struct EditUndo : MutableScalars {
-    // True while the live state has been rolled back to the pre-edit state
-    // (i.e. `ToggleUndo()` has run an odd number of times).
-    bool rolled_back = false;
-
-    // Each map below records, for the keys the edit touches, the value on the
-    // "other side" (the value not currently live): before the edit while in the
-    // forward/post-edit state, and after the edit once rolled back. `nullopt`
-    // means the key is absent on that side. `ToggleUndo()` swaps each recorded
-    // entry with the corresponding live container, so it is self-inverse.
-
-    // levels_[level].added_files entries, keyed by (level, file number). Holds
-    // the FileMetaData* on the non-live side (the map only owns the pointer,
-    // not the object; see `deferred_unref` for lifetime of deleted files).
-    std::map<std::pair<int, uint64_t>, std::optional<FileMetaData*>>
-        added_files;
-    // levels_[level].deleted_files membership, keyed by (level, file number);
-    // value is whether the file number is present on the non-live side.
-    std::map<std::pair<int, uint64_t>, bool> deleted_files;
-    // table_file_levels_ entries, keyed by file number (level, or absent).
-    UnorderedMap<uint64_t, std::optional<int>> table_file_levels;
-    // invalid_level_sizes_ entries, keyed by level (count, or absent).
-    UnorderedMap<int, std::optional<size_t>> invalid_level_sizes;
-    // updated_compact_cursors_ entries, keyed by level (cursor key, or absent).
-    UnorderedMap<int, std::optional<InternalKey>> compact_cursors;
-    // mutable_blob_file_metas_ entries, keyed by blob file number. Holds the
-    // MutableBlobFileMetaData by value on the non-live side; because it owns a
-    // shared_ptr to the SharedBlobFileMetaData, a rolled-back blob addition is
-    // kept alive here rather than destroyed (which would spuriously mark the
-    // blob obsolete).
-    UnorderedMap<uint64_t, std::optional<MutableBlobFileMetaData>> blob_metas;
-    // Membership on the non-live side for each tracking set, keyed by file
-    // number (blob file number for `missing_blob_files`).
-    UnorderedMap<uint64_t, bool> found_files;
-    UnorderedMap<uint64_t, bool> l0_missing_files;
-    UnorderedMap<uint64_t, bool> non_l0_missing_files;
-    UnorderedMap<uint64_t, bool> missing_blob_files;
-
-    // `intermediate_files_` is append-only within an `Apply()`. Restore by
-    // truncating to `intermediate_files_size` (rollback) / re-appending
-    // `intermediate_tail` (redo).
-    size_t intermediate_files_size = 0;
-    std::vector<std::string> intermediate_tail;
-
-    // (Scalar/flag state on the non-live side is held in the MutableScalars
-    // base subobject.)
-
-    // `FileMetaData` removed from `added_files` by a deletion in this edit. The
-    // ref is held here (not dropped) until `CommitLastApply()`, so a rollback
-    // can reinstall the file.
-    std::vector<FileMetaData*> deferred_unref;
-  };
-  std::unique_ptr<EditUndo> undo_;
-
 public:
  Rep(const FileOptions& file_options, const ImmutableCFOptions* ioptions,
      TableCache* table_cache, VersionStorageInfo* base_vstorage,
@@ -429,9 +339,12 @@ class VersionBuilder::Rep : public MutableScalars {
        base_vstorage_(base_vstorage),
        version_set_(version_set),
        num_levels_(base_vstorage->num_levels()),
-        level_zero_cmp_by_epochno_(),
-        level_zero_cmp_by_seqno_(),
-        level_nonzero_cmp_(base_vstorage_->InternalComparator()),
+        has_invalid_levels_(false),
+        level_zero_cmp_by_epochno_(
+            std::make_shared<NewestFirstByEpochNumber>()),
+        level_zero_cmp_by_seqno_(std::make_shared<NewestFirstBySeqNo>()),
+        level_nonzero_cmp_(std::make_shared<BySmallestKey>(
+            base_vstorage_->InternalComparator())),
        file_metadata_cache_res_mgr_(file_metadata_cache_res_mgr),
        cfd_(cfd),
        version_edit_handler_(version_edit_handler),
@@ -454,17 +367,52 @@ class VersionBuilder::Rep : public MutableScalars {
    }
  }

-  // Rep is only ever held via std::unique_ptr and is not copied. (The previous
-  // save-point mechanism deep-copied Rep on every edit, which was quadratic;
-  // it has been replaced by single-edit undo, see EditUndo above.)
-  Rep(const Rep&) = delete;
-  Rep& operator=(const Rep&) = delete;
+  Rep(const Rep& other)
+      : file_options_(other.file_options_),
+        ioptions_(other.ioptions_),
+        table_cache_(other.table_cache_),
+        base_vstorage_(other.base_vstorage_),
+        version_set_(other.version_set_),
+        num_levels_(other.num_levels_),
+        invalid_level_sizes_(other.invalid_level_sizes_),
+        has_invalid_levels_(other.has_invalid_levels_),
+        table_file_levels_(other.table_file_levels_),
+        updated_compact_cursors_(other.updated_compact_cursors_),
+        level_zero_cmp_by_epochno_(other.level_zero_cmp_by_epochno_),
+        level_zero_cmp_by_seqno_(other.level_zero_cmp_by_seqno_),
+        level_nonzero_cmp_(other.level_nonzero_cmp_),
+        mutable_blob_file_metas_(other.mutable_blob_file_metas_),
+        file_metadata_cache_res_mgr_(other.file_metadata_cache_res_mgr_),
+        cfd_(other.cfd_),
+        version_edit_handler_(other.version_edit_handler_),
+        track_found_and_missing_files_(other.track_found_and_missing_files_),
+        allow_incomplete_valid_version_(other.allow_incomplete_valid_version_),
+        found_files_(other.found_files_),
+        l0_missing_files_(other.l0_missing_files_),
+        non_l0_missing_files_(other.non_l0_missing_files_),
+        intermediate_files_(other.intermediate_files_),
+        missing_blob_files_high_(other.missing_blob_files_high_),
+        missing_blob_files_(other.missing_blob_files_),
+        valid_version_available_(other.valid_version_available_),
+        edited_in_atomic_group_(other.edited_in_atomic_group_),
+        version_updated_since_last_check_(
+            other.version_updated_since_last_check_) {
+    assert(ioptions_);
+    levels_ = new LevelState[num_levels_];
+    for (int level = 0; level < num_levels_; level++) {
+      levels_[level] = other.levels_[level];
+      const auto& added = levels_[level].added_files;
+      for (auto& pair : added) {
+        RefFile(pair.second);
+      }
+    }
+    if (track_found_and_missing_files_) {
+      assert(cfd_);
+      assert(version_edit_handler_);
+    }
+  }

  ~Rep() {
-    // Release any FileMetaData whose deletion was deferred by an uncommitted
-    // Apply(), and ensure the live state is in the forward (post-edit) position
-    // so the loop below unrefs exactly the files still owned by added_files.
-    CommitLastApply();
    for (int level = 0; level < num_levels_; level++) {
      const auto& added = levels_[level].added_files;
      for (auto& pair : added) {
@@ -475,6 +423,12 @@ class VersionBuilder::Rep : public MutableScalars {
    delete[] levels_;
  }

+  void RefFile(FileMetaData* f) {
+    assert(f);
+    assert(f->refs > 0);
+    f->refs++;
+  }
+
  void UnrefFile(FileMetaData* f) {
    f->refs--;
    if (f->refs <= 0) {
@@ -485,15 +439,6 @@ class VersionBuilder::Rep : public MutableScalars {
        f->fd.pinned_reader.Release(table_cache_->get_cache().get());
      }

-      // Evict from table cache to prevent leaked entries for files whose
-      // last reference is held by the VersionBuilder (e.g., files from a
-      // failed LogAndApply that were never installed in any Version).
-      // Release() above only releases the pinned handle's ref but does not
-      // remove the entry from the cache hash table.
-      if (table_cache_ != nullptr) {
-        TableCache::Evict(table_cache_->get_cache().get(), f->fd.GetNumber());
-      }
-
      if (file_metadata_cache_res_mgr_) {
        Status s = file_metadata_cache_res_mgr_->UpdateCacheReservation(
            f->ApproximateMemoryUsage(), false /* increase */);
@@ -503,252 +448,6 @@ class VersionBuilder::Rep : public MutableScalars {
    }
  }

-  //======== Single-edit undo support (track_found_and_missing_files_) =======//
-  // See the EditUndo declaration above for the overall model.
-
-  // Records the pre-edit value of `map[key]` into `saved` (first-touch only, so
-  // repeated touches of the same key within one edit keep the true pre-edit
-  // value). The stored value is the "other side" for ToggleMap().
-  template <typename Map, typename Saved, typename K>
-  static void RecordMapEntry(const Map& map, Saved& saved, const K& key) {
-    if (saved.find(key) != saved.end()) {
-      return;
-    }
-    auto it = map.find(key);
-    saved.emplace(key,
-                  it != map.end()
-                      ? std::optional<typename Map::mapped_type>(it->second)
-                      : std::nullopt);
-  }
-
-  // Swaps every recorded entry between `map` and `saved` (self-inverse).
-  template <typename Map, typename Saved>
-  static void ToggleMapEntries(Map& map, Saved& saved) {
-    for (auto& elem : saved) {
-      const auto& key = elem.first;
-      auto& other = elem.second;
-      auto it = map.find(key);
-      std::optional<typename Map::mapped_type> live =
-          it != map.end() ? std::optional<typename Map::mapped_type>(it->second)
-                          : std::nullopt;
-      if (other.has_value()) {
-        // insert_or_assign avoids requiring a default-constructible mapped_type
-        // (e.g. MutableBlobFileMetaData has no default constructor).
-        map.insert_or_assign(key, std::move(*other));
-      } else if (it != map.end()) {
-        map.erase(it);
-      }
-      other = std::move(live);
-    }
-  }
-
-  template <typename Set, typename Saved, typename K>
-  static void RecordSetMembership(const Set& set, Saved& saved, const K& key) {
-    if (saved.find(key) != saved.end()) {
-      return;
-    }
-    saved.emplace(key, set.find(key) != set.end());
-  }
-
-  template <typename Set, typename Saved>
-  static void ToggleSetMembership(Set& set, Saved& saved) {
-    for (auto& elem : saved) {
-      const auto& key = elem.first;
-      bool& other_present = elem.second;
-      bool live_present = set.find(key) != set.end();
-      if (other_present) {
-        set.insert(key);
-      } else {
-        set.erase(key);
-      }
-      other_present = live_present;
-    }
-  }
-
-  void RecordAddedFileEntry(int level, uint64_t fn) {
-    assert(undo_);
-    assert(level < num_levels_);
-    auto key = std::make_pair(level, fn);
-    if (undo_->added_files.find(key) != undo_->added_files.end()) {
-      return;
-    }
-    const auto& map = levels_[level].added_files;
-    auto it = map.find(fn);
-    undo_->added_files.emplace(
-        key, it != map.end() ? std::optional<FileMetaData*>(it->second)
-                             : std::nullopt);
-  }
-
-  void RecordDeletedFileEntry(int level, uint64_t fn) {
-    assert(undo_);
-    assert(level < num_levels_);
-    auto key = std::make_pair(level, fn);
-    if (undo_->deleted_files.find(key) != undo_->deleted_files.end()) {
-      return;
-    }
-    const auto& set = levels_[level].deleted_files;
-    undo_->deleted_files.emplace(key, set.find(fn) != set.end());
-  }
-
-  // Snapshots the pre-edit value of every piece of state that `edit` will
-  // mutate, so the edit can later be rolled back / redone. Must be called
-  // before the edit is applied and only in tracking mode.
-  void CaptureUndo(const VersionEdit* edit) {
-    assert(track_found_and_missing_files_);
-    assert(!undo_);
-    undo_ = std::make_unique<EditUndo>();
-    undo_->intermediate_files_size = intermediate_files_.size();
-    // Snapshot the pre-edit scalars (the MutableScalars base subobject).
-    up_cast<MutableScalars>(*undo_) = up_cast<MutableScalars>(*this);
-
-    auto touch_table_file = [&](int level, uint64_t fn) {
-      RecordMapEntry(table_file_levels_, undo_->table_file_levels, fn);
-      RecordSetMembership(found_files_, undo_->found_files, fn);
-      RecordSetMembership(l0_missing_files_, undo_->l0_missing_files, fn);
-      RecordSetMembership(non_l0_missing_files_, undo_->non_l0_missing_files,
-                          fn);
-      if (level >= 0 && level < num_levels_) {
-        RecordAddedFileEntry(level, fn);
-        RecordDeletedFileEntry(level, fn);
-      } else if (level >= num_levels_) {
-        RecordMapEntry(invalid_level_sizes_, undo_->invalid_level_sizes, level);
-      }
-    };
-    auto touch_blob_file = [&](uint64_t blob_file_number) {
-      if (blob_file_number == kInvalidBlobFileNumber) {
-        return;
-      }
-      RecordMapEntry(mutable_blob_file_metas_, undo_->blob_metas,
-                     blob_file_number);
-      RecordSetMembership(missing_blob_files_, undo_->missing_blob_files,
-                          blob_file_number);
-    };
-
-    for (const auto& ba : edit->GetBlobFileAdditions()) {
-      touch_blob_file(ba.GetBlobFileNumber());
-    }
-    for (const auto& bg : edit->GetBlobFileGarbages()) {
-      touch_blob_file(bg.GetBlobFileNumber());
-    }
-    for (const auto& deleted_file : edit->GetDeletedFiles()) {
-      const int level = deleted_file.first;
-      const uint64_t fn = deleted_file.second;
-      touch_table_file(level, fn);
-      // Only reachable blob metadata is touched (mirrors ApplyFileDeletion).
-      if (level >= 0 && level < num_levels_ &&
-          GetCurrentLevelForTableFile(fn) == level) {
-        touch_blob_file(GetOldestBlobFileNumberForTableFile(level, fn));
-      }
-    }
-    for (const auto& new_file : edit->GetNewFiles()) {
-      const int level = new_file.first;
-      const FileMetaData& meta = new_file.second;
-      touch_table_file(level, meta.fd.GetNumber());
-      touch_blob_file(meta.oldest_blob_file_number);
-    }
-    for (const auto& cursor : edit->GetCompactCursors()) {
-      const int level = cursor.first;
-      if (level >= 0 && level < num_levels_) {
-        RecordMapEntry(updated_compact_cursors_, undo_->compact_cursors, level);
-      }
-    }
-  }
-
-  // Swaps the live state with the recorded "other side", moving between the
-  // post-edit and pre-edit states. Self-inverse.
-  void ToggleUndo() {
-    assert(undo_);
-    for (auto& elem : undo_->added_files) {
-      const int level = elem.first.first;
-      const uint64_t fn = elem.first.second;
-      auto& other = elem.second;
-      auto& map = levels_[level].added_files;
-      auto it = map.find(fn);
-      std::optional<FileMetaData*> live =
-          it != map.end() ? std::optional<FileMetaData*>(it->second)
-                          : std::nullopt;
-      if (other.has_value()) {
-        map[fn] = *other;
-      } else if (it != map.end()) {
-        // Note: erasing the map entry does not delete the FileMetaData; its
-        // lifetime is managed via `deferred_unref` / the built Version's ref.
-        map.erase(it);
-      }
-      other = live;
-    }
-    for (auto& elem : undo_->deleted_files) {
-      const int level = elem.first.first;
-      const uint64_t fn = elem.first.second;
-      bool& other_present = elem.second;
-      auto& set = levels_[level].deleted_files;
-      bool live_present = set.find(fn) != set.end();
-      if (other_present) {
-        set.insert(fn);
-      } else {
-        set.erase(fn);
-      }
-      other_present = live_present;
-    }
-    ToggleMapEntries(table_file_levels_, undo_->table_file_levels);
-    ToggleMapEntries(invalid_level_sizes_, undo_->invalid_level_sizes);
-    ToggleMapEntries(updated_compact_cursors_, undo_->compact_cursors);
-    ToggleMapEntries(mutable_blob_file_metas_, undo_->blob_metas);
-    ToggleSetMembership(found_files_, undo_->found_files);
-    ToggleSetMembership(l0_missing_files_, undo_->l0_missing_files);
-    ToggleSetMembership(non_l0_missing_files_, undo_->non_l0_missing_files);
-    ToggleSetMembership(missing_blob_files_, undo_->missing_blob_files);
-
-    if (!undo_->rolled_back) {
-      // Forward -> pre-edit: peel off the entries appended by this edit.
-      for (size_t i = undo_->intermediate_files_size;
-           i < intermediate_files_.size(); ++i) {
-        undo_->intermediate_tail.push_back(std::move(intermediate_files_[i]));
-      }
-      intermediate_files_.resize(undo_->intermediate_files_size);
-    } else {
-      // Pre-edit -> forward: re-append.
-      for (auto& s : undo_->intermediate_tail) {
-        intermediate_files_.push_back(std::move(s));
-      }
-      undo_->intermediate_tail.clear();
-    }
-
-    // Swap the scalar/flag state (the MutableScalars base subobject).
-    std::swap(up_cast<MutableScalars>(*this), up_cast<MutableScalars>(*undo_));
-
-    undo_->rolled_back = !undo_->rolled_back;
-  }
-
-  // Reverts the most recent Apply() to the pre-edit state.
-  void RollbackLastApply() {
-    assert(undo_);
-    assert(!undo_->rolled_back);
-    ToggleUndo();
-  }
-
-  // Re-applies the most recent Apply() after a RollbackLastApply().
-  void RedoLastApply() {
-    assert(undo_);
-    assert(undo_->rolled_back);
-    ToggleUndo();
-  }
-
-  // Finalizes the most recent Apply(): frees FileMetaData whose deletion was
-  // deferred and drops the undo record. Safe to call with no pending edit.
-  void CommitLastApply() {
-    if (!undo_) {
-      return;
-    }
-    if (undo_->rolled_back) {
-      // Always finalize in the forward (post-edit) state.
-      ToggleUndo();
-    }
-    for (FileMetaData* f : undo_->deferred_unref) {
-      UnrefFile(f);
-    }
-    undo_.reset();
-  }
-
  // Mapping used for checking the consistency of links between SST files and
  // blob files. It is built using the forward links (table file -> blob file),
  // and is subsequently compared with the inverse mapping stored in the
@@ -837,7 +536,7 @@ class VersionBuilder::Rep : public MutableScalars {

          if (epoch_number_requirement ==
              EpochNumberRequirement::kMightMissing) {
-            if (!level_zero_cmp_by_seqno_(lhs, rhs)) {
+            if (!level_zero_cmp_by_seqno_->operator()(lhs, rhs)) {
              std::ostringstream oss;
              oss << "L0 files are not sorted properly: files #"
                  << lhs->fd.GetNumber() << " with seqnos (largest, smallest) "
@@ -869,7 +568,7 @@ class VersionBuilder::Rep : public MutableScalars {
              }
            }

-            if (!level_zero_cmp_by_epochno_(lhs, rhs)) {
+            if (!level_zero_cmp_by_epochno_->operator()(lhs, rhs)) {
              std::ostringstream oss;
              oss << "L0 files are not sorted properly: files #"
                  << lhs->fd.GetNumber() << " with epoch number "
@@ -898,7 +597,7 @@ class VersionBuilder::Rep : public MutableScalars {
          assert(lhs);
          assert(rhs);

-          if (!level_nonzero_cmp_(lhs, rhs)) {
+          if (!level_nonzero_cmp_->operator()(lhs, rhs)) {
            std::ostringstream oss;
            oss << 'L' << level << " files are not sorted properly: files #"
                << lhs->fd.GetNumber() << ", #" << rhs->fd.GetNumber();
@@ -1196,12 +895,7 @@ class VersionBuilder::Rep : public MutableScalars {
    auto& add_files = level_state.added_files;
    auto add_it = add_files.find(file_number);
    if (add_it != add_files.end()) {
-      if (undo_) {
-        // Defer freeing so a rollback of this edit can reinstall the file.
-        undo_->deferred_unref.push_back(add_it->second);
-      } else {
-        UnrefFile(add_it->second);
-      }
+      UnrefFile(add_it->second);
      add_files.erase(add_it);
    }

@@ -1282,7 +976,7 @@ class VersionBuilder::Rep : public MutableScalars {
        delete f;
        s = Status::MemoryLimit(
            "Can't allocate " +
-            kCacheEntryRoleToCamelString[lossless_cast<std::uint32_t>(
+            kCacheEntryRoleToCamelString[static_cast<std::uint32_t>(
                CacheEntryRole::kFileMetadata)] +
            " due to exceeding the memory limit "
            "based on "
@@ -1360,14 +1054,6 @@ class VersionBuilder::Rep : public MutableScalars {
      }
    }

-    // In tracking mode, snapshot how to undo this edit before mutating, so
-    // VersionEditHandlerPointInTime can build a Version from the pre-edit state
-    // (on a valid->invalid negative edge) via RollbackLastApply() instead of
-    // copying the whole Rep on every edit.
-    if (track_found_and_missing_files_) {
-      CaptureUndo(edit);
-    }
-
    // Note: we process the blob file related changes first because the
    // table file addition/deletion logic depends on the blob files
    // already being there.
@@ -1805,13 +1491,13 @@ class VersionBuilder::Rep : public MutableScalars {
    }

    if (epoch_number_requirement == EpochNumberRequirement::kMightMissing) {
-      SaveSSTFilesTo(vstorage, /* level */ 0, level_zero_cmp_by_seqno_);
+      SaveSSTFilesTo(vstorage, /* level */ 0, *level_zero_cmp_by_seqno_);
    } else {
-      SaveSSTFilesTo(vstorage, /* level */ 0, level_zero_cmp_by_epochno_);
+      SaveSSTFilesTo(vstorage, /* level */ 0, *level_zero_cmp_by_epochno_);
    }

    for (int level = 1; level < num_levels_; ++level) {
-      SaveSSTFilesTo(vstorage, level, level_nonzero_cmp_);
+      SaveSSTFilesTo(vstorage, level, *level_nonzero_cmp_);
    }
  }

@@ -1865,13 +1551,13 @@ class VersionBuilder::Rep : public MutableScalars {

    if (epoch_number_requirement == EpochNumberRequirement::kMightMissing) {
      MergeUnorderdAddedFilesWithBase(
-          base_files, unordered_added_files, level_zero_cmp_by_seqno_,
+          base_files, unordered_added_files, *level_zero_cmp_by_seqno_,
          [&](FileMetaData* file) {
            expected_sorted_l0_files.push_back(file);
          });
    } else {
      MergeUnorderdAddedFilesWithBase(
-          base_files, unordered_added_files, level_zero_cmp_by_epochno_,
+          base_files, unordered_added_files, *level_zero_cmp_by_epochno_,
          [&](FileMetaData* file) {
            expected_sorted_l0_files.push_back(file);
          });
@@ -2061,11 +1747,11 @@ Status VersionBuilder::LoadTableHandlers(
                                 max_file_size_for_l0_meta_pin, read_options);
 }

-void VersionBuilder::RollbackLastApply() { rep_->RollbackLastApply(); }
-
-void VersionBuilder::RedoLastApply() { rep_->RedoLastApply(); }
-
-void VersionBuilder::CommitLastApply() { rep_->CommitLastApply(); }
+void VersionBuilder::CreateOrReplaceSavePoint() {
+  assert(rep_);
+  savepoint_ = std::move(rep_);
+  rep_ = std::make_unique<Rep>(*savepoint_);
+}

 bool VersionBuilder::ValidVersionAvailable() {
  return rep_->ValidVersionAvailable();
@@ -2079,6 +1765,29 @@ std::vector<std::string>& VersionBuilder::GetAndClearIntermediateFiles() {

 void VersionBuilder::ClearFoundFiles() { return rep_->ClearFoundFiles(); }

+Status VersionBuilder::SaveSavePointTo(VersionStorageInfo* vstorage) const {
+  if (!savepoint_ || !savepoint_->ValidVersionAvailable()) {
+    return Status::InvalidArgument();
+  }
+  return savepoint_->SaveTo(vstorage);
+}
+
+Status VersionBuilder::LoadSavePointTableHandlers(
+    InternalStats* internal_stats, int max_threads,
+    bool prefetch_index_and_filter_in_cache, bool is_initial_load,
+    const MutableCFOptions& mutable_cf_options,
+    size_t max_file_size_for_l0_meta_pin, const ReadOptions& read_options) {
+  if (!savepoint_ || !savepoint_->ValidVersionAvailable()) {
+    return Status::InvalidArgument();
+  }
+  return savepoint_->LoadTableHandlers(
+      internal_stats, max_threads, prefetch_index_and_filter_in_cache,
+      is_initial_load, mutable_cf_options, max_file_size_for_l0_meta_pin,
+      read_options);
+}
+
+void VersionBuilder::ClearSavePoint() { savepoint_.reset(nullptr); }
+
 BaseReferencedVersionBuilder::BaseReferencedVersionBuilder(
    ColumnFamilyData* cfd, VersionEditHandler* version_edit_handler,
    bool track_found_and_missing_files, bool allow_incomplete_valid_version)
@@ -64,6 +64,14 @@ class VersionBuilder {

  //============APIs only used by VersionEditHandlerPointInTime ============//

+  // Creates a save point for the Version that has been built so far. Subsequent
+  // VersionEdits applied to the builder will not affect the Version in this
+  // save point. VersionBuilder currently only supports creating one save point,
+  // so when `CreateOrReplaceSavePoint` is called again, the previous save point
+  // is cleared. `ClearSavePoint` can be called explicitly to clear
+  // the save point too.
+  void CreateOrReplaceSavePoint();
+
  // The builder can find all the files to build a `Version`. Or if
  // `allow_incomplete_valid_version_` is true and the version history is never
  // edited in an atomic group, and only a suffix of L0 SST files and their
@@ -86,23 +94,27 @@ class VersionBuilder {
  // Clearing all the found files in this Version.
  void ClearFoundFiles();

-  // Single-edit undo for building a Version reflecting the state *before* the
-  // most recent `Apply()`. On a valid->invalid negative edge,
-  // `RollbackLastApply()` reverts the builder to the pre-edit state (so
-  // `SaveTo`/`LoadTableHandlers` build the pre-edit Version), then
-  // `RedoLastApply()` restores the post-edit state to continue replay.
-  // `CommitLastApply()` finalizes the most recent `Apply()` (freeing files
-  // whose deletion was deferred) and must be called once per `Apply()`; it is a
-  // no-op if there is nothing pending. This replaces the previous per-edit
-  // whole-Rep save-point copy, which was quadratic over a MANIFEST.
-  void RollbackLastApply();
-  void RedoLastApply();
-  void CommitLastApply();
+  // Save the Version in the save point to the provided `vstorage`.
+  // Non-OK status will be returned if there is not a valid save point.
+  Status SaveSavePointTo(VersionStorageInfo* vstorage) const;
+
+  // Load all the table handlers for the Version in the save point.
+  // Non-OK status will be returned if there is not a valid save point.
+  Status LoadSavePointTableHandlers(InternalStats* internal_stats,
+                                    int max_threads,
+                                    bool prefetch_index_and_filter_in_cache,
+                                    bool is_initial_load,
+                                    const MutableCFOptions& mutable_cf_options,
+                                    size_t max_file_size_for_l0_meta_pin,
+                                    const ReadOptions& read_options);
+
+  void ClearSavePoint();

  //======= End of APIs only used by VersionEditPointInTime==========//

 private:
  class Rep;
+  std::unique_ptr<Rep> savepoint_;
  std::unique_ptr<Rep> rep_;
 };

@@ -3,25 +3,19 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).

-#include "db/version_builder.h"
-
 #include <cstring>
 #include <iomanip>
 #include <memory>
 #include <sstream>
 #include <string>

-#include "db/db_test_util.h"
 #include "db/version_edit.h"
 #include "db/version_set.h"
 #include "rocksdb/advanced_options.h"
-#include "rocksdb/sst_file_writer.h"
 #include "table/unique_id_impl.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
-#include "util/defer.h"
 #include "util/string_util.h"
-#include "utilities/fault_injection_fs.h"

 namespace ROCKSDB_NAMESPACE {

@@ -159,123 +153,6 @@ class VersionBuilderTest : public testing::Test {
  void UpdateVersionStorageInfo() { UpdateVersionStorageInfo(&vstorage_); }
 };

-class VersionBuilderDBTest : public DBTestBase {
- public:
-  VersionBuilderDBTest()
-      : DBTestBase("version_builder_db_test", /*env_do_fsync=*/false) {}
-};
-
-// Regression test: when LogAndApply fails after VersionBuilder pinned a
-// table reader for a newly-added file (via LoadTableHandlers), the table
-// cache entry must be evicted by VersionBuilder::UnrefFile when the
-// FileMetaData is destroyed.
-//
-// This test faithfully reproduces the crash-test failure mode
-// ("File N is not live nor quarantined" from TEST_VerifyNoObsoleteFilesCached
-// inside Close on ASAN):
-//
-//   1. IngestExternalFile submits an AddFile edit through LogAndApply.
-//   2. LoadTableHandlers inside ProcessManifestWrites pins a table reader
-//      for the new file, creating a table cache entry.
-//   3. SyncManifest fails (fault injected). The error handler adds the
-//      ingested file to its quarantine list.
-//   4. A subsequent successful LogAndApply (via manual Resume() and then
-//      Flush) clears the quarantine (version_set.cc:
-//      `ClearFilesToQuarantine`).
-//   5. Metadata read fault injection prevents FindObsoleteFiles from
-//      scanning the directory, so the on-disk orphan is not discovered.
-//   6. On DB Close, TEST_VerifyNoObsoleteFilesCached iterates the table
-//      cache and finds an entry for a file that is neither live nor
-//      quarantined -> assertion fires (without the fix).
-//
-// The IngestExternalFile path issues a few no-op manifest writes before
-// the actual AddFile edit; we arm the injection only after
-// LoadTableHandlers has actually pinned a reader for the ingested file.
-TEST_F(VersionBuilderDBTest,
-       IngestExternalFileEvictsTableCacheOnLogAndApplyFailure) {
-  auto fault_fs = std::make_shared<FaultInjectionTestFS>(env_->GetFileSystem());
-  std::unique_ptr<Env> fault_env(NewCompositeEnv(fault_fs));
-
-  Options options = CurrentOptions();
-  options.env = fault_env.get();
-  options.disable_auto_compactions = true;
-  // Disable auto-recovery so recovery runs synchronously via our explicit
-  // Resume() call -- no background thread to race with test teardown.
-  options.max_bgerror_resume_count = 0;
-  options.paranoid_file_checks = true;
-  DestroyAndReopen(options);
-  // RAII: ensure the DB is closed before fault_env goes out of scope,
-  // even if an ASSERT_* below early-returns.
-  Defer closer([this]() { Close(); });
-
-  // Seed the memtable with data so a subsequent Flush actually produces a
-  // successful LogAndApply (and thus clears the quarantine).
-  ASSERT_OK(Put("k1", "v1"));
-
-  // Build an external SST through the public SstFileWriter API.
-  const std::string ext_file = dbname_ + "/ingest_me.sst";
-  SstFileWriter writer(EnvOptions(), options);
-  ASSERT_OK(writer.Open(ext_file));
-  ASSERT_OK(writer.Put("k2", "v2"));
-  ExternalSstFileInfo file_info;
-  ASSERT_OK(writer.Finish(&file_info));
-
-  // Arm the injection only once we have observed VersionBuilder actually
-  // pin a table reader for the ingested file (i.e. after FindTable runs).
-  std::atomic<bool> injection_armed{false};
-  std::atomic<bool> injected_once{false};
-  SyncPoint::GetInstance()->SetCallBack("TableCache::FindTable:0",
-                                        [&](void*) { injection_armed = true; });
-  SyncPoint::GetInstance()->SetCallBack(
-      "VersionSet::ProcessManifestWrites:AfterSyncManifest", [&](void* arg) {
-        if (!injection_armed.load()) {
-          return;
-        }
-        if (injected_once.exchange(true)) {
-          return;
-        }
-        auto* ptr = static_cast<IOStatus*>(arg);
-        assert(ptr);
-        *ptr = IOStatus::IOError("injected");
-        // Retryable IOError -> soft error, recoverable via Resume().
-        ptr->SetRetryable(true);
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  IngestExternalFileOptions ifo;
-  Status s = db_->IngestExternalFile({ext_file}, ifo);
-  ASSERT_NOK(s);
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  // Manual synchronous recovery: clear the soft bg error, then do a
-  // successful LogAndApply (via Flush) which triggers
-  // ClearFilesToQuarantine (version_set.cc line ~6591). This puts the
-  // ingested file into the "not live nor quarantined" state.
-  ASSERT_OK(dbfull()->Resume());
-  ASSERT_OK(Flush());
-
-  // Prevent the FindObsoleteFiles full-directory scan from finding the
-  // orphan on disk. Mirrors the crash test's open_metadata_read_fault_one_in.
-  fault_fs->SetThreadLocalErrorContext(
-      FaultInjectionIOType::kMetadataRead, /*seed=*/0, /*one_in=*/1,
-      /*retryable=*/false, /*has_data_loss=*/false);
-  fault_fs->EnableThreadLocalErrorInjection(
-      FaultInjectionIOType::kMetadataRead);
-  Defer disable_fault([&] {
-    fault_fs->DisableThreadLocalErrorInjection(
-        FaultInjectionIOType::kMetadataRead);
-  });
-
-  // The RAII Defer above will run Close() on scope exit. Close's
-  // TEST_VerifyNoObsoleteFilesCached (active on ASAN) iterates the table
-  // cache. Without the D99759696 fix, an entry for the ingested file
-  // remains -- a file that is neither live nor quarantined -- and the
-  // assertion fires. With the fix, VersionBuilder::UnrefFile evicts the
-  // entry when the discarded FileMetaData is destroyed.
-}
-
 void UnrefFilesInVersion(VersionStorageInfo* new_vstorage) {
  for (int i = 0; i < new_vstorage->num_levels(); i++) {
    for (auto* f : new_vstorage->LevelFiles(i)) {
Author	SHA1	Message	Date
Jay Huh	10dfc6acb8	Update version and HISTORY.md for 11.5.2 release	2026-06-25 14:52:45 -07:00
Jay Huh	d46d4b7f82	Revert reverse-comparator handling in range tree lock manager (#14887 ) Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/14887 This reverts two changes to the range-lock endpoint comparator and restores the prior, direction-agnostic behavior: - https://github.com/facebook/rocksdb/pull/14831 ("Fix range lock manager crash with reverse comparator"), which made RangeTreeLockManager::CompareDbtEndpoints reverse-aware, and - https://github.com/facebook/rocksdb/pull/14880 (a follow-up that only corrected the equal-length / point-range branch). Why: #14831 taught the endpoint comparator about reverse-ordered column families by flipping the suffix tie-break based on comparator direction. However, callers that use range locking on a reverse-ordered CF already flip the start/end endpoints themselves before calling lock_range() -- for example, MyRocks does this in ha_rocksdb::set_range_lock() (see its "RangeFlagsShouldBeFlippedForRevCF" comment). The two corrections stack and produce left > right again, which: (a) trips paranoid_invariant(compare(left, right) <= 0) in toku::locktree::try_acquire_lock() and aborts on equality/point locks, and (b) for range scans, mis-orders the endpoints and produces an incorrect lock range, leading to silent correctness issues under concurrency. #14880 only addressed (a) (the equal-length / point-range branch), not (b), so it was an incomplete fix at the wrong layer. Decision: keep CompareDbtEndpoints direction-agnostic and make it an explicit caller requirement to pass a flipped (swapped start/end, with negated infimum/supremum flags) range for range locking to work on a reverse-ordered column family. A function-level comment documenting this contract is added so reverse-awareness is not reintroduced here. Removes the RangeLockWithReverseComparator unit test added by #14831 (it asserts the reverted direction-flipped ordering). Keeps a regression test that a point range lock [infimum(K), supremum(K)] works on a reverse-comparator column family. Reviewed By: xingbowang Differential Revision: D109713989 fbshipit-source-id: 4ea0999c92645e1adc9cd1114d924cad142f2001	2026-06-25 14:26:31 -07:00
Jay Huh	a127d1533b	Update version and HISTORY.md for 11.5.1 release	2026-06-24 16:25:47 -07:00
Josh Kang	928ebd5b8b	Do not allow read only DBs to delete obsolete files (#14881 ) Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/14881 Read-only DB instances can share a directory with a live writer, so their view of live files is only a snapshot from the time they opened. After read-only DB open began setting `opened_successfully_` for its intended open-success semantics, that state had an unintended side effect: the common close path treated a successful read-only open like a read-write open and ran obsolete-file cleanup. If the writer created or made files live after the read-only handle opened, that cleanup could use the stale read-only live set and delete files still needed by the writer. This change records whether a `DBImpl` was opened read-only and skips close-time obsolete-file cleanup for read-only DBs instead of simply keeping `opened_successfully_=false`, which could be confusing and easily mistaken in the future again. For completeness I also updated other callsites of `opened_successfully_`, but those should not be real bugs as ReadOnly DBs do not run flushes/compactions or write to WALs. Reviewed By: xingbowang Differential Revision: D109622445 fbshipit-source-id: d7be4b20fce86ccb218a63ac6f5b707b316aac79	2026-06-24 16:23:13 -07:00
Jay Huh	afcf52a996	Fix range lock manager assertion crash on reverse-comparator CF point locks (#14880 ) Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/14880 The RocksDB 11.5.0 reverse-comparator range-lock fix (the HISTORY.md entry "Fixed a bug where the range lock manager would crash with an assertion failure when using a reverse comparator column family") made `RangeTreeLockManager::CompareDbtEndpoints` reverse-aware by wrapping the endpoint-suffix tie-break results in an `is_reverse` flip. The length-disparity (different user key) branches need that flip, but the equal-length / equal-user-key branch was flipped too, and that is incorrect. Range-lock endpoints are encoded as `[suffix_byte][user_key]` where the suffix is `SUFFIX_INFIMUM` (0x0) or `SUFFIX_SUPREMUM` (0x1). When two endpoints share the same user key and differ only in the suffix byte, the suffix is a positional boundary marker for that key, not key content, so the infimum endpoint must sort before the supremum endpoint in any total order, regardless of the column family sort direction. Flipping it for a reverse comparator makes `m_cmp(infimum(K), supremum(K)) > 0`. MyRocks issues an equality lock (e.g. `UPDATE t1 SET a=123 WHERE a=35`) as the range `[infimum(K), supremum(K)]` over the same user key K. On a reverse (`rev:`) column family — which uses the stock `ReverseBytewiseComparator()`, so `is_reverse` is true — the flipped comparator reports `left > right`, tripping `paranoid_invariant(m_cmp(left_key, right_key) <= 0)` in `toku::locktree::try_acquire_lock` and aborting the server with SIGABRT. This broke many MyRocks `---range_locking` MTR tests (partial_index, bypass_select_range_sk, alter_table_online_debug, allow_no_primary_key_with_sk) after RocksDB was bumped to 11.5.0 in D108936924. Fix: in the equal-length / equal-user-key branch of `CompareDbtEndpoints`, compare the suffix bytes without the `is_reverse` flip so infimum always precedes supremum. The length-disparity branches keep the reverse-aware flip (still covered by `RangeLockWithReverseComparator`). Note: this lands in `internal_repo_rocksdb/repo`, the RocksDB development tree; it reaches `fbcode/rocksdb/src` (what MyRocks/ZippyDB link) through the RocksDB release sync. Tracked in T276980728. Reviewed By: xingbowang Differential Revision: D109591908 fbshipit-source-id: 078b16e6e51f4f365b4a8d539ac5b968a7461729	2026-06-24 16:23:04 -07:00
anand1976	e688e7b235	Update HISTORY.md for 11.5.0 release	2026-06-17 14:24:03 -07:00