Update HISTORY and version for 10.7.6

Summary:
* Address feedback from https://github.com/facebook/rocksdb/issues/14040
* Add additional test for MultiScan
* Fix a bug when del range and data are in same file for multi-scan
* Rewrite the cases need to be handled in SeekMultiScan

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

Test Plan: Unit test

Reviewed By: cbi42, anand1976

Differential Revision: D84851788

Pulled By: xingbowang

fbshipit-source-id: 0f69632733afb99685f6341badbf239681010c38

.clang-tidy

@@ -1,86 +0,0 @@
-# When making changes, verify the output of:
-#   clang-tidy -list-checks
----
-Checks: "-*,\
-  bugprone-argument-comment,\
-  bugprone-dangling-handle,\
-  bugprone-fold-init-type,\
-  bugprone-forward-declaration-namespace,\
-  bugprone-forwarding-reference-overload,\
-  bugprone-shadow,\
-  bugprone-sizeof-*,\
-  bugprone-string-constructor,\
-  bugprone-undefined-memory-manipulation,\
-  bugprone-unused-return-value,\
-  bugprone-use-after-move,\
-  cert-env33-c,\
-  cert-err58-cpp,\
-  cert-msc30-c,\
-  cert-msc50-cpp,\
-  clang-analyzer-*,\
-  clang-diagnostic-*,\
-  -clang-diagnostic-missing-designated-field-initializers,\
-  concurrency-mt-unsafe,\
-  cppcoreguidelines-avoid-non-const-global-variables,\
-  cppcoreguidelines-missing-std-forward,\
-  cppcoreguidelines-pro-type-member-init,\
-  cppcoreguidelines-special-member-functions,\
-  cppcoreguidelines-virtual-class-destructor,\
-  google-build-using-namespace,\
-  google-explicit-constructor,\
-  google-readability-avoid-underscore-in-googletest-name,\
-  misc-definitions-in-headers,\
-  misc-redundant-expression,\
-  modernize-make-shared,\
-  modernize-use-emplace,\
-  modernize-use-noexcept,\
-  modernize-use-override,\
-  modernize-use-using,\
-  performance-faster-string-find,\
-  performance-for-range-copy,\
-  performance-implicit-conversion-in-loop,\
-  performance-inefficient-algorithm,\
-  performance-inefficient-string-concatenation,\
-  performance-inefficient-vector-operation,\
-  performance-move-const-arg,\
-  performance-move-constructor-init,\
-  performance-no-automatic-move,\
-  performance-no-int-to-ptr,\
-  performance-noexcept-move-constructor,\
-  performance-noexcept-swap,\
-  performance-trivially-destructible,\
-  performance-type-promotion-in-math-fn,\
-  performance-unnecessary-copy-initialization,\
-  performance-unnecessary-value-param,\
-  readability-braces-around-statements,\
-  readability-duplicate-include,\
-  readability-isolate-declaration,\
-  readability-operators-representation,\
-  readability-redundant-string-init"
-
-WarningsAsErrors: "bugprone-use-after-move"
-
-CheckOptions:
-- key: bugprone-easily-swappable-parameters.MinimumLength
-  value: 4
-- key: cppcoreguidelines-avoid-non-const-global-variables.AllowThreadLocal
-  value: true
-- key: cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
-  value: true
-- key: cppcoreguidelines-special-member-functions.AllowImplicitlyDeletedCopyOrMove
-  value: true
-- key: modernize-use-using.IgnoreExternC
-  value: true
-- key: performance-move-const-arg.CheckTriviallyCopyableMove
-  value: false
-- key: performance-unnecessary-value-param.AllowedTypes
-  value: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$'
-- key: performance-unnecessary-copy-initialization.AllowedTypes
-  value: '[Pp]ointer$;[Pp]tr$;[Rr]ef(erence)?$'
-- key: readability-operators-representation.BinaryOperators
-  value: '&&;&=;&;|;~;!;!=;||;|=;^;^='
-- key: readability-redundant-string-init.StringNames
-  value: '::std::basic_string'
-- key: readability-named-parameter.InsertPlainNamesInForwardDecls
-  value: true
-...

.github/actions/build-folly/action.yml

@@ -1,17 +1,7 @@
 name: build-folly
-description: Build folly and dependencies (skipped if cache hit)
-inputs:
-  cache-hit:
-    description: Whether the folly cache was hit
-    required: true
 runs:
   using: composite
   steps:
   - name: Build folly and dependencies
-    if: ${{ inputs.cache-hit != 'true' }}
     run: make build_folly
     shell: bash
-  - name: Skip folly build (using cached version)
-    if: ${{ inputs.cache-hit == 'true' }}
-    run: echo "Folly build skipped - using cached version"
-    shell: bash

.github/actions/cache-folly/action.yml

@@ -1,33 +0,0 @@
-name: cache-folly
-description: Cache folly build to speed up CI
-outputs:
-  cache-hit:
-    description: Whether the cache was hit
-    value: ${{ steps.cache-folly-build.outputs.cache-hit }}
-runs:
-  using: composite
-  steps:
-  - name: Extract FOLLY_MK_HASH
-    id: extract-folly-hash
-    shell: bash
-    run: |
-      FOLLY_MK_HASH=$(md5sum folly.mk | cut -d' ' -f1)
-      echo "hash=$FOLLY_MK_HASH" >> $GITHUB_OUTPUT
-  - name: Extract FOLLY_INSTALL_DIR
-    id: extract-folly-install-dir
-    shell: bash
-    run: |
-      FOLLY_INSTALL_DIR=$(cd third-party/folly && python3 build/fbcode_builder/getdeps.py show-inst-dir)
-      echo "dir=$(echo $FOLLY_INSTALL_DIR | sed 's|installed/folly|installed|')" >> $GITHUB_OUTPUT
-  - name: Cache folly build
-    id: cache-folly-build
-    uses: actions/cache@v4
-    with:
-      # Cache the folly build directory
-      path: ${{ steps.extract-folly-install-dir.outputs.dir }}
-      # Key is based on:
-      # - OS and architecture
-      # - The docker image, which may not always be specified/known
-      # - Hash of folly.mk, which includes the folly repository commit hash
-      # NOTE: this is still only intended for DEBUG folly builds
-      key: folly-build-${{ runner.os }}-${{ runner.arch }}-${{ github.job_container.image }}-${{ steps.extract-folly-hash.outputs.hash }}-${{ env.PORTABLE == '1' && 'portable' || 'native' }}

.github/actions/cache-getdeps-downloads/action.yml

@@ -1,21 +0,0 @@
-name: cache-getdeps-downloads
-description: Cache getdeps downloads to avoid unreliable mirrors and speed up builds
-outputs:
-  cache-hit:
-    description: Whether the cache was hit
-    value: ${{ steps.cache-downloads.outputs.cache-hit }}
-runs:
-  using: composite
-  steps:
-  - name: Cache getdeps downloads
-    id: cache-downloads
-    uses: actions/cache@v4
-    with:
-      # Use a fixed path that we control - folly.mk will sync with getdeps downloads dir
-      path: /tmp/rocksdb-getdeps-cache
-      # Use a rolling cache key - the cache accumulates downloads over time
-      # The key includes a weekly timestamp to ensure periodic refresh
-      key: getdeps-downloads-${{ runner.os }}-${{ runner.arch }}-week-${{ github.run_id }}
-      restore-keys: |
-        getdeps-downloads-${{ runner.os }}-${{ runner.arch }}-week-
-        getdeps-downloads-${{ runner.os }}-${{ runner.arch }}-

.github/actions/setup-ccache/action.yml

@@ -1,49 +0,0 @@
-name: setup-ccache
-description: Setup ccache for faster C++ compilation caching
-inputs:
-  cache-key-prefix:
-    description: Unique prefix for the cache key (e.g., 'build-linux')
-    required: true
-  portable:
-    description: Set PORTABLE=1 to disable -march=native (set to "false" for jobs linking pre-built Folly)
-    required: false
-    default: "true"
-runs:
-  using: composite
-  steps:
-    - name: Set ccache environment variables
-      run: |
-        echo "CCACHE_DIR=${{ github.workspace }}/.ccache" >> $GITHUB_ENV
-        echo "CCACHE_BASEDIR=${{ github.workspace }}" >> $GITHUB_ENV
-        echo "CCACHE_NOHASHDIR=true" >> $GITHUB_ENV
-        if [ "${{ inputs.portable }}" = "true" ]; then
-          echo "PORTABLE=1" >> $GITHUB_ENV
-        fi
-      shell: bash
-    - name: Restore ccache
-      uses: actions/cache@v4
-      with:
-        path: ${{ github.workspace }}/.ccache
-        key: ccache-${{ inputs.cache-key-prefix }}-${{ github.head_ref || github.ref }}-${{ github.sha }}
-        restore-keys: |-
-          ccache-${{ inputs.cache-key-prefix }}-${{ github.head_ref || github.ref }}-
-          ccache-${{ inputs.cache-key-prefix }}-refs/heads/main-
-    - name: Install ccache
-      run: |
-        if [ "$RUNNER_OS" = "macOS" ]; then
-          which ccache || brew install ccache
-        else
-          which ccache || (apt-get update && apt-get install -y ccache)
-        fi
-      shell: bash
-    - name: Add ccache to PATH
-      run: |
-        if [ "$RUNNER_OS" = "macOS" ]; then
-          echo "$(brew --prefix ccache)/libexec" >> $GITHUB_PATH
-        else
-          echo "/usr/lib/ccache" >> $GITHUB_PATH
-        fi
-      shell: bash
-    - name: Zero ccache stats
-      run: ccache -z
-      shell: bash

.github/actions/setup-folly/action.yml

@@ -5,7 +5,5 @@ runs:
   - name: Checkout folly sources
     run: |
       make checkout_folly
-    shell: bash
-  - name: Install patchelf and libaio
-    run: apt-get update -y && apt-get install -y patchelf libaio-dev
+      echo "GETDEPS_USE_WGET=1" >> "$GITHUB_ENV"
     shell: bash

.github/actions/windows-build-steps/action.yml

@@ -4,15 +4,6 @@ runs:
   steps:
   - name: Add msbuild to PATH
     uses: microsoft/setup-msbuild@v1.3.1
-  - name: ccache
-    uses: hendrikmuhs/ccache-action@v1.2
-    with:
-      max-size: "10GB"
-  - name: Configure ccache
-    shell: pwsh
-    run: |
-      ccache --set-config=base_dir=C:\a\rocksdb\rocksdb
-      ccache --set-config=hash_dir=false
   - name: Custom steps
     env:
       THIRDPARTY_HOME: ${{ github.workspace }}/thirdparty
@@ -47,12 +38,11 @@ runs:
       $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 ..
+      & cmake -G "$Env:CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE="$Env:CMAKE_PORTABLE" -DSNAPPY=1 -DXPRESS=1 -DJNI=1 ..
       if(!$?) { Exit $LASTEXITCODE }
       cd ..
       echo "Building with VS version: $Env:CMAKE_GENERATOR"
-      # use more parallel processes than the number of processes available, as most of the compile command would be cache hit
-      msbuild build/rocksdb.sln /m:32 /p:LinkIncremental=false -property:Configuration=Debug -property:Platform=x64
+      msbuild build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64
       if(!$?) { Exit $LASTEXITCODE }
       echo ========================= Test RocksDB =========================
       build_tools\run_ci_db_test.ps1 -SuiteRun arena_test,db_basic_test,db_test,db_test2,db_merge_operand_test,bloom_test,c_test,coding_test,crc32c_test,dynamic_bloom_test,env_basic_test,env_test,hash_test,random_test -Concurrency 16
@@ -62,7 +52,3 @@ runs:
       & ctest -C Debug -j 16
       if(!$?) { Exit $LASTEXITCODE }
     shell: pwsh
-  - name: Show ccache stats
-    shell: pwsh
-    run: |
-      ccache --show-stats -v

.github/scripts/parse-claude-review.js

@@ -1,78 +0,0 @@
-// Parse Claude Code execution log and produce a markdown review comment.
-//
-// Usage from actions/github-script:
-//   const parse = require('./.github/scripts/parse-claude-review.js');
-//   const markdown = parse({ executionFile, conclusion, meta });
-//
-// Parameters:
-//   executionFile - path to the JSON execution log from claude-code-base-action
-//   conclusion    - 'success' or 'failure' from the action output
-//   meta          - { trigger, headSha, reviewer, isQuery }
-
-const fs = require('fs');
-
-module.exports = function parseClaude({executionFile, conclusion, meta}) {
-  let responseBody = '';
-
-  try {
-    const executionLog = JSON.parse(fs.readFileSync(executionFile, 'utf8'));
-
-    if (!Array.isArray(executionLog)) {
-      throw new Error('Expected array format from claude-code-base-action');
-    }
-
-    const resultMessage = executionLog.find(m => m.type === 'result');
-
-    if (!resultMessage) {
-      responseBody = '⚠️ No result message found in execution log.';
-    } else if (resultMessage.subtype === 'success' && resultMessage.result) {
-      responseBody = resultMessage.result;
-    } else if (resultMessage.is_error || resultMessage.subtype === 'error') {
-      const errorInfo =
-          resultMessage.result || resultMessage.error || 'Unknown error';
-      responseBody = `❌ **Claude encountered an error:**\n\n${errorInfo}`;
-    } else if (resultMessage.result) {
-      responseBody = `⚠️ **Completed with status: ${
-          resultMessage.subtype}**\n\n${resultMessage.result}`;
-    } else {
-      responseBody = '⚠️ Claude completed but produced no output.';
-    }
-  } catch (error) {
-    responseBody = `❌ Error parsing Claude response: ${error.message}`;
-  }
-
-  const icon = conclusion === 'success' ? '✅' : '⚠️';
-  const headerTitle = meta.isQuery ? 'Claude Response' : 'Claude Code Review';
-  const triggerLine = meta.trigger === 'auto' ?
-      `*Auto-triggered after CI passed — reviewing commit ${
-          meta.headSha.substring(0, 7)}*` :
-      `*Requested by @${meta.reviewer}*`;
-
-  return [
-    `## ${icon} ${headerTitle}`,
-    '',
-    triggerLine,
-    '',
-    '---',
-    '',
-    responseBody,
-    '',
-    '---',
-    '',
-    '<details>',
-    '<summary>ℹ️ About this response</summary>',
-    '',
-    'Generated by [Claude Code](https://github.com/anthropics/claude-code-action).',
-    'Review methodology: `claude_md/code_review.md`',
-    '',
-    '**Limitations:**',
-    '- Claude may miss context from files not in the diff',
-    '- Large PRs may be truncated',
-    '- Always apply human judgment to AI suggestions',
-    '',
-    '**Commands:**',
-    '- `/claude-review [context]` — Request a code review',
-    '- `/claude-query <question>` — Ask about the PR or codebase',
-    '</details>',
-  ].join('\n');
-};

.github/scripts/post-pr-comment.js

@@ -1,57 +0,0 @@
-// Shared PR comment posting utility.
-// Used by both clang-tidy-comment.yml and claude-review-comment.yml.
-//
-// Usage from actions/github-script:
-//   const post = require('./.github/scripts/post-pr-comment.js');
-//   await post({ github, context, core, prNumber, body, marker });
-//
-// Parameters:
-//   github   - octokit instance from actions/github-script
-//   context  - GitHub Actions context
-//   core     - @actions/core for logging
-//   prNumber - PR number to comment on
-//   body     - comment body (markdown string)
-//   marker   - HTML comment marker for dedup (e.g. '<!-- claude-review -->')
-//              If an existing comment with this marker is found, it is updated.
-//              If not found, a new comment is created.
-
-module.exports = async function postPrComment(
-    {github, context, core, prNumber, body, marker}) {
-  if (!prNumber || !body) {
-    core.warning('Missing prNumber or body; skipping comment.');
-    return;
-  }
-
-  const owner = context.repo.owner;
-  const repo = context.repo.repo;
-
-  // Ensure marker is embedded in the body
-  const markedBody = body.includes(marker) ? body : `${marker}\n${body}`;
-
-  // Search for existing comment with this marker
-  const {data: comments} = await github.rest.issues.listComments({
-    owner,
-    repo,
-    issue_number: prNumber,
-    per_page: 100,
-  });
-  const existing = comments.find(c => c.body.includes(marker));
-
-  if (existing) {
-    await github.rest.issues.updateComment({
-      owner,
-      repo,
-      comment_id: existing.id,
-      body: markedBody,
-    });
-    core.info(`Updated existing comment ${existing.id}`);
-  } else {
-    await github.rest.issues.createComment({
-      owner,
-      repo,
-      issue_number: prNumber,
-      body: markedBody,
-    });
-    core.info('Created new PR comment');
-  }
-};

.github/workflows/clang-tidy-comment.yml

@@ -1,51 +0,0 @@
-name: Post clang-tidy PR comment
-on:
-  workflow_run:
-    workflows: ["clang-tidy"]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-
-jobs:
-  comment:
-    if: github.event.workflow_run.event == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout scripts
-      uses: actions/checkout@v4
-      with:
-        sparse-checkout: .github/scripts
-        sparse-checkout-cone-mode: true
-
-    - name: Download clang-tidy results
-      id: download
-      uses: actions/download-artifact@v4.0.0
-      with:
-        name: clang-tidy-result
-        run-id: ${{ github.event.workflow_run.id }}
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-      continue-on-error: true
-
-    - name: Post or update PR comment
-      if: steps.download.outcome == 'success'
-      uses: actions/github-script@v7
-      with:
-        script: |
-          const fs = require('fs');
-          if (!fs.existsSync('clang-tidy-comment.md') || !fs.existsSync('pr_number.txt')) {
-            core.info('No clang-tidy results found; skipping.');
-            return;
-          }
-          const body = fs.readFileSync('clang-tidy-comment.md', 'utf8');
-          const prNumber = parseInt(fs.readFileSync('pr_number.txt', 'utf8').trim());
-          const post = require('./.github/scripts/post-pr-comment.js');
-
-          await post({
-            github,
-            context,
-            core,
-            prNumber,
-            body,
-            marker: '<!-- clang-tidy-bot -->',
-          });

.github/workflows/clang-tidy.yml

@@ -1,74 +0,0 @@
-name: clang-tidy
-on:
-  push:
-  pull_request:
-
-permissions: {}
-
-jobs:
-  clang-tidy:
-    if: github.repository_owner == 'facebook'
-    runs-on:
-      labels: 4-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:24.0
-    steps:
-    - uses: actions/checkout@v4.1.0
-      with:
-        fetch-depth: 2
-    - name: Mark workspace as safe for git
-      run: git config --global --add safe.directory $GITHUB_WORKSPACE
-    - name: Determine diff base
-      id: diff-base
-      run: |
-        if [ "${{ github.event_name }}" = "pull_request" ]; then
-          BASE="${{ github.event.pull_request.base.sha }}"
-          git fetch --depth=1 origin "$BASE"
-        else
-          BASE="${{ github.event.before }}"
-          if echo "$BASE" | grep -q '^0\{40\}$'; then
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            echo "New branch push; skipping clang-tidy."
-            exit 0
-          fi
-        fi
-        echo "ref=$BASE" >> "$GITHUB_OUTPUT"
-        echo "skip=false" >> "$GITHUB_OUTPUT"
-    - name: Install clang-tidy
-      if: steps.diff-base.outputs.skip != 'true'
-      run: apt-get update && apt-get install -y clang-tidy
-    - name: Generate compile_commands.json
-      if: steps.diff-base.outputs.skip != 'true'
-      run: |
-        mkdir build && cd build
-        cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-              -DCMAKE_C_COMPILER=clang-18 \
-              -DCMAKE_CXX_COMPILER=clang++-18 ..
-        cd ..
-        ln -sf build/compile_commands.json compile_commands.json
-    - name: Run clang-tidy on changed files
-      id: clang-tidy
-      if: steps.diff-base.outputs.skip != 'true'
-      run: |
-        python3 tools/run_clang_tidy.py \
-          -j 4 \
-          --diff-base ${{ steps.diff-base.outputs.ref }} \
-          --github-annotations \
-          --github-step-summary \
-          --comment-output clang-tidy-comment.md
-      continue-on-error: true
-    - name: Save PR number
-      if: github.event_name == 'pull_request' && always()
-      run: echo "${{ github.event.pull_request.number }}" > pr_number.txt
-    - name: Upload clang-tidy results
-      if: always()
-      uses: actions/upload-artifact@v4.0.0
-      with:
-        name: clang-tidy-result
-        path: |
-          clang-tidy-comment.md
-          pr_number.txt
-        if-no-files-found: ignore
-    - name: Fail if clang-tidy found issues
-      if: steps.clang-tidy.outcome == 'failure'
-      run: exit 1

.github/workflows/claude-review-comment.yml

@@ -1,146 +0,0 @@
-# Claude Code Review — Comment Posting Workflow
-#
-# Companion to claude-review.yml. Downloads the review artifact and posts
-# it as a PR comment. This workflow has write permissions but never runs
-# AI or processes untrusted code.
-#
-# Security: Separating analysis (has ANTHROPIC_API_KEY, no write perms)
-# from posting (has GITHUB_TOKEN write perms, no AI) prevents a crafted
-# PR from tricking Claude into exfiltrating tokens.
-
-name: Post Claude Review Comment
-
-on:
-  workflow_run:
-    workflows: ["Claude Code Review"]
-    types: [completed]
-
-permissions:
-  pull-requests: write
-  issues: write
-
-jobs:
-  comment:
-    if: github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout scripts
-        uses: actions/checkout@v4
-        with:
-          sparse-checkout: .github/scripts
-          sparse-checkout-cone-mode: true
-
-      - name: Download review artifact
-        id: download
-        uses: actions/download-artifact@v4
-        with:
-          name: claude-review-result
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: true
-
-      - name: Post or update PR comment
-        if: steps.download.outcome == 'success'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            if (!fs.existsSync('claude-review-comment.md') || !fs.existsSync('pr_number.txt')) {
-              core.info('No review results found; skipping.');
-              return;
-            }
-
-            const body = fs.readFileSync('claude-review-comment.md', 'utf8');
-            const prNumber = parseInt(fs.readFileSync('pr_number.txt', 'utf8').trim());
-            const trigger = fs.existsSync('trigger_type.txt')
-              ? fs.readFileSync('trigger_type.txt', 'utf8').trim()
-              : 'auto';
-
-            // Use different markers for auto vs manual so they don't
-            // overwrite each other. Auto-reviews update in place (one
-            // per PR). Manual reviews always create new comments.
-            const marker = trigger === 'auto'
-              ? '<!-- claude-review-auto -->'
-              : `<!-- claude-review-manual-${Date.now()} -->`;
-
-            const post = require('./.github/scripts/post-pr-comment.js');
-
-            await post({
-              github,
-              context,
-              core,
-              prNumber,
-              body,
-              marker,
-            });
-
-      - name: Add reaction to trigger comment
-        if: steps.download.outcome == 'success'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            if (!fs.existsSync('trigger_type.txt')) return;
-            const trigger = fs.readFileSync('trigger_type.txt', 'utf8').trim();
-            if (trigger !== 'manual') return;
-            if (!fs.existsSync('comment_id.txt')) return;
-            const commentId = parseInt(fs.readFileSync('comment_id.txt', 'utf8').trim());
-            if (!commentId) return;
-
-            await github.rest.reactions.createForIssueComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: commentId,
-              content: 'rocket'
-            });
-
-  # Notify on failure (for manual triggers)
-  failure-notice:
-    if: github.event.workflow_run.conclusion == 'failure'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download artifact for PR number
-        id: download
-        uses: actions/download-artifact@v4
-        with:
-          name: claude-review-result
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: true
-
-      - name: React with failure
-        if: steps.download.outcome == 'success'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const fs = require('fs');
-            if (!fs.existsSync('comment_id.txt')) return;
-            const commentId = parseInt(fs.readFileSync('comment_id.txt', 'utf8').trim());
-            if (!commentId) return;
-
-            await github.rest.reactions.createForIssueComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: commentId,
-              content: 'confused'
-            });
-
-  # Unauthorized user notice
-  unauthorized-notice:
-    runs-on: ubuntu-latest
-
-    if: >-
-      github.event.workflow_run.event == 'issue_comment' &&
-      github.event.workflow_run.conclusion == 'skipped'
-
-    steps:
-      - name: Check if unauthorized
-        id: check
-        uses: actions/github-script@v7
-        with:
-          script: |
-            // This job only runs when the analysis workflow was skipped,
-            // which happens when the user is not in the authorized list.
-            // We cannot easily get the original comment from workflow_run,
-            // so this is a best-effort notice via workflow logs.
-            core.info('Analysis workflow was skipped — likely unauthorized user.');

.github/workflows/claude-review.yml

@@ -1,476 +0,0 @@
-# Claude Code Review — Analysis Workflow
-#
-# This workflow runs Claude to review PRs. It produces a markdown review
-# as an artifact but does NOT post comments (no write permissions).
-# The companion workflow (claude-review-comment.yml) handles posting.
-#
-# Triggers:
-#   1. workflow_run: Auto-review after pr-jobs passes
-#   2. issue_comment: Manual /claude-review or /claude-query by maintainers
-#   3. workflow_dispatch: Manual testing
-#
-# Security:
-#   - This job has contents:read ONLY (no PR write, no issue write)
-#   - ANTHROPIC_API_KEY is used here but never coexists with write tokens
-#   - Claude uses read-only tools (View, GlobTool, GrepTool)
-#   - Review methodology: claude_md/code_review.md
-
-name: Claude Code Review
-
-on:
-  workflow_run:
-    workflows: ["facebook/rocksdb/pr-jobs"]
-    types: [completed]
-
-  issue_comment:
-    types: [created]
-
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: PR number to review
-        required: true
-        type: number
-      model:
-        description: Claude model to use
-        required: false
-        type: choice
-        options:
-          - claude-opus-4-6
-          - claude-sonnet-4-20250514
-        default: claude-opus-4-6
-
-permissions:
-  contents: read
-
-jobs:
-  # ======================== Auto Review ======================== #
-  auto-review:
-    name: Auto Claude Review
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      actions: read
-
-    if: >-
-      github.event_name == 'workflow_run' &&
-      github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.event == 'pull_request'
-
-    steps:
-      - name: Get PR info
-        id: pr_info
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const headSha = context.payload.workflow_run.head_sha;
-            let prNumber = null;
-
-            const prs = context.payload.workflow_run.pull_requests;
-            if (prs && prs.length > 0) {
-              prNumber = prs[0].number;
-            } else {
-              const { data: pulls } = await github.rest.pulls.list({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                state: 'open',
-                sort: 'updated',
-                direction: 'desc',
-                per_page: 30
-              });
-              const match = pulls.find(p => p.head.sha === headSha);
-              if (match) prNumber = match.number;
-            }
-
-            if (!prNumber) {
-              core.setFailed(`Could not find PR for SHA ${headSha}`);
-              return;
-            }
-
-            const pr = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: prNumber
-            });
-
-            core.setOutput('pr_number', prNumber.toString());
-            core.setOutput('head_repo', pr.data.head.repo.clone_url);
-            core.setOutput('head_ref', pr.data.head.ref);
-            core.setOutput('head_sha', pr.data.head.sha);
-            core.setOutput('base_sha', pr.data.base.sha);
-            core.setOutput('base_ref', pr.data.base.ref);
-            core.setOutput('pr_title', pr.data.title);
-            core.setOutput('pr_body', pr.data.body || '');
-            core.setOutput('pr_author', pr.data.user.login);
-
-      - name: Check for existing review
-        id: check_existing
-        uses: actions/github-script@v7
-        env:
-          PR_NUMBER: ${{ steps.pr_info.outputs.pr_number }}
-          HEAD_SHA: ${{ steps.pr_info.outputs.head_sha }}
-        with:
-          script: |
-            const comments = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: parseInt(process.env.PR_NUMBER),
-              per_page: 100
-            });
-            const shortSha = process.env.HEAD_SHA.substring(0, 7);
-            const existing = comments.data.find(c =>
-              c.body.includes('<!-- claude-review -->') &&
-              c.body.includes(shortSha)
-            );
-            core.setOutput('skip', existing ? 'true' : 'false');
-
-      - name: Checkout base repository
-        if: steps.check_existing.outputs.skip != 'true'
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ steps.pr_info.outputs.base_ref }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Generate diff and prompt
-        if: steps.check_existing.outputs.skip != 'true'
-        env:
-          HEAD_REPO: ${{ steps.pr_info.outputs.head_repo }}
-          HEAD_REF: ${{ steps.pr_info.outputs.head_ref }}
-          HEAD_SHA: ${{ steps.pr_info.outputs.head_sha }}
-          BASE_SHA: ${{ steps.pr_info.outputs.base_sha }}
-          PR_TITLE: ${{ steps.pr_info.outputs.pr_title }}
-          PR_BODY: ${{ steps.pr_info.outputs.pr_body }}
-          PR_AUTHOR: ${{ steps.pr_info.outputs.pr_author }}
-        run: |
-          git remote add fork "${HEAD_REPO}" || true
-          git fetch fork "${HEAD_REF}" --depth=100
-
-          git diff "${BASE_SHA}...${HEAD_SHA}" > /tmp/pr.diff
-          DIFF_STATS=$(git diff --stat "${BASE_SHA}...${HEAD_SHA}" | tail -1)
-
-          DIFF_SIZE=$(wc -c < /tmp/pr.diff)
-          IS_TRUNCATED=false
-          if [ "$DIFF_SIZE" -gt 100000 ]; then
-            head -c 100000 /tmp/pr.diff > /tmp/pr_truncated.diff
-            mv /tmp/pr_truncated.diff /tmp/pr.diff
-            IS_TRUNCATED=true
-          fi
-
-          cat > /tmp/prompt.txt << 'PROMPT_EOF'
-          Read claude_md/code_review.md for the full review methodology, then
-          review the pull request described below. Follow all perspectives and
-          the output format defined in that document.
-          PROMPT_EOF
-
-          cat >> /tmp/prompt.txt << PROMPT_EOF
-
-          ## Pull Request Information
-          - **Title:** ${PR_TITLE}
-          - **Author:** ${PR_AUTHOR}
-          - **Changes:** ${DIFF_STATS}
-          PROMPT_EOF
-
-          if [ "${IS_TRUNCATED}" = "true" ]; then
-            echo "- **Note:** Diff truncated due to size." >> /tmp/prompt.txt
-          fi
-
-          printf '\n## PR Description\n' >> /tmp/prompt.txt
-          printf '%s\n' "${PR_BODY}" >> /tmp/prompt.txt
-          printf '\n---\n\n## Diff to Review\n\n' >> /tmp/prompt.txt
-          cat /tmp/pr.diff >> /tmp/prompt.txt
-
-      - name: Run Claude
-        if: steps.check_existing.outputs.skip != 'true'
-        id: claude
-        uses: anthropics/claude-code-base-action@beta
-        with:
-          prompt_file: /tmp/prompt.txt
-          model: claude-opus-4-6
-          max_turns: "30"
-          allowed_tools: "View,GlobTool,GrepTool"
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-
-      - name: Build review comment
-        if: steps.check_existing.outputs.skip != 'true'
-        uses: actions/github-script@v7
-        env:
-          EXECUTION_FILE: ${{ steps.claude.outputs.execution_file }}
-          CONCLUSION: ${{ steps.claude.outputs.conclusion }}
-          HEAD_SHA: ${{ steps.pr_info.outputs.head_sha }}
-        with:
-          script: |
-            const parse = require('./.github/scripts/parse-claude-review.js');
-            const body = parse({
-              executionFile: process.env.EXECUTION_FILE,
-              conclusion: process.env.CONCLUSION,
-              meta: {
-                trigger: 'auto',
-                headSha: process.env.HEAD_SHA,
-                reviewer: '',
-              }
-            });
-            const fs = require('fs');
-            fs.writeFileSync('claude-review-comment.md', body);
-
-      - name: Save PR number
-        if: steps.check_existing.outputs.skip != 'true'
-        run: echo "${{ steps.pr_info.outputs.pr_number }}" > pr_number.txt
-
-      - name: Save trigger metadata
-        if: steps.check_existing.outputs.skip != 'true'
-        run: echo "auto" > trigger_type.txt
-
-      - name: Upload review artifact
-        if: always() && steps.check_existing.outputs.skip != 'true'
-        uses: actions/upload-artifact@v4
-        with:
-          name: claude-review-result
-          path: |
-            claude-review-comment.md
-            pr_number.txt
-            trigger_type.txt
-          if-no-files-found: ignore
-          retention-days: 1
-
-      - name: Upload execution log
-        if: always() && steps.check_existing.outputs.skip != 'true'
-        uses: actions/upload-artifact@v4
-        with:
-          name: claude-review-execution-log
-          path: ${{ steps.claude.outputs.execution_file }}
-          retention-days: 7
-          if-no-files-found: warn
-
-  # ======================== Manual Review ======================== #
-  manual-review:
-    name: Manual Claude Review
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    if: >-
-      github.event_name == 'workflow_dispatch' ||
-      (
-        github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
-        (contains(github.event.comment.body, '/claude-review') || contains(github.event.comment.body, '/claude-query')) &&
-        contains(fromJSON('["pdillinger", "jaykorean", "hx235", "dannyhchen", "joshkang97", "zaidoon1", "omkarhgawde", "xingbowang", "anand1976", "virajthakur", "nmk70", "archang19", "mszeszko-meta", "yoshinorim", "cbi42"]'), github.event.comment.user.login)
-      )
-
-    steps:
-      - name: Detect command type
-        id: command
-        uses: actions/github-script@v7
-        with:
-          script: |
-            if (context.eventName === 'workflow_dispatch') {
-              core.setOutput('type', 'review');
-              core.setOutput('query', '');
-              return;
-            }
-            const body = context.payload.comment.body;
-            if (body.includes('/claude-review')) {
-              core.setOutput('type', 'review');
-              const match = body.match(/\/claude-review\s+([\s\S]*)/);
-              core.setOutput('query', match ? match[1].trim() : '');
-            } else if (body.includes('/claude-query')) {
-              const match = body.match(/\/claude-query\s+([\s\S]*)/);
-              const query = match ? match[1].trim() : '';
-              if (!query) {
-                core.setFailed('No query provided. Usage: /claude-query <your question>');
-                return;
-              }
-              core.setOutput('type', 'query');
-              core.setOutput('query', query);
-            } else {
-              core.setFailed('Unknown command');
-            }
-
-      - name: Get PR details
-        id: pr_info
-        uses: actions/github-script@v7
-        env:
-          INPUT_PR_NUMBER: ${{ inputs.pr_number }}
-        with:
-          script: |
-            const prNumber = context.eventName === 'workflow_dispatch'
-              ? parseInt(process.env.INPUT_PR_NUMBER, 10)
-              : context.issue.number;
-
-            const pr = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: prNumber
-            });
-
-            core.setOutput('pr_number', prNumber.toString());
-            core.setOutput('head_repo', pr.data.head.repo.clone_url);
-            core.setOutput('head_ref', pr.data.head.ref);
-            core.setOutput('head_sha', pr.data.head.sha);
-            core.setOutput('base_sha', pr.data.base.sha);
-            core.setOutput('base_ref', pr.data.base.ref);
-            core.setOutput('pr_title', pr.data.title);
-            core.setOutput('pr_body', pr.data.body || '');
-            core.setOutput('pr_author', pr.data.user.login);
-
-      - name: Checkout base repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ steps.pr_info.outputs.base_ref }}
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Generate diff and prompt
-        env:
-          HEAD_REPO: ${{ steps.pr_info.outputs.head_repo }}
-          HEAD_REF: ${{ steps.pr_info.outputs.head_ref }}
-          HEAD_SHA: ${{ steps.pr_info.outputs.head_sha }}
-          BASE_SHA: ${{ steps.pr_info.outputs.base_sha }}
-          PR_TITLE: ${{ steps.pr_info.outputs.pr_title }}
-          PR_BODY: ${{ steps.pr_info.outputs.pr_body }}
-          PR_AUTHOR: ${{ steps.pr_info.outputs.pr_author }}
-          DIFF_STATS: ""
-          COMMAND_TYPE: ${{ steps.command.outputs.type }}
-          ADDITIONAL_CONTEXT: ${{ steps.command.outputs.query }}
-          USER_QUERY: ${{ steps.command.outputs.query }}
-        run: |
-          git remote add fork "${HEAD_REPO}" || true
-          git fetch fork "${HEAD_REF}" --depth=100
-
-          git diff "${BASE_SHA}...${HEAD_SHA}" > /tmp/pr.diff
-          DIFF_STATS=$(git diff --stat "${BASE_SHA}...${HEAD_SHA}" | tail -1)
-
-          DIFF_SIZE=$(wc -c < /tmp/pr.diff)
-          IS_TRUNCATED=false
-          if [ "$DIFF_SIZE" -gt 100000 ]; then
-            head -c 100000 /tmp/pr.diff > /tmp/pr_truncated.diff
-            mv /tmp/pr_truncated.diff /tmp/pr.diff
-            IS_TRUNCATED=true
-          fi
-
-          if [ "${COMMAND_TYPE}" = "query" ]; then
-            # Query prompt
-            cat > /tmp/prompt.txt << 'PROMPT_EOF'
-          You are an expert C++ engineer for RocksDB.
-          Read CLAUDE.md in the repo root and claude_md/ files for project context.
-          Answer thoroughly with exact file paths and line numbers.
-
-          ---
-
-          PROMPT_EOF
-
-            cat >> /tmp/prompt.txt << PROMPT_EOF
-          ## Pull Request Context
-          - **Title:** ${PR_TITLE}
-          - **Author:** ${PR_AUTHOR}
-          - **Changes:** ${DIFF_STATS}
-
-          ## PR Description
-          PROMPT_EOF
-            printf '%s\n' "${PR_BODY}" >> /tmp/prompt.txt
-            printf '\n## Question\n' >> /tmp/prompt.txt
-            printf '%s\n' "${USER_QUERY}" >> /tmp/prompt.txt
-            printf '\n---\n## PR Diff (for reference)\n' >> /tmp/prompt.txt
-            cat /tmp/pr.diff >> /tmp/prompt.txt
-          else
-            # Review prompt
-            cat > /tmp/prompt.txt << 'PROMPT_EOF'
-          Read claude_md/code_review.md for the full review methodology, then
-          review the pull request described below. Follow all perspectives and
-          the output format defined in that document.
-          PROMPT_EOF
-
-            cat >> /tmp/prompt.txt << PROMPT_EOF
-
-          ## Pull Request Information
-          - **Title:** ${PR_TITLE}
-          - **Author:** ${PR_AUTHOR}
-          - **Changes:** ${DIFF_STATS}
-          PROMPT_EOF
-
-            if [ "${IS_TRUNCATED}" = "true" ]; then
-              echo "- **Note:** Diff truncated due to size." >> /tmp/prompt.txt
-            fi
-
-            printf '\n## PR Description\n' >> /tmp/prompt.txt
-            printf '%s\n' "${PR_BODY}" >> /tmp/prompt.txt
-
-            if [ -n "${ADDITIONAL_CONTEXT}" ]; then
-              printf '\n## Additional Instructions from Reviewer\n' >> /tmp/prompt.txt
-              printf '%s\n' "${ADDITIONAL_CONTEXT}" >> /tmp/prompt.txt
-            fi
-
-            printf '\n---\n\n## Diff to Review\n\n' >> /tmp/prompt.txt
-            cat /tmp/pr.diff >> /tmp/prompt.txt
-          fi
-
-      - name: Run Claude
-        id: claude
-        uses: anthropics/claude-code-base-action@beta
-        with:
-          prompt_file: /tmp/prompt.txt
-          model: ${{ github.event_name == 'workflow_dispatch' && inputs.model || 'claude-opus-4-6' }}
-          max_turns: "30"
-          allowed_tools: "View,GlobTool,GrepTool"
-          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-
-      - name: Build review comment
-        uses: actions/github-script@v7
-        env:
-          EXECUTION_FILE: ${{ steps.claude.outputs.execution_file }}
-          CONCLUSION: ${{ steps.claude.outputs.conclusion }}
-          HEAD_SHA: ${{ steps.pr_info.outputs.head_sha }}
-          REVIEWER: ${{ github.event_name == 'workflow_dispatch' && github.actor || github.event.comment.user.login }}
-          COMMAND_TYPE: ${{ steps.command.outputs.type }}
-        with:
-          script: |
-            const parse = require('./.github/scripts/parse-claude-review.js');
-            const isReview = process.env.COMMAND_TYPE === 'review';
-            const body = parse({
-              executionFile: process.env.EXECUTION_FILE,
-              conclusion: process.env.CONCLUSION,
-              meta: {
-                trigger: 'manual',
-                headSha: process.env.HEAD_SHA,
-                reviewer: process.env.REVIEWER,
-                isQuery: !isReview,
-              }
-            });
-            const fs = require('fs');
-            fs.writeFileSync('claude-review-comment.md', body);
-
-      - name: Save PR number
-        run: echo "${{ steps.pr_info.outputs.pr_number }}" > pr_number.txt
-
-      - name: Save trigger metadata
-        env:
-          REVIEWER: ${{ github.event_name == 'workflow_dispatch' && github.actor || github.event.comment.user.login }}
-          COMMENT_ID: ${{ github.event.comment.id }}
-        run: |
-          echo "manual" > trigger_type.txt
-          echo "${REVIEWER}" > reviewer.txt
-          echo "${COMMENT_ID}" > comment_id.txt
-
-      - name: Upload review artifact
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: claude-review-result
-          path: |
-            claude-review-comment.md
-            pr_number.txt
-            trigger_type.txt
-            reviewer.txt
-            comment_id.txt
-          if-no-files-found: ignore
-          retention-days: 1
-
-      - name: Upload execution log
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: claude-review-execution-log
-          path: ${{ steps.claude.outputs.execution_file }}
-          retention-days: 7
-          if-no-files-found: warn

.github/workflows/nightly.yml

@@ -54,12 +54,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
     - uses: "./.github/actions/setup-folly"
     - uses: "./.github/actions/build-folly"
     - run: LIB_MODE=static USE_CLANG=1 USE_FOLLY=1 COMPILE_WITH_UBSAN=1 COMPILE_WITH_ASAN=1 make -j32 check
     - uses: "./.github/actions/post-steps"
-  build-linux-cmake-with-folly:
+  build-linux-valgrind:
     if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
@@ -69,30 +68,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - uses: "./.github/actions/cache-folly"
-      id: cache-folly
-    - uses: "./.github/actions/build-folly"
-      with:
-        cache-hit: ${{ steps.cache-folly.outputs.cache-hit }}
-    - run: "(mkdir build && cd build && cmake -DUSE_FOLLY=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 .. && make VERBOSE=1 -j20 && ctest -j20)"
-    - uses: "./.github/actions/post-steps"
-  build-linux-release-with-folly:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - run: "DEBUG_LEVEL=0 make -j20 build_folly"
-    - run: "USE_FOLLY=1 LIB_MODE=static DEBUG_LEVEL=0 V=1 make -j20 release"
-    - run: "(mkdir build && cd build && cmake -DUSE_FOLLY=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j20 && ctest -j20)"
+    - run: make V=1 -j32 valgrind_test
     - uses: "./.github/actions/post-steps"
   build-windows-vs2022-avx2:
     if: ${{ github.repository_owner == 'facebook' }}
@@ -113,20 +89,6 @@ jobs:
       - run: sudo apt-get update && sudo apt-get install -y build-essential libgflags-dev
       - run: make V=1 J=4 -j4 check
       - uses: "./.github/actions/post-steps"
-  build-linux-arm-crashtest:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 4-core-ubuntu-arm
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - run: sudo apt-get update && sudo apt-get install -y build-essential libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
-    - run: sudo mount -o remount,size=16G /dev/shm
-    - run: sudo dd bs=1048576 count=4096 if=/dev/zero of=/swapfile && sudo chmod 600 /swapfile && sudo mkswap /swapfile && sudo swapon /swapfile
-    - run: ulimit -S -n `ulimit -H -n` && make V=1 -j8 CRASH_TEST_EXT_ARGS='--duration=1800 --max_key=2500000' blackbox_crash_test_with_atomic_flush
-    - run: rm -rf /dev/shm/rocksdb.*
-    - run: ulimit -S -n `ulimit -H -n` && make V=1 -j8 CRASH_TEST_EXT_ARGS='--duration=1800 --max_key=2500000' blackbox_crash_test_with_multiops_wc_txn
-    - uses: "./.github/actions/post-steps"
   build-examples:
     if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
@@ -155,7 +117,7 @@ jobs:
     - name: Build fuzzers
       run: cd fuzz && make sst_file_writer_fuzzer db_fuzzer db_map_fuzzer
     - uses: "./.github/actions/post-steps"
-  build-linux-cmake-with-folly-lite:
+  build-linux-cmake-with-folly-lite-no-test:
     if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
@@ -165,7 +127,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
     - uses: "./.github/actions/setup-folly"
-    - run: "(mkdir build && cd build && cmake -DUSE_FOLLY_LITE=1 -DWITH_GFLAGS=1 -DCMAKE_CXX_FLAGS=-DGLOG_USE_GLOG_EXPORT .. && make VERBOSE=1 -j20 && ctest -j20)"
+    - run: "(mkdir build && cd build && cmake -DUSE_FOLLY_LITE=1 -DWITH_GFLAGS=1 -DCMAKE_CXX_FLAGS=-DGLOG_USE_GLOG_EXPORT .. && make V=1 -j20)"
     - uses: "./.github/actions/post-steps"

.github/workflows/pr-jobs.yml

@@ -1,18 +1,7 @@
 name: facebook/rocksdb/pr-jobs
 on: [push, pull_request]
 permissions: {}
-env:
-  # Set to a job name to run only that job (on any repo), or leave empty for
-  # normal behavior (all jobs on facebook repo only).
-  ONLY_JOB: ''
 jobs:
-  config:
-    runs-on: ubuntu-latest
-    outputs:
-      only_job: ${{ steps.set.outputs.only_job }}
-    steps:
-    - id: set
-      run: echo "only_job=$ONLY_JOB" >> "$GITHUB_OUTPUT"
   # NOTE: multiple workflows would be recommended, but the current GHA UI in
   # PRs doesn't make it clear when there's an overall error with a workflow,
   # making it easy to overlook something broken. Grouping everything into one
@@ -30,10 +19,6 @@ jobs:
   # increasing the risk of misconfiguration, especially on forks that might
   # want to run with this GHA setup.
   #
-  # SELECTIVE JOB EXECUTION: Set the ONLY_JOB env var at the top of this file
-  # to a job name (e.g. "build-linux-clang-tidy") to run only that job,
-  # bypassing the repository owner check. Leave it empty for normal behavior.
-  #
   # DEBUGGING WITH SSH: Temporarily add this as a job step, either before the
   # step of interest without the "if:" line or after the failing step with the
   # "if:" line. Then use ssh command printed in CI output.
@@ -45,8 +30,7 @@ jobs:
 
   # ======================== Fast Initial Checks ====================== #
   check-format-and-targets:
-    if: needs.config.outputs.only_job == 'check-format-and-targets' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4.1.0
@@ -60,10 +44,6 @@ jobs:
       run: python -m pip install --upgrade pip
     - name: Install argparse
       run: pip install argparse
-    - name: Install clang-format
-      run: |
-        pip install https://files.pythonhosted.org/packages/fb/ac/3c04772acc0257f5730e83adb542b2603c1a62d1315010ab593a980af404/clang_format-21.1.2-py2.py3-none-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl
-        clang-format --version
     - name: Download clang-format-diff.py
       run: wget https://rocksdb-deps.s3.us-west-2.amazonaws.com/llvm/llvm-project/release/12.x/clang/tools/clang-format/clang-format-diff.py
     - name: Check format
@@ -82,8 +62,7 @@ jobs:
         SANITY_CHECK=1 LONG_TEST=1 tools/check_format_compatible.sh
   # ========================= Linux With Tests ======================== #
   build-linux:
-    if: needs.config.outputs.only_job == 'build-linux' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
     container:
@@ -92,18 +71,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: build-linux
     - run: make V=1 J=32 -j32 check
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-cmake-mingw:
-    if: needs.config.outputs.only_job == 'build-linux-cmake-mingw' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 4-core-ubuntu
     container:
@@ -112,9 +83,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: cmake-mingw
     - run: update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
     - name: Build cmake-mingw
       run: |-
@@ -123,41 +91,37 @@ jobs:
         which java && java -version
         which javac && javac -version
         mkdir build && cd build && cmake -DJNI=1 -DWITH_GFLAGS=OFF .. -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DCMAKE_SYSTEM_NAME=Windows && make -j4 rocksdb rocksdbjni
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
+    - uses: "./.github/actions/post-steps"
+  build-linux-cmake-with-folly:
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on:
+      labels: 16-core-ubuntu
+    container:
+      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
+      options: --shm-size=16gb
+    steps:
+    - uses: actions/checkout@v4.1.0
+    - uses: "./.github/actions/pre-steps"
+    - uses: "./.github/actions/setup-folly"
+    - uses: "./.github/actions/build-folly"
+    - run: "(mkdir build && cd build && cmake -DUSE_FOLLY=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 .. && make V=1 -j20 && ctest -j20)"
     - uses: "./.github/actions/post-steps"
   build-linux-make-with-folly:
-    if: needs.config.outputs.only_job == 'build-linux-make-with-folly' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
-      labels: 32-core-ubuntu
+      labels: 16-core-ubuntu
     container:
       image: ghcr.io/facebook/rocksdb_ubuntu:22.1
       options: --shm-size=16gb
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
     - uses: "./.github/actions/setup-folly"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: make-with-folly
-    - uses: "./.github/actions/cache-folly"
-      id: cache-folly
     - uses: "./.github/actions/build-folly"
-      with:
-        cache-hit: ${{ steps.cache-folly.outputs.cache-hit }}
-    - run: USE_FOLLY=1 LIB_MODE=static V=1 make -j64 check
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
+    - run: USE_FOLLY=1 LIB_MODE=static V=1 make -j32 check
     - uses: "./.github/actions/post-steps"
   build-linux-make-with-folly-lite-no-test:
-    if: needs.config.outputs.only_job == 'build-linux-make-with-folly-lite-no-test' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
     container:
@@ -166,47 +130,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
     - uses: "./.github/actions/setup-folly"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: make-folly-lite
     - run: USE_FOLLY_LITE=1 EXTRA_CXXFLAGS=-DGLOG_USE_GLOG_EXPORT V=1 make -j32 all
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-cmake-with-folly-coroutines:
-    if: needs.config.outputs.only_job == 'build-linux-cmake-with-folly-coroutines' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on:
-      labels: 32-core-ubuntu
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/cache-getdeps-downloads"
-    - uses: "./.github/actions/setup-folly"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: cmake-folly-coroutines
-    - uses: "./.github/actions/cache-folly"
-      id: cache-folly
-    - uses: "./.github/actions/build-folly"
-      with:
-        cache-hit: ${{ steps.cache-folly.outputs.cache-hit }}
-    - run: "(mkdir build && cd build && cmake -DUSE_COROUTINES=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 -DPORTABLE=ON .. && make VERBOSE=1 -j64 && ctest -j64)"
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
-    - uses: "./.github/actions/post-steps"
-  build-linux-cmake-with-benchmark-no-thread-status:
-    if: needs.config.outputs.only_job == 'build-linux-cmake-with-benchmark-no-thread-status' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
     container:
@@ -215,18 +143,24 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: cmake-benchmark
-    - run: mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 -DPORTABLE=ON -DCMAKE_CXX_FLAGS=-DNROCKSDB_THREAD_STATUS .. && make VERBOSE=1 -j20 && ctest -j20
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
+    - uses: "./.github/actions/setup-folly"
+    - uses: "./.github/actions/build-folly"
+    - run: "(mkdir build && cd build && cmake -DUSE_COROUTINES=1 -DWITH_GFLAGS=1 -DROCKSDB_BUILD_SHARED=0 .. && make V=1 -j20 && ctest -j20)"
+    - uses: "./.github/actions/post-steps"
+  build-linux-cmake-with-benchmark:
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on:
+      labels: 16-core-ubuntu
+    container:
+      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
+      options: --shm-size=16gb
+    steps:
+    - uses: actions/checkout@v4.1.0
+    - uses: "./.github/actions/pre-steps"
+    - run: mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20
     - uses: "./.github/actions/post-steps"
   build-linux-encrypted_env-no_compression:
-    if: needs.config.outputs.only_job == 'build-linux-encrypted_env-no_compression' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
     container:
@@ -235,20 +169,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: encrypted-env-no-compression
     - run: ENCRYPTED_ENV=1 ROCKSDB_DISABLE_SNAPPY=1 ROCKSDB_DISABLE_ZLIB=1 ROCKSDB_DISABLE_BZIP=1 ROCKSDB_DISABLE_LZ4=1 ROCKSDB_DISABLE_ZSTD=1 make V=1 J=32 -j32 check
     - run: "./sst_dump --help | grep -E -q 'Supported built-in compression types: kNoCompression$' # Verify no compiled in compression\n"
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   # ======================== Linux No Test Runs ======================= #
   build-linux-release:
-    if: needs.config.outputs.only_job == 'build-linux-release' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
     container:
@@ -256,9 +182,6 @@ jobs:
       options: --shm-size=16gb
     steps:
     - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: release
     - run: make V=1 -j32 LIB_MODE=shared release
     - run: ls librocksdb.so
     - run: "./trace_analyzer --version" # A tool dependent on gflags that can run in release build
@@ -275,14 +198,9 @@ jobs:
     - run: USE_RTTI=1 make V=1 -j32 release
     - run: ls librocksdb.a
     - run: if ./trace_analyzer --version; then false; else true; fi
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-clang-13-no_test_run:
-    if: needs.config.outputs.only_job == 'build-linux-clang-13-no_test_run' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 8-core-ubuntu
     container:
@@ -291,22 +209,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: clang-13
     # FIXME: get back to "all microbench" targets
     - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 EXTRA_CXXFLAGS=-stdlib=libc++ EXTRA_LDFLAGS=-stdlib=libc++ make -j32 shared_lib
     - run: make clean
     # FIXME: get back to "release" target
     - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 EXTRA_CXXFLAGS=-stdlib=libc++ EXTRA_LDFLAGS=-stdlib=libc++ DEBUG_LEVEL=0 make -j32 shared_lib
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-clang-18-no_test_run:
-    if: needs.config.outputs.only_job == 'build-linux-clang-18-no_test_run' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
     container:
@@ -315,20 +225,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: clang-18
     - run: CC=clang-18 CXX=clang++-18 USE_CLANG=1 make -j32 all microbench
     - run: make clean
     - run: CC=clang-18 CXX=clang++-18 USE_CLANG=1 DEBUG_LEVEL=0 make -j32 release
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-gcc-14-no_test_run:
-    if: needs.config.outputs.only_job == 'build-linux-gcc-14-no_test_run' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
     container:
@@ -337,21 +239,31 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: gcc-14
     - run: CC=gcc-14 CXX=g++-14 V=1 make -j32 all microbench
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
 
   # ======================== Linux Other Checks ======================= #
-
+  build-linux-clang18-clang-analyze:
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on:
+      labels: 16-core-ubuntu
+    container:
+      image: ghcr.io/facebook/rocksdb_ubuntu:24.0
+      options: --shm-size=16gb
+    steps:
+    - uses: actions/checkout@v4.1.0
+    - uses: "./.github/actions/pre-steps"
+    - run: CC=clang-18 CXX=clang++-18 ROCKSDB_DISABLE_ALIGNED_NEW=1 CLANG_ANALYZER="/usr/bin/clang++-18" CLANG_SCAN_BUILD=scan-build-18 USE_CLANG=1 make V=1 -j32 analyze
+    - uses: "./.github/actions/post-steps"
+    - name: compress test report
+      run: tar -cvzf scan_build_report.tar.gz scan_build_report
+      if: failure()
+    - uses: actions/upload-artifact@v4.0.0
+      with:
+        name: scan-build-report
+        path: scan_build_report.tar.gz
   build-linux-unity-and-headers:
-    if: needs.config.outputs.only_job == 'build-linux-unity-and-headers' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 4-core-ubuntu
     container:
@@ -360,20 +272,12 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - run: apt-get update -y && apt-get install -y libgflags-dev
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: unity-headers
     - name: Unity build
       run: make V=1 -j8 unity_test
     - run: make V=1 -j8 -k check-headers
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-mini-crashtest:
-    if: needs.config.outputs.only_job == 'build-linux-mini-crashtest' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 4-core-ubuntu
     container:
@@ -382,19 +286,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: mini-crashtest
     - run: ulimit -S -n `ulimit -H -n` && make V=1 -j8 CRASH_TEST_EXT_ARGS='--duration=960 --max_key=2500000' blackbox_crash_test_with_atomic_flush
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   # ======================= Linux with Sanitizers ===================== #
   build-linux-clang18-asan-ubsan:
-    if: needs.config.outputs.only_job == 'build-linux-clang18-asan-ubsan' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 32-core-ubuntu
     container:
@@ -403,18 +299,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: clang18-asan-ubsan
     - run: COMPILE_WITH_ASAN=1 COMPILE_WITH_UBSAN=1 CC=clang-18 CXX=clang++-18 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j40 check
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-clang18-mini-tsan:
-    if: needs.config.outputs.only_job == 'build-linux-clang18-mini-tsan' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 32-core-ubuntu
     container:
@@ -423,18 +311,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: clang18-tsan
     - run: COMPILE_WITH_TSAN=1 CC=clang-18 CXX=clang++-18 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-static_lib-alt_namespace-status_checked:
-    if: needs.config.outputs.only_job == 'build-linux-static_lib-alt_namespace-status_checked' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 16-core-ubuntu
     container:
@@ -443,86 +323,56 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: static-alt-namespace
     - run: ASSERT_STATUS_CHECKED=1 TEST_UINT128_COMPAT=1 ROCKSDB_MODIFY_NPHASH=1 LIB_MODE=static OPT="-DROCKSDB_USE_STD_SEMAPHORES -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" make V=1 -j24 check
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   # ========================= MacOS build only ======================== #
   build-macos:
-    if: needs.config.outputs.only_job == 'build-macos' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on: macos-13
     env:
       ROCKSDB_DISABLE_JEMALLOC: 1
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
       with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos
+        xcode-version: 14.3.1
     - uses: "./.github/actions/increase-max-open-files-on-macos"
     - uses: "./.github/actions/install-gflags-on-macos"
     - uses: "./.github/actions/pre-steps-macos"
     - name: Build
-      run: ulimit -S -n `ulimit -H -n` && make V=1 J=16 -j8 all
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
+      run: ulimit -S -n `ulimit -H -n` && make V=1 J=16 -j16 all
     - uses: "./.github/actions/post-steps"
   # ========================= MacOS with Tests ======================== #
   build-macos-cmake:
-    if: needs.config.outputs.only_job == 'build-macos-cmake' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on: macos-13
     strategy:
       matrix:
-        run_sharded_tests: [0, 1, 2, 3]
+        run_even_tests: [true, false]
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
       with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos-cmake
+        xcode-version: 14.3.1
     - uses: "./.github/actions/increase-max-open-files-on-macos"
     - uses: "./.github/actions/install-gflags-on-macos"
     - uses: "./.github/actions/pre-steps-macos"
     - name: cmake generate project file
       run: ulimit -S -n `ulimit -H -n` && mkdir build && cd build && cmake -DWITH_GFLAGS=1 ..
     - name: Build tests
-      run: cd build && make VERBOSE=1 -j8
-    - name: Run shard 0 out of 4 test shards
-      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j8 -I 0,,4
-      if: ${{ matrix.run_sharded_tests == 0 }}
-    - name: Run shard 1 out of 4 test shards
-      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j8 -I 1,,4
-      if: ${{ matrix.run_sharded_tests == 1 }}
-    - name: Run shard 2 out of 4 test shards
-      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j8 -I 2,,4
-      if: ${{ matrix.run_sharded_tests == 2 }}
-    - name: Run shard 3 out of 4 test shards
-      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j8 -I 3,,4
-      if: ${{ matrix.run_sharded_tests == 3 }}
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
+      run: cd build && make V=1 -j16
+    - name: Run even tests
+      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j16 -I 0,,2
+      if: ${{ matrix.run_even_tests }}
+    - name: Run odd tests
+      run: ulimit -S -n `ulimit -H -n` && cd build && ctest -j16 -I 1,,2
+      if: ${{ ! matrix.run_even_tests  }}
     - uses: "./.github/actions/post-steps"
   # ======================== Windows with Tests ======================= #
   # NOTE: some windows jobs are in "nightly" to save resources
   build-windows-vs2022:
-    if: needs.config.outputs.only_job == 'build-windows-vs2022' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: windows-8-core
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on: windows-2022
     env:
       CMAKE_GENERATOR: Visual Studio 17 2022
       CMAKE_PORTABLE: 1
@@ -531,59 +381,70 @@ jobs:
     - uses: "./.github/actions/windows-build-steps"
   # ============================ Java Jobs ============================ #
   build-linux-java:
-    if: needs.config.outputs.only_job == 'build-linux-java' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 4-core-ubuntu
     container:
       image: ghcr.io/facebook/rocksdb_ubuntu:22.1
       options: --shm-size=16gb
     steps:
-    - uses: actions/checkout@v4.1.0
+    # The docker image is intentionally based on an OS that has an older GLIBC version.
+    # That GLIBC is incompatibile with GitHub's actions/checkout. Thus we implement a manual checkout step.
+    # NOTE: replaced evolvedbinary/rocksjava:centos7_x64-be with ghcr.io/facebook/rocksdb_ubuntu:22.1
+    # until a more appropriate docker image with C++20 support is made.
+    - name: Checkout
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        chown `whoami` . || true
+        git clone --no-checkout https://oath2:$GH_TOKEN@github.com/${{ github.repository }}.git .
+        git -c protocol.version=2 fetch --update-head-ok --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}:${{ github.ref }}
+        git checkout --progress --force ${{ github.ref }}
+        git log -1 --format='%H'
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: java
     - name: Set Java Environment
       run: |-
         echo "JAVA_HOME=${JAVA_HOME}"
         which java && java -version
         which javac && javac -version
     - name: Test RocksDBJava
+    # NOTE: replaced scl enable devtoolset-7 'make V=1 J=8 -j8 jtest'
       run: make V=1 J=8 -j8 jtest
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
+    # post-steps skipped because of compatibility issues with docker image
   build-linux-java-static:
-    if: needs.config.outputs.only_job == 'build-linux-java-static' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 4-core-ubuntu
     container:
       image: ghcr.io/facebook/rocksdb_ubuntu:22.1
       options: --shm-size=16gb
     steps:
-    - uses: actions/checkout@v4.1.0
+    # The docker image is intentionally based on an OS that has an older GLIBC version.
+    # That GLIBC is incompatibile with GitHub's actions/checkout. Thus we implement a manual checkout step.
+    # NOTE: replaced evolvedbinary/rocksjava:centos7_x64-be with ghcr.io/facebook/rocksdb_ubuntu:22.1
+    # until a more appropriate docker image with C++20 support is made.
+    - name: Checkout
+      env:
+        GH_TOKEN: ${{ github.token }}
+      run: |
+        chown `whoami` . || true
+        git clone --no-checkout https://oath2:$GH_TOKEN@github.com/${{ github.repository }}.git .
+        git -c protocol.version=2 fetch --update-head-ok --no-tags --prune --no-recurse-submodules --depth=1 origin +${{ github.sha }}:${{ github.ref }}
+        git checkout --progress --force ${{ github.ref }}
+        git log -1 --format='%H'
     - uses: "./.github/actions/pre-steps"
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: java-static
     - name: Set Java Environment
       run: |-
         echo "JAVA_HOME=${JAVA_HOME}"
         which java && java -version
         which javac && javac -version
     - name: Build RocksDBJava Static Library
+    # NOTE: replaced scl enable devtoolset-7 'make V=1 J=8 -j8 rocksdbjavastatic'
       run: make V=1 J=8 -j8 rocksdbjavastatic
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
+    # post-steps skipped because of compatibility issues with docker image
   build-macos-java:
-    if: needs.config.outputs.only_job == 'build-macos-java' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on: macos-13
     env:
       JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
       ROCKSDB_DISABLE_JEMALLOC: 1
@@ -591,10 +452,7 @@ jobs:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
       with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos-java
+        xcode-version: 14.3.1
     - uses: "./.github/actions/increase-max-open-files-on-macos"
     - uses: "./.github/actions/install-gflags-on-macos"
     - uses: "./.github/actions/install-jdk8-on-macos"
@@ -606,25 +464,17 @@ jobs:
         which javac && javac -version
     - name: Test RocksDBJava
       run: make V=1 J=16 -j16 jtest
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-macos-java-static:
-    if: needs.config.outputs.only_job == 'build-macos-java-static' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on: macos-13
     env:
       JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
       with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos-java-static
+        xcode-version: 14.3.1
     - uses: "./.github/actions/increase-max-open-files-on-macos"
     - uses: "./.github/actions/install-gflags-on-macos"
     - uses: "./.github/actions/install-jdk8-on-macos"
@@ -636,25 +486,17 @@ jobs:
         which javac && javac -version
     - name: Build RocksDBJava x86 and ARM Static Libraries
       run: make V=1 J=16 -j16 rocksdbjavastaticosx
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-macos-java-static-universal:
-    if: needs.config.outputs.only_job == 'build-macos-java-static-universal' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
-    runs-on: macos-15-xlarge
+    if: ${{ github.repository_owner == 'facebook' }}
+    runs-on: macos-13
     env:
       JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
       with:
-        xcode-version: 16.4.0
-    - uses: "./.github/actions/setup-ccache"
-      with:
-        cache-key-prefix: macos-java-static-universal
+        xcode-version: 14.3.1
     - uses: "./.github/actions/increase-max-open-files-on-macos"
     - uses: "./.github/actions/install-gflags-on-macos"
     - uses: "./.github/actions/install-jdk8-on-macos"
@@ -666,14 +508,9 @@ jobs:
         which javac && javac -version
     - name: Build RocksDBJava Universal Binary Static Library
       run: make V=1 J=16 -j16 rocksdbjavastaticosx_ub
-    - name: Print ccache stats
-      run: ccache -s
-      if: always()
-      shell: bash
     - uses: "./.github/actions/post-steps"
   build-linux-java-pmd:
-    if: needs.config.outputs.only_job == 'build-linux-java-pmd' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 4-core-ubuntu
     container:
@@ -699,20 +536,12 @@ jobs:
         name: maven-site
         path: "${{ github.workspace }}/java/target/site"
   build-linux-arm:
-    if: needs.config.outputs.only_job == 'build-linux-arm' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
-    needs: config
+    if: ${{ github.repository_owner == 'facebook' }}
     runs-on:
       labels: 4-core-ubuntu-arm
     steps:
       - uses: actions/checkout@v4.1.0
       - uses: "./.github/actions/pre-steps"
-      - run: sudo apt-get update && sudo apt-get install -y build-essential ccache
-      - uses: "./.github/actions/setup-ccache"
-        with:
-          cache-key-prefix: arm
+      - run: sudo apt-get update && sudo apt-get install -y build-essential
       - run: ROCKSDBTESTS_PLATFORM_DEPENDENT=only make V=1 J=4 -j4 all_but_some_tests check_some
-      - name: Print ccache stats
-        run: ccache -s
-        if: always()
-        shell: bash
       - uses: "./.github/actions/post-steps"

.github/workflows/weekly.yml

@@ -1,20 +0,0 @@
-name: facebook/rocksdb/weekly
-on:
-  schedule:
-  - cron: 0 9 * * 0
-  workflow_dispatch:
-permissions: {}
-jobs:
-  build-linux-valgrind:
-    if: ${{ github.repository_owner == 'facebook' }}
-    runs-on:
-      labels: 16-core-ubuntu
-    timeout-minutes: 840
-    container:
-      image: ghcr.io/facebook/rocksdb_ubuntu:22.1
-      options: --shm-size=16gb
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/pre-steps"
-    - run: make V=1 -j20 valgrind_test
-    - uses: "./.github/actions/post-steps"

BUCK

@@ -1,14 +1,12 @@
 # This file @generated by:
 #$ python3 buckifier/buckify_rocksdb.py
 # --> DO NOT EDIT MANUALLY <--
-# This file is a Meta-specific integration for buck builds, so can
-# only be validated by Meta employees.
+# This file is a Facebook-specific integration for buck builds, so can
+# only be validated by Facebook employees.
 load("//rocks/buckifier:defs.bzl", "cpp_library_wrapper","rocks_cpp_library_wrapper","cpp_binary_wrapper","cpp_unittest_wrapper","fancy_bench_wrapper","add_c_test_wrapper")
 load("@fbcode_macros//build_defs:export_files.bzl", "export_file")
 
 
-oncall("rocksdb_point_of_contact")
-
 cpp_library_wrapper(name="rocksdb_lib", srcs=[
         "cache/cache.cc",
         "cache/cache_entry_roles.cc",
@@ -106,7 +104,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
         "db/version_edit.cc",
         "db/version_edit_handler.cc",
         "db/version_set.cc",
-        "db/version_util.cc",
         "db/wal_edit.cc",
         "db/wal_manager.cc",
         "db/wide/wide_column_serialization.cc",
@@ -208,7 +205,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
         "table/block_based/hash_index_reader.cc",
         "table/block_based/index_builder.cc",
         "table/block_based/index_reader_common.cc",
-        "table/block_based/multi_scan_index_iterator.cc",
         "table/block_based/parsed_full_filter_block.cc",
         "table/block_based/partitioned_filter_block.cc",
         "table/block_based/partitioned_index_iterator.cc",
@@ -270,7 +266,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
         "util/dynamic_bloom.cc",
         "util/file_checksum_helper.cc",
         "util/hash.cc",
-        "util/io_dispatcher_imp.cc",
         "util/murmurhash.cc",
         "util/random.cc",
         "util/rate_limiter.cc",
@@ -364,9 +359,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
         "utilities/transactions/write_prepared_txn_db.cc",
         "utilities/transactions/write_unprepared_txn.cc",
         "utilities/transactions/write_unprepared_txn_db.cc",
-        "utilities/trie_index/bitvector.cc",
-        "utilities/trie_index/louds_trie.cc",
-        "utilities/trie_index/trie_index_factory.cc",
         "utilities/ttl/db_ttl_impl.cc",
         "utilities/types_util.cc",
         "utilities/wal_filter.cc",
@@ -433,7 +425,6 @@ rocks_cpp_library_wrapper(name="rocksdb_stress_lib", srcs=[
         "db_stress_tool/batched_ops_stress.cc",
         "db_stress_tool/cf_consistency_stress.cc",
         "db_stress_tool/db_stress_common.cc",
-        "db_stress_tool/db_stress_compaction_service.cc",
         "db_stress_tool/db_stress_compression_manager.cc",
         "db_stress_tool/db_stress_driver.cc",
         "db_stress_tool/db_stress_filters.cc",
@@ -4828,12 +4819,6 @@ cpp_unittest_wrapper(name="db_clip_test",
             extra_compiler_flags=[])
 
 
-cpp_unittest_wrapper(name="db_compaction_abort_test",
-            srcs=["db/db_compaction_abort_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_compaction_filter_test",
             srcs=["db/db_compaction_filter_test.cc"],
             deps=[":rocksdb_test_lib"],
@@ -4858,12 +4843,6 @@ cpp_unittest_wrapper(name="db_encryption_test",
             extra_compiler_flags=[])
 
 
-cpp_unittest_wrapper(name="db_etc3_test",
-            srcs=["db/db_etc3_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="db_flush_test",
             srcs=["db/db_flush_test.cc"],
             deps=[":rocksdb_test_lib"],
@@ -5142,12 +5121,6 @@ cpp_unittest_wrapper(name="faiss_ivf_index_test",
             extra_compiler_flags=[])
 
 
-cpp_unittest_wrapper(name="fault_injection_fs_test",
-            srcs=["utilities/fault_injection_fs_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="fault_injection_test",
             srcs=["db/fault_injection_test.cc"],
             deps=[":rocksdb_test_lib"],
@@ -5232,12 +5205,6 @@ cpp_unittest_wrapper(name="interval_test",
             extra_compiler_flags=[])
 
 
-cpp_unittest_wrapper(name="io_dispatcher_test",
-            srcs=["util/io_dispatcher_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="io_posix_test",
             srcs=["env/io_posix_test.cc"],
             deps=[":rocksdb_test_lib"],
@@ -5634,18 +5601,6 @@ cpp_unittest_wrapper(name="transaction_test",
             extra_compiler_flags=[])
 
 
-cpp_unittest_wrapper(name="trie_index_db_test",
-            srcs=["utilities/trie_index/trie_index_db_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
-cpp_unittest_wrapper(name="trie_index_test",
-            srcs=["utilities/trie_index/trie_index_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="ttl_test",
             srcs=["utilities/ttl/ttl_test.cc"],
             deps=[":rocksdb_test_lib"],
@@ -5748,12 +5703,6 @@ cpp_unittest_wrapper(name="write_controller_test",
             extra_compiler_flags=[])
 
 
-cpp_unittest_wrapper(name="write_prepared_transaction_seqno_test",
-            srcs=["utilities/transactions/write_prepared_transaction_seqno_test.cc"],
-            deps=[":rocksdb_test_lib"],
-            extra_compiler_flags=[])
-
-
 cpp_unittest_wrapper(name="write_prepared_transaction_test",
             srcs=["utilities/transactions/write_prepared_transaction_test.cc"],
             deps=[":rocksdb_test_lib"],

CLAUDE.md

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

CMakeLists.txt

@@ -80,7 +80,6 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING
     "Default BUILD_TYPE is ${default_build_type}" FORCE)
 endif()
-message(STATUS "CMAKE_BUILD_TYPE is set to ${CMAKE_BUILD_TYPE}")
 
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
@@ -133,9 +132,7 @@ else()
     option(WITH_GFLAGS "build with GFlags" ON)
   endif()
   set(GFLAGS_LIB)
-  # Skip all gflags detection and setup when USE_FOLLY or USE_COROUTINES is enabled
-  # since Folly provides its own gflags (USE_COROUTINES automatically sets USE_FOLLY)
-  if(WITH_GFLAGS AND NOT USE_FOLLY AND NOT USE_COROUTINES)
+  if(WITH_GFLAGS)
     # Config with namespace available since gflags 2.2.2
     option(GFLAGS_USE_TARGET_NAMESPACE "Use gflags import target with namespace." ON)
     find_package(gflags CONFIG)
@@ -154,9 +151,6 @@ else()
     include_directories(${GFLAGS_INCLUDE_DIR})
     list(APPEND THIRDPARTY_LIBS ${GFLAGS_LIB})
     add_definitions(-DGFLAGS=1)
-  elseif(WITH_GFLAGS AND (USE_FOLLY OR USE_COROUTINES))
-    # Still set the DGFLAGS=1 define when using Folly since Folly provides gflags
-    add_definitions(-DGFLAGS=1)
   endif()
 
   if(WITH_SNAPPY)
@@ -209,20 +203,9 @@ if(WIN32 AND MSVC)
   endif()
 endif()
 
-option(WIN_CI "Accelerate build speed and reduce build artifect size for github CI with MSVC" OFF)
-
 if(MSVC)
-  if(WIN_CI)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /nologo /EHsc /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /W4 /wd4127 /wd4996 /wd4100 /wd4324 /wd4702")
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4996 /wd4100 /wd4324")
-  endif()
-  if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DNDEBUG")
-    message(STATUS "Setting /DNDEBUG as CMAKE_BUILD_TYPE is set to ${CMAKE_BUILD_TYPE}")
-  endif()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /nologo /EHsc /GS /Gd /GR /GF /fp:precise /Zc:wchar_t /Zc:forScope /errorReport:queue")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4996 /wd4100 /wd4324")
 else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wextra -Wall -pthread")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare -Wshadow -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-invalid-offsetof")
@@ -330,7 +313,7 @@ if(NOT MSVC)
 endif()
 
 # Check if -latomic is required or not
-if (NOT MSVC AND NOT APPLE)
+if (NOT MSVC)
   CHECK_CXX_SOURCE_COMPILES("
 #include <atomic>
 std::atomic<uint64_t> x(0);
@@ -467,33 +450,24 @@ else()
   endif()
 endif()
 
-# Used to run optimized debug build and tests so we can run faster
+# Used to run CI build and tests so we can run faster
 option(OPTDBG "Build optimized debug build with MSVC" OFF)
 option(WITH_RUNTIME_DEBUG "build with debug version of runtime library" ON)
 if(MSVC)
-  if (WIN_CI)
+  if(OPTDBG)
     message(STATUS "Debug optimization is enabled")
     set(CMAKE_CXX_FLAGS_DEBUG "/Oxt")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FASTLINK")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FASTLINK")
   else()
-    if(OPTDBG)
-      message(STATUS "Debug optimization is enabled")
-      set(CMAKE_CXX_FLAGS_DEBUG "/Oxt")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /RTC1")
+
+    # Minimal Build is deprecated after MSVC 2015
+    if( MSVC_VERSION GREATER 1900 )
+      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm-")
     else()
-      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /RTC1")
-
-      # Minimal Build is deprecated after MSVC 2015
-      if( MSVC_VERSION GREATER 1900 )
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm-")
-      else()
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm")
-      endif()
+      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm")
     endif()
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
-  endif()
 
+  endif()
   if(WITH_RUNTIME_DEBUG)
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /${RUNTIME_LIBRARY}d")
   else()
@@ -501,6 +475,8 @@ if(MSVC)
   endif()
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oxt /Zp8 /Gm- /Gy /${RUNTIME_LIBRARY}")
 
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
@@ -652,12 +628,6 @@ if(USE_FOLLY)
     ${FOLLY_INST_PATH}/lib/cmake/folly/folly-targets.cmake)
 
     include(${FOLLY_INST_PATH}/lib/cmake/folly/folly-config.cmake)
-
-    # Fix gflags library name for debug builds
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath=${GFLAGS_INST_PATH}/lib")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GFLAGS_INST_PATH}/lib/libgflags_debug.so.2.2")
-    endif()
   endif()
 
   add_compile_definitions(USE_FOLLY FOLLY_NO_CONFIG HAVE_CXX11_ATOMIC)
@@ -766,7 +736,6 @@ set(SOURCES
         db/version_edit.cc
         db/version_edit_handler.cc
         db/version_set.cc
-        db/version_util.cc
         db/wal_edit.cc
         db/wal_manager.cc
         db/wide/wide_column_serialization.cc
@@ -843,7 +812,6 @@ set(SOURCES
         table/block_based/block_based_table_builder.cc
         table/block_based/block_based_table_factory.cc
         table/block_based/block_based_table_iterator.cc
-        table/block_based/multi_scan_index_iterator.cc
         table/block_based/block_based_table_reader.cc
         table/block_based/block_builder.cc
         table/block_based/block_cache.cc
@@ -920,7 +888,6 @@ set(SOURCES
         util/data_structure.cc
         util/dynamic_bloom.cc
         util/hash.cc
-        util/io_dispatcher_imp.cc
         util/murmurhash.cc
         util/random.cc
         util/rate_limiter.cc
@@ -1001,9 +968,6 @@ set(SOURCES
         utilities/transactions/write_prepared_txn_db.cc
         utilities/transactions/write_unprepared_txn.cc
         utilities/transactions/write_unprepared_txn_db.cc
-        utilities/trie_index/bitvector.cc
-        utilities/trie_index/louds_trie.cc
-        utilities/trie_index/trie_index_factory.cc
         utilities/types_util.cc
         utilities/ttl/db_ttl_impl.cc
         utilities/wal_filter.cc
@@ -1104,21 +1068,12 @@ if(USE_FOLLY_LITE)
     third-party/folly/folly/synchronization/DistributedMutex.cpp
     third-party/folly/folly/synchronization/ParkingLot.cpp)
   include_directories(${PROJECT_SOURCE_DIR}/third-party/folly)
-  # Add boost to the include path
   exec_program(python3 ${PROJECT_SOURCE_DIR}/third-party/folly ARGS
   build/fbcode_builder/getdeps.py show-source-dir boost OUTPUT_VARIABLE
   BOOST_SOURCE_PATH)
   exec_program(ls ARGS -d ${BOOST_SOURCE_PATH}/boost* OUTPUT_VARIABLE
   BOOST_INCLUDE_DIR)
   include_directories(${BOOST_INCLUDE_DIR})
-  # Add fmt to the include path
-  exec_program(python3 ${PROJECT_SOURCE_DIR}/third-party/folly ARGS
-  build/fbcode_builder/getdeps.py show-source-dir fmt OUTPUT_VARIABLE
-  FMT_SOURCE_PATH)
-  exec_program(ls ARGS -d ${FMT_SOURCE_PATH}/fmt*/include OUTPUT_VARIABLE
-  FMT_INCLUDE_DIR)
-  include_directories(${FMT_INCLUDE_DIR})
-
   add_definitions(-DUSE_FOLLY -DFOLLY_NO_CONFIG)
   list(APPEND THIRDPARTY_LIBS glog)
 endif()
@@ -1387,11 +1342,9 @@ if(WITH_TESTS)
         db/db_bloom_filter_test.cc
         db/db_compaction_filter_test.cc
         db/db_compaction_test.cc
-        db/db_compaction_abort_test.cc
         db/db_clip_test.cc
         db/db_dynamic_level_test.cc
         db/db_encryption_test.cc
-        db/db_etc3_test.cc
         db/db_flush_test.cc
         db/db_inplace_update_test.cc
         db/db_io_failure_test.cc
@@ -1536,7 +1489,6 @@ if(WITH_TESTS)
         utilities/cassandra/cassandra_serialize_test.cc
         utilities/checkpoint/checkpoint_test.cc
         utilities/env_timed_test.cc
-        utilities/fault_injection_fs_test.cc
         utilities/memory/memory_test.cc
         utilities/merge_operators/string_append/stringappend_test.cc
         utilities/object_registry_test.cc
@@ -1554,12 +1506,9 @@ if(WITH_TESTS)
         utilities/transactions/lock/point/point_lock_manager_stress_test.cc
         utilities/transactions/write_committed_transaction_ts_test.cc
         utilities/transactions/write_prepared_transaction_test.cc
-        utilities/transactions/write_prepared_transaction_seqno_test.cc
         utilities/transactions/write_unprepared_transaction_test.cc
         utilities/transactions/lock/range/range_locking_test.cc
         utilities/transactions/timestamped_snapshot_test.cc
-        utilities/trie_index/trie_index_db_test.cc
-        utilities/trie_index/trie_index_test.cc
         utilities/ttl/ttl_test.cc
         utilities/types_util_test.cc
         utilities/util_merge_operators_test.cc

Directory.Build.props

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-    <PropertyGroup>
-        <CLToolExe>ccache_msvc_compiler.bat</CLToolExe>
-        <CLToolPath>$(MSBuildThisFileDirectory)</CLToolPath>
-        <UseMultiToolTask>true</UseMultiToolTask>
-        <EnforceProcessCountAcrossBuilds>true</EnforceProcessCountAcrossBuilds>
-    </PropertyGroup>
-</Project>

HISTORY.md

@@ -1,129 +1,32 @@
 # Rocksdb Change Log
 > NOTE: Entries for next release do not go here. Follow instructions in `unreleased_history/README.txt`
 
-## 11.1.2 (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.
+## 10.7.6 (10/23/2025)
+* Fix a bug when del range and data are in same file for multi-scan
 
-## 11.1.1 (04/10/2026)
+## 10.7.5 (10/20/2025)
+### Bug Fixes
+* Fix a bug in Page unpinning in MultiScan
+
+## 10.7.4 (10/14/2025)
 ### Public API Changes
-* Changed experimental feature `ExternalTableReader::Get` and `ExternalTableReader::MultiGet` to use `PinnableSlice` instead of `std::string` for output values, enabling zero-copy pinning. This will break existing implementations.
-* Added `SstFileReader::Get` and `SstFileReader::MultiGet` overloads that accept `PinnableSlice`/`std::vector<PinnableSlice>*`, enabling zero-copy reads when the underlying `TableReader` supports pinning.
-* Added block_decompress_count to PerfContext
-
-### Bug Fixes
-* Fix a memory accounting leak in IODispatcher where ReadIndex() moved block values out of ReadSet without releasing the associated prefetch memory, causing subsequent prefetches to be blocked when max_prefetch_memory_bytes was set.
-
-## 11.1.0 (03/23/2026)
-### New Features
-* Add a new option `open_files_async`. The existing behavior is on DB open, we open all sst files and do basic validations. For very large DBs on remote filesystems with many ssts, this may take very long. This option performs these validations instead in the background. Open errors found by this async background task are surfaced as a new background error kAsyncFileOpen.
-* Added `BlockBasedTableOptions::kAuto` index block search type that automatically selects between binary and interpolation search on a per-index-block basis. During SST construction, each index block's key distribution uniformity is analyzed using the coefficient of variation of key gaps, and index blocks with uniform keys use interpolation search while others fall back to binary search. The uniformity threshold is configurable via `BlockBasedTableOptions::uniform_cv_threshold` (default: 0.2).
-* Introduced enforce_write_buffer_manager_during_recovery option to allow WriteBufferManager to be enforced during WAL recovery. (Default: true)
-* Add `memtable_batch_lookup_optimization` option to use batch lookup optimization for memtable MultiGet. For skip list memtables, after each key lookup, the search path is cached and reused for the next key, reducing per-key cost from O(log N) to O(log d) where d is the distance between consecutive keys. Benchmarks show ~7% improvement in memtable-resident MultiGet throughput.
-* Added `BlockBasedTableOptions::PrepopulateBlockCache::kFlushAndCompaction` to prepopulate the block cache during both flush and compaction. Compaction-warmed blocks are inserted at `BOTTOM` priority (vs `LOW` for flush) so they are evicted first under cache pressure. Recommended only for use cases where most or all of the database is expected to reside in cache (e.g., tiered or remote storage where the working set fits in cache).
-* Added new mutable DB option `verify_manifest_content_on_close` (default: false). When enabled, on DB close the MANIFEST file is read back and all records are validated (CRC checksums and logical content). If corruption is detected, a fresh MANIFEST is written from in-memory state.
-
-### Behavior Changes
-* num_reads_sampled now factors in re-seeks and next/prev() on file iterators for files in L1+. next/prev() is discounted by 64x compared to seek due to being a much cheaper call.
-* Remote compaction workers now skip WAL recovery when opening the secondary DB instance, since only the LSM state from MANIFEST is needed for compaction. This reduces I/O and speeds up remote compaction startup.
-
-### Bug Fixes
-* Fix a bug in round-robin compaction that missed selecting input files that are needed to guarantee data correctness and cause crashing in debug builds or silent data corruption in release builds for Get().
-
-## 11.0.0 (02/23/2026)
-### New Features
-* Added support for storing wide-column entity column values in blob files. When `min_blob_size` is configured, large column values in wide-column entities will be stored in blob files, reducing SST file size and improving read performance.
-* Added `CompactionOptionsFIFO::max_data_files_size` to support FIFO compaction trimming based on combined SST and blob file sizes. Added `CompactionOptionsFIFO::use_kv_ratio_compaction` to enable a capacity-derived intra-L0 compaction strategy optimized for BlobDB workloads, producing uniform-sized compacted files for predictable FIFO trimming.
-* Include interpolation search as an alternative to binary search, which typically performs better when keys are uniformly distributed. This is exposed as a new table option `index_block_search_type`. The default is `binary_search`.
-
-### Public API Changes
-* Added new virtual methods `AbortAllCompactions()` and `ResumeAllCompactions()` to the `DB` class. Added new `Status::SubCode::kCompactionAborted` to indicate a compaction was aborted. Added `Status::IsCompactionAborted()` helper method to check if a status represents an aborted compaction.
-* Drop support for reading (and writing) SST files using `BlockBasedTableOptions.format_version` < 2, which hasn't been the default format for about 10 years. An upgrade path is still possible with full compaction using a RocksDB version >= 4.6.0 and < 11.0.0 and then using the newer version.
-* Remove deprecated raw `DB*` variants of `DB::Open` and related functions. Some other minor public APIs were updated as a result
-* Remove deprecated `DB::MaxMemCompactionLevel()`
-* Remove useless option `CompressedSecondaryCacheOptions::compress_format_version`
-* Remove deprecated DB option `skip_checking_sst_file_sizes_on_db_open`. The option was deprecated in 10.5.0 and has been a no-op since then. File size validation is now always performed in parallel during DB open.
-* Remove deprecated `SliceTransform::InRange()` virtual method and the `in_range` callback parameter from `rocksdb_slicetransform_create()` in the C API. `InRange()` was never called by RocksDB and existed only for backward compatibility.
-* Remove deprecated, unused APIs and options: `ReadOptions::managed` and `ColumnFamilyOptions::snap_refresh_nanos`. Corresponding C and Java APIs are also removed.
-* Remove deprecated `SstFileWriter::Add()` method (use `Put()` instead) and the deprecated `skip_filters` parameter from `SstFileWriter` constructors (use `BlockBasedTableOptions::filter_policy` set to `nullptr` to skip filter generation instead).
-
-### Behavior Changes
-* Change the default value of `CompactionOptionsUniversal::reduce_file_locking` from `false` to `true` to improve write stall and reduce read regression
-
-### Bug Fixes
-* Fix longstanding failures that can arise from reading and/or compacting old DB dirs with range deletions (likely from version < 5.19.0) in many newer versions.
-* Fix a bug where WritePrepared/WriteUnprepared TransactionDB with two_write_queues=true could experience "sequence number going backwards" corruption during recovery from a background error, due to allocated-but-not-published sequence numbers not being synced before creating new WAL files.
-
-### Performance Improvements
-* Add a new table option `separate_key_value_in_data_block`. When set to true keys and values will be stored separately in the data block, which can result in higher cpu cache hit rate and better compression. Works best with data blocks with sufficient restart intervals and large values. Previous versions of RocksDB will reject files written using this option.
-
-## 10.11.0 (01/23/2026)
-### Public API Changes
-* New SetOptions API that allows setting options for multiple CFs, avoiding the need to reserialize OPTIONS file for each CF
-* Remove remaining pieces of Lua integration
-
-### Behavior Changes
-* The new default for `BlockBasedTableOptions::format_version` is 7, which has been supported since RocksDB 10.4.0 and is required in order to use CompressionManagers supporting custom compression types.
-
-### Bug Fixes
-* Fixed a small performance bug with `format_version=7` when decompressing formats other than Snappy and ZSTD.
-* Fixed an infinite compaction loop bug with User-Defined Timestamps (UDT) where bottommost files were repeatedly marked for compaction even though their timestamp could not be collapsed.
-* Bugfix for persisted UDT record sequence number zeroing logic.
-
-## 10.10.0 (12/16/2025)
-### Bug Fixes
-* Fixed a bug in best-efforts recovery that causes use-after-free crashes when accessing SST files that were cached during the recovery.
-* Fix resumable compaction incorrectly allowing resumption from a truncated range deletion that is not well handled currently.
-* Fixed a bug in `PosixRandomFileAccess` IO uring submission queue ownership & management. Fix eliminates the false positive 'Bad cqe data' IO errors in `PosixRandomFileAccess::MultiRead` when interleaved with `PosixRandomFileAccess::ReadAsync` on the same thread.
-
-## 10.9.0 (11/21/2025)
-### New Features
-* Added an auto-tuning feature for DB manifest file size that also (by default) improves the safety of existing configurations in case `max_manifest_file_size` is repeatedly exceeded. The new recommendation is to set `max_manifest_file_size` to something small like 1MB and tune `max_manifest_space_amp_pct` as needed to balance write amp and space amp in the manifest. Refer to comments on those options in `DBOptions` for details. Both options are (now) mutable.
-* Added a new API to support option migration for multiple column families
-* Added new option target_file_size_is_upper_bound  that makes most compaction output SST files come close to the target file size without exceeding it, rather than commonly exceeding it by some fraction (current behavior). For now the new behavior is off by default, but we expect to enable it by default in the future.
-* Add a new option allow_trivial_move in CompactionOptions to allow CompactFiles to perform trivial move if possible. By default the flag of allow_trivial_move is false, so it preserve the original behavior.
-
-### Public API Changes
-* To reduce risk of ODR violations or similar, `ROCKSDB_USING_THREAD_STATUS` has been removed from public headers and replaced with static `const bool ThreadStatus::kEnabled`. Some other uses of conditional compilation have been removed from public API headers to reduce risk of ODR violations or other issues.
-
-### Behavior Changes
-* PosixWritableFile now repositions the seek pointer to the new end of file after a call to Truncate.
-* Updated standalone range deletion L0 file compaction behavior to avoid compacting with any newer L0 files (which is expensive and not useful).
-
-### Bug Fixes
-* Fix a bug where compaction with range deletion can persist kTypeMaxValid in MANIFEST as file metadata. kTypeMaxValid is not supposed to be persisted and can change as new value types are introduced. This can cause a forward compatibility issue where older versions of RocksDB don't recognize kTypeMaxValid from newer versions. A new placeholder value type kTypeTruncatedRangeDeletionSentinel is also introduced to replace kTypeMaxValid when reading existing SST files' metadata from MANIFEST. This allows us to strengthen some checks to avoid using kTypeMaxValid in the future.
-* Fixed a bug where `DB::GetSortedWalFiles()` could hang when waiting for a purge operation that found nothing to do (potentially triggered by iterator release, flush, compaction, etc.).
-* Fixed a bug in MultiScan where `max_sequential_skip_in_iterations` could cause the iterator to seek backward to already-unpinned blocks when the same user key spans multiple data blocks, leading to assertion failures or seg fault.
-* Fixed a bug for `WAL_ttl_seconds > 0` use cases where the newest archived WAL files could be incorrectly deleted when the system clock moved backwards.
-
-### Performance Improvements
-* Added optimization that allowed for the asynchronous prefetching of all data outlined in a multiscan iterator. This optimization was applied to the level iterator, which prefetches all data through each of the block-based iterators.
-
-## 10.8.0 (10/21/2025)
-### New Features
-* Add kFSPrefetch to FSSupportedOps enum to allow file systems to indicate prefetch support capability, avoiding unnecessary prefetch system calls on file systems that don't support them.
-* Added experimental support `OpenAndCompactOptions::allow_resumption` for resumable compaction that persists progress during `OpenAndCompact()`, allowing interrupted compactions to resume from the last progress persitence. The default behavior is to not persist progress.
-
-### Public API Changes
-* Allow specifying output temperature in CompactionOptions
-* Added `DB::FlushWAL(const FlushWALOptions&)` as an alternative to `DB::FlushWAL(bool sync)`, where `FlushWALOptions` includes a new `rate_limiter_priority` field (default `Env::IO_TOTAL`) that allows rate limiting and priority passing of manual WAL flush's IO operations.
 * The MultiScan API contract is updated. After a multi scan range got prepared with Prepare API call, the following seeks must seek the start of each prepared scan range in order. In addition, when limit is set, upper bound must be set to the same value of limit before each seek
 
-### Behavior Changes
-* `kChangeTemperature` FIFO compaction will now honor `compaction_target_temp` to all levels regardless of `cf_options::last_level_temperature`
-* Allow UDIs with a non BytewiseComparator
+## 10.7.3 (10/06/2025)
+### Bug Fixes
+* Fix a few bugs in MultiScan
 
+## 10.7.2 (09/30/2025)
 ### Bug Fixes
 * Fix incorrect MultiScan seek error status due to bugs in handling range limit falling between adjacent SST files key range.
-* Fix a bug in Page unpinning in MultiScan
 
 ### Performance Improvements
 * Fixed a performance regression in LZ4 compression that started in version 10.6.0
 
-## 10.7.0 (09/19/2025)
+## 10.7.0 (09/24/2025)
 ### New Features
 * Add the fail_if_no_udi_on_open flag in BlockBasedTableOption to control whether a missing user defined index block in a SST is a hard error or not.
-* A new flag memtable_verify_per_key_checksum_on_seek is added to AdvancedColumnFamilyOptions. When it is enabled, it will validate key checksum along the binary search path on skiplist based memtable during seek operation.
+* A new flag memtable_veirfy_per_key_checksum_on_seek is added to AdvancedColumnFamilyOptions. When it is enabled, it will validate key checksum along the binary search path on skiplist based memtable during seek operation.
 * Introduce option MultiScanArgs::use_async_io to enable asynchronous I/O during MultiScan, instead of waiting for I/O to be done in Prepare().
 * Add new option `MultiScanArgs::max_prefetch_size` that limits the memory usage of per file pinning of prefetched blocks.
 * Improved `sst_dump` by allowing standalone file and directory arguments without `--file=`. Also added new options and better output for `sst_dump --command=recompress`. See `sst_dump --help`
@@ -135,6 +38,7 @@
 
 ### Behavior Changes
 * The default provided block cache implementation is now HyperClockCache instead of LRUCache, when `block_cache` is nullptr (default) and `no_block_cache==false` (default). We recommend explicitly creating a HyperClockCache block cache based on memory budget and sharing it across all column families and even DB instances. This change could expose previously hidden memory or resource leaks.
+* Allow UDIs with a non BytewiseComparator
 
 ### Bug Fixes
 * Reported numbers for compaction and flush CPU usage now include time spent by parallel compression worker threads. This now means compaction/flush CPU usage could exceed the wall clock time.
@@ -181,7 +85,7 @@ Together, a new configuration TransactionOptions::deadlock_timeout_us is added,
 * DB option skip_checking_sst_file_sizes_on_db_open is deprecated, in favor of validating file size in parallel in a thread pool, when db is opened. When DB is opened, with paranoid check enabled, a file with the wrong size would fail the DB open. With paranoid check disabled, the DB open would succeed, the column family with the corrupted file would not be read or write, while the other healthy column families could be read and write normally. When max_open_files option is not set to -1, only a subset of the files will be opened and checked. The rest of the files will be opened and checked when they are accessed.
 
 ### Behavior Changes
-* PessimisticTransaction::GetWaitingTxns now returns waiting transaction information even if the current transaction has timed out. This allows the information to be surfaced to users for debugging purposes once it is known that the timeout has occurred.
+* PessimisticTransaction::GetWaitingTxns now returns waiting transaction information even if the current transaction has timed out. This allows the information to be surfaced to users for debugging purposes once it is known that the timeout has occured.
 * A new API GetFileSize is added to FSRandomAccessFile interface class. It uses fstat vs stat on the posix implementation which is more efficient. Caller could use it to get file size faster. This function might be required in the future for FileSystem implementation outside of the RocksDB code base.
 * RocksDB now triggers eligible compactions every 12 hours when periodic compaction is configured. This solves a limitation of the compaction trigger mechanism, which would only trigger compaction after specific events like flush, compaction, or SetOptions.
 
@@ -238,7 +142,7 @@ system's prefetch) on SST file during compaction read
 * Deprecated API `DB::MaxMemCompactionLevel()`.
 * Deprecated `ReadOptions::ignore_range_deletions`.
 * Deprecated API `experimental::PromoteL0()`.
-* Added arbitrary string map for additional options to be overridden for remote compactions
+* Added arbitrary string map for additional options to be overriden for remote compactions
 * The fail_if_options_file_error option in DBOptions has been removed. The behavior now is to always return failure in any API that fails to persist the OPTIONS file.
 
 ### Behavior Changes
@@ -388,7 +292,7 @@ system's prefetch) on SST file during compaction read
 * In FIFO compaction, compactions for changing file temperature (configured by option `file_temperature_age_thresholds`) will compact one file at a time, instead of merging multiple eligible file together (#13018).
 * Support ingesting db generated files using hard link, i.e. IngestExternalFileOptions::move_files/link_files and IngestExternalFileOptions::allow_db_generated_files.
 * Add a new file ingestion option `IngestExternalFileOptions::link_files` to hard link input files and preserve original files links after ingestion.
-* DB::Close now untracks files in SstFileManager, making available any space used
+* DB::Close now untracks files in SstFileManager, making avaialble any space used
 by them. Prior to this change they would be orphaned until the DB is re-opened.
 
 ### Bug Fixes
@@ -584,7 +488,7 @@ MultiGetBenchmarks.multiGetList10 no_column_family 10000 16 100 1024 thrpt 25 76
 * Removed deprecated option `ColumnFamilyOptions::check_flush_compaction_key_order`
 * Remove the default `WritableFile::GetFileSize` and `FSWritableFile::GetFileSize` implementation that returns 0 and make it pure virtual, so that subclasses are enforced to explicitly provide an implementation.
 * Removed deprecated option `ColumnFamilyOptions::level_compaction_dynamic_file_size`
-* Removed tickers with typos "rocksdb.error.handler.bg.error.count", "rocksdb.error.handler.bg.io.error.count", "rocksdb.error.handler.bg.retryable.io.error.count".
+* Removed tickers with typos "rocksdb.error.handler.bg.errro.count", "rocksdb.error.handler.bg.io.errro.count", "rocksdb.error.handler.bg.retryable.io.errro.count".
 * Remove the force mode for `EnableFileDeletions` API because it is unsafe with no known legitimate use.
 * Removed deprecated option `ColumnFamilyOptions::ignore_max_compaction_bytes_for_input`
 * `sst_dump --command=check` now compares the number of records in a table with `num_entries` in table property, and reports corruption if there is a mismatch. API `SstFileDumper::ReadSequential()` is updated to optionally do this verification. (#12322)
@@ -611,7 +515,7 @@ MultiGetBenchmarks.multiGetList10 no_column_family 10000 16 100 1024 thrpt 25 76
 * Exposed options ttl via c api.
 
 ### Behavior Changes
-* `rocksdb.blobdb.blob.file.write.micros` expands to also measure time writing the header and footer. Therefore the COUNT may be higher and values may be smaller than before. For stacked BlobDB, it no longer measures the time of explicitly flushing blob file.
+* `rocksdb.blobdb.blob.file.write.micros` expands to also measure time writing the header and footer. Therefore the COUNT may be higher and values may be smaller than before. For stacked BlobDB, it no longer measures the time of explictly flushing blob file.
 * Files will be compacted to the next level if the data age exceeds periodic_compaction_seconds except for the last level.
 * Reduced the compaction debt ratio trigger for scheduling parallel compactions
 * For leveled compaction with default compaction pri (kMinOverlappingRatio), files marked for compaction will be prioritized over files not marked when picking a file from a level for compaction.
@@ -676,7 +580,7 @@ want to continue to use force enabling, they need to explicitly pass a `true` to
 
 ### Behavior Changes
 * During off-peak hours defined by `daily_offpeak_time_utc`, the compaction picker will select a larger number of files for periodic compaction. This selection will include files that are projected to expire by the next off-peak start time, ensuring that these files are not chosen for periodic compaction outside of off-peak hours.
-* If an error occurs when writing to a trace file after `DB::StartTrace()`, the subsequent trace writes are skipped to avoid writing to a file that has previously seen error. In this case, `DB::EndTrace()` will also return a non-ok status with info about the error occurred previously in its status message.
+* If an error occurs when writing to a trace file after `DB::StartTrace()`, the subsequent trace writes are skipped to avoid writing to a file that has previously seen error. In this case, `DB::EndTrace()` will also return a non-ok status with info about the error occured previously in its status message.
 * Deleting stale files upon recovery are delegated to SstFileManger if available so they can be rate limited.
 * Make RocksDB only call `TablePropertiesCollector::Finish()` once.
 * When `WAL_ttl_seconds > 0`, we now process archived WALs for deletion at least every `WAL_ttl_seconds / 2` seconds. Previously it could be less frequent in case of small `WAL_ttl_seconds` values when size-based expiration (`WAL_size_limit_MB > 0 `) was simultaneously enabled.
@@ -1464,7 +1368,7 @@ Note: The next release will be major release 7.0. See https://github.com/faceboo
 ### Public API change
 * Extend WriteBatch::AssignTimestamp and AssignTimestamps API so that both functions can accept an optional `checker` argument that performs additional checking on timestamp sizes.
 * Introduce a new EventListener callback that will be called upon the end of automatic error recovery.
-* Add IncreaseFullHistoryTsLow API so users can advance each column family's full_history_ts_low separately.
+* Add IncreaseFullHistoryTsLow API so users can advance each column family's full_history_ts_low seperately.
 * Add GetFullHistoryTsLow API so users can query current full_history_low value of specified column family.
 
 ### Performance Improvements

Makefile

@@ -296,28 +296,6 @@ $(info $(shell $(CC) --version))
 $(info $(shell $(CXX) --version))
 endif
 
-# ccache support
-# Set USE_CCACHE=1 to enable ccache, or let it auto-detect
-ifndef USE_CCACHE
-  CCACHE := $(shell which ccache 2>/dev/null)
-  ifneq ($(CCACHE),)
-    USE_CCACHE := 1
-  else
-    USE_CCACHE := 0
-  endif
-endif
-
-ifeq ($(USE_CCACHE), 1)
-  CCACHE := $(shell which ccache 2>/dev/null)
-  ifneq ($(CCACHE),)
-    $(info Using ccache: $(CCACHE))
-    CC := $(CCACHE) $(CC)
-    CXX := $(CCACHE) $(CXX)
-  else
-    $(warning ccache requested but not found in PATH)
-  endif
-endif
-
 missing_make_config_paths := $(shell				\
 	grep "\./\S*\|/\S*" -o $(CURDIR)/make_config.mk | 	\
 	while read path;					\
@@ -390,6 +368,8 @@ ifdef COMPILE_WITH_TSAN
         # Turn off -pg when enabling TSAN testing, because that induces
         # a link failure.  TODO: find the root cause
 	PROFILING_FLAGS =
+	# LUA is not supported under TSAN
+	LUA_PATH =
 	# Limit keys for crash test under TSAN to avoid error:
 	# "ThreadSanitizer: DenseSlabAllocator overflow. Dying."
 	CRASH_TEST_EXT_ARGS += --max_key=1000000
@@ -466,7 +446,83 @@ else
 	PLATFORM_CXXFLAGS += -isystem $(GTEST_DIR)
 endif
 
-include folly.mk
+# This provides a Makefile simulation of a Meta-internal folly integration.
+# It is not validated for general use.
+#
+# USE_FOLLY links the build targets with libfolly.a. The latter could be
+# built using 'make build_folly', or built externally and specified in
+# the CXXFLAGS and EXTRA_LDFLAGS env variables. The build_detect_platform
+# script tries to detect if an external folly dependency has been specified.
+# If not, it exports FOLLY_PATH to the path of the installed Folly and
+# dependency libraries.
+#
+# USE_FOLLY_LITE cherry picks source files from Folly to include in the
+# RocksDB library. Its faster and has fewer dependencies on 3rd party
+# libraries, but with limited functionality. For example, coroutine
+# functionality is not available.
+ifeq ($(USE_FOLLY),1)
+ifeq ($(USE_FOLLY_LITE),1)
+$(error Please specify only one of USE_FOLLY and USE_FOLLY_LITE)
+endif
+ifneq ($(strip $(FOLLY_PATH)),)
+	BOOST_PATH = $(shell (ls -d $(FOLLY_PATH)/../boost*))
+	DBL_CONV_PATH = $(shell (ls -d $(FOLLY_PATH)/../double-conversion*))
+	GFLAGS_PATH = $(shell (ls -d $(FOLLY_PATH)/../gflags*))
+	GLOG_PATH = $(shell (ls -d $(FOLLY_PATH)/../glog*))
+	LIBEVENT_PATH = $(shell (ls -d $(FOLLY_PATH)/../libevent*))
+	XZ_PATH = $(shell (ls -d $(FOLLY_PATH)/../xz*))
+	LIBSODIUM_PATH = $(shell (ls -d $(FOLLY_PATH)/../libsodium*))
+	FMT_PATH = $(shell (ls -d $(FOLLY_PATH)/../fmt*))
+
+	# For some reason, glog and fmt libraries are under either lib or lib64
+	GLOG_LIB_PATH = $(shell (ls -d $(GLOG_PATH)/lib*))
+	FMT_LIB_PATH = $(shell (ls -d $(FMT_PATH)/lib*))
+
+	# AIX: pre-defined system headers are surrounded by an extern "C" block
+	ifeq ($(PLATFORM), OS_AIX)
+		PLATFORM_CCFLAGS += -I$(BOOST_PATH)/include -I$(DBL_CONV_PATH)/include -I$(GLOG_PATH)/include -I$(LIBEVENT_PATH)/include -I$(XZ_PATH)/include -I$(LIBSODIUM_PATH)/include -I$(FOLLY_PATH)/include -I$(FMT_PATH)/include
+		PLATFORM_CXXFLAGS += -I$(BOOST_PATH)/include -I$(DBL_CONV_PATH)/include -I$(GLOG_PATH)/include -I$(LIBEVENT_PATH)/include -I$(XZ_PATH)/include -I$(LIBSODIUM_PATH)/include -I$(FOLLY_PATH)/include -I$(FMT_PATH)/include
+	else
+		PLATFORM_CCFLAGS += -isystem $(BOOST_PATH)/include -isystem $(DBL_CONV_PATH)/include -isystem $(GLOG_PATH)/include -isystem $(LIBEVENT_PATH)/include -isystem $(XZ_PATH)/include -isystem $(LIBSODIUM_PATH)/include -isystem $(FOLLY_PATH)/include -isystem $(FMT_PATH)/include
+		PLATFORM_CXXFLAGS += -isystem $(BOOST_PATH)/include -isystem $(DBL_CONV_PATH)/include -isystem $(GLOG_PATH)/include -isystem $(LIBEVENT_PATH)/include -isystem $(XZ_PATH)/include -isystem $(LIBSODIUM_PATH)/include -isystem $(FOLLY_PATH)/include -isystem $(FMT_PATH)/include
+	endif
+
+	# Add -ldl at the end as gcc resolves a symbol in a library by searching only in libraries specified later
+	# in the command line
+	PLATFORM_LDFLAGS += $(FOLLY_PATH)/lib/libfolly.a $(BOOST_PATH)/lib/libboost_context.a $(BOOST_PATH)/lib/libboost_filesystem.a $(BOOST_PATH)/lib/libboost_atomic.a $(BOOST_PATH)/lib/libboost_program_options.a $(BOOST_PATH)/lib/libboost_regex.a $(BOOST_PATH)/lib/libboost_system.a $(BOOST_PATH)/lib/libboost_thread.a $(DBL_CONV_PATH)/lib/libdouble-conversion.a $(FMT_LIB_PATH)/libfmt.a $(GLOG_LIB_PATH)/libglog.so $(GFLAGS_PATH)/lib/libgflags.so.2.2 $(LIBEVENT_PATH)/lib/libevent-2.1.so -ldl
+	PLATFORM_LDFLAGS += -Wl,-rpath=$(GFLAGS_PATH)/lib -Wl,-rpath=$(GLOG_LIB_PATH) -Wl,-rpath=$(LIBEVENT_PATH)/lib -Wl,-rpath=$(LIBSODIUM_PATH)/lib -Wl,-rpath=$(LIBEVENT_PATH)/lib
+endif
+	PLATFORM_CCFLAGS += -DUSE_FOLLY -DFOLLY_NO_CONFIG
+	PLATFORM_CXXFLAGS += -DUSE_FOLLY -DFOLLY_NO_CONFIG
+endif
+
+ifeq ($(USE_FOLLY_LITE),1)
+	# Path to the Folly source code and include files
+	FOLLY_DIR = ./third-party/folly
+ifneq ($(strip $(BOOST_SOURCE_PATH)),)
+	BOOST_INCLUDE = $(shell (ls -d $(BOOST_SOURCE_PATH)/boost*/))
+	# AIX: pre-defined system headers are surrounded by an extern "C" block
+	ifeq ($(PLATFORM), OS_AIX)
+		PLATFORM_CCFLAGS += -I$(BOOST_INCLUDE)
+		PLATFORM_CXXFLAGS += -I$(BOOST_INCLUDE)
+	else
+		PLATFORM_CCFLAGS += -isystem $(BOOST_INCLUDE)
+		PLATFORM_CXXFLAGS += -isystem $(BOOST_INCLUDE)
+	endif
+endif  # BOOST_SOURCE_PATH
+	# AIX: pre-defined system headers are surrounded by an extern "C" block
+	ifeq ($(PLATFORM), OS_AIX)
+		PLATFORM_CCFLAGS += -I$(FOLLY_DIR)
+		PLATFORM_CXXFLAGS += -I$(FOLLY_DIR)
+	else
+		PLATFORM_CCFLAGS += -isystem $(FOLLY_DIR)
+		PLATFORM_CXXFLAGS += -isystem $(FOLLY_DIR)
+	endif
+	PLATFORM_CCFLAGS += -DUSE_FOLLY -DFOLLY_NO_CONFIG
+	PLATFORM_CXXFLAGS += -DUSE_FOLLY -DFOLLY_NO_CONFIG
+# TODO: fix linking with fbcode compiler config
+	PLATFORM_LDFLAGS += -lglog
+endif
 
 ifdef TEST_CACHE_LINE_SIZE
   PLATFORM_CCFLAGS += -DTEST_CACHE_LINE_SIZE=$(TEST_CACHE_LINE_SIZE)
@@ -506,6 +562,32 @@ ifndef DISABLE_WARNING_AS_ERROR
 endif
 
 
+ifdef LUA_PATH
+
+ifndef LUA_INCLUDE
+LUA_INCLUDE=$(LUA_PATH)/include
+endif
+
+LUA_INCLUDE_FILE=$(LUA_INCLUDE)/lualib.h
+
+ifeq ("$(wildcard $(LUA_INCLUDE_FILE))", "")
+# LUA_INCLUDE_FILE does not exist
+$(error Cannot find lualib.h under $(LUA_INCLUDE).  Try to specify both LUA_PATH and LUA_INCLUDE manually)
+endif
+LUA_FLAGS = -I$(LUA_INCLUDE) -DLUA -DLUA_COMPAT_ALL
+CFLAGS += $(LUA_FLAGS)
+CXXFLAGS += $(LUA_FLAGS)
+
+ifndef LUA_LIB
+LUA_LIB = $(LUA_PATH)/lib/liblua.a
+endif
+ifeq ("$(wildcard $(LUA_LIB))", "") # LUA_LIB does not exist
+$(error $(LUA_LIB) does not exist.  Try to specify both LUA_PATH and LUA_LIB manually)
+endif
+EXEC_LDFLAGS += $(LUA_LIB)
+
+endif
+
 ifeq ($(NO_THREEWAY_CRC32C), 1)
 	CXXFLAGS += -DNO_THREEWAY_CRC32C
 endif
@@ -576,8 +658,8 @@ ifneq ($(filter check-headers, $(MAKECMDGOALS)),)
 # TODO: add/support JNI headers
 	DEV_HEADER_DIRS := $(sort include/ $(dir $(ALL_SOURCES)))
 # Some headers like in port/ are platform-specific
-	DEV_HEADERS_TO_CHECK := $(shell $(FIND) $(DEV_HEADER_DIRS) -type f -name '*.h' | grep -E -v 'port/|plugin/|range_tree/|secondary_index/')
-	PUBLIC_HEADERS_TO_CHECK := $(shell $(FIND) include/ -type f -name '*.h')
+	DEV_HEADERS_TO_CHECK := $(shell $(FIND) $(DEV_HEADER_DIRS) -type f -name '*.h' | grep -E -v 'port/|plugin/|lua/|range_tree/|secondary_index/')
+	PUBLIC_HEADERS_TO_CHECK := $(shell $(FIND) include/ -type f -name '*.h' | grep -E -v 'lua/')
 else
 	DEV_HEADERS_TO_CHECK :=
 	PUBLIC_HEADERS_TO_CHECK :=
@@ -601,7 +683,6 @@ am__v_CCH_1 =
 %.h.pub: %.h # .h.pub not actually created, so re-checked on each invocation
 	$(AM_V_CCH) cd include/ && echo '#include "$(patsubst include/%,%,$<)"' | \
 	  $(CXX) -std=$(or $(ROCKSDB_CXX_STANDARD),c++20) -I. -DROCKSDB_NAMESPACE=42 -x c++ -c - -o /dev/null
-	build_tools/check-public-header.sh $<
 
 check-headers: $(HEADER_OK_FILES)
 
@@ -627,22 +708,11 @@ ROCKSDBTESTS_SUBSET ?= $(TESTS)
 #   its various tests. Parallel can fill up your /dev/shm
 # db_bloom_filter_test - serial because excessive space usage by instances
 #   of DBFilterConstructionReserveMemoryTestWithParam can fill up /dev/shm
-# perf_context_test - 1GB write_buffer_size default, parallel can fill /dev/shm
-# obsolete_files_test - ~1GB write_buffer_size/target_file_size_base
-# backup_engine_test - 1GB write_buffer_size in FailOverwritingBackups
-# prefetch_test - 1GB write_buffer_size in PrefetchWhenReseek parameterized test
-# db_io_failure_test - 256MB write_buffer_size in FlushSstRangeSyncError and
-#   CompactionSstRangeSyncError
 NON_PARALLEL_TEST = \
 	c_test \
 	env_test \
 	deletefile_test \
 	db_bloom_filter_test \
-	perf_context_test \
-	obsolete_files_test \
-	backup_engine_test \
-	prefetch_test \
-	db_io_failure_test \
 	$(PLUGIN_TESTS) \
 
 PARALLEL_TEST = $(filter-out $(NON_PARALLEL_TEST), $(TESTS))
@@ -816,7 +886,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
+	uninstall analyze tools tools_lib check-headers checkout_folly
 
 all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(TESTS)
 
@@ -895,9 +965,6 @@ $(parallel_tests):
       "d=\$(TEST_TMPDIR)$$TEST_SCRIPT" \
       'mkdir -p $$d' \
       "TEST_TMPDIR=\$$d $(DRIVER) ./$$TEST_BINARY --gtest_filter=$$TEST_NAME" \
-      'test_retcode=$$?' \
-      '[ $$test_retcode -eq 0 ] && rm -rf $$d' \
-      'exit $$test_retcode' \
 		> $$TEST_SCRIPT; \
 		chmod a=rx $$TEST_SCRIPT; \
 	done
@@ -1007,19 +1074,9 @@ watch-log:
 dump-log:
 	bash -c '$(quoted_perl_command)' < LOG
 
-# Machine-parseable progress output for automated monitoring (e.g., Claude Code)
-# Outputs JSON: {"status":"running","completed":45,"total":100,"failed":0,"percent":45,"eta_seconds":120}
-check-progress:
-	@build_tools/check_progress.sh
-
 # If J != 1 and GNU parallel is installed, run the tests in parallel,
 # via the check_0 rule above.  Otherwise, run them sequentially.
 check: all
-	$(AM_V_at)echo "Cleaning up stale test directories older than 3 hours..."; \
-	  test_tmpdir_parent=$$(dirname $(TEST_TMPDIR)); \
-	  find $$test_tmpdir_parent -maxdepth 1 -name 'rocksdb.*' -type d \
-	    -mmin +180 -exec rm -rf {} + 2>/dev/null; \
-	  true
 	$(MAKE) gen_parallel_tests
 	$(AM_V_GEN)if test "$(J)" != 1                                  \
 	    && (build_tools/gnu_parallel --gnu --help 2>/dev/null) |                    \
@@ -1228,10 +1285,6 @@ tags0:
 format:
 	build_tools/format-diff.sh
 
-# Non-interactive format (auto-apply without prompts, for CI/automation/Claude Code)
-format-auto:
-	build_tools/format-diff.sh -y
-
 check-format:
 	build_tools/format-diff.sh -c
 
@@ -1241,15 +1294,6 @@ check-buck-targets:
 check-sources:
 	build_tools/check-sources.sh
 
-# Run clang-tidy on locally changed files, filtered to changed lines only.
-# Requires compile_commands.json (generate with cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON).
-# Override CLANG_TIDY_BINARY and CLANG_TIDY_JOBS as needed:
-#   make clang-tidy CLANG_TIDY_BINARY=/usr/bin/clang-tidy CLANG_TIDY_JOBS=8
-CLANG_TIDY_BINARY ?= /opt/homebrew/opt/llvm/bin/clang-tidy
-CLANG_TIDY_JOBS ?= $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 4)
-clang-tidy:
-	python3 tools/run_clang_tidy.py --clang-tidy-binary $(CLANG_TIDY_BINARY) -j $(CLANG_TIDY_JOBS)
-
 package:
 	bash build_tools/make_package.sh $(SHARED_MAJOR).$(SHARED_MINOR)
 
@@ -1452,9 +1496,6 @@ db_test: $(OBJ_DIR)/db/db_test.o $(TEST_LIBRARY) $(LIBRARY)
 db_test2: $(OBJ_DIR)/db/db_test2.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
-db_etc3_test: $(OBJ_DIR)/db/db_etc3_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 compression_test: $(OBJ_DIR)/util/compression_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
@@ -1479,9 +1520,6 @@ db_compaction_filter_test: $(OBJ_DIR)/db/db_compaction_filter_test.o $(TEST_LIBR
 db_compaction_test: $(OBJ_DIR)/db/db_compaction_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
-db_compaction_abort_test: $(OBJ_DIR)/db/db_compaction_abort_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 db_clip_test: $(OBJ_DIR)/db/db_clip_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
@@ -1608,12 +1646,6 @@ object_registry_test: $(OBJ_DIR)/utilities/object_registry_test.o $(TEST_LIBRARY
 ttl_test: $(OBJ_DIR)/utilities/ttl/ttl_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
-trie_index_db_test: $(OBJ_DIR)/utilities/trie_index/trie_index_db_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
-trie_index_test: $(OBJ_DIR)/utilities/trie_index/trie_index_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 types_util_test: $(OBJ_DIR)/utilities/types_util_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
@@ -1665,9 +1697,6 @@ io_posix_test: $(OBJ_DIR)/env/io_posix_test.o $(TEST_LIBRARY) $(LIBRARY)
 fault_injection_test: $(OBJ_DIR)/db/fault_injection_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
-fault_injection_fs_test: $(OBJ_DIR)/utilities/fault_injection_fs_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 rate_limiter_test: $(OBJ_DIR)/util/rate_limiter_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
@@ -1866,9 +1895,6 @@ write_committed_transaction_ts_test: $(OBJ_DIR)/utilities/transactions/write_com
 write_prepared_transaction_test: $(OBJ_DIR)/utilities/transactions/write_prepared_transaction_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
-write_prepared_transaction_seqno_test: $(OBJ_DIR)/utilities/transactions/write_prepared_transaction_seqno_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 write_unprepared_transaction_test: $(OBJ_DIR)/utilities/transactions/write_unprepared_transaction_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
@@ -1974,9 +2000,6 @@ blob_source_test: $(OBJ_DIR)/db/blob/blob_source_test.o $(TEST_LIBRARY) $(LIBRAR
 blob_garbage_meter_test: $(OBJ_DIR)/db/blob/blob_garbage_meter_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
-io_dispatcher_test: $(OBJ_DIR)/util/io_dispatcher_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 timer_test: $(OBJ_DIR)/util/timer_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)
 
@@ -2469,6 +2492,40 @@ commit_prereq:
 	false # J=$(J) build_tools/precommit_checker.py unit clang_unit release clang_release tsan asan ubsan lite unit_non_shm
 	# $(MAKE) clean && $(MAKE) jclean && $(MAKE) rocksdbjava;
 
+# For public CI runs, checkout folly in a way that can build with RocksDB.
+# This is mostly intended as a test-only simulation of Meta-internal folly
+# integration.
+checkout_folly:
+	if [ -e third-party/folly ]; then \
+		cd third-party/folly && ${GIT_COMMAND} fetch origin; \
+	else \
+		cd third-party && ${GIT_COMMAND} clone https://github.com/facebook/folly.git; \
+	fi
+	@# Pin to a particular version for public CI, so that PR authors don't
+	@# need to worry about folly breaking our integration. Update periodically
+	cd third-party/folly && git reset --hard e95383b7c8b5b1e46cf47acf2f317d54f93c8268
+	@# Apparently missing include
+	perl -pi -e 's/(#include <atomic>)/$$1\n#include <cstring>/' third-party/folly/folly/lang/Exception.h
+	@# Warning-as-error on memcpy
+	perl -pi -e 's/memcpy.&ptr/memcpy((void*)&ptr/' third-party/folly/folly/lang/Exception.cpp
+	@# const mismatch
+	perl -pi -e 's/: environ/: (const char**)(environ)/' third-party/folly/folly/Subprocess.cpp
+	@# NOTE: boost source will be needed for any build including `USE_FOLLY_LITE` builds as those depend on boost headers
+	cd third-party/folly && $(PYTHON) build/fbcode_builder/getdeps.py fetch boost
+
+CXX_M_FLAGS = $(filter -m%, $(CXXFLAGS))
+
+build_folly:
+	FOLLY_INST_PATH=`cd third-party/folly; $(PYTHON) build/fbcode_builder/getdeps.py show-inst-dir`; \
+	if [ "$$FOLLY_INST_PATH" ]; then \
+		rm -rf $${FOLLY_INST_PATH}/../../*; \
+	else \
+		echo "Please run checkout_folly first"; \
+		false; \
+	fi
+	cd third-party/folly && \
+		CXXFLAGS=" $(CXX_M_FLAGS) -DHAVE_CXX11_ATOMIC " $(PYTHON) build/fbcode_builder/getdeps.py build --no-tests
+
 # ---------------------------------------------------------------------------
 #   Build size testing
 # ---------------------------------------------------------------------------
@@ -2589,7 +2646,7 @@ list_all_tests:
 
 # Remove the rules for which dependencies should not be generated and see if any are left.
 #If so, include the dependencies; if not, do not include the dependency files
-ROCKS_DEP_RULES=$(filter-out clean format check-format check-buck-targets check-headers check-sources clang-tidy jclean jtest package analyze tags rocksdbjavastatic% unity.% unity_test checkout_folly, $(MAKECMDGOALS))
+ROCKS_DEP_RULES=$(filter-out clean format check-format check-buck-targets check-headers check-sources jclean jtest package analyze tags rocksdbjavastatic% unity.% unity_test checkout_folly, $(MAKECMDGOALS))
 ifneq ("$(ROCKS_DEP_RULES)", "")
 -include $(DEPFILES)
 endif

buckifier/buckify_rocksdb.py

@@ -135,9 +135,6 @@ def generate_buck(repo_path, deps_map):
 
     BUCK = TARGETSBuilder("%s/BUCK" % repo_path, extra_argv)
 
-    # Add oncall("rocksdb_point_of_contact") at the top
-    BUCK.add_oncall("rocksdb_point_of_contact")
-
     # rocksdb_lib
     BUCK.add_library(
         "rocksdb_lib",

buckifier/targets_builder.py

@@ -45,11 +45,6 @@ class TARGETSBuilder:
         self.total_bin = 0
         self.total_test = 0
         self.tests_cfg = ""
-    
-    def add_oncall(self, oncall):
-       with open(self.path, "ab") as targets_file:
-            targets_file.write(targets_cfg.oncall_template.format(name=oncall).encode("utf-8"))
-                
 
     def add_library(
         self,

buckifier/targets_cfg.py

@@ -1,12 +1,10 @@
-#  Copyright (c) Meta Platforms, Inc. and affiliates.
-#  This source code is licensed under both the GPLv2 (found in the COPYING file in the root directory)
-#  and the Apache 2.0 License (found in the LICENSE.Apache file in the root directory).
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
 rocksdb_target_header_template = """# This file \100generated by:
 #$ python3 buckifier/buckify_rocksdb.py{extra_argv}
 # --> DO NOT EDIT MANUALLY <--
-# This file is a Meta-specific integration for buck builds, so can
-# only be validated by Meta employees.
+# This file is a Facebook-specific integration for buck builds, so can
+# only be validated by Facebook employees.
 load("//rocks/buckifier:defs.bzl", "cpp_library_wrapper","rocks_cpp_library_wrapper","cpp_binary_wrapper","cpp_unittest_wrapper","fancy_bench_wrapper","add_c_test_wrapper")
 load("@fbcode_macros//build_defs:export_files.bzl", "export_file")
 
@@ -43,8 +41,3 @@ fancy_bench_wrapper(suite_name="{name}", binary_to_bench_to_metric_list_map={ben
 export_file_template = """
 export_file(name = "{name}")
 """
-
-
-oncall_template = """
-oncall("{name}")
-"""

build_tools/build_detect_platform

@@ -311,8 +311,7 @@ EOF
 EOF
         then
           COMMON_FLAGS="$COMMON_FLAGS -DGFLAGS=1"
-          # Hack: don't link extra gflags assuming it comes with folly
-          [ "$USE_FOLLY" ] || PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags"
+          PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags"
         # check if namespace is gflags
         elif $CXX $PLATFORM_CXXFLAGS -x c++ - -o test.o 2>/dev/null << EOF
             #include <gflags/gflags.h>
@@ -321,8 +320,7 @@ EOF
 EOF
         then
           COMMON_FLAGS="$COMMON_FLAGS -DGFLAGS=1 -DGFLAGS_NAMESPACE=gflags"
-          # Hack: don't link extra gflags assuming it comes with folly
-          [ "$USE_FOLLY" ] || PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags"
+          PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lgflags"
         # check if namespace is google
         elif $CXX $PLATFORM_CXXFLAGS -x c++ - -o test.o 2>/dev/null << EOF
             #include <gflags/gflags.h>
@@ -774,7 +772,6 @@ fi
 if [ "$USE_FOLLY_LITE" ]; then
   if [ "$FOLLY_DIR" ]; then
     BOOST_SOURCE_PATH=`cd $FOLLY_DIR && $PYTHON build/fbcode_builder/getdeps.py show-source-dir boost`
-    FMT_SOURCE_PATH=`cd $FOLLY_DIR && $PYTHON build/fbcode_builder/getdeps.py show-source-dir fmt`
   fi
 fi
 
@@ -819,7 +816,6 @@ echo "FIND=$FIND" >> "$OUTPUT"
 echo "WATCH=$WATCH" >> "$OUTPUT"
 echo "FOLLY_PATH=$FOLLY_PATH" >> "$OUTPUT"
 echo "BOOST_SOURCE_PATH=$BOOST_SOURCE_PATH" >> "$OUTPUT"
-echo "FMT_SOURCE_PATH=$FMT_SOURCE_PATH" >> "$OUTPUT"
 
 # This will enable some related identifiers for the preprocessor
 if test -n "$JEMALLOC"; then
@@ -831,6 +827,7 @@ fi
 if test -n "$WITH_JEMALLOC_FLAG"; then
   echo "WITH_JEMALLOC_FLAG=$WITH_JEMALLOC_FLAG" >> "$OUTPUT"
 fi
+echo "LUA_PATH=$LUA_PATH" >> "$OUTPUT"
 if test -n "$USE_FOLLY"; then
   echo "USE_FOLLY=$USE_FOLLY" >> "$OUTPUT"
 fi

build_tools/check-public-header.sh

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

build_tools/check_progress.sh

@@ -1,231 +0,0 @@
-#!/bin/bash
-# Output test progress in JSON format for machine parsing
-# Usage: build_tools/check_progress.sh
-
-LOG_FILE="LOG"
-T_DIR="t"
-SRC_MK="src.mk"
-
-# Maximum lines of test output to include per failed test
-MAX_OUTPUT_LINES=50
-
-# Helper to escape string for JSON (handles newlines, quotes, backslashes, tabs)
-json_escape() {
-    local str="$1"
-    # Use python for reliable JSON escaping if available, otherwise use sed
-    if command -v python3 &>/dev/null; then
-        printf '%s' "$str" | python3 -c 'import json,sys; print(json.dumps(sys.stdin.read())[1:-1], end="")'
-    else
-        printf '%s' "$str" | sed 's/\\/\\\\/g; s/"/\\"/g; s/\t/\\t/g; s/\r/\\r/g' | awk '{printf "%s\\n", $0}' | sed 's/\\n$//'
-    fi
-}
-
-# Helper to output JSON and exit
-output_json() {
-    local status="$1"
-    local completed="${2:-0}"
-    local total="${3:-0}"
-    local failed="${4:-0}"
-    local percent="${5:-0}"
-    local eta="${6:-0}"
-    local avg_time="${7:-0}"
-    local last_item="${8:-}"
-    local phase="${9:-}"
-    local failed_tests="${10:-}"
-
-    # Build JSON output
-    local json="{\"status\":\"$status\""
-
-    if [[ -n "$phase" ]]; then
-        json="$json,\"phase\":\"$phase\""
-    fi
-
-    json="$json,\"completed\":$completed,\"total\":$total,\"failed\":$failed,\"percent\":$percent"
-    json="$json,\"eta_seconds\":$eta,\"avg_time\":\"$avg_time\",\"last_item\":\"$(json_escape "$last_item")\""
-
-    if [[ -n "$failed_tests" ]]; then
-        json="$json,\"failed_tests\":[$failed_tests]"
-    fi
-
-    json="$json}"
-    echo "$json"
-}
-
-# Get failed test info with log output
-get_failed_tests_json() {
-    local log_file="$1"
-    local t_dir="$2"
-    local max_failures=10
-    local count=0
-    local first=true
-
-    # Get failed tests from LOG file
-    while IFS=$'\t' read -r seq host starttime runtime send recv exitval signal cmd; do
-        # Skip header line
-        [[ "$seq" == "Seq" ]] && continue
-
-        # Check if failed (exitval != 0 or signal != 0)
-        if [[ "$exitval" != "0" || "$signal" != "0" ]]; then
-            # Extract test name from command
-            test_name=$(echo "$cmd" | sed 's,.*/run-,,;s, .*,,')
-
-            # Get log file path
-            log_path="$t_dir/log-run-$test_name"
-
-            # Read test output (last N lines)
-            if [[ -f "$log_path" ]]; then
-                output=$(tail -n "$MAX_OUTPUT_LINES" "$log_path" 2>/dev/null)
-            else
-                output="(log file not found: $log_path)"
-            fi
-
-            # Escape output for JSON
-            escaped_output=$(json_escape "$output")
-
-            # Build JSON object for this failure
-            if [[ "$first" == "true" ]]; then
-                first=false
-            else
-                printf ","
-            fi
-            printf '{"test":"%s","exit_code":%d,"signal":%d,"output":"%s"}' \
-                "$test_name" "$exitval" "$signal" "$escaped_output"
-
-            ((count++))
-            if [[ $count -ge $max_failures ]]; then
-                break
-            fi
-        fi
-    done < "$log_file"
-}
-
-# Check if tests are running (LOG file exists)
-if [[ -f "$LOG_FILE" ]]; then
-    # Count total tests from t/run-* files
-    if [[ -d "$T_DIR" ]]; then
-        total=$(find "$T_DIR" -name 'run-*' -type f 2>/dev/null | wc -l)
-    else
-        total=0
-    fi
-
-    # If no parallel tests generated yet
-    if [[ "$total" -eq 0 ]]; then
-        output_json "running" 0 0 0 0 0 "0" "" "generating"
-        exit 0
-    fi
-
-    # Parse LOG file (skip header line)
-    # LOG format: Seq Host Starttime JobRuntime Send Receive Exitval Signal Command
-    completed=$(tail -n +2 "$LOG_FILE" 2>/dev/null | wc -l)
-
-    # Count failures
-    failed=$(awk -F'\t' 'NR>1 && ($7 != 0 || $8 != 0) {count++} END {print count+0}' "$LOG_FILE" 2>/dev/null)
-
-    # Get failed tests JSON with output (only if there are failures)
-    if [[ "$failed" -gt 0 ]]; then
-        failed_tests=$(get_failed_tests_json "$LOG_FILE" "$T_DIR")
-    else
-        failed_tests=""
-    fi
-
-    # Calculate percentage
-    if [[ "$total" -gt 0 ]]; then
-        percent=$((completed * 100 / total))
-    else
-        percent=0
-    fi
-
-    # Get last completed test name (extract from command column)
-    last_test=$(tail -1 "$LOG_FILE" 2>/dev/null | awk -F'\t' '{print $9}' | sed 's,.*/run-,,;s, .*,,;s,^./,,')
-
-    # Calculate ETA based on average time
-    if [[ "$completed" -gt 0 ]]; then
-        avg_time=$(awk -F'\t' 'NR>1 {sum+=$4; count++} END {if(count>0) printf "%.1f", sum/count; else print "0"}' "$LOG_FILE")
-        remaining=$((total - completed))
-        eta=$(awk "BEGIN {printf \"%.0f\", $avg_time * $remaining}")
-    else
-        avg_time="0"
-        eta="0"
-    fi
-
-    # Determine status
-    if [[ "$completed" -ge "$total" ]]; then
-        status="completed"
-    elif [[ "$completed" -gt 0 ]]; then
-        status="running"
-    else
-        status="starting"
-    fi
-
-    output_json "$status" "$completed" "$total" "$failed" "$percent" "$eta" "$avg_time" "$last_test" "testing" "$failed_tests"
-    exit 0
-fi
-
-# No LOG file - check if we're in compilation/linking phase
-# Count expected source files from src.mk
-if [[ -f "$SRC_MK" ]]; then
-    # Count LIB_SOURCES (library object files to compile)
-    expected_lib_objects=$(grep -E '\.cc\s*\\?$' "$SRC_MK" | grep -v '^#' | wc -l)
-
-    # Count TEST_MAIN_SOURCES (test binaries to link)
-    expected_test_binaries=$(sed -n '/^TEST_MAIN_SOURCES =/,/^[^ ]/p' "$SRC_MK" | grep -cE '\.cc\s*\\?$' 2>/dev/null || echo 0)
-else
-    expected_lib_objects=0
-    expected_test_binaries=0
-fi
-
-# Check for test generation phase (t/ directory being created)
-if [[ -d "$T_DIR" ]]; then
-    total=$(find "$T_DIR" -name 'run-*' -type f 2>/dev/null | wc -l)
-    if [[ "$total" -gt 0 ]]; then
-        output_json "running" 0 "$total" 0 0 0 "0" "" "generating"
-        exit 0
-    fi
-fi
-
-# Count compiled object files (in subdirectories matching source structure)
-# Object files are created as dir/file.o (e.g., cache/cache.o, db/db_impl.o)
-compiled_objects=0
-if [[ "$expected_lib_objects" -gt 0 ]]; then
-    # Count .o files in source directories
-    compiled_objects=$(find cache db env file logging memory memtable monitoring options port table test_util trace_replay util utilities -name '*.o' -type f 2>/dev/null | wc -l)
-fi
-
-# Count linked test binaries (test binaries are in current directory with _test suffix)
-linked_tests=0
-if [[ "$expected_test_binaries" -gt 0 ]]; then
-    linked_tests=$(find . -maxdepth 1 -name '*_test' -type f -executable 2>/dev/null | wc -l)
-fi
-
-# Determine phase based on what exists
-if [[ "$compiled_objects" -eq 0 && "$linked_tests" -eq 0 ]]; then
-    # Nothing compiled yet - not started or just beginning
-    output_json "not_started" 0 0 0 0 0 "0" ""
-    exit 0
-fi
-
-# Calculate total work units: compiling + linking
-total_work=$((expected_lib_objects + expected_test_binaries))
-completed_work=$((compiled_objects + linked_tests))
-
-if [[ "$total_work" -gt 0 ]]; then
-    percent=$((completed_work * 100 / total_work))
-else
-    percent=0
-fi
-
-# Determine phase
-if [[ "$compiled_objects" -lt "$expected_lib_objects" ]]; then
-    phase="compiling"
-    # Get most recently modified .o file as last_item
-    last_item=$(find cache db env file logging memory memtable monitoring options port table test_util trace_replay util utilities -name '*.o' -type f -printf '%T@ %p\n' 2>/dev/null | sort -rn | head -1 | cut -d' ' -f2- | sed 's,^\./,,;s,\.o$,,')
-elif [[ "$linked_tests" -lt "$expected_test_binaries" ]]; then
-    phase="linking"
-    # Get most recently modified test binary as last_item
-    last_item=$(find . -maxdepth 1 -name '*_test' -type f -executable -printf '%T@ %p\n' 2>/dev/null | sort -rn | head -1 | cut -d' ' -f2- | sed 's,^\./,,')
-else
-    phase="generating"
-    last_item=""
-fi
-
-output_json "running" "$completed_work" "$total_work" 0 "$percent" 0 "0" "$last_item" "$phase"

build_tools/dependencies_platform010.sh

@@ -19,3 +19,4 @@ BENCHMARK_BASE=/mnt/gvfs/third-party2/benchmark/780c7a0f9cf0967961e69ad08e61cddd
 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
+LUA_BASE=/mnt/gvfs/third-party2/lua/363787fa5cac2a8aa20638909210443278fa138e/5.3.4/platform010/9079c97

build_tools/fbcode_config.sh

@@ -164,4 +164,12 @@ EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GF
 
 VALGRIND_VER="$VALGRIND_BASE/bin/"
 
-export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD
+LUA_PATH="$LUA_BASE"
+
+if test -z $PIC_BUILD; then
+  LUA_LIB=" $LUA_PATH/lib/liblua.a"
+else
+  LUA_LIB=" $LUA_PATH/lib/liblua_pic.a"
+fi
+
+export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB

build_tools/fbcode_config_platform010.sh

@@ -172,4 +172,4 @@ EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GF
 
 VALGRIND_VER="$VALGRIND_BASE/bin/"
 
-export CC CXX AR AS CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD
+export CC CXX AR AS CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB

build_tools/format-diff.sh

@@ -7,18 +7,14 @@ print_usage () {
   echo "Usage:"
   echo "format-diff.sh [OPTIONS]"
   echo "-c: check only."
-  echo "-y: auto-apply formatting without prompts (non-interactive mode)."
   echo "-h: print this message."
 }
 
-while getopts ':cyh' OPTION; do
+while getopts ':ch' OPTION; do
   case "$OPTION" in
     c)
       CHECK_ONLY=1
       ;;
-    y)
-      AUTO_APPLY=1
-      ;;
     h)
       print_usage
       exit 1
@@ -152,70 +148,6 @@ else
   echo "Checking format of uncommitted changes..."
 fi
 
-# Check for missing copyright in new files
-echo "Checking for copyright headers in new files..."
-
-# Get list of new files (added, not just modified)
-if [ -z "$uncommitted_code" ]; then
-  # Post-commit: check files added since merge base
-  new_files=$(git diff --name-only --diff-filter=A "$FORMAT_UPSTREAM_MERGE_BASE" -- '*.h' '*.cc' '*.py' $EXCLUDE)
-else
-  # Pre-commit: check staged new files
-  new_files=$(git diff --name-only --diff-filter=A --cached HEAD -- '*.h' '*.cc' '*.py' $EXCLUDE)
-fi
-
-if [ -n "$new_files" ]; then
-  files_missing_copyright=""
-
-  for file in $new_files; do
-    if [ -f "$file" ]; then
-      # Check if file is missing copyright
-      # For .py files, check for Python-style comment
-      # For .h and .cc files, check for C++-style comment
-      if [[ "$file" == *.py ]]; then
-        if ! grep -q "Copyright (c) Meta Platforms, Inc. and affiliates" "$file"; then
-          files_missing_copyright="$files_missing_copyright $file"
-          # Add copyright header to Python file
-          temp_file=$(mktemp)
-          {
-            echo "#  Copyright (c) Meta Platforms, Inc. and affiliates."
-            echo "#  This source code is licensed under both the GPLv2 (found in the COPYING file in the root directory)"
-            echo "#  and the Apache 2.0 License (found in the LICENSE.Apache file in the root directory)."
-            echo
-            cat "$file"
-          } > "$temp_file"
-          mv "$temp_file" "$file"
-          echo "Added copyright header to $file"
-        fi
-      elif [[ "$file" == *.h ]] || [[ "$file" == *.cc ]]; then
-        if ! grep -q "Copyright (c) Meta Platforms, Inc. and affiliates" "$file"; then
-          files_missing_copyright="$files_missing_copyright $file"
-          # Add copyright header to C++ file
-          temp_file=$(mktemp)
-          {
-            echo "//  Copyright (c) Meta Platforms, Inc. and affiliates. "
-            echo "//  This source code is licensed under both the GPLv2 (found in the "
-            echo "//  COPYING file in the root directory) and Apache 2.0 License "
-            echo "//  (found in the LICENSE.Apache file in the root directory)."
-            echo
-            cat "$file"
-          } > "$temp_file"
-          mv "$temp_file" "$file"
-          echo "Added copyright header to $file"
-        fi
-      fi
-    fi
-  done
-
-  if [ -n "$files_missing_copyright" ]; then
-    echo "Copyright headers were added to new files."
-  else
-    echo "All new files have copyright headers."
-  fi
-else
-  echo "No new files to check for copyright headers."
-fi
-
 if [ -z "$diffs" ]
 then
   echo "Nothing needs to be reformatted!"
@@ -244,16 +176,11 @@ echo "$diffs" |
   sed -e "s/\(^-.*$\)/`echo -e \"$COLOR_RED\1$COLOR_END\"`/" |
   sed -e "s/\(^+.*$\)/`echo -e \"$COLOR_GREEN\1$COLOR_END\"`/"
 
-# Handle auto-apply mode (non-interactive)
-if [ "$AUTO_APPLY" ]; then
-  to_fix="y"
-else
-  echo -e "Would you like to fix the format automatically (y/n): \c"
+echo -e "Would you like to fix the format automatically (y/n): \c"
 
-  # Make sure under any mode, we can read user input.
-  exec < /dev/tty
-  read to_fix
-fi
+# Make sure under any mode, we can read user input.
+exec < /dev/tty
+read to_fix
 
 if [ "$to_fix" != "y" ]
 then
@@ -270,8 +197,7 @@ fi
 echo "Files reformatted!"
 
 # Amend to last commit if user do the post-commit format check
-# Skip amend prompt in auto-apply mode (user can amend manually if desired)
-if [ -z "$uncommitted_code" ] && [ -z "$AUTO_APPLY" ]; then
+if [ -z "$uncommitted_code" ]; then
   echo -e "Would you like to amend the changes to last commit (`git log HEAD --oneline | head -1`)? (y/n): \c"
   read to_amend
 

build_tools/getdeps_fallback_mirror.py

@@ -1,123 +0,0 @@
-#!/usr/bin/env python3
-"""
-Pre-download packages with unreliable mirrors using fallback mirrors.
-Reads package info from folly's getdeps manifest files.
-"""
-import sys
-import os
-import hashlib
-import subprocess
-import configparser
-
-def sha256_file(path):
-    """Calculate SHA256 hash of a file."""
-    h = hashlib.sha256()
-    try:
-        with open(path, 'rb') as f:
-            for chunk in iter(lambda: f.read(65536), b''):
-                h.update(chunk)
-        return h.hexdigest()
-    except Exception:
-        return None
-
-def parse_manifest(manifest_path):
-    """Parse a getdeps manifest file to extract download info."""
-    config = configparser.ConfigParser()
-    try:
-        config.read(manifest_path)
-        if 'download' in config:
-            return {
-                'url': config['download'].get('url', ''),
-                'sha256': config['download'].get('sha256', ''),
-            }
-    except Exception:
-        pass
-    return None
-
-def get_fallback_mirrors(url):
-    """Get fallback mirror URLs for a given URL."""
-    # Fallback mirror patterns for known unreliable hosts
-    mirror_fallbacks = {
-        "ftp.gnu.org/gnu/": [
-            "https://mirrors.kernel.org/gnu/",
-            "https://ftpmirror.gnu.org/gnu/",
-            "https://ftp.gnu.org/gnu/",
-        ],
-        "ftpmirror.gnu.org/gnu/": [
-            "https://mirrors.kernel.org/gnu/",
-            "https://ftpmirror.gnu.org/gnu/",
-            "https://ftp.gnu.org/gnu/",
-        ],
-    }
-
-    for pattern, mirrors in mirror_fallbacks.items():
-        if pattern in url:
-            # Extract the path after the pattern
-            path_start = url.find(pattern) + len(pattern)
-            path = url[path_start:]
-            return [mirror + path for mirror in mirrors]
-    return [url]  # No fallback, use original
-
-def main():
-    if len(sys.argv) != 4:
-        print(f"Usage: {sys.argv[0]} <download_dir> <cache_dir> <manifests_dir>")
-        sys.exit(1)
-
-    download_dir, cache_dir, manifests_dir = sys.argv[1], sys.argv[2], sys.argv[3]
-
-    # Packages known to have unreliable mirrors
-    packages_to_check = ["autoconf", "automake", "libtool"]
-
-    for package in packages_to_check:
-        manifest_path = os.path.join(manifests_dir, package)
-        if not os.path.exists(manifest_path):
-            continue
-
-        info = parse_manifest(manifest_path)
-        if not info or not info['url'] or not info['sha256']:
-            continue
-
-        # Determine filename from URL
-        url = info['url']
-        expected_sha256 = info['sha256']
-        url_filename = os.path.basename(url)
-
-        # getdeps uses format: {package}-{filename}
-        filename = f"{package}-{url_filename}"
-        filepath = os.path.join(download_dir, filename)
-        cache_path = os.path.join(cache_dir, filename)
-
-        # Check if already valid
-        if os.path.exists(filepath) and sha256_file(filepath) == expected_sha256:
-            print(f"  {filename}: OK (already downloaded)")
-            continue
-
-        # Check cache
-        if os.path.exists(cache_path) and sha256_file(cache_path) == expected_sha256:
-            print(f"  {filename}: OK (from cache)")
-            subprocess.run(['cp', cache_path, filepath], check=True)
-            continue
-
-        # Try fallback mirrors
-        mirrors = get_fallback_mirrors(url)
-        downloaded = False
-        for mirror_url in mirrors:
-            print(f"  {filename}: trying {mirror_url}...")
-            try:
-                subprocess.run(['wget', '-q', '-O', filepath, mirror_url], check=True, timeout=120)
-                if sha256_file(filepath) == expected_sha256:
-                    print(f"  {filename}: OK (downloaded)")
-                    subprocess.run(['cp', filepath, cache_path], check=False)
-                    downloaded = True
-                    break
-                else:
-                    os.remove(filepath)
-            except Exception:
-                if os.path.exists(filepath):
-                    os.remove(filepath)
-
-        if not downloaded:
-            print(f"  {filename}: WARNING - all mirrors failed")
-
-if __name__ == "__main__":
-    main()

build_tools/update_dependencies.sh

@@ -101,5 +101,6 @@ get_lib_base benchmark  LATEST  platform010
 get_lib_base kernel-headers fb platform010
 get_lib_base binutils   LATEST centos8-native
 get_lib_base valgrind   LATEST platform010
+get_lib_base lua        5.3.4  platform010
 
 git diff $OUTPUT

cache/cache.cc

@@ -54,6 +54,11 @@ static std::unordered_map<std::string, OptionTypeInfo>
          {offsetof(struct CompressedSecondaryCacheOptions, compression_type),
           OptionType::kCompressionType, OptionVerificationType::kNormal,
           OptionTypeFlags::kMutable}},
+        {"compress_format_version",
+         {offsetof(struct CompressedSecondaryCacheOptions,
+                   compress_format_version),
+          OptionType::kUInt32T, OptionVerificationType::kNormal,
+          OptionTypeFlags::kMutable}},
         {"enable_custom_split_merge",
          {offsetof(struct CompressedSecondaryCacheOptions,
                    enable_custom_split_merge),

cache/cache_bench_tool.cc

@@ -119,7 +119,7 @@ DEFINE_uint32(seed, 0, "Hashing/random seed to use. 0 = choose at random");
 DEFINE_string(secondary_cache_uri, "",
               "Full URI for creating a custom secondary cache object");
 
-DEFINE_string(cache_type, "hyper_clock_cache", "Type of block cache.");
+DEFINE_string(cache_type, "lru_cache", "Type of block cache.");
 
 DEFINE_bool(use_jemalloc_no_dump_allocator, false,
             "Whether to use JemallocNoDumpAllocator");

cache/cache_entry_stats.h

@@ -101,23 +101,23 @@ class CacheEntryStatsCollector {
   }
 
   // Gets saved stats, regardless of age
-  void GetStats(Stats* stats) {
+  void GetStats(Stats *stats) {
     std::lock_guard<std::mutex> lock(saved_mutex_);
     *stats = saved_stats_;
   }
 
-  Cache* GetCache() const { return cache_; }
+  Cache *GetCache() const { return cache_; }
 
   // Gets or creates a shared instance of CacheEntryStatsCollector in the
   // cache itself, and saves into `ptr`. This shared_ptr will hold the
   // entry in cache until all refs are destroyed.
-  static Status GetShared(Cache* raw_cache, SystemClock* clock,
-                          std::shared_ptr<CacheEntryStatsCollector>* ptr) {
+  static Status GetShared(Cache *raw_cache, SystemClock *clock,
+                          std::shared_ptr<CacheEntryStatsCollector> *ptr) {
     assert(raw_cache);
     BasicTypedCacheInterface<CacheEntryStatsCollector, CacheEntryRole::kMisc>
         cache{raw_cache};
 
-    const Slice& cache_key = GetCacheKey();
+    const Slice &cache_key = GetCacheKey();
     auto h = cache.Lookup(cache_key);
     if (h == nullptr) {
       // Not yet in cache, but Cache doesn't provide a built-in way to
@@ -152,7 +152,7 @@ class CacheEntryStatsCollector {
   }
 
  private:
-  explicit CacheEntryStatsCollector(Cache* cache, SystemClock* clock)
+  explicit CacheEntryStatsCollector(Cache *cache, SystemClock *clock)
       : saved_stats_(),
         working_stats_(),
         last_start_time_micros_(0),
@@ -160,7 +160,7 @@ class CacheEntryStatsCollector {
         cache_(cache),
         clock_(clock) {}
 
-  static const Slice& GetCacheKey() {
+  static const Slice &GetCacheKey() {
     // For each template instantiation
     static CacheKey ckey = CacheKey::CreateUniqueForProcessLifetime();
     static Slice ckey_slice = ckey.AsSlice();
@@ -175,8 +175,8 @@ class CacheEntryStatsCollector {
   uint64_t last_start_time_micros_;
   uint64_t last_end_time_micros_;
 
-  Cache* const cache_;
-  SystemClock* const clock_;
+  Cache *const cache_;
+  SystemClock *const clock_;
 };
 
 }  // namespace ROCKSDB_NAMESPACE

cache/cache_key.cc

@@ -24,7 +24,7 @@ namespace ROCKSDB_NAMESPACE {
 //              0 |      >= 1<<63 | CreateUniqueForProcessLifetime
 //            > 0 |           any | OffsetableCacheKey.WithOffset
 
-CacheKey CacheKey::CreateUniqueForCacheLifetime(Cache* cache) {
+CacheKey CacheKey::CreateUniqueForCacheLifetime(Cache *cache) {
   // +1 so that we can reserve all zeros for "unset" cache key
   uint64_t id = cache->NewId() + 1;
   // Ensure we don't collide with CreateUniqueForProcessLifetime
@@ -297,8 +297,8 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 //
 // TODO: Nevertheless / regardless, an efficient way to detect (and thus
 // quantify) block cache corruptions, including collisions, should be added.
-OffsetableCacheKey::OffsetableCacheKey(const std::string& db_id,
-                                       const std::string& db_session_id,
+OffsetableCacheKey::OffsetableCacheKey(const std::string &db_id,
+                                       const std::string &db_session_id,
                                        uint64_t file_number) {
   UniqueId64x2 internal_id;
   Status s = GetSstInternalUniqueId(db_id, db_session_id, file_number,

cache/cache_key.h

@@ -44,13 +44,13 @@ class CacheKey {
   inline Slice AsSlice() const {
     static_assert(sizeof(*this) == 16, "Standardized on 16-byte cache key");
     assert(!IsEmpty());
-    return Slice(reinterpret_cast<const char*>(this), sizeof(*this));
+    return Slice(reinterpret_cast<const char *>(this), sizeof(*this));
   }
 
   // Create a CacheKey that is unique among others associated with this Cache
   // instance. Depends on Cache::NewId. This is useful for block cache
   // "reservations".
-  static CacheKey CreateUniqueForCacheLifetime(Cache* cache);
+  static CacheKey CreateUniqueForCacheLifetime(Cache *cache);
 
   // Create a CacheKey that is unique among others for the lifetime of this
   // process. This is useful for saving in a static data member so that
@@ -87,7 +87,7 @@ class OffsetableCacheKey : private CacheKey {
 
   // Constructs an OffsetableCacheKey with the given information about a file.
   // This constructor never generates an "empty" base key.
-  OffsetableCacheKey(const std::string& db_id, const std::string& db_session_id,
+  OffsetableCacheKey(const std::string &db_id, const std::string &db_session_id,
                      uint64_t file_number);
 
   // Creates an OffsetableCacheKey from an SST unique ID, so that cache keys
@@ -134,9 +134,9 @@ class OffsetableCacheKey : private CacheKey {
     static_assert(sizeof(file_num_etc64_) == kCommonPrefixSize,
                   "8 byte common prefix expected");
     assert(!IsEmpty());
-    assert(&this->file_num_etc64_ == static_cast<const void*>(this));
+    assert(&this->file_num_etc64_ == static_cast<const void *>(this));
 
-    return Slice(reinterpret_cast<const char*>(this), kCommonPrefixSize);
+    return Slice(reinterpret_cast<const char *>(this), kCommonPrefixSize);
   }
 };
 

cache/cache_reservation_manager.h

@@ -44,8 +44,8 @@ class CacheReservationManager {
                                         bool increase) = 0;
   virtual Status MakeCacheReservation(
       std::size_t incremental_memory_used,
-      std::unique_ptr<CacheReservationManager::CacheReservationHandle>*
-          handle) = 0;
+      std::unique_ptr<CacheReservationManager::CacheReservationHandle>
+          *handle) = 0;
   virtual std::size_t GetTotalReservedCacheSize() = 0;
   virtual std::size_t GetTotalMemoryUsed() = 0;
 };
@@ -90,11 +90,11 @@ class CacheReservationManagerImpl
                                        bool delayed_decrease = false);
 
   // no copy constructor, copy assignment, move constructor, move assignment
-  CacheReservationManagerImpl(const CacheReservationManagerImpl&) = delete;
-  CacheReservationManagerImpl& operator=(const CacheReservationManagerImpl&) =
+  CacheReservationManagerImpl(const CacheReservationManagerImpl &) = delete;
+  CacheReservationManagerImpl &operator=(const CacheReservationManagerImpl &) =
       delete;
-  CacheReservationManagerImpl(CacheReservationManagerImpl&&) = delete;
-  CacheReservationManagerImpl& operator=(CacheReservationManagerImpl&&) =
+  CacheReservationManagerImpl(CacheReservationManagerImpl &&) = delete;
+  CacheReservationManagerImpl &operator=(CacheReservationManagerImpl &&) =
       delete;
 
   ~CacheReservationManagerImpl() override;
@@ -178,7 +178,7 @@ class CacheReservationManagerImpl
   // REQUIRES: handle != nullptr
   Status MakeCacheReservation(
       std::size_t incremental_memory_used,
-      std::unique_ptr<CacheReservationManager::CacheReservationHandle>* handle)
+      std::unique_ptr<CacheReservationManager::CacheReservationHandle> *handle)
       override;
 
   // Return the size of the cache (which is a multiple of kSizeDummyEntry)
@@ -200,7 +200,7 @@ class CacheReservationManagerImpl
   // For testing only - it is to help ensure the CacheItemHelperForRole<R>
   // accessed from CacheReservationManagerImpl and the one accessed from the
   // test are from the same translation units
-  static const Cache::CacheItemHelper* TEST_GetCacheItemHelperForRole();
+  static const Cache::CacheItemHelper *TEST_GetCacheItemHelperForRole();
 
  private:
   static constexpr std::size_t kSizeDummyEntry = 256 * 1024;
@@ -216,7 +216,7 @@ class CacheReservationManagerImpl
   bool delayed_decrease_;
   std::atomic<std::size_t> cache_allocated_size_;
   std::size_t memory_used_;
-  std::vector<Cache::Handle*> dummy_handles_;
+  std::vector<Cache::Handle *> dummy_handles_;
   CacheKey cache_key_;
 };
 
@@ -251,14 +251,14 @@ class ConcurrentCacheReservationManager
       std::shared_ptr<CacheReservationManager> cache_res_mgr) {
     cache_res_mgr_ = std::move(cache_res_mgr);
   }
-  ConcurrentCacheReservationManager(const ConcurrentCacheReservationManager&) =
+  ConcurrentCacheReservationManager(const ConcurrentCacheReservationManager &) =
       delete;
-  ConcurrentCacheReservationManager& operator=(
-      const ConcurrentCacheReservationManager&) = delete;
-  ConcurrentCacheReservationManager(ConcurrentCacheReservationManager&&) =
+  ConcurrentCacheReservationManager &operator=(
+      const ConcurrentCacheReservationManager &) = delete;
+  ConcurrentCacheReservationManager(ConcurrentCacheReservationManager &&) =
       delete;
-  ConcurrentCacheReservationManager& operator=(
-      ConcurrentCacheReservationManager&&) = delete;
+  ConcurrentCacheReservationManager &operator=(
+      ConcurrentCacheReservationManager &&) = delete;
 
   ~ConcurrentCacheReservationManager() override {}
 
@@ -286,7 +286,7 @@ class ConcurrentCacheReservationManager
 
   inline Status MakeCacheReservation(
       std::size_t incremental_memory_used,
-      std::unique_ptr<CacheReservationManager::CacheReservationHandle>* handle)
+      std::unique_ptr<CacheReservationManager::CacheReservationHandle> *handle)
       override {
     std::unique_ptr<CacheReservationManager::CacheReservationHandle>
         wrapped_handle;

cache/cache_test.cc

@@ -644,7 +644,7 @@ using TypedHandle = SharedCache::TypedHandle;
 
 TEST_P(CacheTest, SetCapacity) {
   if (IsHyperClock()) {
-    // TODO: update test & code for limited support
+    // TODO: update test & code for limited supoort
     ROCKSDB_GTEST_BYPASS(
         "HyperClockCache doesn't support arbitrary capacity "
         "adjustments.");

cache/clock_cache.h

@@ -317,89 +317,40 @@ struct ClockHandle : public ClockHandleBasicData {
   // | acquire counter      | release counter     | hit bit | state marker |
   // -----------------------------------------------------------------------
 
-  struct SlotMeta : public BitFields<uint64_t, SlotMeta> {
-    // For reading or updating counters in meta word.
-    static constexpr uint8_t kCounterNumBits = 30;
-    // Number of times the a reference has been acquired (or attempted)
-    // since last reset by eviction processing
-    using AcquireCounter =
-        UnsignedBitField<SlotMeta, kCounterNumBits, NoPrevBitField>;
-    // Number of times the a reference has been released (or attempted)
-    // since last reset by eviction processing
-    using ReleaseCounter =
-        UnsignedBitField<SlotMeta, kCounterNumBits, AcquireCounter>;
-    // Metadata bit in support of secondary cache
-    using HitFlag = BoolBitField<SlotMeta, ReleaseCounter>;
-    // Occupied means any state other than empty
-    using OccupiedFlag = BoolBitField<SlotMeta, HitFlag>;
-    // Shareable means the entry is reference counted (visible or invisible)
-    // (only set if also occupied)
-    using ShareableFlag = BoolBitField<SlotMeta, OccupiedFlag>;
-    // Visible is only set if also shareable (invisible can't be found by
-    // Lookup)
-    using VisibleFlag = BoolBitField<SlotMeta, ShareableFlag>;
+  // For reading or updating counters in meta word.
+  static constexpr uint8_t kCounterNumBits = 30;
+  static constexpr uint64_t kCounterMask = (uint64_t{1} << kCounterNumBits) - 1;
 
-    // Convenience functions
-    uint32_t GetAcquireCounter() const { return Get<AcquireCounter>(); }
-    void SetAcquireCounter(uint32_t val) { Set<AcquireCounter>(val); }
-    uint32_t GetReleaseCounter() const { return Get<ReleaseCounter>(); }
-    void SetReleaseCounter(uint32_t val) { Set<ReleaseCounter>(val); }
-    uint32_t GetRefcount() const {
-      return Get<AcquireCounter>() - Get<ReleaseCounter>();
-    }
-    bool GetHit() const { return Get<HitFlag>(); }
-    void SetHit(bool val) { Set<HitFlag>(val); }
+  static constexpr uint8_t kAcquireCounterShift = 0;
+  static constexpr uint64_t kAcquireIncrement = uint64_t{1}
+                                                << kAcquireCounterShift;
+  static constexpr uint8_t kReleaseCounterShift = kCounterNumBits;
+  static constexpr uint64_t kReleaseIncrement = uint64_t{1}
+                                                << kReleaseCounterShift;
 
-    // Some distinct states for the various state flags
-    bool IsEmpty() const {
-      bool rv = !Get<OccupiedFlag>();
-      if (rv) {
-        assert(!Get<ShareableFlag>());
-        assert(!Get<VisibleFlag>());
-      }
-      return rv;
-    }
+  // For setting the hit bit
+  static constexpr uint8_t kHitBitShift = 2U * kCounterNumBits;
+  static constexpr uint64_t kHitBitMask = uint64_t{1} << kHitBitShift;
 
-    bool IsUnderConstruction() const {
-      bool rv = Get<OccupiedFlag>() && !Get<ShareableFlag>();
-      if (rv) {
-        assert(!Get<VisibleFlag>());
-      }
-      return rv;
-    }
-    void SetUnderConstruction() {
-      Set<OccupiedFlag>(true);
-      Set<ShareableFlag>(false);
-      Set<VisibleFlag>(false);
-    }
+  // For reading or updating the state marker in meta word
+  static constexpr uint8_t kStateShift = kHitBitShift + 1;
 
-    bool IsShareable() const { return Get<ShareableFlag>(); }
-    bool IsInvisible() const {
-      bool rv = Get<ShareableFlag>() && !Get<VisibleFlag>();
-      if (rv) {
-        assert(Get<OccupiedFlag>());
-      }
-      return rv;
-    }
-    void SetInvisible() {
-      Set<OccupiedFlag>(true);
-      Set<ShareableFlag>(true);
-      Set<VisibleFlag>(false);
-    }
+  // Bits contribution to state marker.
+  // Occupied means any state other than empty
+  static constexpr uint8_t kStateOccupiedBit = 0b100;
+  // Shareable means the entry is reference counted (visible or invisible)
+  // (only set if also occupied)
+  static constexpr uint8_t kStateShareableBit = 0b010;
+  // Visible is only set if also shareable
+  static constexpr uint8_t kStateVisibleBit = 0b001;
 
-    bool IsVisible() const {
-      bool rv = Get<ShareableFlag>() && Get<VisibleFlag>();
-      if (rv) {
-        assert(Get<OccupiedFlag>());
-      }
-      return rv;
-    }
-    void SetVisible() {
-      Set<OccupiedFlag>(true);
-      Set<ShareableFlag>(true);
-      Set<VisibleFlag>(true);
-    }
-  };
+  // Complete state markers (not shifted into full word)
+  static constexpr uint8_t kStateEmpty = 0b000;
+  static constexpr uint8_t kStateConstruction = kStateOccupiedBit;
+  static constexpr uint8_t kStateInvisible =
+      kStateOccupiedBit | kStateShareableBit;
+  static constexpr uint8_t kStateVisible =
+      kStateOccupiedBit | kStateShareableBit | kStateVisibleBit;
 
   // Constants for initializing the countdown clock. (Countdown clock is only
   // in effect with zero refs, acquire counter == release counter, and in that
@@ -413,7 +364,7 @@ struct ClockHandle : public ClockHandleBasicData {
   // TODO: make these coundown values tuning parameters for eviction?
 
   // See above. Mutable for read reference counting.
-  mutable BitFieldsAtomic<SlotMeta> meta{};
+  mutable AcqRelAtomic<uint64_t> meta{};
 };  // struct ClockHandle
 
 class BaseClockTable {
@@ -480,9 +431,9 @@ class BaseClockTable {
   bool IsEvictionEffortExceeded(const BaseClockTable::EvictionData& data) const;
 #ifndef NDEBUG
   // Acquire N references
-  void TEST_RefN(ClockHandle& handle, uint32_t n);
+  void TEST_RefN(ClockHandle& handle, size_t n);
   // Helper for TEST_ReleaseN
-  void TEST_ReleaseNMinus1(ClockHandle* handle, uint32_t n);
+  void TEST_ReleaseNMinus1(ClockHandle* handle, size_t n);
 #endif
 
  private:  // fns
@@ -538,13 +489,13 @@ class BaseClockTable {
   // TODO: is this separation needed if we don't do background evictions?
   ALIGN_AS(CACHE_LINE_SIZE)
   // Number of elements in the table.
-  Atomic<size_t> occupancy_{};
+  AcqRelAtomic<size_t> occupancy_{};
 
   // Memory usage by entries tracked by the cache (including standalone)
-  Atomic<size_t> usage_{};
+  AcqRelAtomic<size_t> usage_{};
 
   // Part of usage by standalone entries (not in table)
-  Atomic<size_t> standalone_usage_{};
+  AcqRelAtomic<size_t> standalone_usage_{};
 
   // Maximum total charge of all elements stored in the table.
   // (Relaxed: eventual consistency/update is OK)
@@ -635,7 +586,7 @@ class FixedHyperClockTable : public BaseClockTable {
   bool GrowIfNeeded(size_t new_occupancy, InsertState& state);
 
   HandleImpl* DoInsert(const ClockHandleBasicData& proto,
-                       uint32_t initial_countdown, bool take_ref,
+                       uint64_t initial_countdown, bool take_ref,
                        InsertState& state);
 
   // Runs the clock eviction algorithm trying to reclaim at least
@@ -663,7 +614,7 @@ class FixedHyperClockTable : public BaseClockTable {
   }
 
   // Release N references
-  void TEST_ReleaseN(HandleImpl* handle, uint32_t n);
+  void TEST_ReleaseN(HandleImpl* handle, size_t n);
 #endif
 
   // The load factor p is a real number in (0, 1) such that at all
@@ -824,7 +775,6 @@ class AutoHyperClockTable : public BaseClockTable {
     // chain--specifically the next entry in the chain.
     // * The end of a chain is given a special "end" marker and refers back
     // to the head of the chain.
-    // These decorated pointers use the NextWithShift bit field struct below.
     //
     // Why do we need shift on each pointer? To make Lookup wait-free, we need
     // to be able to query a chain without missing anything, and preferably
@@ -844,63 +794,47 @@ class AutoHyperClockTable : public BaseClockTable {
     // it is normal to see "under construction" entries on the chain, and it
     // is not safe to read their hashed key without either a read reference
     // on the entry or a rewrite lock on the chain.
-    struct NextWithShift : public BitFields<uint64_t, NextWithShift> {
-      // The "shift" associated with this decorated pointer (see description
-      // above).
-      using Shift = UnsignedBitField<NextWithShift, 6, NoPrevBitField>;
-      // Marker for the end of a chain. Must also (a) point back to the head of
-      // the chain (with end marker removed), and (b) set the LockedFlag
-      // (below), so that attempting to lock an empty chain has no effect (not
-      // needed, as the lock is only needed for removals).
-      using EndFlag = BoolBitField<NextWithShift, Shift>;
-      // Marker that some thread owning writes to the chain structure (except
-      // for inserts), but only if not an "end" pointer. Also called the
-      // "rewrite lock."
-      using LockedFlag = BoolBitField<NextWithShift, EndFlag>;
-      // The "next" associated with this decorated pointer, which is an index
-      // into the table's array_ (see description above).
-      using Next = UnsignedBitField<NextWithShift, 56, LockedFlag>;
 
-      bool IsLocked() const { return Get<LockedFlag>(); }
-      bool IsEnd() const {
-        // End flag should imply locked flag
-        assert(!Get<EndFlag>() || Get<LockedFlag>());
-        return Get<EndFlag>();
-      }
-      bool IsLockedNotEnd() const {
-        // NOTE: helping GCC to optimize this simpler code:
-        // return IsLocked() && !IsEnd();
-        constexpr U kEndFlag = U{1} << EndFlag::kBitOffset;
-        constexpr U kLockedFlag = U{1} << LockedFlag::kBitOffset;
-        return (underlying & (kEndFlag | kLockedFlag)) == kLockedFlag;
-      }
-      auto GetNext() const { return Get<Next>(); }
-      auto GetShift() const { return Get<Shift>(); }
+    // Marker in a "with_shift" head pointer for some thread owning writes
+    // to the chain structure (except for inserts), but only if not an
+    // "end" pointer. Also called the "rewrite lock."
+    static constexpr uint64_t kHeadLocked = uint64_t{1} << 7;
 
-      static NextWithShift Make(size_t next, int shift) {
-        return NextWithShift{}.With<Next>(next).With<Shift>(
-            static_cast<uint8_t>(shift));
-      }
+    // Marker in a "with_shift" pointer for the end of a chain. Must also
+    // point back to the head of the chain (with end marker removed).
+    // Also includes the "locked" bit so that attempting to lock an empty
+    // chain has no effect (not needed, as the lock is only needed for
+    // removals).
+    static constexpr uint64_t kNextEndFlags = (uint64_t{1} << 6) | kHeadLocked;
 
-      static NextWithShift MakeEnd(size_t next, int shift) {
-        return Make(next, shift).With<EndFlag>(true).With<LockedFlag>(true);
-      }
-    };
+    static inline bool IsEnd(uint64_t next_with_shift) {
+      // Assuming certain values never used, suffices to check this one bit
+      constexpr auto kCheckBit = kNextEndFlags ^ kHeadLocked;
+      return next_with_shift & kCheckBit;
+    }
+
+    // Bottom bits to right shift away to get an array index from a
+    // "with_shift" pointer.
+    static constexpr int kNextShift = 8;
+
+    // A bit mask for the "shift" associated with each "with_shift" pointer.
+    // Always bottommost bits.
+    static constexpr int kShiftMask = 63;
 
     // A marker for head_next_with_shift that indicates this HandleImpl is
     // heap allocated (standalone) rather than in the table.
-    static constexpr NextWithShift kStandaloneMarker{UINT64_MAX};
+    static constexpr uint64_t kStandaloneMarker = UINT64_MAX;
 
     // A marker for head_next_with_shift indicating the head is not yet part
     // of the usable table, or for chain_next_with_shift indicating that the
     // entry is not present or is not yet part of a chain (must not be
     // "shareable" state).
-    static constexpr NextWithShift kUnusedMarker{0};
+    static constexpr uint64_t kUnusedMarker = 0;
 
     // See above. The head pointer is logically independent of the rest of
     // the entry, including the chain next pointer.
-    BitFieldsAtomic<NextWithShift> head_next_with_shift{kUnusedMarker};
-    BitFieldsAtomic<NextWithShift> chain_next_with_shift{kUnusedMarker};
+    AcqRelAtomic<uint64_t> head_next_with_shift{kUnusedMarker};
+    AcqRelAtomic<uint64_t> chain_next_with_shift{kUnusedMarker};
 
     // For supporting CreateStandalone and some fallback cases.
     inline bool IsStandalone() const {
@@ -946,7 +880,7 @@ class AutoHyperClockTable : public BaseClockTable {
   bool GrowIfNeeded(size_t new_occupancy, InsertState& state);
 
   HandleImpl* DoInsert(const ClockHandleBasicData& proto,
-                       uint32_t initial_countdown, bool take_ref,
+                       uint64_t initial_countdown, bool take_ref,
                        InsertState& state);
 
   // Runs the clock eviction algorithm trying to reclaim at least
@@ -974,7 +908,7 @@ class AutoHyperClockTable : public BaseClockTable {
   }
 
   // Release N references
-  void TEST_ReleaseN(HandleImpl* handle, uint32_t n);
+  void TEST_ReleaseN(HandleImpl* handle, size_t n);
 #endif
 
   // Maximum ratio of number of occupied slots to number of usable slots. The
@@ -1056,7 +990,7 @@ class AutoHyperClockTable : public BaseClockTable {
   // To maximize parallelization of Grow() operations, this field is only
   // updated opportunistically after Grow() operations and in DoInsert() where
   // it is found to be out-of-date. See CatchUpLengthInfoNoWait().
-  Atomic<uint64_t> length_info_;
+  AcqRelAtomic<uint64_t> length_info_;
 
   // An already-computed version of the usable length times the max load
   // factor. Could be slightly out of date but GrowIfNeeded()/Grow() handle
@@ -1179,8 +1113,8 @@ class ALIGN_AS(CACHE_LINE_SIZE) ClockCacheShard final : public CacheShardBase {
     return table_.TEST_MutableOccupancyLimit();
   }
   // Acquire/release N references
-  void TEST_RefN(HandleImpl* handle, uint32_t n);
-  void TEST_ReleaseN(HandleImpl* handle, uint32_t n);
+  void TEST_RefN(HandleImpl* handle, size_t n);
+  void TEST_ReleaseN(HandleImpl* handle, size_t n);
 #endif
 
  private:  // data

cache/compressed_secondary_cache.cc

@@ -50,7 +50,8 @@ CompressedSecondaryCache::CompressedSecondaryCache(
           std::make_shared<CacheReservationManagerImpl<CacheEntryRole::kMisc>>(
               cache_))),
       disable_cache_(opts.capacity == 0) {
-  auto mgr = GetBuiltinV2CompressionManager();
+  auto mgr =
+      GetBuiltinCompressionManager(cache_options_.compress_format_version);
   compressor_ = mgr->GetCompressor(cache_options_.compression_opts,
                                    cache_options_.compression_type);
   decompressor_ =
@@ -355,6 +356,9 @@ std::string CompressedSecondaryCache::GetPrintableOptions() const {
                const_cast<CompressionOptions&>(cache_options_.compression_opts))
                .c_str());
   ret.append(buffer);
+  snprintf(buffer, kBufferSize, "    compress_format_version : %d\n",
+           cache_options_.compress_format_version);
+  ret.append(buffer);
   return ret;
 }
 

cache/compressed_secondary_cache_test.cc

@@ -856,7 +856,8 @@ TEST_P(CompressedSecondaryCacheTestWithCompressionParam, BasicTestFromString) {
     if (LZ4_Supported()) {
       sec_cache_uri =
           "compressed_secondary_cache://"
-          "capacity=2048;num_shard_bits=0;compression_type=kLZ4Compression";
+          "capacity=2048;num_shard_bits=0;compression_type=kLZ4Compression;"
+          "compress_format_version=2";
     } else {
       ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
       sec_cache_uri =
@@ -887,7 +888,7 @@ TEST_P(CompressedSecondaryCacheTestWithCompressionParam,
       sec_cache_uri =
           "compressed_secondary_cache://"
           "capacity=2048;num_shard_bits=0;compression_type=kLZ4Compression;"
-          "enable_custom_split_merge=true";
+          "compress_format_version=2;enable_custom_split_merge=true";
     } else {
       ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
       sec_cache_uri =

cache/lru_cache_test.cc

@@ -1503,7 +1503,7 @@ TEST_P(BasicSecondaryCacheTest, FullCapacityTest) {
         /*context*/ this, Cache::Priority::LOW);
     ASSERT_EQ(handle1, nullptr);
 
-    // k1 promotion can fail with strict_capacity_limit=true, but Lookup still
+    // k1 promotion can fail with strict_capacit_limit=true, but Lookup still
     // succeeds using a standalone handle
     handle1 = cache->Lookup(k1.AsSlice(), GetHelper(),
                             /*context*/ this, Cache::Priority::LOW);
@@ -1680,7 +1680,7 @@ TEST_P(DBSecondaryCacheTest, TestSecondaryCacheCorrectness2) {
   // After Flush is successful, RocksDB will do the paranoid check for the new
   // SST file. Meta blocks are always cached in the block cache and they
   // will not be evicted. When block_2 is cache miss and read out, it is
-  // inserted to the block cache. Therefore, block_1 is evicted from block
+  // inserted to the block cache. Thefore, block_1 is evicted from block
   // cache and successfully inserted to the secondary cache. Here are 2
   // lookups in the secondary cache for block_1 and block_2.
   ASSERT_EQ(secondary_cache->num_inserts(), 1u);
@@ -1721,7 +1721,7 @@ TEST_P(DBSecondaryCacheTest, TestSecondaryCacheCorrectness2) {
   v = Get(Key(0));
   ASSERT_EQ(1007, v.size());
   // This Get needs to access block_1, since block_1 is not in block cache
-  // there is one secondary cache lookup. Then, block_1 is cached in the
+  // there is one econdary cache lookup. Then, block_1 is cached in the
   // block cache.
   ASSERT_EQ(secondary_cache->num_inserts(), 2u);
   ASSERT_EQ(secondary_cache->num_lookups(), 5u);
@@ -1785,7 +1785,7 @@ TEST_P(DBSecondaryCacheTest, NoSecondaryCacheInsertion) {
   std::string v = Get(Key(0));
   ASSERT_EQ(1000, v.size());
   // Since the block cache is large enough, all the blocks are cached. we
-  // do not need to lookup the secondary cache.
+  // do not need to lookup the seondary cache.
   ASSERT_EQ(secondary_cache->num_inserts(), 0u);
   ASSERT_EQ(secondary_cache->num_lookups(), 2u);
 
@@ -2150,7 +2150,7 @@ TEST_P(DBSecondaryCacheTest, LRUCacheDumpLoadBasic) {
   ASSERT_OK(Flush());
   Compact("a", "z");
 
-  // do the read for all the key value pairs, so all the blocks should be in
+  // do th eread for all the key value pairs, so all the blocks should be in
   // cache
   uint32_t start_insert = cache->GetInsertCount();
   uint32_t start_lookup = cache->GetLookupcount();
@@ -2179,7 +2179,7 @@ TEST_P(DBSecondaryCacheTest, LRUCacheDumpLoadBasic) {
                             &cache_dumper);
   ASSERT_OK(s);
   std::vector<DB*> db_list;
-  db_list.push_back(db_.get());
+  db_list.push_back(db_);
   s = cache_dumper->SetDumpFilter(db_list);
   ASSERT_OK(s);
   s = cache_dumper->DumpCacheEntriesToWriter();
@@ -2263,11 +2263,11 @@ TEST_P(DBSecondaryCacheTest, LRUCacheDumpLoadWithFilter) {
   options.env = fault_env_.get();
   std::string dbname1 = test::PerThreadDBPath("db_1");
   ASSERT_OK(DestroyDB(dbname1, options));
-  std::unique_ptr<DB> db1;
+  DB* db1 = nullptr;
   ASSERT_OK(DB::Open(options, dbname1, &db1));
   std::string dbname2 = test::PerThreadDBPath("db_2");
   ASSERT_OK(DestroyDB(dbname2, options));
-  std::unique_ptr<DB> db2;
+  DB* db2 = nullptr;
   ASSERT_OK(DB::Open(options, dbname2, &db2));
   fault_fs_->SetFailGetUniqueId(true);
 
@@ -2335,7 +2335,7 @@ TEST_P(DBSecondaryCacheTest, LRUCacheDumpLoadWithFilter) {
                             &cache_dumper);
   ASSERT_OK(s);
   std::vector<DB*> db_list;
-  db_list.push_back(db1.get());
+  db_list.push_back(db1);
   s = cache_dumper->SetDumpFilter(db_list);
   ASSERT_OK(s);
   s = cache_dumper->DumpCacheEntriesToWriter();
@@ -2377,7 +2377,7 @@ TEST_P(DBSecondaryCacheTest, LRUCacheDumpLoadWithFilter) {
   ASSERT_OK(s);
 
   ASSERT_OK(db1->Close());
-  db1.reset();
+  delete db1;
   ASSERT_OK(DB::Open(options, dbname1, &db1));
 
   // After load, we do the Get again. To validate the cache, we do not allow any
@@ -2406,8 +2406,8 @@ TEST_P(DBSecondaryCacheTest, LRUCacheDumpLoadWithFilter) {
   ASSERT_EQ(256, static_cast<int>(block_lookup));
   fault_fs_->SetFailGetUniqueId(false);
   fault_fs_->SetFilesystemActive(true);
-  db1.reset();
-  db2.reset();
+  delete db1;
+  delete db2;
   ASSERT_OK(DestroyDB(dbname1, options));
   ASSERT_OK(DestroyDB(dbname2, options));
 }
@@ -2464,7 +2464,7 @@ TEST_P(DBSecondaryCacheTest, TestSecondaryCacheOptionBasic) {
   std::string v = Get(Key(0));
   ASSERT_EQ(1007, v.size());
 
-  // Check the data in first block. Cache miss, directly read from SST file.
+  // Check the data in first block. Cache miss, direclty read from SST file.
   ASSERT_EQ(secondary_cache->num_inserts(), 0u);
   ASSERT_EQ(secondary_cache->num_lookups(), 0u);
 
@@ -2598,7 +2598,7 @@ TEST_P(DBSecondaryCacheTest, TestSecondaryCacheOptionChange) {
 }
 
 // Two DB test. We create 2 DBs sharing the same block cache and secondary
-// cache. We disable the secondary cache option for DB2.
+// cache. We diable the secondary cache option for DB2.
 TEST_P(DBSecondaryCacheTest, TestSecondaryCacheOptionTwoDB) {
   if (IsHyperClock()) {
     ROCKSDB_GTEST_BYPASS("Test depends on LRUCache-specific behaviors");
@@ -2619,11 +2619,11 @@ TEST_P(DBSecondaryCacheTest, TestSecondaryCacheOptionTwoDB) {
   options.paranoid_file_checks = true;
   std::string dbname1 = test::PerThreadDBPath("db_t_1");
   ASSERT_OK(DestroyDB(dbname1, options));
-  std::unique_ptr<DB> db1;
+  DB* db1 = nullptr;
   ASSERT_OK(DB::Open(options, dbname1, &db1));
   std::string dbname2 = test::PerThreadDBPath("db_t_2");
   ASSERT_OK(DestroyDB(dbname2, options));
-  std::unique_ptr<DB> db2;
+  DB* db2 = nullptr;
   Options options2 = options;
   options2.lowest_used_cache_tier = CacheTier::kVolatileTier;
   ASSERT_OK(DB::Open(options2, dbname2, &db2));
@@ -2700,8 +2700,8 @@ TEST_P(DBSecondaryCacheTest, TestSecondaryCacheOptionTwoDB) {
 
   fault_fs_->SetFailGetUniqueId(false);
   fault_fs_->SetFilesystemActive(true);
-  db1.reset();
-  db2.reset();
+  delete db1;
+  delete db2;
   ASSERT_OK(DestroyDB(dbname1, options));
   ASSERT_OK(DestroyDB(dbname2, options));
 }

cache/secondary_cache_adapter.cc

@@ -33,7 +33,7 @@ const char* kTieredCacheName = "TieredCache";
 // proportionally across the primary/secondary caches.
 //
 // The primary block cache is initially sized to the sum of the primary cache
-// budget + the secondary cache budget, as follows -
+// budget + teh secondary cache budget, as follows -
 //   |---------    Primary Cache Configured Capacity  -----------|
 //   |---Secondary Cache Budget----|----Primary Cache Budget-----|
 //
@@ -51,7 +51,7 @@ const char* kTieredCacheName = "TieredCache";
 // placeholder is counted against the primary cache. To compensate and count
 // a portion of it against the secondary cache, the secondary cache Deflate()
 // method is called to shrink it. Since the Deflate() causes the secondary
-// actual usage to shrink, it is reflected here by releasing an equal amount
+// actual usage to shrink, it is refelcted here by releasing an equal amount
 // from the pri_cache_res_ reservation. The Deflate() in the secondary cache
 // can be, but is not required to be, implemented using its own cache
 // reservation manager.
@@ -72,7 +72,7 @@ const char* kTieredCacheName = "TieredCache";
 // reservation is increased by an equal amount.
 //
 // Another way of implementing this would have been to simply split the user
-// reservation into primary and secondary components. However, this would
+// reservation into primary and seconary components. However, this would
 // require allocating a structure to track the associated secondary cache
 // reservation, which adds some complexity and overhead.
 //
@@ -621,7 +621,7 @@ Status CacheWithSecondaryAdapter::UpdateCacheReservationRatio(
   } else {
     // We're shrinking the ratio. Try to avoid unnecessary evictions -
     // 1. Lower the secondary cache capacity
-    // 2. Decrease pri_cache_res_ reservation to reflect lower secondary
+    // 2. Decrease pri_cache_res_ reservation to relect lower secondary
     //    cache utilization (decrease in capacity - decrease in share of cache
     //    reservations)
     // 3. Inflate the secondary cache to give it back the reduction in its

ccache_msvc_compiler.bat

@@ -1 +0,0 @@
-ccache.exe cl.exe %*

claude_md/add_option.md

@@ -1,512 +0,0 @@
-# Adding New Options to RocksDB Public API
-
-This document provides guidance on how to add new options to RocksDB's public API. There are two main categories of options:
-
-1. **Standard Column Family Options** (Options/DBOptions/AdvancedColumnFamilyOptions)
-2. **BlockBasedTableOptions** (options specific to block-based table format)
-
-## Overview of Files to Modify
-
-### For Standard Column Family Options
-
-| File | Purpose |
-|------|---------|
-| `include/rocksdb/advanced_options.h` | Define the option with documentation |
-| `include/rocksdb/options.h` | Add reference in related option groups if needed |
-| `options/cf_options.h` | Add to `MutableCFOptions` or `ImmutableCFOptions` struct |
-| `options/cf_options.cc` | Register option for serialization/deserialization and logging |
-| `options/options_helper.cc` | Add to `UpdateColumnFamilyOptions()` for mutable options |
-| `options/options_settable_test.cc` | Add to test string for option parsing |
-| `db_stress_tool/db_stress_common.h` | Declare gflag |
-| `db_stress_tool/db_stress_gflags.cc` | Define gflag with default value |
-| `db_stress_tool/db_stress_test_base.cc` | Apply flag to options |
-| `tools/db_bench_tool.cc` | Add flag definition and apply to options |
-| `tools/db_crashtest.py` | Add randomized values for stress testing |
-| `unreleased_history/new_features/` | Add release note markdown file |
-
-### For BlockBasedTableOptions
-
-| File | Purpose |
-|------|---------|
-| `include/rocksdb/table.h` | Define the option in `BlockBasedTableOptions` struct |
-| `table/block_based/block_based_table_factory.cc` | Register for serialization, validation, and printing |
-| `options/options_settable_test.cc` | Add to `BlockBasedTableOptionsAllFieldsSettable` test |
-| `options/options_test.cc` | Add to `MutableCFOptions` test if applicable |
-| `db_stress_tool/db_stress_common.h` | Declare gflag |
-| `db_stress_tool/db_stress_gflags.cc` | Define gflag |
-| `db_stress_tool/db_stress_test_base.cc` | Apply flag to `block_based_options` |
-| `tools/db_bench_tool.cc` | Add flag definition and apply to `block_based_options` |
-| `tools/db_crashtest.py` | Add randomized values |
-| `java/src/main/java/org/rocksdb/BlockBasedTableConfig.java` | Java API |
-| `java/rocksjni/portal.h` | JNI portal for Java bindings |
-| `java/rocksjni/table.cc` | JNI implementation |
-| `java/src/test/java/org/rocksdb/BlockBasedTableConfigTest.java` | Java unit test |
-
----
-
-## Pattern 1: Adding a Standard Column Family Option
-
-Example reference: commit `94e65a2e0b4f817aa4bfa4c96cdf867e7980d7bc` (memtable_veirfy_per_key_checksum_on_seek)
-
-### Step 1: Define the Option in Public Header
-
-**File: `include/rocksdb/advanced_options.h`**
-
-Add the option with documentation in `AdvancedColumnFamilyOptions` struct:
-
-```cpp
-// Enables additional integrity checks during seek.
-// Specifically, for skiplist-based memtables, key checksum validation could
-// be enabled during seek optionally. This is helpful to detect corrupted
-// memtable keys during reads. Enabling this feature incurs a performance
-// overhead due to additional key checksum validation during memtable seek
-// operation.
-// This option depends on memtable_protection_bytes_per_key to be non zero.
-// If memtable_protection_bytes_per_key is zero, no validation is performed.
-bool memtable_veirfy_per_key_checksum_on_seek = false;
-```
-
-### Step 2: Add to Internal Options Structs
-
-**File: `options/cf_options.h`**
-
-Add to `MutableCFOptions` struct (or `ImmutableCFOptions` for immutable options):
-
-```cpp
-// In MutableCFOptions constructor from Options:
-memtable_veirfy_per_key_checksum_on_seek(
-    options.memtable_veirfy_per_key_checksum_on_seek),
-
-// In MutableCFOptions default constructor:
-memtable_veirfy_per_key_checksum_on_seek(false),
-
-// In MutableCFOptions struct member declarations:
-bool memtable_veirfy_per_key_checksum_on_seek;
-```
-
-### Step 3: Register for Serialization/Deserialization
-
-**File: `options/cf_options.cc`**
-
-Add to the options type info map for serialization:
-
-```cpp
-{"memtable_veirfy_per_key_checksum_on_seek",
- {offsetof(struct MutableCFOptions,
-           memtable_veirfy_per_key_checksum_on_seek),
-  OptionType::kBoolean, OptionVerificationType::kNormal,
-  OptionTypeFlags::kMutable}},
-```
-
-Add logging in `MutableCFOptions::Dump()`:
-
-```cpp
-ROCKS_LOG_INFO(log, "memtable_veirfy_per_key_checksum_on_seek: %d",
-               memtable_veirfy_per_key_checksum_on_seek);
-```
-
-### Step 4: Update Options Helper
-
-**File: `options/options_helper.cc`**
-
-Add to `UpdateColumnFamilyOptions()`:
-
-```cpp
-cf_opts->memtable_veirfy_per_key_checksum_on_seek =
-    moptions.memtable_veirfy_per_key_checksum_on_seek;
-```
-
-### Step 5: Add to Options Settable Test
-
-**File: `options/options_settable_test.cc`**
-
-Add to the test string in `ColumnFamilyOptionsAllFieldsSettable`:
-
-```cpp
-"memtable_veirfy_per_key_checksum_on_seek=1;"
-```
-
-### Step 6: Add db_stress Support
-
-**File: `db_stress_tool/db_stress_common.h`**
-
-```cpp
-DECLARE_bool(memtable_veirfy_per_key_checksum_on_seek);
-```
-
-**File: `db_stress_tool/db_stress_gflags.cc`**
-
-```cpp
-DEFINE_bool(
-    memtable_veirfy_per_key_checksum_on_seek,
-    ROCKSDB_NAMESPACE::Options().memtable_veirfy_per_key_checksum_on_seek,
-    "Sets CF option memtable_veirfy_per_key_checksum_on_seek.");
-```
-
-**File: `db_stress_tool/db_stress_test_base.cc`**
-
-```cpp
-options.memtable_veirfy_per_key_checksum_on_seek =
-    FLAGS_memtable_veirfy_per_key_checksum_on_seek;
-```
-
-### Step 7: Add db_bench Support
-
-**File: `tools/db_bench_tool.cc`**
-
-```cpp
-// Flag definition (near related flags):
-DEFINE_bool(memtable_veirfy_per_key_checksum_on_seek, false,
-            "Sets CF option memtable_veirfy_per_key_checksum_on_seek");
-
-// Apply flag to options (in InitializeOptionsFromFlags or similar):
-options.memtable_veirfy_per_key_checksum_on_seek =
-    FLAGS_memtable_veirfy_per_key_checksum_on_seek;
-```
-
-### Step 8: Add Crash Test Support
-
-**File: `tools/db_crashtest.py`**
-
-```python
-"memtable_veirfy_per_key_checksum_on_seek": lambda: random.choice([0] * 7 + [1]),
-```
-
-Also add constraint handling in `finalize_and_sanitize()` if needed:
-
-```python
-# only skip list memtable representation supports paranoid memory checks
-if dest_params.get("memtablerep") != "skip_list":
-    dest_params["memtable_veirfy_per_key_checksum_on_seek"] = 0
-```
-
-### Step 9: Add Release Note
-
-**File: `unreleased_history/new_features/<descriptive_name>.md`**
-
-```markdown
-A new flag memtable_veirfy_per_key_checksum_on_seek is added to AdvancedColumnFamilyOptions. When it is enabled, it will validate key checksum along the binary search path on skiplist based memtable during seek operation.
-```
-
----
-
-## Pattern 2: Adding a BlockBasedTableOptions Option
-
-Example reference: commit `742741b175c5f238374c1714f9db3340d49de569` (super_block_alignment_size)
-
-### Step 1: Define the Option in Public Header
-
-**File: `include/rocksdb/table.h`**
-
-Add to `BlockBasedTableOptions` struct with documentation:
-
-```cpp
-// Align data blocks on super block alignment. Avoid a data block split across
-// super block boundaries. Works with/without compression.
-//
-// Here a "super block" refers to an aligned unit of underlying Filesystem
-// storage for which there is an extra cost when a random read involves two
-// such super blocks instead of just one. Configuring that size here suggests
-// inserting padding in the SST file to avoid a single SST block splitting
-// across two super blocks. Only power-of-two sizes are supported. See also
-// super_block_alignment_space_overhead_ratio. Default to 0, which means super
-// block alignment is disabled.
-size_t super_block_alignment_size = 0;
-
-// This option controls the storage space overhead of super block alignment.
-// It is used to calculate the max padding size allowed for super block
-// alignment. It is calculated in this way. If super_block_alignment_size is
-// 2MB, and super_block_alignment_overhead_ratio is 128, then the max padding
-// size allowed for super block alignment is 2MB / 128 = 16KB.
-// Note that, when it is set to 0, super block alignment is disabled.
-size_t super_block_alignment_space_overhead_ratio = 128;
-```
-
-### Step 2: Register for Serialization in Table Factory
-
-**File: `table/block_based/block_based_table_factory.cc`**
-
-Add to the type info map:
-
-```cpp
-{"super_block_alignment_size",
- {offsetof(struct BlockBasedTableOptions, super_block_alignment_size),
-  OptionType::kSizeT, OptionVerificationType::kNormal}},
-{"super_block_alignment_space_overhead_ratio",
- {offsetof(struct BlockBasedTableOptions,
-           super_block_alignment_space_overhead_ratio),
-  OptionType::kSizeT, OptionVerificationType::kNormal}},
-```
-
-Add validation in `ValidateOptions()`:
-
-```cpp
-if ((table_options_.super_block_alignment_size &
-     (table_options_.super_block_alignment_size - 1))) {
-  return Status::InvalidArgument(
-      "Super Block alignment requested but super block alignment size is not "
-      "a power of 2");
-}
-if (table_options_.super_block_alignment_size >
-    std::numeric_limits<uint32_t>::max()) {
-  return Status::InvalidArgument(
-      "Super block alignment size exceeds maximum number (4GiB) allowed");
-}
-```
-
-Add printing in `GetPrintableOptions()`:
-
-```cpp
-snprintf(buffer, kBufferSize,
-         "  super_block_alignment_size: %" ROCKSDB_PRIszt "\n",
-         table_options_.super_block_alignment_size);
-ret.append(buffer);
-```
-
-### Step 3: Add to Options Settable Test
-
-**File: `options/options_settable_test.cc`**
-
-Add to `BlockBasedTableOptionsAllFieldsSettable` test:
-
-```cpp
-"super_block_alignment_size=65536;"
-"super_block_alignment_space_overhead_ratio=4096;"
-```
-
-### Step 4: Add to Options Test
-
-**File: `options/options_test.cc`**
-
-```cpp
-ASSERT_OK(GetColumnFamilyOptionsFromString(
-    config_options, cf_opts,
-    "block_based_table_factory.super_block_alignment_size=65536; "
-    "block_based_table_factory.super_block_alignment_space_overhead_ratio=4096;",
-    &cf_opts));
-ASSERT_EQ(bbto->super_block_alignment_size, 65536);
-ASSERT_EQ(bbto->super_block_alignment_space_overhead_ratio, 4096);
-```
-
-### Step 5: Add db_stress Support
-
-**File: `db_stress_tool/db_stress_common.h`**
-
-```cpp
-DECLARE_uint64(super_block_alignment_size);
-DECLARE_uint64(super_block_alignment_space_overhead_ratio);
-```
-
-**File: `db_stress_tool/db_stress_gflags.cc`**
-
-```cpp
-DEFINE_uint64(
-    super_block_alignment_size,
-    ROCKSDB_NAMESPACE::BlockBasedTableOptions().super_block_alignment_size,
-    "BlockBasedTableOptions.super_block_alignment_size");
-
-DEFINE_uint64(
-    super_block_alignment_space_overhead_ratio,
-    ROCKSDB_NAMESPACE::BlockBasedTableOptions()
-        .super_block_alignment_space_overhead_ratio,
-    "BlockBasedTableOptions.super_block_alignment_space_overhead_ratio");
-```
-
-**File: `db_stress_tool/db_stress_test_base.cc`**
-
-```cpp
-block_based_options.super_block_alignment_size =
-    fLU64::FLAGS_super_block_alignment_size;
-block_based_options.super_block_alignment_space_overhead_ratio =
-    fLU64::FLAGS_super_block_alignment_space_overhead_ratio;
-```
-
-### Step 6: Add db_bench Support
-
-**File: `tools/db_bench_tool.cc`**
-
-```cpp
-// Flag definitions:
-DEFINE_uint64(
-    super_block_alignment_size,
-    ROCKSDB_NAMESPACE::BlockBasedTableOptions().super_block_alignment_size,
-    "Configure super block size");
-
-DEFINE_uint64(super_block_alignment_space_overhead_ratio,
-              ROCKSDB_NAMESPACE::BlockBasedTableOptions()
-                  .super_block_alignment_space_overhead_ratio,
-              "Configure space overhead for super block alignment");
-
-// Apply to block_based_options (in the block where other options are set):
-block_based_options.super_block_alignment_size = FLAGS_super_block_alignment_size;
-block_based_options.super_block_alignment_space_overhead_ratio =
-    FLAGS_super_block_alignment_space_overhead_ratio;
-```
-
-### Step 7: Add Crash Test Support
-
-**File: `tools/db_crashtest.py`**
-
-```python
-"super_block_alignment_size": lambda: random.choice(
-    [0, 128 * 1024, 512 * 1024, 2 * 1024 * 1024]
-),
-"super_block_alignment_space_overhead_ratio": lambda: random.choice([0, 32, 4096]),
-```
-
-### Step 8: Add Java API Support
-
-**File: `java/src/main/java/org/rocksdb/BlockBasedTableConfig.java`**
-
-Add getter and setter methods:
-
-```java
-/**
- * Get the super block alignment size.
- *
- * @return the super block alignment size.
- */
-public long superBlockAlignmentSize() {
-  return superBlockAlignmentSize;
-}
-
-/**
- * Set the super block alignment size.
- * When set to 0, super block alignment is disabled.
- *
- * @param superBlockAlignmentSize the super block alignment size.
- *
- * @return the reference to the current option.
- */
-public BlockBasedTableConfig setSuperBlockAlignmentSize(final long superBlockAlignmentSize) {
-  this.superBlockAlignmentSize = superBlockAlignmentSize;
-  return this;
-}
-```
-
-Add member variable:
-
-```java
-private long superBlockAlignmentSize;
-```
-
-Update constructor and native method signature.
-
-**File: `java/rocksjni/portal.h`**
-
-Update `GetMethodID` signature and add fields to Java object construction.
-
-**File: `java/rocksjni/table.cc`**
-
-Add parameters to JNI function and apply to options.
-
-**File: `java/src/test/java/org/rocksdb/BlockBasedTableConfigTest.java`**
-
-Add unit tests:
-
-```java
-@Test
-public void superBlockAlignmentSize() {
-  final BlockBasedTableConfig blockBasedTableConfig = new BlockBasedTableConfig();
-  blockBasedTableConfig.setSuperBlockAlignmentSize(1024 * 1024);
-  assertThat(blockBasedTableConfig.superBlockAlignmentSize()).isEqualTo(1024 * 1024);
-}
-```
-
----
-
-## Pattern 3: Adding C API for Existing Option
-
-Example reference: commit `429b36c22d76403d275dd0e6877b08d4cea2bc90` (block_align C API)
-
-If an option already exists but needs C API support:
-
-**File: `db/c.cc`**
-
-```cpp
-void rocksdb_block_based_options_set_block_align(
-    rocksdb_block_based_table_options_t* options, unsigned char v) {
-  options->rep.block_align = v;
-}
-```
-
-**File: `include/rocksdb/c.h`**
-
-```cpp
-extern ROCKSDB_LIBRARY_API void rocksdb_block_based_options_set_block_align(
-    rocksdb_block_based_table_options_t*, unsigned char);
-```
-
----
-
-## Unit Testing Guidelines
-
-### For Standard Options
-
-Add tests in appropriate test files (e.g., `db/db_memtable_test.cc`, `db/db_options_test.cc`):
-
-```cpp
-TEST_F(DBMemTableTest, YourOptionTest) {
-  Options options;
-  options.your_new_option = true;
-  Reopen(options);
-  // Test the behavior
-}
-```
-
-### For BlockBasedTableOptions
-
-Add tests in `db/db_flush_test.cc`, `table/block_based/block_based_table_reader_test.cc`, or `table/table_test.cc`:
-
-```cpp
-TEST_P(DBFlushYourFeatureTest, YourFeature) {
-  Options options;
-  BlockBasedTableOptions block_options;
-  block_options.your_new_option = some_value;
-  options.table_factory.reset(NewBlockBasedTableFactory(block_options));
-
-  ASSERT_OK(options.table_factory->ValidateOptions(
-      DBOptions(options), ColumnFamilyOptions(options)));
-
-  Reopen(options);
-  // Test the behavior
-}
-```
-
----
-
-## Option Type Reference
-
-Common option types used in serialization:
-
-| OptionType | C++ Type | Example |
-|------------|----------|---------|
-| `kBoolean` | `bool` | `paranoid_memory_checks` |
-| `kInt` | `int` | `max_write_buffer_number` |
-| `kInt32T` | `int32_t` | `level0_file_num_compaction_trigger` |
-| `kUInt32T` | `uint32_t` | `memtable_protection_bytes_per_key` |
-| `kUInt64T` | `uint64_t` | `target_file_size_base` |
-| `kSizeT` | `size_t` | `block_size` |
-| `kDouble` | `double` | `compression_ratio` |
-| `kString` | `std::string` | `db_log_dir` |
-
----
-
-## Checklist Summary
-
-- [ ] Public header file with option definition and documentation
-- [ ] Internal options struct (MutableCFOptions or ImmutableCFOptions)
-- [ ] Options serialization/deserialization registration
-- [ ] Options logging in Dump() method
-- [ ] UpdateColumnFamilyOptions() for mutable options
-- [ ] options_settable_test.cc
-- [ ] db_stress_common.h (DECLARE)
-- [ ] db_stress_gflags.cc (DEFINE)
-- [ ] db_stress_test_base.cc (apply flag)
-- [ ] db_bench_tool.cc (DEFINE and apply)
-- [ ] db_crashtest.py (randomized values)
-- [ ] Unit tests
-- [ ] unreleased_history markdown file
-- [ ] Java API (for BlockBasedTableOptions)
-- [ ] C API (if needed)
-

claude_md/add_public_api.md

@@ -1,504 +0,0 @@
-# RocksDB API Development Guide
-
-This document provides guidance for adding new public APIs to RocksDB, following the established patterns used by existing APIs like `CompactRange`.
-
-## API Layer Architecture
-
-RocksDB exposes public APIs through multiple layers. Users can access RocksDB through any of the three public APIs: C++ headers, C headers, or Java bindings.
-
-Here is an example for public header db.h:
-
-```
-┌─────────────────────────────────────────────────────────────────────────────┐
-│                     Level 1: Public APIs (User Entry Points)                │
-├───────────────────────┬─────────────────────────┬───────────────────────────┤
-│   C++ Public API      │     C API Bindings      │       Java/JNI API        │
-│ include/rocksdb/db.h  │   include/rocksdb/c.h   │ java/src/.../RocksDB.java │
-│ include/rocksdb/*.h   │                         │ java/src/.../*.java       │
-└───────────────────────┴────────────┬────────────┴───────────────────────────┘
-                                     ↓
-┌─────────────────────────────────────────────────────────────────────────────┐
-│              Level 2: C++ Implementation (Internal Core)                    │
-│              db/db_impl/db_impl*.cc, db/c.cc, java/rocksjni/*.cc            │
-└─────────────────────────────────────────────────────────────────────────────┘
-```
-
-## Step-by-Step Guide: Adding a New Public API
-
-### Step 1: Define the C++ Public Interface
-
-**File:** `include/rocksdb/db.h`
-
-Add the virtual method declaration in the `DB` class:
-
-\`\`\`cpp
-// Pure virtual - must be implemented by DBImpl
-virtual Status YourNewAPI(const YourAPIOptions& options,
-                          ColumnFamilyHandle* column_family,
-                          /* other params */) = 0;
-
-// Convenience overload for default column family
-virtual Status YourNewAPI(const YourAPIOptions& options,
-                          /* other params */) {
-  return YourNewAPI(options, DefaultColumnFamily(), /* other params */);
-}
-\`\`\`
-
-**Key Patterns:**
-- Use `Status` return type for error handling
-- Use `OptSlice` to avoid unnecessary levels of indirection and use of raw pointers.
-- Use `ColumnFamilyHandle*` for column family support
-- Provide convenience overloads for the default column family
-
-### Step 2: Define Options Struct (If Needed)
-
-**File:** `include/rocksdb/options.h`
-
-If your API has multiple configuration options, define an options struct:
-
-\`\`\`cpp
-struct YourAPIOptions {
-  // Document each option with clear comments
-  bool some_boolean_option = false;
-
-  // Default value explanation
-  int some_int_option = -1;
-
-  // Pointer options require careful lifetime management
-  std::atomic<bool>* canceled = nullptr;
-
-  // Enum options for multi-choice settings
-  YourEnumType some_enum = YourEnumType::kDefault;
-};
-\`\`\`
-
-**Key Patterns:**
-- Use sensible default values specified inline (e.g., `= false`, `= -1`)
-- Do NOT redundantly document the default value in comments; instead, document the rationale (why this default), historical context, and how different values are interpreted
-- Group related options logically
-- Consider thread-safety for pointer options
-
-### Step 3: Implement in DBImpl
-
-**Header:** `db/db_impl/db_impl.h`
-
-\`\`\`cpp
-using DB::YourNewAPI;
-Status YourNewAPI(const YourAPIOptions& options,
-                  ColumnFamilyHandle* column_family,
-                  /* other params */) override;
-
-// Private internal implementation if needed
-Status YourNewAPIInternal(const YourAPIOptions& options,
-                          ColumnFamilyHandle* column_family,
-                          /* other params */);
-\`\`\`
-
-**Implementation:** `db/db_impl/db_impl_<category>.cc`
-
-Choose the appropriate implementation file based on functionality:
-- `db_impl_compaction_flush.cc` - Compaction and flush operations
-- `db_impl_write.cc` - Write operations
-- `db_impl_open.cc` - DB opening/closing
-- `db_impl_files.cc` - File operations
-- `db_impl.cc` - General operations
-
-\`\`\`cpp
-Status DBImpl::YourNewAPI(const YourAPIOptions& options,
-                          ColumnFamilyHandle* column_family,
-                          /* other params */) {
-  // 1. Input validation
-  if (/* invalid input */) {
-    return Status::InvalidArgument("Error message");
-  }
-
-  // 2. Check for cancellation/abort conditions
-  if (options.canceled && options.canceled->load(std::memory_order_acquire)) {
-    return Status::Incomplete(Status::SubCode::kManualCompactionPaused);
-  }
-
-  // 3. Get column family data
-  auto cfh = static_cast<ColumnFamilyHandleImpl*>(column_family);
-  auto cfd = cfh->cfd();
-
-  // 4. Core implementation logic
-  // ...
-
-  return Status::OK();
-}
-\`\`\`
-
-### Step 4: Handle Special DB Types
-
-**StackableDB (Wrapper DBs):**
-**File:** `include/rocksdb/utilities/stackable_db.h`
-
-\`\`\`cpp
-using DB::YourNewAPI;
-Status YourNewAPI(const YourAPIOptions& options,
-                  ColumnFamilyHandle* column_family,
-                  /* other params */) override {
-  return db_->YourNewAPI(options, column_family, /* other params */);
-}
-\`\`\`
-
-**Secondary DB (Read-Only):**
-**File:** `db/db_impl/db_impl_secondary.h`
-
-\`\`\`cpp
-using DBImpl::YourNewAPI;
-Status YourNewAPI(const YourAPIOptions& /*options*/,
-                  ColumnFamilyHandle* /*column_family*/,
-                  /* other params */) override {
-  return Status::NotSupported("Not supported in secondary DB");
-}
-\`\`\`
-
-**CompactedDB (Read-Only):**
-**File:** `db/db_impl/compacted_db_impl.h`
-
-\`\`\`cpp
-using DBImpl::YourNewAPI;
-Status YourNewAPI(const YourAPIOptions& /*options*/,
-                  ColumnFamilyHandle* /*column_family*/,
-                  /* other params */) override {
-  return Status::NotSupported("Not supported for read-only DB");
-}
-\`\`\`
-
-### Step 5: Add C API Bindings
-
-**Header:** `include/rocksdb/c.h`
-
-\`\`\`c
-// Basic version
-extern ROCKSDB_LIBRARY_API void rocksdb_your_new_api(
-    rocksdb_t* db,
-    const char* start_key, size_t start_key_len,
-    const char* limit_key, size_t limit_key_len);
-
-// Column family version
-extern ROCKSDB_LIBRARY_API void rocksdb_your_new_api_cf(
-    rocksdb_t* db, rocksdb_column_family_handle_t* column_family,
-    const char* start_key, size_t start_key_len,
-    const char* limit_key, size_t limit_key_len);
-
-// With options and error handling
-extern ROCKSDB_LIBRARY_API void rocksdb_your_new_api_opt(
-    rocksdb_t* db, rocksdb_your_api_options_t* opt,
-    const char* start_key, size_t start_key_len,
-    const char* limit_key, size_t limit_key_len,
-    char** errptr);
-\`\`\`
-
-**Implementation:** `db/c.cc`
-
-\`\`\`cpp
-void rocksdb_your_new_api(rocksdb_t* db, const char* start_key,
-                          size_t start_key_len, const char* limit_key,
-                          size_t limit_key_len) {
-  Slice a, b;
-  db->rep->YourNewAPI(
-      YourAPIOptions(),  // Default options
-      (start_key ? (a = Slice(start_key, start_key_len), &a) : nullptr),
-      (limit_key ? (b = Slice(limit_key, limit_key_len), &b) : nullptr));
-}
-
-void rocksdb_your_new_api_cf(rocksdb_t* db,
-                             rocksdb_column_family_handle_t* column_family,
-                             const char* start_key, size_t start_key_len,
-                             const char* limit_key, size_t limit_key_len) {
-  Slice a, b;
-  db->rep->YourNewAPI(
-      YourAPIOptions(),
-      column_family->rep,
-      (start_key ? (a = Slice(start_key, start_key_len), &a) : nullptr),
-      (limit_key ? (b = Slice(limit_key, limit_key_len), &b) : nullptr));
-}
-\`\`\`
-
-**If you have options, also add:**
-
-\`\`\`cpp
-// Options struct wrapper
-struct rocksdb_your_api_options_t {
-  YourAPIOptions rep;
-};
-
-rocksdb_your_api_options_t* rocksdb_your_api_options_create() {
-  return new rocksdb_your_api_options_t;
-}
-
-void rocksdb_your_api_options_destroy(rocksdb_your_api_options_t* opt) {
-  delete opt;
-}
-
-void rocksdb_your_api_options_set_some_option(
-    rocksdb_your_api_options_t* opt, unsigned char value) {
-  opt->rep.some_boolean_option = value;
-}
-\`\`\`
-
-### Step 6: Add Java Bindings
-
-**Java API:** `java/src/main/java/org/rocksdb/RocksDB.java`
-
-\`\`\`java
-// Basic version
-public void yourNewAPI() throws RocksDBException {
-  yourNewAPI(null);
-}
-
-// Column family version
-public void yourNewAPI(ColumnFamilyHandle columnFamilyHandle)
-    throws RocksDBException {
-  yourNewAPI(nativeHandle_, null, -1, null, -1, 0,
-      columnFamilyHandle == null ? 0 : columnFamilyHandle.nativeHandle_);
-}
-
-// Range version
-public void yourNewAPI(final byte[] begin, final byte[] end)
-    throws RocksDBException {
-  yourNewAPI(null, begin, end);
-}
-
-// Full-featured version with options
-public void yourNewAPI(ColumnFamilyHandle columnFamilyHandle,
-                       final byte[] begin, final byte[] end,
-                       final YourAPIOptions options)
-    throws RocksDBException {
-  yourNewAPI(nativeHandle_,
-      begin, begin == null ? -1 : begin.length,
-      end, end == null ? -1 : end.length,
-      options.nativeHandle_,
-      columnFamilyHandle == null ? 0 : columnFamilyHandle.nativeHandle_);
-}
-
-// Native method declaration
-private static native void yourNewAPI(final long handle,
-    /* @Nullable */ final byte[] begin, final int beginLen,
-    /* @Nullable */ final byte[] end, final int endLen,
-    final long optionsHandle,
-    final long cfHandle);
-\`\`\`
-
-**Options Class:** `java/src/main/java/org/rocksdb/YourAPIOptions.java`
-
-\`\`\`java
-public class YourAPIOptions extends RocksObject {
-
-  public YourAPIOptions() {
-    super(newYourAPIOptions());
-  }
-
-  // Builder pattern setters
-  public YourAPIOptions setSomeBooleanOption(boolean value) {
-    setSomeBooleanOption(nativeHandle_, value);
-    return this;
-  }
-
-  // Getters
-  public boolean someBooleanOption() {
-    return someBooleanOption(nativeHandle_);
-  }
-
-  // Native method declarations
-  private static native long newYourAPIOptions();
-  private static native void disposeInternalJni(long handle);
-  private static native void setSomeBooleanOption(long handle, boolean value);
-  private static native boolean someBooleanOption(long handle);
-
-  @Override
-  protected final void disposeInternal(final long handle) {
-    disposeInternalJni(handle);
-  }
-}
-\`\`\`
-
-**JNI Implementation:** `java/rocksjni/rocksjni.cc`
-
-\`\`\`cpp
-void Java_org_rocksdb_RocksDB_yourNewAPI(
-    JNIEnv* env, jclass,
-    jlong jdb_handle, jbyteArray jbegin, jint jbegin_len,
-    jbyteArray jend, jint jend_len,
-    jlong joptions_handle, jlong jcf_handle) {
-
-  // 1. Convert Java byte arrays to C++ strings
-  jboolean has_exception = JNI_FALSE;
-  std::string str_begin;
-  if (jbegin_len > 0) {
-    str_begin = ROCKSDB_NAMESPACE::JniUtil::byteString<std::string>(
-        env, jbegin, jbegin_len,
-        [](const char* str, const size_t len) { return std::string(str, len); },
-        &has_exception);
-    if (has_exception == JNI_TRUE) return;
-  }
-
-  std::string str_end;
-  if (jend_len > 0) {
-    str_end = ROCKSDB_NAMESPACE::JniUtil::byteString<std::string>(
-        env, jend, jend_len,
-        [](const char* str, const size_t len) { return std::string(str, len); },
-        &has_exception);
-    if (has_exception == JNI_TRUE) return;
-  }
-
-  // 2. Get or create options
-  ROCKSDB_NAMESPACE::YourAPIOptions* options = nullptr;
-  if (joptions_handle == 0) {
-    options = new ROCKSDB_NAMESPACE::YourAPIOptions();
-  } else {
-    options = reinterpret_cast<ROCKSDB_NAMESPACE::YourAPIOptions*>(joptions_handle);
-  }
-
-  // 3. Unwrap handles
-  auto* db = reinterpret_cast<ROCKSDB_NAMESPACE::DB*>(jdb_handle);
-  ROCKSDB_NAMESPACE::ColumnFamilyHandle* cf_handle =
-      jcf_handle == 0 ? db->DefaultColumnFamily()
-                      : reinterpret_cast<ROCKSDB_NAMESPACE::ColumnFamilyHandle*>(jcf_handle);
-
-  // 4. Create Slices
-  std::unique_ptr<ROCKSDB_NAMESPACE::Slice> begin;
-  std::unique_ptr<ROCKSDB_NAMESPACE::Slice> end;
-  if (jbegin_len > 0) begin.reset(new ROCKSDB_NAMESPACE::Slice(str_begin));
-  if (jend_len > 0) end.reset(new ROCKSDB_NAMESPACE::Slice(str_end));
-
-  // 5. Call C++ API
-  ROCKSDB_NAMESPACE::Status s = db->YourNewAPI(*options, cf_handle, begin.get(), end.get());
-
-  // 6. Cleanup if we created options
-  if (joptions_handle == 0) delete options;
-
-  // 7. Throw Java exception on error
-  ROCKSDB_NAMESPACE::RocksDBExceptionJni::ThrowNew(env, s);
-}
-\`\`\`
-
-**Options JNI:** `java/rocksjni/your_api_options.cc`
-
-\`\`\`cpp
-jlong Java_org_rocksdb_YourAPIOptions_newYourAPIOptions(JNIEnv*, jclass) {
-  auto* options = new ROCKSDB_NAMESPACE::YourAPIOptions();
-  return GET_CPLUSPLUS_POINTER(options);
-}
-
-void Java_org_rocksdb_YourAPIOptions_disposeInternalJni(JNIEnv*, jclass, jlong jhandle) {
-  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::YourAPIOptions*>(jhandle);
-  delete options;
-}
-
-void Java_org_rocksdb_YourAPIOptions_setSomeBooleanOption(
-    JNIEnv*, jclass, jlong jhandle, jboolean value) {
-  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::YourAPIOptions*>(jhandle);
-  options->some_boolean_option = static_cast<bool>(value);
-}
-
-jboolean Java_org_rocksdb_YourAPIOptions_someBooleanOption(JNIEnv*, jclass, jlong jhandle) {
-  auto* options = reinterpret_cast<ROCKSDB_NAMESPACE::YourAPIOptions*>(jhandle);
-  return static_cast<jboolean>(options->some_boolean_option);
-}
-\`\`\`
-
-### Step 7: Update Build Files
-
-**Java CMakeLists.txt:** `java/CMakeLists.txt`
-
-Add your new Java source files:
-\`\`\`cmake
-src/main/java/org/rocksdb/YourAPIOptions.java
-src/test/java/org/rocksdb/YourAPIOptionsTest.java
-\`\`\`
-
-### Step 8: Add Release Notes
-
-**Directory:** `unreleased_history/`
-
-RocksDB uses individual files in the `unreleased_history/` directory rather than directly editing `HISTORY.md`. This avoids merge conflicts and ensures changes are attributed to the correct release version.
-
-Add a file to the appropriate subdirectory:
-- `unreleased_history/new_features/` - For new functionality
-- `unreleased_history/public_api_changes/` - For API changes
-- `unreleased_history/behavior_changes/` - For behavior modifications
-- `unreleased_history/bug_fixes/` - For bug fixes
-
-**Example:** `unreleased_history/new_features/your_new_api.md`
-
-\`\`\`markdown
-Added `YourNewAPI()` to support [describe functionality]. See `YourAPIOptions` for configuration.
-\`\`\`
-
-**Example:** `unreleased_history/public_api_changes/your_api_options.md`
-
-**Note:** Files should contain one line of markdown. The "* " prefix is automatically added if not included. These files are compiled into `HISTORY.md` during the release process.
-
-### Step 9: Add Tests
-
-**C++ Unit Tests:** `db/db_your_api_test.cc` or add to existing test file
-
-\`\`\`cpp
-TEST_F(DBTest, YourNewAPIBasic) {
-  Options options = CurrentOptions();
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  // Setup test data
-  ASSERT_OK(Put(1, "key1", "value1"));
-  ASSERT_OK(Put(1, "key2", "value2"));
-
-  // Test your API
-  YourAPIOptions api_options;
-  api_options.some_boolean_option = true;
-  ASSERT_OK(db_->YourNewAPI(api_options, handles_[1], nullptr, nullptr));
-
-  // Verify results
-  // ...
-}
-\`\`\`
-
-**Java Tests:** `java/src/test/java/org/rocksdb/YourAPIOptionsTest.java`
-
-\`\`\`java
-public class YourAPIOptionsTest {
-  @Test
-  public void yourAPIOptions() {
-    try (final YourAPIOptions options = new YourAPIOptions()) {
-      assertFalse(options.someBooleanOption());
-      options.setSomeBooleanOption(true);
-      assertTrue(options.someBooleanOption());
-    }
-  }
-}
-\`\`\`
-
-## File Summary Checklist
-
-
-| Component | File(s) | Required |
-|-----------|---------|----------|
-| C++ Public Interface | `include/rocksdb/db.h` | ✓ |
-| Options Struct | `include/rocksdb/options.h` | If needed |
-| DBImpl Declaration | `db/db_impl/db_impl.h` | ✓ |
-| DBImpl Implementation | `db/db_impl/db_impl_*.cc` | ✓ |
-| 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 | `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` | ✓ |
-| JNI Options | `java/rocksjni/your_api_options.cc` | If needed |
-| Java CMake | `java/CMakeLists.txt` | If new files |
-| Changelog | `unreleased_history/*.md` | ✓ |
-| C++ Tests | `db/db_*_test.cc` | ✓ |
-| Java Tests | `java/src/test/java/org/rocksdb/*Test.java` | ✓ |
-
-## Best Practices
-
-1. **Error Handling**: Always return `Status` objects in C++, throw exceptions in Java
-2. **Default Values**: Provide sensible defaults for all options
-3. **Documentation**: Add clear comments for all public methods and options
-4. **Column Family Support**: Always support column family operations
-5. **Thread Safety**: Document thread-safety guarantees
-6. **Backward Compatibility**: Avoid breaking existing API contracts
-7. **Testing**: Add comprehensive unit tests for all code paths

claude_md/code_review.md

@@ -1,104 +0,0 @@
-# Code Review Skill
-
-This document defines the methodology for performing thorough, multi-perspective
-code reviews on RocksDB changes. It is used both by CI (GitHub Actions) and
-local review workflows.
-
-## Prerequisites
-
-Before starting a review:
-- Read `CLAUDE.md` in the repository root for project-specific guidelines
-- Read any files in `claude_md/` for architecture context
-- Identify the commit/diff/PR to review and parse the changed files
-
-## Review Methodology
-
-Conduct the review from multiple perspectives, then synthesize findings into a
-single report. Each perspective catches different classes of bugs.
-
-### Perspective 1: Codebase Context & Call-Chain Analysis
-
-Before reviewing the diff itself, build deep context:
-- For each changed function/method, trace the call chain UPWARD 3-5 levels.
-  Who consumes the changed behavior? What invariants do callers rely on?
-- Trace DOWNWARD into callees. What side effects do they have? What shared
-  state do they mutate (counters, sequence numbers, flags, metadata)?
-- Identify the "sibling" or "reference" implementation that handles the same
-  scenario the standard way. Compare behaviors.
-- For data written to shared structures (memtable, SST block, cache entry),
-  find ALL readers and verify their visibility rules match the writer.
-
-### Perspective 2: Correctness & Edge Cases
-
-- Thread safety and concurrency (lock ordering, data races)
-- Error handling and Status propagation
-- Edge cases: empty inputs, overflow, boundary conditions
-- Data corruption scenarios
-- Behavioral contract changes: do return value semantics match callers?
-
-### Perspective 3: Cross-Component & Adversarial Analysis
-
-Check the change in ALL execution contexts:
-
-| Context | Key difference |
-|---------|---------------|
-| WritePreparedTxnDB | read_callback_ controls visibility |
-| ReadOnly DB / SecondaryInstance | No mutable memtable |
-| CompactionService / Remote compaction | Different process |
-| User-defined timestamps | Extra key comparison dimension |
-| MemPurge | Memtable-to-memtable path |
-| BlobDB | Values in blob files, not inline |
-| Old snapshots | Seqno far behind current |
-| Concurrent writers | Lock-free vs locked paths |
-| FIFO / Universal compaction | Different invariants |
-| Prefix seek / total order seek | Different iterator behavior |
-
-When the change claims a property ("logically redundant", "safe because X"),
-systematically try to break it: list preconditions, construct counterexamples.
-
-### Perspective 4: Performance
-
-RocksDB is a high-performance storage engine.
-- Memory allocation on hot paths
-- Unnecessary copies (prefer move semantics, Slice, string_view)
-- Cache efficiency and data locality
-- Loop optimization, branch prediction (LIKELY/UNLIKELY)
-
-### Perspective 5: API, Compatibility & Testing
-
-- Public API backwards compatibility
-- Serialization format correctness and versioning
-- Test coverage for edge cases, failure modes, and system-level interactions
-
-## How to Explore the Codebase
-
-Use available tools to explore deeply — do NOT just review the diff in isolation.
-The most critical bugs hide at component boundaries.
-
-- Read the header files for changed implementations
-- Search for callers of changed functions (3-5 levels up)
-- Read existing tests to understand guaranteed behaviors
-- Check related implementations for conventions and patterns
-
-## Output Format
-
-### Summary
-Brief overall assessment (1-2 sentences).
-
-### Issues Found
-Categorize by severity:
-- :red_circle: **Critical**: Must fix (correctness, data corruption, security)
-- :yellow_circle: **Suggestion**: Should consider (performance, edge cases)
-- :green_circle: **Nitpick**: Minor style issues
-
-For each issue include:
-- File and line reference
-- Which review perspective found it
-- Description with root cause analysis
-- Suggested fix
-
-### Cross-Component Analysis
-Execution context checks and assumption stress-test results.
-
-### Positive Observations
-Good patterns, clever optimizations, or improvements.

claude_md/remove_option.md

@@ -1,7 +0,0 @@
-# Removing Deprecated Options from RocksDB
-### Keep in these files:
-- [ ] **KEEP** entry in type_info (`options/cf_options.cc` or `options/db_options.cc`) with `OptionVerificationType::kDeprecated` for loading old option files
-- [ ] **KEEP** or add test in `options/options_test.cc` `OptionsOldApiTest::GetOptionsFromMapTest` for loading old option files
-
-### Documentation:
-- [ ] Add release note to `HISTORY.md` and `unreleased_history/`

crash_test.mk

@@ -8,7 +8,7 @@ DB_STRESS_CMD?=./db_stress
 include common.mk
 
 CRASHTEST_MAKE=$(MAKE) -f crash_test.mk
-CRASHTEST_PY=$(PYTHON) -u tools/db_crashtest.py --stress_cmd=$(DB_STRESS_CMD) --cleanup_cmd='$(DB_CLEANUP_CMD)' --destroy_db_initially=1
+CRASHTEST_PY=$(PYTHON) -u tools/db_crashtest.py --stress_cmd=$(DB_STRESS_CMD) --cleanup_cmd='$(DB_CLEANUP_CMD)'
 
 .PHONY: crash_test crash_test_with_atomic_flush crash_test_with_txn \
 	crash_test_with_wc_txn crash_test_with_wp_txn crash_test_with_wup_txn \
@@ -34,7 +34,6 @@ CRASHTEST_PY=$(PYTHON) -u tools/db_crashtest.py --stress_cmd=$(DB_STRESS_CMD) --
 	whitebox_crash_test_with_txn whitebox_crash_test_with_ts \
 	whitebox_crash_test_with_optimistic_txn \
 	whitebox_crash_test_with_tiered_storage \
-	crash_test_db_cleanup \
 
 crash_test: $(DB_STRESS_CMD)
 # Do not parallelize
@@ -162,9 +161,6 @@ whitebox_crash_test_with_optimistic_txn: $(DB_STRESS_CMD)
 	$(CRASHTEST_PY) --optimistic_txn whitebox --random_kill_odd \
       $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
 
-crash_test_db_cleanup: $(DB_STRESS_CMD)
-	$(DB_STRESS_CMD) --delete_dir_and_exit=$(TEST_TMPDIR)
-
 # Old names DEPRECATED
 crash_test_with_txn: crash_test_with_wc_txn
 whitebox_crash_test_with_txn: whitebox_crash_test_with_wc_txn

db/blob/blob_file_builder.cc

@@ -67,16 +67,6 @@ BlobFileBuilder::BlobFileBuilder(
       min_blob_size_(mutable_cf_options->min_blob_size),
       blob_file_size_(mutable_cf_options->blob_file_size),
       blob_compression_type_(mutable_cf_options->blob_compression_type),
-      // TODO: support most CompressionOptions with a new CF option
-      // blob_compression_opts
-      // TODO with schema change: support custom compression manager and options
-      // such as max_compressed_bytes_per_kb
-      // NOTE: returns nullptr for kNoCompression
-      blob_compressor_(GetBuiltinV2CompressionManager()->GetCompressor(
-          CompressionOptions{}, blob_compression_type_)),
-      blob_compressor_wa_(blob_compressor_
-                              ? blob_compressor_->ObtainWorkingArea()
-                              : Compressor::ManagedWorkingArea{}),
       prepopulate_blob_cache_(mutable_cf_options->prepopulate_blob_cache),
       file_options_(file_options),
       write_options_(write_options),
@@ -123,7 +113,7 @@ Status BlobFileBuilder::Add(const Slice& key, const Slice& value,
   }
 
   Slice blob = value;
-  GrowableBuffer compressed_blob;
+  std::string compressed_blob;
 
   {
     const Status s = CompressBlobIfNeeded(&blob, &compressed_blob);
@@ -264,27 +254,36 @@ Status BlobFileBuilder::OpenBlobFileIfNeeded() {
 }
 
 Status BlobFileBuilder::CompressBlobIfNeeded(
-    Slice* blob, GrowableBuffer* compressed_blob) const {
+    Slice* blob, std::string* compressed_blob) const {
   assert(blob);
   assert(compressed_blob);
   assert(compressed_blob->empty());
   assert(immutable_options_);
 
-  if (!blob_compressor_) {
-    assert(blob_compression_type_ == kNoCompression);
+  if (blob_compression_type_ == kNoCompression) {
     return Status::OK();
   }
-  assert(blob_compression_type_ != kNoCompression);
 
-  // WART: always stored as compressed even when that increases the size.
+  // TODO: allow user CompressionOptions, including max_compressed_bytes_per_kb
+  CompressionOptions opts;
+  CompressionContext context(blob_compression_type_, opts);
 
-  Status s;
-  StopWatch stop_watch(immutable_options_->clock, immutable_options_->stats,
-                       BLOB_DB_COMPRESSION_MICROS);
-  s = LegacyForceBuiltinCompression(*blob_compressor_, &blob_compressor_wa_,
-                                    *blob, compressed_blob);
-  if (!s.ok()) {
-    return s;
+  CompressionInfo info(opts, context, CompressionDict::GetEmptyDict(),
+                       blob_compression_type_);
+
+  constexpr uint32_t compression_format_version = 2;
+
+  bool success = false;
+
+  {
+    StopWatch stop_watch(immutable_options_->clock, immutable_options_->stats,
+                         BLOB_DB_COMPRESSION_MICROS);
+    success = OLD_CompressData(*blob, info, compression_format_version,
+                               compressed_blob);
+  }
+
+  if (!success) {
+    return Status::Corruption("Error compressing blob");
   }
 
   *blob = Slice(*compressed_blob);

db/blob/blob_file_builder.h

@@ -10,14 +10,12 @@
 #include <string>
 #include <vector>
 
-#include "rocksdb/advanced_compression.h"
 #include "rocksdb/advanced_options.h"
 #include "rocksdb/compression_type.h"
 #include "rocksdb/env.h"
 #include "rocksdb/options.h"
 #include "rocksdb/rocksdb_namespace.h"
 #include "rocksdb/types.h"
-#include "util/aligned_buffer.h"
 
 namespace ROCKSDB_NAMESPACE {
 
@@ -78,8 +76,7 @@ class BlobFileBuilder {
  private:
   bool IsBlobFileOpen() const;
   Status OpenBlobFileIfNeeded();
-  Status CompressBlobIfNeeded(Slice* blob,
-                              GrowableBuffer* compressed_blob) const;
+  Status CompressBlobIfNeeded(Slice* blob, std::string* compressed_blob) const;
   Status WriteBlobToFile(const Slice& key, const Slice& blob,
                          uint64_t* blob_file_number, uint64_t* blob_offset);
   Status CloseBlobFile();
@@ -94,8 +91,6 @@ class BlobFileBuilder {
   uint64_t min_blob_size_;
   uint64_t blob_file_size_;
   CompressionType blob_compression_type_;
-  std::unique_ptr<Compressor> blob_compressor_;
-  mutable Compressor::ManagedWorkingArea blob_compressor_wa_;
   PrepopulateBlobCache prepopulate_blob_cache_;
   const FileOptions* file_options_;
   const WriteOptions* write_options_;

db/blob/blob_file_builder_test.cc

@@ -403,19 +403,22 @@ TEST_F(BlobFileBuilderTest, Compression) {
   ASSERT_EQ(blob_file_addition.GetBlobFileNumber(), blob_file_number);
   ASSERT_EQ(blob_file_addition.GetTotalBlobCount(), 1);
 
-  auto compressor =
-      GetBuiltinV2CompressionManager()->GetCompressor({}, kSnappyCompression);
-  GrowableBuffer compressed_value;
-  ASSERT_OK(LegacyForceBuiltinCompression(*compressor, /*working_area=*/nullptr,
-                                          uncompressed_value,
-                                          &compressed_value));
+  CompressionOptions opts;
+  CompressionContext context(kSnappyCompression, opts);
+
+  CompressionInfo info(opts, context, CompressionDict::GetEmptyDict(),
+                       kSnappyCompression);
+
+  std::string compressed_value;
+  ASSERT_TRUE(Snappy_Compress(info, uncompressed_value.data(),
+                              uncompressed_value.size(), &compressed_value));
 
   ASSERT_EQ(blob_file_addition.GetTotalBlobBytes(),
             BlobLogRecord::kHeaderSize + key_size + compressed_value.size());
 
   // Verify the contents of the new blob file as well as the blob reference
   std::vector<std::pair<std::string, std::string>> expected_key_value_pairs{
-      {key, compressed_value.AsSlice().ToString()}};
+      {key, compressed_value}};
   std::vector<std::string> blob_indexes{blob_index};
 
   VerifyBlobFile(blob_file_number, blob_file_path, column_family_id,
@@ -454,12 +457,11 @@ TEST_F(BlobFileBuilderTest, CompressionError) {
       nullptr /*IOTracer*/, nullptr /*BlobFileCompletionCallback*/,
       BlobFileCreationReason::kFlush, &blob_file_paths, &blob_file_additions);
 
-  SyncPoint::GetInstance()->SetCallBack(
-      "LegacyForceBuiltinCompression:TamperWithStatus", [](void* arg) {
-        Status* ret = static_cast<Status*>(arg);
-        ASSERT_OK(*ret);
-        *ret = Status::Corruption("Tampered result");
-      });
+  SyncPoint::GetInstance()->SetCallBack("CompressData:TamperWithReturnValue",
+                                        [](void* arg) {
+                                          bool* ret = static_cast<bool*>(arg);
+                                          *ret = false;
+                                        });
   SyncPoint::GetInstance()->EnableProcessing();
 
   constexpr char key[] = "1";
@@ -467,7 +469,7 @@ TEST_F(BlobFileBuilderTest, CompressionError) {
 
   std::string blob_index;
 
-  ASSERT_EQ(builder.Add(key, value, &blob_index).code(), Status::kCorruption);
+  ASSERT_TRUE(builder.Add(key, value, &blob_index).IsCorruption());
 
   SyncPoint::GetInstance()->DisableProcessing();
   SyncPoint::GetInstance()->ClearAllCallBacks();

db/blob/blob_file_reader.cc

@@ -17,10 +17,10 @@
 #include "rocksdb/file_system.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/status.h"
-#include "table/format.h"
 #include "table/multiget_context.h"
 #include "test_util/sync_point.h"
 #include "util/compression.h"
+#include "util/crc32c.h"
 #include "util/stop_watch.h"
 
 namespace ROCKSDB_NAMESPACE {
@@ -69,16 +69,9 @@ Status BlobFileReader::Create(
     }
   }
 
-  std::shared_ptr<Decompressor> decompressor;
-  if (compression_type != kNoCompression) {
-    // The blob format has always used compression format 2
-    decompressor = GetBuiltinV2CompressionManager()->GetDecompressorOptimizeFor(
-        compression_type);
-  }
-
-  blob_file_reader->reset(new BlobFileReader(
-      std::move(file_reader), file_size, compression_type,
-      std::move(decompressor), immutable_options.clock, statistics));
+  blob_file_reader->reset(
+      new BlobFileReader(std::move(file_reader), file_size, compression_type,
+                         immutable_options.clock, statistics));
 
   return Status::OK();
 }
@@ -289,13 +282,11 @@ Status BlobFileReader::ReadFromFile(const RandomAccessFileReader* file_reader,
 
 BlobFileReader::BlobFileReader(
     std::unique_ptr<RandomAccessFileReader>&& file_reader, uint64_t file_size,
-    CompressionType compression_type,
-    std::shared_ptr<Decompressor> decompressor, SystemClock* clock,
+    CompressionType compression_type, SystemClock* clock,
     Statistics* statistics)
     : file_reader_(std::move(file_reader)),
       file_size_(file_size),
       compression_type_(compression_type),
-      decompressor_(std::move(decompressor)),
       clock_(clock),
       statistics_(statistics) {
   assert(file_reader_);
@@ -384,9 +375,8 @@ Status BlobFileReader::GetBlob(
   const Slice value_slice(record_slice.data() + adjustment, value_size);
 
   {
-    const Status s = UncompressBlobIfNeeded(value_slice, compression_type,
-                                            decompressor_.get(), allocator,
-                                            clock_, statistics_, result);
+    const Status s = UncompressBlobIfNeeded(
+        value_slice, compression_type, allocator, clock_, statistics_, result);
     if (!s.ok()) {
       return s;
     }
@@ -533,10 +523,10 @@ void BlobFileReader::MultiGetBlob(
     }
 
     // Uncompress blob if needed
-    Slice value_slice(record_slice.data() + adjustments[j - 1], req->len);
-    *req->status = UncompressBlobIfNeeded(
-        value_slice, compression_type_, decompressor_.get(), allocator, clock_,
-        statistics_, &blob_reqs[i].second);
+    Slice value_slice(record_slice.data() + adjustments[i], req->len);
+    *req->status =
+        UncompressBlobIfNeeded(value_slice, compression_type_, allocator,
+                               clock_, statistics_, &blob_reqs[i].second);
     if (req->status->ok()) {
       total_bytes += record_slice.size();
     }
@@ -593,8 +583,8 @@ Status BlobFileReader::VerifyBlob(const Slice& record_slice,
 
 Status BlobFileReader::UncompressBlobIfNeeded(
     const Slice& value_slice, CompressionType compression_type,
-    Decompressor* decompressor, MemoryAllocator* allocator, SystemClock* clock,
-    Statistics* statistics, std::unique_ptr<BlobContents>* result) {
+    MemoryAllocator* allocator, SystemClock* clock, Statistics* statistics,
+    std::unique_ptr<BlobContents>* result) {
   assert(result);
 
   if (compression_type == kNoCompression) {
@@ -603,33 +593,31 @@ Status BlobFileReader::UncompressBlobIfNeeded(
     return Status::OK();
   }
 
-  assert(decompressor);
+  UncompressionContext context(compression_type);
+  UncompressionInfo info(context, UncompressionDict::GetEmptyDict(),
+                         compression_type);
 
-  Decompressor::Args args;
-  args.compression_type = compression_type;
-  args.compressed_data = value_slice;
+  size_t uncompressed_size = 0;
+  constexpr uint32_t compression_format_version = 2;
 
-  Status s = decompressor->ExtractUncompressedSize(args);
-  if (!s.ok()) {
-    return Status::Corruption(s.ToString());
-  }
-
-  CacheAllocationPtr output = AllocateBlock(args.uncompressed_size, allocator);
+  CacheAllocationPtr output;
 
   {
     PERF_TIMER_GUARD(blob_decompress_time);
     StopWatch stop_watch(clock, statistics, BLOB_DB_DECOMPRESSION_MICROS);
-    s = decompressor->DecompressBlock(args, output.get());
+    output = OLD_UncompressData(info, value_slice.data(), value_slice.size(),
+                                &uncompressed_size, compression_format_version,
+                                allocator);
   }
 
   TEST_SYNC_POINT_CALLBACK(
-      "BlobFileReader::UncompressBlobIfNeeded:TamperWithResult", &s);
+      "BlobFileReader::UncompressBlobIfNeeded:TamperWithResult", &output);
 
-  if (!s.ok()) {
-    return Status::Corruption(s.ToString());
+  if (!output) {
+    return Status::Corruption("Unable to uncompress blob");
   }
 
-  result->reset(new BlobContents(std::move(output), args.uncompressed_size));
+  result->reset(new BlobContents(std::move(output), uncompressed_size));
 
   return Status::OK();
 }

db/blob/blob_file_reader.h

@@ -10,7 +10,6 @@
 
 #include "db/blob/blob_read_request.h"
 #include "file/random_access_file_reader.h"
-#include "rocksdb/advanced_compression.h"
 #include "rocksdb/compression_type.h"
 #include "rocksdb/rocksdb_namespace.h"
 #include "util/autovector.h"
@@ -65,8 +64,7 @@ class BlobFileReader {
  private:
   BlobFileReader(std::unique_ptr<RandomAccessFileReader>&& file_reader,
                  uint64_t file_size, CompressionType compression_type,
-                 std::shared_ptr<Decompressor> decompressor, SystemClock* clock,
-                 Statistics* statistics);
+                 SystemClock* clock, Statistics* statistics);
 
   static Status OpenFile(const ImmutableOptions& immutable_options,
                          const FileOptions& file_opts,
@@ -98,7 +96,6 @@ class BlobFileReader {
 
   static Status UncompressBlobIfNeeded(const Slice& value_slice,
                                        CompressionType compression_type,
-                                       Decompressor* decompressor,
                                        MemoryAllocator* allocator,
                                        SystemClock* clock,
                                        Statistics* statistics,
@@ -107,7 +104,6 @@ class BlobFileReader {
   std::unique_ptr<RandomAccessFileReader> file_reader_;
   uint64_t file_size_;
   CompressionType compression_type_;
-  std::shared_ptr<Decompressor> decompressor_;
   SystemClock* clock_;
   Statistics* statistics_;
 };

db/blob/blob_file_reader_test.cc

@@ -65,7 +65,7 @@ void WriteBlobFile(const ImmutableOptions& immutable_options,
 
   ASSERT_OK(blob_log_writer.WriteHeader(WriteOptions(), header));
 
-  std::vector<GrowableBuffer> compressed_blobs(num);
+  std::vector<std::string> compressed_blobs(num);
   std::vector<Slice> blobs_to_write(num);
   if (kNoCompression == compression) {
     for (size_t i = 0; i < num; ++i) {
@@ -73,13 +73,16 @@ void WriteBlobFile(const ImmutableOptions& immutable_options,
       blob_sizes[i] = blobs[i].size();
     }
   } else {
-    auto compressor =
-        GetBuiltinV2CompressionManager()->GetCompressor({}, compression);
+    CompressionOptions opts;
+    CompressionContext context(compression, opts);
+    CompressionInfo info(opts, context, CompressionDict::GetEmptyDict(),
+                         compression);
+
+    constexpr uint32_t compression_format_version = 2;
 
     for (size_t i = 0; i < num; ++i) {
-      ASSERT_OK(LegacyForceBuiltinCompression(*compressor,
-                                              /*working_area=*/nullptr,
-                                              blobs[i], &compressed_blobs[i]));
+      ASSERT_TRUE(OLD_CompressData(blobs[i], info, compression_format_version,
+                                   &compressed_blobs[i]));
       blobs_to_write[i] = compressed_blobs[i];
       blob_sizes[i] = compressed_blobs[i].size();
     }
@@ -806,10 +809,11 @@ TEST_F(BlobFileReaderTest, UncompressionError) {
 
   SyncPoint::GetInstance()->SetCallBack(
       "BlobFileReader::UncompressBlobIfNeeded:TamperWithResult", [](void* arg) {
-        auto* result = static_cast<Status*>(arg);
-        assert(result);
+        CacheAllocationPtr* const output =
+            static_cast<CacheAllocationPtr*>(arg);
+        assert(output);
 
-        *result = Status::Corruption("Injected result");
+        output->reset();
       });
 
   SyncPoint::GetInstance()->EnableProcessing();
@@ -820,12 +824,11 @@ TEST_F(BlobFileReaderTest, UncompressionError) {
   std::unique_ptr<BlobContents> value;
   uint64_t bytes_read = 0;
 
-  ASSERT_EQ(reader
-                ->GetBlob(ReadOptions(), key, blob_offset, blob_size,
-                          kSnappyCompression, prefetch_buffer, allocator,
-                          &value, &bytes_read)
-                .code(),
-            Status::Code::kCorruption);
+  ASSERT_TRUE(reader
+                  ->GetBlob(ReadOptions(), key, blob_offset, blob_size,
+                            kSnappyCompression, prefetch_buffer, allocator,
+                            &value, &bytes_read)
+                  .IsCorruption());
   ASSERT_EQ(value, nullptr);
   ASSERT_EQ(bytes_read, 0);
 
@@ -1011,92 +1014,6 @@ TEST_P(BlobFileReaderDecodingErrorTest, DecodingError) {
   SyncPoint::GetInstance()->ClearAllCallBacks();
 }
 
-TEST_F(BlobFileReaderTest, MultiGetBlobWithFailedValidation) {
-  // Test that MultiGetBlob correctly handles the case where some requests
-  // fail validation. The adjustments vector is only populated for requests
-  // that pass validation, so the indices must track correctly.
-  Options options;
-  options.env = mock_env_.get();
-  options.cf_paths.emplace_back(
-      test::PerThreadDBPath(
-          mock_env_.get(),
-          "BlobFileReaderTest_MultiGetBlobWithFailedValidation"),
-      0);
-  options.enable_blob_files = true;
-
-  ImmutableOptions immutable_options(options);
-
-  constexpr uint32_t column_family_id = 1;
-  constexpr bool has_ttl = false;
-  constexpr ExpirationRange expiration_range;
-  constexpr uint64_t blob_file_number = 1;
-  constexpr size_t num_blobs = 3;
-  const std::vector<std::string> key_strs = {"key1", "key2", "key3"};
-  const std::vector<std::string> blob_strs = {"blob1", "blob2", "blob3"};
-
-  const std::vector<Slice> keys = {key_strs[0], key_strs[1], key_strs[2]};
-  const std::vector<Slice> blobs = {blob_strs[0], blob_strs[1], blob_strs[2]};
-
-  std::vector<uint64_t> blob_offsets(keys.size());
-  std::vector<uint64_t> blob_sizes(keys.size());
-
-  WriteBlobFile(immutable_options, column_family_id, has_ttl, expiration_range,
-                expiration_range, blob_file_number, keys, blobs, kNoCompression,
-                blob_offsets, blob_sizes);
-
-  constexpr HistogramImpl* blob_file_read_hist = nullptr;
-
-  std::unique_ptr<BlobFileReader> reader;
-
-  ReadOptions read_options;
-  ASSERT_OK(BlobFileReader::Create(
-      immutable_options, read_options, FileOptions(), column_family_id,
-      blob_file_read_hist, blob_file_number, nullptr /*IOTracer*/, &reader));
-
-  // Enable checksum verification so adjustments are non-zero
-  read_options.verify_checksums = true;
-  constexpr MemoryAllocator* allocator = nullptr;
-
-  // Fail the first request by giving it an invalid offset (too small).
-  // This causes the first request to be skipped in the adjustments vector,
-  // so adjustments has only 2 entries (for blobs 1 and 2), while blob_reqs
-  // has 3 entries. Without the fix, adjustments[i] would use the wrong
-  // index for the remaining valid requests.
-  std::array<Status, num_blobs> statuses_buf;
-  std::array<BlobReadRequest, num_blobs> requests_buf;
-  autovector<std::pair<BlobReadRequest*, std::unique_ptr<BlobContents>>>
-      blob_reqs;
-
-  // First request: invalid offset (too small, will fail validation)
-  requests_buf[0] = BlobReadRequest(keys[0], /*offset=*/0, blob_sizes[0],
-                                    kNoCompression, nullptr, &statuses_buf[0]);
-  // Second and third requests: valid
-  requests_buf[1] = BlobReadRequest(keys[1], blob_offsets[1], blob_sizes[1],
-                                    kNoCompression, nullptr, &statuses_buf[1]);
-  requests_buf[2] = BlobReadRequest(keys[2], blob_offsets[2], blob_sizes[2],
-                                    kNoCompression, nullptr, &statuses_buf[2]);
-
-  for (size_t i = 0; i < num_blobs; ++i) {
-    blob_reqs.emplace_back(&requests_buf[i], std::unique_ptr<BlobContents>());
-  }
-
-  uint64_t bytes_read = 0;
-  reader->MultiGetBlob(read_options, allocator, blob_reqs, &bytes_read);
-
-  // First request should fail validation
-  ASSERT_TRUE(statuses_buf[0].IsCorruption());
-  ASSERT_EQ(blob_reqs[0].second, nullptr);
-
-  // Second and third requests should succeed with correct data
-  ASSERT_OK(statuses_buf[1]);
-  ASSERT_NE(blob_reqs[1].second, nullptr);
-  ASSERT_EQ(blob_reqs[1].second->data(), blobs[1]);
-
-  ASSERT_OK(statuses_buf[2]);
-  ASSERT_NE(blob_reqs[2].second, nullptr);
-  ASSERT_EQ(blob_reqs[2].second->data(), blobs[2]);
-}
-
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

db/blob/blob_index.h

@@ -137,18 +137,6 @@ class BlobIndex {
     return oss.str();
   }
 
-  // Encode this blob index into dst based on its type.
-  void EncodeTo(std::string* dst) const {
-    if (IsInlined()) {
-      EncodeInlinedTTL(dst, expiration_, value_);
-    } else if (HasTTL()) {
-      EncodeBlobTTL(dst, expiration_, file_number_, offset_, size_,
-                    compression_);
-    } else {
-      EncodeBlob(dst, file_number_, offset_, size_, compression_);
-    }
-  }
-
   static void EncodeInlinedTTL(std::string* dst, uint64_t expiration,
                                const Slice& value) {
     assert(dst != nullptr);

db/blob/blob_source_test.cc

@@ -67,7 +67,7 @@ void WriteBlobFile(const ImmutableOptions& immutable_options,
 
   ASSERT_OK(blob_log_writer.WriteHeader(WriteOptions(), header));
 
-  std::vector<GrowableBuffer> compressed_blobs(num);
+  std::vector<std::string> compressed_blobs(num);
   std::vector<Slice> blobs_to_write(num);
   if (kNoCompression == compression) {
     for (size_t i = 0; i < num; ++i) {
@@ -75,13 +75,16 @@ void WriteBlobFile(const ImmutableOptions& immutable_options,
       blob_sizes[i] = blobs[i].size();
     }
   } else {
-    auto compressor =
-        GetBuiltinV2CompressionManager()->GetCompressor({}, compression);
+    CompressionOptions opts;
+    CompressionContext context(compression, opts);
+    CompressionInfo info(opts, context, CompressionDict::GetEmptyDict(),
+                         compression);
+
+    constexpr uint32_t compression_format_version = 2;
 
     for (size_t i = 0; i < num; ++i) {
-      ASSERT_OK(LegacyForceBuiltinCompression(*compressor,
-                                              /*working_area=*/nullptr,
-                                              blobs[i], &compressed_blobs[i]));
+      ASSERT_TRUE(OLD_CompressData(blobs[i], info, compression_format_version,
+                                   &compressed_blobs[i]));
       blobs_to_write[i] = compressed_blobs[i];
       blob_sizes[i] = compressed_blobs[i].size();
     }

db/builder.cc

@@ -56,18 +56,6 @@ TableBuilder* NewTableBuilder(const TableBuilderOptions& tboptions,
   return tboptions.moptions.table_factory->NewTableBuilder(tboptions, file);
 }
 
-void ExtractTimestampFromTableProperties(const TableProperties& tp,
-                                         FileMetaData* meta) {
-  auto min_ts_iter = tp.user_collected_properties.find("rocksdb.timestamp_min");
-  if (min_ts_iter != tp.user_collected_properties.end()) {
-    meta->min_timestamp = min_ts_iter->second;
-  }
-  auto max_ts_iter = tp.user_collected_properties.find("rocksdb.timestamp_max");
-  if (max_ts_iter != tp.user_collected_properties.end()) {
-    meta->max_timestamp = max_ts_iter->second;
-  }
-}
-
 Status BuildTable(
     const std::string& dbname, VersionSet* versions,
     const ImmutableDBOptions& db_options, const TableBuilderOptions& tboptions,
@@ -322,8 +310,6 @@ Status BuildTable(
     }
 
     TEST_SYNC_POINT("BuildTable:BeforeFinishBuildTable");
-    TEST_SYNC_POINT_CALLBACK("BuildTable:BeforeCheckEmpty",
-                             static_cast<TableBuilder*>(builder));
     const bool empty = builder->IsEmpty();
     if (flush_stats) {
       assert(c_iter.HasNumInputEntryScanned());
@@ -332,14 +318,6 @@ Status BuildTable(
     }
     if (!s.ok() || empty) {
       builder->Abandon();
-      // Propagate the builder's error when the builder is empty due to an
-      // internal error (e.g., write fault injection causing all Add() calls to
-      // return early). Without this, `s` would remain OK and the downstream
-      // key count validation in flush_job.cc would produce a misleading
-      // Corruption error instead of the actual builder error.
-      if (s.ok() && !builder->status().ok()) {
-        s = builder->status();
-      }
     } else {
       SeqnoToTimeMapping relevant_mapping;
       if (seqno_to_time_mapping) {
@@ -377,7 +355,6 @@ Status BuildTable(
       assert(meta->fd.GetFileSize() > 0);
       tp = builder
                ->GetTableProperties();  // refresh now that builder is finished
-      ExtractTimestampFromTableProperties(tp, meta);
       if (memtable_payload_bytes != nullptr &&
           memtable_garbage_bytes != nullptr) {
         const CompactionIterationStats& ci_stats = c_iter.iter_stats();

db/builder.h

@@ -41,13 +41,6 @@ class BlobFileCompletionCallback;
 TableBuilder* NewTableBuilder(const TableBuilderOptions& tboptions,
                               WritableFileWriter* file);
 
-// Extract min/max timestamps from table properties and populate FileMetaData.
-// This is used by both flush (BuildTable) and compaction (CompactionOutputs)
-// to populate timestamp range in FileMetaData from the TimestampTableProperties
-// collector output.
-void ExtractTimestampFromTableProperties(const TableProperties& tp,
-                                         FileMetaData* meta);
-
 // Build a Table file from the contents of *iter.  The generated file
 // will be named according to number specified in meta. On success, the rest of
 // *meta will be filled with metadata about the generated table.

db/c_test.c

@@ -722,88 +722,6 @@ static void LoadAndCheckLatestOptions(const char* db_name, rocksdb_env_t* env,
                                       num_column_families);
 }
 
-// Global state for tracking remote compaction calls
-typedef struct {
-  int schedule_called;
-  int wait_called;
-  int cancel_called;
-  char last_scheduled_job_id[256];
-  char last_db_name[256];
-} RemoteCompactionState;
-
-// Schedule callback - gets called when compaction is scheduled
-static rocksdb_compactionservice_scheduleresponse_t* RemoteCompactionSchedule(
-    void* state, const rocksdb_compactionservice_jobinfo_t* info,
-    const char* input, size_t input_len) {
-  (void)input;
-  (void)input_len;
-  RemoteCompactionState* rcs = (RemoteCompactionState*)state;
-  rcs->schedule_called++;
-
-  // Extract job info
-  size_t db_name_len;
-  const char* db_name =
-      rocksdb_compactionservice_jobinfo_t_get_db_name(info, &db_name_len);
-  memcpy(rcs->last_db_name, db_name, db_name_len);
-  rcs->last_db_name[db_name_len] = '\0';
-
-  // Generate a job ID
-  snprintf(rcs->last_scheduled_job_id, sizeof(rcs->last_scheduled_job_id),
-           "job-%d", rcs->schedule_called);
-
-  // Create response with success status
-  char* err = NULL;
-  rocksdb_compactionservice_scheduleresponse_t* response =
-      rocksdb_compactionservice_scheduleresponse_create(
-          rcs->last_scheduled_job_id,
-          rocksdb_compactionservice_jobstatus_success, &err);
-  if (err) {
-    free(err);
-  }
-  return response;
-}
-
-// Wait callback - simulates waiting for remote compaction to complete
-static int RemoteCompactionWait(void* state, const char* scheduled_job_id,
-                                char** result, size_t* result_len) {
-  RemoteCompactionState* rcs = (RemoteCompactionState*)state;
-  rcs->wait_called++;
-
-  if (strcmp(scheduled_job_id, rcs->last_scheduled_job_id) != 0) {
-    return rocksdb_compactionservice_jobstatus_failure;
-  }
-
-  // For testing purposes, return kUseLocal to cause RocksDB to fall back to
-  // local compaction. This tests the callback mechanism without needing a fully
-  // serialized result. In a real scenario, this would communicate with a remote
-  // worker that calls rocksdb_open_and_compact() and returns a properly
-  // serialized CompactionServiceResult
-  *result = NULL;
-  *result_len = 0;
-
-  return rocksdb_compactionservice_jobstatus_use_local;
-}
-
-// Cancel callback - cancels pending jobs
-static void RemoteCompactionCancel(void* state) {
-  RemoteCompactionState* rcs = (RemoteCompactionState*)state;
-  rcs->cancel_called++;
-}
-
-// Destructor callback
-static void RemoteCompactionDestroy(void* state) { (void)state; }
-
-// NULL schedule callback for testing failure handling
-static rocksdb_compactionservice_scheduleresponse_t* NullSchedule(
-    void* state, const rocksdb_compactionservice_jobinfo_t* info,
-    const char* input, size_t input_len) {
-  (void)state;
-  (void)info;
-  (void)input;
-  (void)input_len;
-  return NULL;  // Return NULL to simulate failure
-}
-
 int main(int argc, char** argv) {
   (void)argc;
   (void)argv;
@@ -1337,70 +1255,6 @@ int main(int argc, char** argv) {
     rocksdb_writebatch_destroy(wb);
   }
 
-  StartPhase("writebatch_vectors_cf");
-  {
-    const char* cf_name = "wb_vectors_cf";
-    rocksdb_column_family_handle_t* wb_cf =
-        rocksdb_create_column_family(db, options, cf_name, &err);
-    CheckNoError(err);
-
-    rocksdb_writebatch_t* wb = rocksdb_writebatch_create();
-
-    // Test putv_cf: concatenates multiple slices into a single key/value
-    const char* put_keys[2] = {"k", "ey"};
-    const size_t put_key_sizes[2] = {1, 2};
-    const char* put_vals[3] = {"v", "a", "l"};
-    const size_t put_val_sizes[3] = {1, 1, 1};
-    rocksdb_writebatch_putv_cf(wb, wb_cf, 2, put_keys, put_key_sizes, 3,
-                               put_vals, put_val_sizes);
-    rocksdb_write(db, woptions, wb, &err);
-    CheckNoError(err);
-    // putv_cf concatenates: key="k"+"ey"="key", value="v"+"a"+"l"="val"
-    CheckGetCF(db, roptions, wb_cf, "key", "val");
-    CheckGetCF(db, roptions, wb_cf, "k", NULL);
-    CheckGetCF(db, roptions, wb_cf, "ey", NULL);
-
-    // Test deletev_cf: concatenates multiple slices for key
-    rocksdb_writebatch_clear(wb);
-    const char* del_keys[2] = {"k", "ey"};
-    const size_t del_key_sizes[2] = {1, 2};
-    rocksdb_writebatch_deletev_cf(wb, wb_cf, 2, del_keys, del_key_sizes);
-    rocksdb_write(db, woptions, wb, &err);
-    CheckNoError(err);
-    CheckGetCF(db, roptions, wb_cf, "key", NULL);
-
-    // Test delete_rangev_cf: concatenates slices for range deletion
-    rocksdb_writebatch_clear(wb);
-    rocksdb_writebatch_put_cf(wb, wb_cf, "a", 1, "1", 1);
-    rocksdb_writebatch_put_cf(wb, wb_cf, "b", 1, "2", 1);
-    rocksdb_writebatch_put_cf(wb, wb_cf, "c", 1, "3", 1);
-    rocksdb_write(db, woptions, wb, &err);
-    CheckNoError(err);
-    CheckGetCF(db, roptions, wb_cf, "a", "1");
-    CheckGetCF(db, roptions, wb_cf, "b", "2");
-    CheckGetCF(db, roptions, wb_cf, "c", "3");
-
-    rocksdb_writebatch_clear(wb);
-    const char* range_start[2] = {"a", ""};  // "a" + "" = "a"
-    const size_t range_start_sizes[2] = {1, 0};
-    const char* range_end[2] = {"c", ""};
-    const size_t range_end_sizes[2] = {1, 0};
-    rocksdb_writebatch_delete_rangev_cf(wb, wb_cf, 2, range_start,
-                                        range_start_sizes, range_end,
-                                        range_end_sizes);
-    rocksdb_write(db, woptions, wb, &err);
-    CheckNoError(err);
-    // Range [a, c) should delete "a" and "b", but not "c"
-    CheckGetCF(db, roptions, wb_cf, "a", NULL);
-    CheckGetCF(db, roptions, wb_cf, "b", NULL);
-    CheckGetCF(db, roptions, wb_cf, "c", "3");
-
-    rocksdb_writebatch_destroy(wb);
-    rocksdb_drop_column_family(db, wb_cf, &err);
-    CheckNoError(err);
-    rocksdb_column_family_handle_destroy(wb_cf);
-  }
-
   StartPhase("writebatch_vectors");
   {
     rocksdb_writebatch_t* wb = rocksdb_writebatch_create();
@@ -1566,43 +1420,6 @@ int main(int argc, char** argv) {
     rocksdb_iter_destroy(iter);
   }
 
-  StartPhase("iter_slice");
-  {
-    // Test the new slice-based iterator API for better performance
-    rocksdb_iterator_t* iter = rocksdb_create_iterator(db, roptions);
-    CheckCondition(!rocksdb_iter_valid(iter));
-    rocksdb_iter_seek_to_first(iter);
-    CheckCondition(rocksdb_iter_valid(iter));
-
-    // Test rocksdb_iter_key_slice
-    rocksdb_slice_t key_slice = rocksdb_iter_key_slice(iter);
-    CheckEqual("box", key_slice.data, key_slice.size);
-
-    // Test rocksdb_iter_value_slice
-    rocksdb_slice_t value_slice = rocksdb_iter_value_slice(iter);
-    CheckEqual("c", value_slice.data, value_slice.size);
-
-    // Move to next entry and test again
-    rocksdb_iter_next(iter);
-    CheckCondition(rocksdb_iter_valid(iter));
-    key_slice = rocksdb_iter_key_slice(iter);
-    value_slice = rocksdb_iter_value_slice(iter);
-    CheckEqual("foo", key_slice.data, key_slice.size);
-    CheckEqual("hello", value_slice.data, value_slice.size);
-
-    // Test seeking with slice API
-    rocksdb_iter_seek(iter, "b", 1);
-    CheckCondition(rocksdb_iter_valid(iter));
-    key_slice = rocksdb_iter_key_slice(iter);
-    value_slice = rocksdb_iter_value_slice(iter);
-    CheckEqual("box", key_slice.data, key_slice.size);
-    CheckEqual("c", value_slice.data, value_slice.size);
-
-    rocksdb_iter_get_error(iter, &err);
-    CheckNoError(err);
-    rocksdb_iter_destroy(iter);
-  }
-
   StartPhase("wbwi_iter");
   {
     rocksdb_iterator_t* base_iter = rocksdb_create_iterator(db, roptions);
@@ -1688,53 +1505,6 @@ int main(int argc, char** argv) {
     CheckMultiGetValues(3, vals, vals_sizes, errs, expected);
   }
 
-  StartPhase("zero_copy_get_pinned_v2");
-  {
-    // Test new zero-copy get functions
-
-    // Test rocksdb_get_pinned_v2
-    rocksdb_pinnable_handle_t* handle =
-        rocksdb_get_pinned_v2(db, roptions, "foo", 3, &err);
-    CheckNoError(err);
-    CheckCondition(handle != NULL);
-    size_t val_len;
-    const char* val = rocksdb_pinnable_handle_get_value(handle, &val_len);
-    CheckEqual("hello", val, val_len);
-    rocksdb_pinnable_handle_destroy(handle);
-
-    // Test with non-existent key
-    handle = rocksdb_get_pinned_v2(db, roptions, "notfound", 8, &err);
-    CheckNoError(err);
-    CheckCondition(handle == NULL);
-
-    // Test rocksdb_get_into_buffer
-    char buffer[100];
-    unsigned char found;
-    unsigned char success = rocksdb_get_into_buffer(
-        db, roptions, "foo", 3, buffer, sizeof(buffer), &val_len, &found, &err);
-    CheckNoError(err);
-    CheckCondition(success == 1);
-    CheckCondition(found == 1);
-    CheckCondition(val_len == 5);
-    CheckCondition(memcmp(buffer, "hello", 5) == 0);
-
-    // Test with buffer too small
-    success = rocksdb_get_into_buffer(db, roptions, "foo", 3, buffer,
-                                      2,  // Buffer too small
-                                      &val_len, &found, &err);
-    CheckNoError(err);
-    CheckCondition(success == 0);  // Should fail due to small buffer
-    CheckCondition(found == 1);
-    CheckCondition(val_len == 5);  // Should still report actual size
-
-    // Test with non-existent key
-    success = rocksdb_get_into_buffer(db, roptions, "notfound", 8, buffer,
-                                      sizeof(buffer), &val_len, &found, &err);
-    CheckNoError(err);
-    CheckCondition(success == 0);
-    CheckCondition(found == 0);
-  }
-
   StartPhase("pin_get");
   {
     CheckPinGet(db, roptions, "box", "c");
@@ -2152,55 +1922,6 @@ int main(int argc, char** argv) {
     rocksdb_flush_wal(db, 1, &err);
     CheckNoError(err);
 
-    // Test column family handle get name
-    {
-      size_t name_len;
-      char* cf_name =
-          rocksdb_column_family_handle_get_name(handles[1], &name_len);
-      CheckCondition(name_len == 3);
-      CheckCondition(memcmp(cf_name, "cf1", 3) == 0);
-      rocksdb_free(cf_name);
-    }
-
-    // Test zero-copy get with column families
-    {
-      rocksdb_pinnable_handle_t* handle =
-          rocksdb_get_pinned_cf_v2(db, roptions, handles[1], "box", 3, &err);
-      CheckNoError(err);
-      CheckCondition(handle != NULL);
-      size_t val_len;
-      const char* val = rocksdb_pinnable_handle_get_value(handle, &val_len);
-      CheckEqual("c", val, val_len);
-      rocksdb_pinnable_handle_destroy(handle);
-
-      // Test with non-existent key
-      handle = rocksdb_get_pinned_cf_v2(db, roptions, handles[1], "notfound", 8,
-                                        &err);
-      CheckNoError(err);
-      CheckCondition(handle == NULL);
-
-      // Test rocksdb_get_into_buffer_cf
-      char buffer[100];
-      unsigned char found;
-      unsigned char success = rocksdb_get_into_buffer_cf(
-          db, roptions, handles[1], "buff", 4, buffer, sizeof(buffer), &val_len,
-          &found, &err);
-      CheckNoError(err);
-      CheckCondition(success == 1);
-      CheckCondition(found == 1);
-      CheckCondition(val_len == 7);
-      CheckCondition(memcmp(buffer, "rocksdb", 7) == 0);
-
-      // Test with buffer too small
-      success = rocksdb_get_into_buffer_cf(db, roptions, handles[1], "buff", 4,
-                                           buffer, 3,  // Buffer too small
-                                           &val_len, &found, &err);
-      CheckNoError(err);
-      CheckCondition(success == 0);  // Should fail due to small buffer
-      CheckCondition(found == 1);
-      CheckCondition(val_len == 7);  // Should still report actual size
-    }
-
     // Test WriteBatchWithIndex iteration with Column Family
     rocksdb_writebatch_wi_t* wbwi = rocksdb_writebatch_wi_create(0, true);
     rocksdb_writebatch_wi_put_cf(wbwi, handles[1], "boat", 4, "row",
@@ -2277,74 +1998,6 @@ int main(int argc, char** argv) {
       }
     }
 
-    {
-      // Test rocksdb_batched_multi_get_cf_slice for better performance
-      // Build rocksdb_slice_t array directly to avoid conversion overhead
-      rocksdb_slice_t batched_key_slices[4];
-      batched_key_slices[0].data = "box";
-      batched_key_slices[0].size = 3;
-      batched_key_slices[1].data = "buff";
-      batched_key_slices[1].size = 4;
-      batched_key_slices[2].data = "barfooxx";
-      batched_key_slices[2].size = 8;
-      batched_key_slices[3].data = "box";
-      batched_key_slices[3].size = 3;
-
-      const char* expected_value[4] = {"c", "rocksdb", NULL, "c"};
-      char* batched_errs[4];
-      rocksdb_pinnableslice_t* pvals[4];
-
-      rocksdb_batched_multi_get_cf_slice(db, roptions, handles[1], 4,
-                                         batched_key_slices, pvals,
-                                         batched_errs, false);
-
-      const char* val;
-      size_t val_len;
-      for (i = 0; i < 4; ++i) {
-        CheckNoError(batched_errs[i]);
-        if (pvals[i] != NULL) {
-          val = rocksdb_pinnableslice_value(pvals[i], &val_len);
-          CheckEqual(expected_value[i], val, val_len);
-          rocksdb_pinnableslice_destroy(pvals[i]);
-        } else {
-          CheckEqual(expected_value[i], NULL, 0);
-        }
-      }
-    }
-
-    {
-      // Test rocksdb_batched_multi_get_cf_slice with sorted_input=true
-      // Keys must be in sorted order for this optimization
-      rocksdb_slice_t sorted_key_slices[3];
-      sorted_key_slices[0].data = "box";
-      sorted_key_slices[0].size = 3;
-      sorted_key_slices[1].data = "buff";
-      sorted_key_slices[1].size = 4;
-      sorted_key_slices[2].data = "notfound";
-      sorted_key_slices[2].size = 8;
-
-      const char* expected_value[3] = {"c", "rocksdb", NULL};
-      char* batched_errs[3];
-      rocksdb_pinnableslice_t* pvals[3];
-
-      rocksdb_batched_multi_get_cf_slice(db, roptions, handles[1], 3,
-                                         sorted_key_slices, pvals, batched_errs,
-                                         true);
-
-      const char* val;
-      size_t val_len;
-      for (i = 0; i < 3; ++i) {
-        CheckNoError(batched_errs[i]);
-        if (pvals[i] != NULL) {
-          val = rocksdb_pinnableslice_value(pvals[i], &val_len);
-          CheckEqual(expected_value[i], val, val_len);
-          rocksdb_pinnableslice_destroy(pvals[i]);
-        } else {
-          CheckEqual(expected_value[i], NULL, 0);
-        }
-      }
-    }
-
     {
       unsigned char value_found = 0;
 
@@ -3596,14 +3249,6 @@ int main(int argc, char** argv) {
         100000 ==
         rocksdb_fifo_compaction_options_get_max_table_files_size(fco));
 
-    rocksdb_fifo_compaction_options_set_max_data_files_size(fco, 200000);
-    CheckCondition(
-        200000 == rocksdb_fifo_compaction_options_get_max_data_files_size(fco));
-
-    rocksdb_fifo_compaction_options_set_use_kv_ratio_compaction(fco, 1);
-    CheckCondition(
-        1 == rocksdb_fifo_compaction_options_get_use_kv_ratio_compaction(fco));
-
     rocksdb_fifo_compaction_options_destroy(fco);
   }
 
@@ -3824,17 +3469,6 @@ int main(int argc, char** argv) {
     rocksdb_transaction_put(txn, "foo", 3, "hello", 5, &err);
     CheckNoError(err);
 
-    // test transaction get/set name (before commit)
-    {
-      rocksdb_transaction_set_name(txn, "test_txn", 8, &err);
-      CheckNoError(err);
-      size_t name_len;
-      char* txn_name = rocksdb_transaction_get_name(txn, &name_len);
-      CheckCondition(name_len == 8);
-      CheckCondition(memcmp(txn_name, "test_txn", 8) == 0);
-      rocksdb_free(txn_name);
-    }
-
     // read from outside transaction, before commit
     CheckTxnDBGet(txn_db, roptions, "foo", NULL);
     CheckTxnDBPinGet(txn_db, roptions, "foo", NULL);
@@ -4455,7 +4089,7 @@ int main(int argc, char** argv) {
 
   StartPhase("statistics");
   {
-    const uint32_t BYTES_WRITTEN_TICKER = 61;
+    const uint32_t BYTES_WRITTEN_TICKER = 60;
     const uint32_t DB_WRITE_HIST = 1;
 
     rocksdb_statistics_histogram_data_t* hist =
@@ -4573,296 +4207,6 @@ int main(int argc, char** argv) {
     rocksdb_cache_destroy(lru);
   }
 
-  StartPhase("remote_compaction_service");
-  {
-    RemoteCompactionState remote_state = {0, 0, 0, "", ""};
-
-    // Create compaction service
-    rocksdb_compactionservice_t* service = rocksdb_compactionservice_create(
-        &remote_state,             // state
-        RemoteCompactionDestroy,   // destructor
-        RemoteCompactionSchedule,  // schedule callback
-        "TestRemoteCompaction",    // name
-        RemoteCompactionWait,      // wait callback
-        RemoteCompactionCancel,    // cancel_awaiting_jobs
-        NULL);                     // on_installation
-
-    // Create options with remote compaction
-    rocksdb_options_t* remote_options = rocksdb_options_create();
-    rocksdb_options_set_create_if_missing(remote_options, 1);
-    rocksdb_options_set_level0_file_num_compaction_trigger(remote_options, 2);
-    rocksdb_options_set_write_buffer_size(remote_options,
-                                          64 * 1024);  // 64KB buffer
-    rocksdb_options_set_max_bytes_for_level_base(remote_options,
-                                                 256 * 1024);  // 256KB
-    rocksdb_options_set_target_file_size_base(
-        remote_options, 64 * 1024);  // 64KB target file size
-    // Disable automatic compactions to test manual compaction only
-    rocksdb_options_set_disable_auto_compactions(remote_options, 1);
-    rocksdb_options_set_compaction_service(remote_options, service);
-
-    // Destroy old DB and create new one
-    rocksdb_close(db);
-    rocksdb_destroy_db(remote_options, dbname, &err);
-    CheckNoError(err);
-
-    db = rocksdb_open(remote_options, dbname, &err);
-    CheckNoError(err);
-
-    // Create multiple SST files to trigger compaction
-    rocksdb_flushoptions_t* flush_opts = rocksdb_flushoptions_create();
-    rocksdb_flushoptions_set_wait(flush_opts, 1);
-
-    // Write and flush multiple times to create multiple L0 files
-    // Write more data with larger values to ensure files are substantial
-    for (int batch = 0; batch < 5; batch++) {
-      for (int i = 0; i < 200; i++) {
-        char key[20], val[1000];
-        snprintf(key, sizeof(key), "key%d_%d", batch, i);
-        // Fill value with repeated data to make it larger
-        memset(val, 'a' + (batch % 26), sizeof(val) - 1);
-        val[sizeof(val) - 1] = '\0';
-        rocksdb_put(db, woptions, key, strlen(key), val, strlen(val), &err);
-        CheckNoError(err);
-      }
-      rocksdb_flush(db, flush_opts, &err);
-      CheckNoError(err);
-    }
-    rocksdb_flushoptions_destroy(flush_opts);
-
-    // Trigger manual compaction to invoke remote compaction service
-    rocksdb_compact_range(db, NULL, 0, NULL, 0);
-
-    rocksdb_wait_for_compact_options_t* wco =
-        rocksdb_wait_for_compact_options_create();
-    rocksdb_wait_for_compact(db, wco, &err);
-    CheckNoError(err);
-    rocksdb_wait_for_compact_options_destroy(wco);
-
-    // Verify that callbacks were actually called
-    CheckCondition(remote_state.schedule_called > 0);
-    CheckCondition(remote_state.wait_called > 0);
-    CheckCondition(strlen(remote_state.last_db_name) > 0);
-    CheckCondition(strstr(remote_state.last_db_name, "rocksdb_c_test") != NULL);
-
-    // Verify data is still accessible after remote compaction
-    // Just check a few keys to verify data integrity
-    for (int batch = 0; batch < 5; batch++) {
-      char key[20];
-      snprintf(key, sizeof(key), "key%d_0", batch);
-      size_t vallen;
-      char* val = rocksdb_get(db, roptions, key, strlen(key), &vallen, &err);
-      CheckNoError(err);
-      CheckCondition(val != NULL);
-      CheckCondition(vallen == 999);  // strlen of 1000-byte string
-      free(val);
-    }
-
-    // Test cancellation API directly
-    RemoteCompactionCancel(&remote_state);
-    CheckCondition(remote_state.cancel_called > 0);
-
-    // Cleanup
-    rocksdb_close(db);
-    rocksdb_destroy_db(remote_options, dbname, &err);
-    CheckNoError(err);
-    rocksdb_options_destroy(remote_options);
-
-    // Reopen DB with original options for subsequent tests
-    db = rocksdb_open(options, dbname, &err);
-    CheckNoError(err);
-  }
-
-  StartPhase("remote_compaction_scheduleresponse");
-  {
-    // Test scheduleresponse creation and getters
-    rocksdb_compactionservice_scheduleresponse_t* response;
-
-    // Test success response
-    err = NULL;
-    response = rocksdb_compactionservice_scheduleresponse_create(
-        "test-job-123", rocksdb_compactionservice_jobstatus_success, &err);
-    CheckNoError(err);
-    CheckCondition(response != NULL);
-    CheckCondition(
-        rocksdb_compactionservice_scheduleresponse_getstatus(response) ==
-        rocksdb_compactionservice_jobstatus_success);
-
-    size_t job_id_len;
-    const char* job_id =
-        rocksdb_compactionservice_scheduleresponse_get_scheduled_job_id(
-            response, &job_id_len);
-    CheckCondition(job_id_len == strlen("test-job-123"));
-    CheckCondition(memcmp(job_id, "test-job-123", job_id_len) == 0);
-    rocksdb_compactionservice_scheduleresponse_t_destroy(response);
-
-    // Test failure response
-    response = rocksdb_compactionservice_scheduleresponse_create_with_status(
-        rocksdb_compactionservice_jobstatus_failure, &err);
-    CheckCondition(response != NULL);
-    CheckCondition(
-        rocksdb_compactionservice_scheduleresponse_getstatus(response) ==
-        rocksdb_compactionservice_jobstatus_failure);
-    rocksdb_compactionservice_scheduleresponse_t_destroy(response);
-
-    response = rocksdb_compactionservice_scheduleresponse_create_with_status(
-        999, &err);
-    CheckCondition(response == NULL);  // Invalid status
-    if (err) {
-      Free(&err);
-    }
-  }
-
-  StartPhase("remote_compaction_options_override");
-  {
-    // Test CompactionServiceOptionsOverride API
-    rocksdb_compaction_service_options_override_t* override_opts =
-        rocksdb_compaction_service_options_override_create();
-    CheckCondition(override_opts != NULL);
-
-    // Set up override options
-    rocksdb_compaction_service_options_override_set_env(override_opts, env);
-    rocksdb_compaction_service_options_override_set_comparator(override_opts,
-                                                               cmp);
-
-    // Test file checksum gen factory
-    rocksdb_file_checksum_gen_factory_t* checksum_factory =
-        rocksdb_file_checksum_gen_crc32c_factory_create();
-    CheckCondition(checksum_factory != NULL);
-    rocksdb_compaction_service_options_override_set_file_checksum_gen_factory(
-        override_opts, checksum_factory);
-
-    // Test SST partitioner factory
-    rocksdb_sst_partitioner_factory_t* partitioner_factory =
-        rocksdb_sst_partitioner_fixed_prefix_factory_create(4);
-    CheckCondition(partitioner_factory != NULL);
-    rocksdb_compaction_service_options_override_set_sst_partitioner_factory(
-        override_opts, partitioner_factory);
-
-    // Test merge operator
-    rocksdb_compaction_service_options_override_set_merge_operator(
-        override_opts, NULL);
-
-    // Test compaction filter
-    rocksdb_compaction_service_options_override_set_compaction_filter(
-        override_opts, NULL);
-
-    // Test prefix extractor
-    rocksdb_compaction_service_options_override_set_prefix_extractor(
-        override_opts, NULL);
-
-    // Test table factory - block based
-    rocksdb_block_based_table_options_t* table_opts =
-        rocksdb_block_based_options_create();
-    rocksdb_compaction_service_options_override_set_block_based_table_factory(
-        override_opts, table_opts);
-    rocksdb_block_based_options_destroy(table_opts);
-
-    // Test statistics via options
-    rocksdb_options_t* stats_opts = rocksdb_options_create();
-    rocksdb_options_enable_statistics(stats_opts);
-    rocksdb_compaction_service_options_override_set_statistics(override_opts,
-                                                               stats_opts);
-    rocksdb_options_destroy(stats_opts);
-
-    // Test info log
-    rocksdb_logger_t* logger =
-        rocksdb_logger_create_stderr_logger(1, "test_prefix");
-    rocksdb_compaction_service_options_override_set_info_log(override_opts,
-                                                             logger);
-    rocksdb_logger_destroy(logger);
-
-    // Test options map
-    rocksdb_compaction_service_options_override_set_option(
-        override_opts, "max_bytes_for_level_base", "67108864");
-
-    // Cleanup
-    rocksdb_file_checksum_gen_factory_destroy(checksum_factory);
-    rocksdb_sst_partitioner_factory_destroy(partitioner_factory);
-    rocksdb_compaction_service_options_override_destroy(override_opts);
-  }
-
-  StartPhase("factory_options_on_regular_options");
-  {
-    // Test that the new factory types work with regular rocksdb_options_t
-    rocksdb_options_t* test_opts = rocksdb_options_create();
-
-    // Test file checksum gen factory on regular options
-    rocksdb_file_checksum_gen_factory_t* checksum_factory =
-        rocksdb_file_checksum_gen_crc32c_factory_create();
-    CheckCondition(checksum_factory != NULL);
-    rocksdb_options_set_file_checksum_gen_factory(test_opts, checksum_factory);
-
-    // Test SST partitioner factory on regular options
-    rocksdb_sst_partitioner_factory_t* partitioner_factory =
-        rocksdb_sst_partitioner_fixed_prefix_factory_create(8);
-    CheckCondition(partitioner_factory != NULL);
-    rocksdb_options_set_sst_partitioner_factory(test_opts, partitioner_factory);
-
-    // Cleanup
-    rocksdb_file_checksum_gen_factory_destroy(checksum_factory);
-    rocksdb_sst_partitioner_factory_destroy(partitioner_factory);
-    rocksdb_options_destroy(test_opts);
-  }
-
-  StartPhase("remote_compaction_null_callback_handling");
-  {
-    // Test that NULL callback returns are handled gracefully
-    // This simulates a failure in the remote compaction service
-    rocksdb_compactionservice_t* null_service =
-        rocksdb_compactionservice_create(NULL, NULL, NullSchedule,
-                                         "NullTestService", NULL, NULL, NULL);
-
-    rocksdb_options_t* null_opts = rocksdb_options_create();
-    rocksdb_options_set_create_if_missing(null_opts, 1);
-    rocksdb_options_set_compaction_service(null_opts, null_service);
-
-    const char* null_db = "rocksdb_c_test_null_service";
-
-    rocksdb_t* null_db_handle = rocksdb_open(null_opts, null_db, &err);
-    CheckNoError(err);
-
-    // Write data and trigger compaction
-    for (int i = 0; i < 100; i++) {
-      char key[20], val[50];
-      snprintf(key, sizeof(key), "key%d", i);
-      snprintf(val, sizeof(val), "val%d", i);
-      rocksdb_put(null_db_handle, woptions, key, strlen(key), val, strlen(val),
-                  &err);
-      CheckNoError(err);
-    }
-
-    // This should fall back to local compaction (not crash)
-    rocksdb_compact_range(null_db_handle, NULL, 0, NULL, 0);
-
-    // Data should still be readable
-    CheckGet(null_db_handle, roptions, "key50", "val50");
-
-    rocksdb_close(null_db_handle);
-    rocksdb_destroy_db(null_opts, null_db, &err);
-    rocksdb_options_destroy(null_opts);
-  }
-
-  StartPhase("remote_compaction_canceled_flag");
-  {
-    // Test atomic cancellation flag API
-    unsigned char* canceled = rocksdb_open_and_compact_canceled_create();
-    CheckCondition(canceled != NULL);
-
-    // Set cancellation
-    rocksdb_open_and_compact_canceled_set(canceled, 1);
-
-    // Use with OpenAndCompactOptions
-    rocksdb_open_and_compact_options_t* oac_opts =
-        rocksdb_open_and_compact_options_create();
-    rocksdb_open_and_compact_options_set_canceled(oac_opts, canceled);
-    rocksdb_open_and_compact_options_set_allow_resumption(oac_opts, 1);
-
-    // Cleanup
-    rocksdb_open_and_compact_options_destroy(oac_opts);
-    rocksdb_open_and_compact_canceled_destroy(canceled);
-  }
-
   StartPhase("sst_file_manager");
   {
     rocksdb_sst_file_manager_t* sst_file_manager;
@@ -4880,21 +4224,6 @@ int main(int argc, char** argv) {
     rocksdb_sst_file_manager_destroy(sst_file_manager);
   }
 
-  StartPhase("create_column_family_error_returns_null");
-  {
-    // Creating a column family with a name that already exists should fail
-    // and return NULL. Without the fix, the handle is leaked and a non-NULL
-    // pointer with an indeterminate rep field is returned.
-    char* cf_err = NULL;
-    rocksdb_column_family_handle_t* cf_handle =
-        rocksdb_create_column_family(db, options, "default", &cf_err);
-    // Should have an error since "default" already exists
-    CheckCondition(cf_err != NULL);
-    // The handle should be NULL on error (this is the bug fix)
-    CheckCondition(cf_handle == NULL);
-    free(cf_err);
-  }
-
   StartPhase("cancel_all_background_work");
   rocksdb_cancel_all_background_work(db, 1);
 

db/column_family.cc

@@ -401,13 +401,7 @@ ColumnFamilyOptions SanitizeCfOptions(const ImmutableDBOptions& db_options,
   }
 
   if (result.max_compaction_bytes == 0) {
-    // For FIFO with use_kv_ratio_compaction, leave max_compaction_bytes as 0
-    // to signal "auto-calculate target from capacity and SST/blob ratio."
-    // When explicitly set by the user, it overrides the auto-calculated target.
-    if (result.compaction_style != kCompactionStyleFIFO ||
-        !result.compaction_options_fifo.use_kv_ratio_compaction) {
-      result.max_compaction_bytes = result.target_file_size_base * 25;
-    }
+    result.max_compaction_bytes = result.target_file_size_base * 25;
   }
 
   bool is_block_based_table = (result.table_factory->IsInstanceOf(
@@ -1254,7 +1248,7 @@ Compaction* ColumnFamilyData::PickCompaction(
   auto* result = compaction_picker_->PickCompaction(
       GetName(), mutable_options, mutable_db_options, existing_snapshots,
       snapshot_checker, current_->storage_info(), log_buffer,
-      GetFullHistoryTsLow(), require_max_output_level);
+      require_max_output_level);
   if (result != nullptr) {
     result->FinalizeInputInfo(current_);
   }
@@ -1342,7 +1336,7 @@ Compaction* ColumnFamilyData::CompactRange(
       GetName(), mutable_cf_options, mutable_db_options,
       current_->storage_info(), input_level, output_level,
       compact_range_options, begin, end, compaction_end, conflict,
-      max_file_num_to_ignore, trim_ts, GetFullHistoryTsLow());
+      max_file_num_to_ignore, trim_ts);
   if (result != nullptr) {
     result->FinalizeInputInfo(current_);
   }
@@ -1569,28 +1563,6 @@ Status ColumnFamilyData::ValidateOptions(
         "FIFO compaction only supported with max_open_files = -1.");
   }
 
-  if (db_options.open_files_async) {
-    // FIFO TTL picker relies on reading the files table properties inside a
-    // DB mutex. This can be slow if files are opened asynchronously, so we
-    // disable it.
-    //
-    // TODO: consider blocking fifo compaction until async file open task
-    // completes.
-    if (cf_options.compaction_style == kCompactionStyleFIFO) {
-      return Status::NotSupported(
-          "FIFO compaction is not supported with open_files_async = true.");
-    }
-    // Open files async is not useful if skip_stats_update_on_db_open=true
-    // because DB open will still block on IO.
-    //
-    // TODO: consider moving stats update inside async file open background
-    // task.
-    if (!db_options.skip_stats_update_on_db_open) {
-      return Status::InvalidArgument(
-          "open_files_async requires skip_stats_update_on_db_open = true.");
-    }
-  }
-
   std::vector<uint32_t> supported{0, 1, 2, 4, 8};
   if (std::find(supported.begin(), supported.end(),
                 cf_options.memtable_protection_bytes_per_key) ==

db/column_family_test.cc

@@ -118,7 +118,8 @@ class ColumnFamilyTestBase : public testing::Test {
 
     for (int i = 0; i < n; i++) {
       if (flush_every != 0 && i != 0 && i % flush_every == 0) {
-        dbfull()->TEST_FlushMemTable();
+        DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+        dbi->TEST_FlushMemTable();
       }
 
       int keyi = base + i;
@@ -176,7 +177,8 @@ class ColumnFamilyTestBase : public testing::Test {
     }
     handles_.clear();
     names_.clear();
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
   }
 
   Status TryOpen(std::vector<std::string> cf,
@@ -216,7 +218,7 @@ class ColumnFamilyTestBase : public testing::Test {
 
   void Open() { Open({"default"}); }
 
-  DBImpl* dbfull() { return static_cast_with_check<DBImpl>(db_.get()); }
+  DBImpl* dbfull() { return static_cast_with_check<DBImpl>(db_); }
 
   int GetProperty(int cf, std::string property) {
     std::string value;
@@ -498,7 +500,7 @@ class ColumnFamilyTestBase : public testing::Test {
   ColumnFamilyOptions column_family_options_;
   DBOptions db_options_;
   std::string dbname_;
-  std::unique_ptr<DB> db_;
+  DB* db_ = nullptr;
   EnvCounter* env_;
   std::shared_ptr<Env> env_guard_;
   Random rnd_;
@@ -515,7 +517,7 @@ class ColumnFamilyTest
 INSTANTIATE_TEST_CASE_P(FormatDef, ColumnFamilyTest,
                         testing::Values(test::kDefaultFormatVersion));
 INSTANTIATE_TEST_CASE_P(FormatLatest, ColumnFamilyTest,
-                        testing::Values(kLatestBbtFormatVersion));
+                        testing::Values(kLatestFormatVersion));
 
 TEST_P(ColumnFamilyTest, DontReuseColumnFamilyID) {
   for (int iter = 0; iter < 3; ++iter) {
@@ -705,8 +707,8 @@ INSTANTIATE_TEST_CASE_P(
                     std::make_tuple(test::kDefaultFormatVersion, false)));
 INSTANTIATE_TEST_CASE_P(
     FormatLatest, FlushEmptyCFTestWithParam,
-    testing::Values(std::make_tuple(kLatestBbtFormatVersion, true),
-                    std::make_tuple(kLatestBbtFormatVersion, false)));
+    testing::Values(std::make_tuple(kLatestFormatVersion, true),
+                    std::make_tuple(kLatestFormatVersion, false)));
 
 TEST_P(ColumnFamilyTest, AddDrop) {
   Open();
@@ -3540,10 +3542,11 @@ TEST_P(ColumnFamilyTest, MultipleCFPathsTest) {
 
   // Re-open and verify the keys.
   Reopen({ColumnFamilyOptions(), cf_opt1, cf_opt2});
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
   for (int cf = 1; cf != 3; ++cf) {
     ReadOptions read_options;
     read_options.readahead_size = 0;
-    auto it = db_->NewIterator(read_options, handles_[cf]);
+    auto it = dbi->NewIterator(read_options, handles_[cf]);
     for (it->SeekToFirst(); it->Valid(); it->Next()) {
       ASSERT_OK(it->status());
       Slice key(it->key());
@@ -3633,7 +3636,7 @@ TEST(ColumnFamilyTest, ValidateMemtableKVChecksumOption) {
 // the behavior of manual flush is that it skips retaining UDTs.
 class ColumnFamilyRetainUDTTest : public ColumnFamilyTestBase {
  public:
-  ColumnFamilyRetainUDTTest() : ColumnFamilyTestBase(kLatestBbtFormatVersion) {}
+  ColumnFamilyRetainUDTTest() : ColumnFamilyTestBase(kLatestFormatVersion) {}
 
   void SetUp() override {
     db_options_.allow_concurrent_memtable_write = false;
@@ -3883,7 +3886,7 @@ TEST_F(ManualFlushSkipRetainUDTTest, FlushRemovesStaleEntries) {
       static_cast_with_check<ColumnFamilyHandleImpl>(cfh)->cfd();
   for (int version = 0; version < 100; version++) {
     if (version == 50) {
-      ASSERT_OK(dbfull()->TEST_SwitchMemtable(cfd));
+      ASSERT_OK(static_cast_with_check<DBImpl>(db_)->TEST_SwitchMemtable(cfd));
     }
     ASSERT_OK(
         Put(0, "foo", EncodeAsUint64(version), "v" + std::to_string(version)));

db/compact_files_test.cc

@@ -75,9 +75,10 @@ TEST_F(CompactFilesTest, L0ConflictsFiles) {
   options.level0_file_num_compaction_trigger = kLevel0Trigger;
   options.compression = kNoCompression;
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   ASSERT_OK(DestroyDB(db_name_, options));
-  ASSERT_OK(DB::Open(options, db_name_, &db));
+  Status s = DB::Open(options, db_name_, &db);
+  assert(s.ok());
   assert(db);
 
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency({
@@ -113,6 +114,7 @@ TEST_F(CompactFilesTest, L0ConflictsFiles) {
     }
   }
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
+  delete db;
 }
 
 TEST_F(CompactFilesTest, MultipleLevel) {
@@ -126,11 +128,11 @@ TEST_F(CompactFilesTest, MultipleLevel) {
   FlushedFileCollector* collector = new FlushedFileCollector();
   options.listeners.emplace_back(collector);
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   ASSERT_OK(DestroyDB(db_name_, options));
   Status s = DB::Open(options, db_name_, &db);
   ASSERT_OK(s);
-  ASSERT_NE(db.get(), nullptr);
+  ASSERT_NE(db, nullptr);
 
   // create couple files in L0, L3, L4 and L5
   for (int i = 5; i > 2; --i) {
@@ -139,8 +141,7 @@ TEST_F(CompactFilesTest, MultipleLevel) {
     ASSERT_OK(db->Flush(FlushOptions()));
     // Ensure background work is fully finished including listener callbacks
     // before accessing listener state.
-    ASSERT_OK(
-        static_cast_with_check<DBImpl>(db.get())->TEST_WaitForBackgroundWork());
+    ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForBackgroundWork());
     auto l0_files = collector->GetFlushedFiles();
     ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files, i));
 
@@ -190,6 +191,8 @@ TEST_F(CompactFilesTest, MultipleLevel) {
   ASSERT_OK(db->CompactFiles(CompactionOptions(), files, 5));
   SyncPoint::GetInstance()->DisableProcessing();
   thread.join();
+
+  delete db;
 }
 
 TEST_F(CompactFilesTest, ObsoleteFiles) {
@@ -209,11 +212,11 @@ TEST_F(CompactFilesTest, ObsoleteFiles) {
   FlushedFileCollector* collector = new FlushedFileCollector();
   options.listeners.emplace_back(collector);
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   ASSERT_OK(DestroyDB(db_name_, options));
   Status s = DB::Open(options, db_name_, &db);
   ASSERT_OK(s);
-  ASSERT_NE(db.get(), nullptr);
+  ASSERT_NE(db, nullptr);
 
   // create couple files
   for (int i = 1000; i < 2000; ++i) {
@@ -223,12 +226,13 @@ TEST_F(CompactFilesTest, ObsoleteFiles) {
 
   auto l0_files = collector->GetFlushedFiles();
   ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files, 1));
-  ASSERT_OK(static_cast_with_check<DBImpl>(db.get())->TEST_WaitForCompact());
+  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForCompact());
 
   // verify all compaction input files are deleted
   for (const auto& fname : l0_files) {
     ASSERT_EQ(Status::NotFound(), env_->FileExists(fname));
   }
+  delete db;
 }
 
 TEST_F(CompactFilesTest, NotCutOutputOnLevel0) {
@@ -247,9 +251,10 @@ TEST_F(CompactFilesTest, NotCutOutputOnLevel0) {
   FlushedFileCollector* collector = new FlushedFileCollector();
   options.listeners.emplace_back(collector);
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   ASSERT_OK(DestroyDB(db_name_, options));
-  ASSERT_OK(DB::Open(options, db_name_, &db));
+  Status s = DB::Open(options, db_name_, &db);
+  assert(s.ok());
   assert(db);
 
   // create couple files
@@ -257,20 +262,19 @@ TEST_F(CompactFilesTest, NotCutOutputOnLevel0) {
     ASSERT_OK(db->Put(WriteOptions(), std::to_string(i),
                       std::string(1000, 'a' + (i % 26))));
   }
-  ASSERT_OK(
-      static_cast_with_check<DBImpl>(db.get())->TEST_WaitForFlushMemTable());
+  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
   auto l0_files_1 = collector->GetFlushedFiles();
   collector->ClearFlushedFiles();
   for (int i = 0; i < 500; ++i) {
     ASSERT_OK(db->Put(WriteOptions(), std::to_string(i),
                       std::string(1000, 'a' + (i % 26))));
   }
-  ASSERT_OK(
-      static_cast_with_check<DBImpl>(db.get())->TEST_WaitForFlushMemTable());
+  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
   auto l0_files_2 = collector->GetFlushedFiles();
   ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files_1, 0));
   ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files_2, 0));
   // no assertion failure
+  delete db;
 }
 
 TEST_F(CompactFilesTest, CapturingPendingFiles) {
@@ -285,7 +289,7 @@ TEST_F(CompactFilesTest, CapturingPendingFiles) {
   FlushedFileCollector* collector = new FlushedFileCollector();
   options.listeners.emplace_back(collector);
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   ASSERT_OK(DestroyDB(db_name_, options));
   Status s = DB::Open(options, db_name_, &db);
   ASSERT_OK(s);
@@ -299,8 +303,7 @@ TEST_F(CompactFilesTest, CapturingPendingFiles) {
 
   // Ensure background work is fully finished including listener callbacks
   // before accessing listener state.
-  ASSERT_OK(
-      static_cast_with_check<DBImpl>(db.get())->TEST_WaitForBackgroundWork());
+  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForBackgroundWork());
   auto l0_files = collector->GetFlushedFiles();
   EXPECT_EQ(5, l0_files.size());
 
@@ -324,12 +327,13 @@ TEST_F(CompactFilesTest, CapturingPendingFiles) {
 
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
 
-  db.reset();
+  delete db;
 
   // Make sure we can reopen the DB.
   s = DB::Open(options, db_name_, &db);
   ASSERT_OK(s);
   assert(db);
+  delete db;
 }
 
 TEST_F(CompactFilesTest, CompactionFilterWithGetSv) {
@@ -361,12 +365,12 @@ TEST_F(CompactFilesTest, CompactionFilterWithGetSv) {
   options.create_if_missing = true;
   options.compaction_filter = cf.get();
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   ASSERT_OK(DestroyDB(db_name_, options));
   Status s = DB::Open(options, db_name_, &db);
   ASSERT_OK(s);
 
-  cf->SetDB(db.get());
+  cf->SetDB(db);
 
   // Write one L0 file
   ASSERT_OK(db->Put(WriteOptions(), "K1", "V1"));
@@ -380,6 +384,8 @@ TEST_F(CompactFilesTest, CompactionFilterWithGetSv) {
     ASSERT_OK(
         db->CompactFiles(ROCKSDB_NAMESPACE::CompactionOptions(), {fname}, 0));
   }
+
+  delete db;
 }
 
 TEST_F(CompactFilesTest, SentinelCompressionType) {
@@ -407,7 +413,7 @@ TEST_F(CompactFilesTest, SentinelCompressionType) {
     options.create_if_missing = true;
     FlushedFileCollector* collector = new FlushedFileCollector();
     options.listeners.emplace_back(collector);
-    std::unique_ptr<DB> db;
+    DB* db = nullptr;
     ASSERT_OK(DB::Open(options, db_name_, &db));
 
     ASSERT_OK(db->Put(WriteOptions(), "key", "val"));
@@ -415,8 +421,7 @@ TEST_F(CompactFilesTest, SentinelCompressionType) {
 
     // Ensure background work is fully finished including listener callbacks
     // before accessing listener state.
-    ASSERT_OK(
-        static_cast_with_check<DBImpl>(db.get())->TEST_WaitForBackgroundWork());
+    ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForBackgroundWork());
     auto l0_files = collector->GetFlushedFiles();
     ASSERT_EQ(1, l0_files.size());
 
@@ -428,10 +433,10 @@ TEST_F(CompactFilesTest, SentinelCompressionType) {
     ROCKSDB_NAMESPACE::TablePropertiesCollection all_tables_props;
     ASSERT_OK(db->GetPropertiesOfAllTables(&all_tables_props));
     for (const auto& name_and_table_props : all_tables_props) {
-      // As of format_version 7, more elaborate information is encoded into the
-      // compression_name property
-      ASSERT_EQ("BuiltinV2;02;", name_and_table_props.second->compression_name);
+      ASSERT_EQ(CompressionTypeToString(CompressionType::kZlibCompression),
+                name_and_table_props.second->compression_name);
     }
+    delete db;
   }
 }
 
@@ -456,7 +461,11 @@ TEST_F(CompactFilesTest, CompressionWithBlockAlign) {
   }
 
   std::unique_ptr<DB> db;
-  ASSERT_OK(DB::Open(options, db_name_, &db));
+  {
+    DB* _db = nullptr;
+    ASSERT_OK(DB::Open(options, db_name_, &_db));
+    db.reset(_db);
+  }
 
   ASSERT_OK(db->Put(WriteOptions(), "key", "val"));
   ASSERT_OK(db->Flush(FlushOptions()));
@@ -495,7 +504,7 @@ TEST_F(CompactFilesTest, GetCompactionJobInfo) {
   FlushedFileCollector* collector = new FlushedFileCollector();
   options.listeners.emplace_back(collector);
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   ASSERT_OK(DestroyDB(db_name_, options));
   Status s = DB::Open(options, db_name_, &db);
   ASSERT_OK(s);
@@ -506,8 +515,7 @@ TEST_F(CompactFilesTest, GetCompactionJobInfo) {
     ASSERT_OK(db->Put(WriteOptions(), std::to_string(i),
                       std::string(1000, 'a' + (i % 26))));
   }
-  ASSERT_OK(
-      static_cast_with_check<DBImpl>(db.get())->TEST_WaitForFlushMemTable());
+  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForFlushMemTable());
   auto l0_files_1 = collector->GetFlushedFiles();
   CompactionOptions co;
   co.compression = CompressionType::kLZ4Compression;
@@ -523,228 +531,7 @@ TEST_F(CompactFilesTest, GetCompactionJobInfo) {
   ASSERT_EQ(compaction_job_info.output_level, 0);
   ASSERT_OK(compaction_job_info.status);
   // no assertion failure
-}
-
-// Helper function to generate zero-padded keys
-// e.g., MakeKey("a", 5) -> "a05", MakeKey("b", 42) -> "b42"
-static std::string MakeKey(const std::string& prefix, int index) {
-  return prefix + (index < 10 ? "0" : "") + std::to_string(index);
-}
-
-TEST_F(CompactFilesTest, TrivialMoveNonOverlappingFiles) {
-  Options options;
-  options.create_if_missing = true;
-  options.disable_auto_compactions = true;
-  options.compression = kNoCompression;
-  options.level_compaction_dynamic_level_bytes = false;
-
-  std::unique_ptr<DB> db;
-  ASSERT_OK(DestroyDB(db_name_, options));
-  Status s = DB::Open(options, db_name_, &db);
-  ASSERT_OK(s);
-  ASSERT_NE(db.get(), nullptr);
-
-  // Create 3 non-overlapping files in L0
-  // File 1: keys [a00-a99]
-  for (int i = 0; i < 100; i++) {
-    std::string key = MakeKey("a", i);
-    ASSERT_OK(db->Put(WriteOptions(), key, "value_" + key));
-  }
-  ASSERT_OK(db->Flush(FlushOptions()));
-
-  // File 2: keys [b00-b99]
-  for (int i = 0; i < 100; i++) {
-    std::string key = MakeKey("b", i);
-    ASSERT_OK(db->Put(WriteOptions(), key, "value_" + key));
-  }
-  ASSERT_OK(db->Flush(FlushOptions()));
-
-  // File 3: keys [c00-c99]
-  for (int i = 0; i < 100; i++) {
-    std::string key = MakeKey("c", i);
-    ASSERT_OK(db->Put(WriteOptions(), key, "value_" + key));
-  }
-  ASSERT_OK(db->Flush(FlushOptions()));
-
-  // Verify files are in L0
-  ColumnFamilyMetaData meta;
-  db->GetColumnFamilyMetaData(&meta);
-  ASSERT_EQ(meta.levels[0].files.size(), 3);
-  ASSERT_EQ(meta.levels[1].files.size(), 0);
-
-  // Get L0 files
-  std::vector<std::string> l0_files;
-  for (const auto& file : meta.levels[0].files) {
-    l0_files.push_back(file.db_path + "/" + file.name);
-  }
-
-  CompactionOptions compact_option;
-  compact_option.allow_trivial_move = true;
-  // Compact all L0 files to L1 (non-overlapping in L1)
-  ASSERT_OK(db->CompactFiles(compact_option, l0_files, 1));
-
-  // Verify files are now in L1
-  db->GetColumnFamilyMetaData(&meta);
-  ASSERT_EQ(meta.levels[0].files.size(), 0);
-  ASSERT_EQ(meta.levels[1].files.size(), 3);
-
-  // Get the first file from L1 (should be the one with keys a00-a99)
-  std::string l1_file_to_move;
-  std::vector<std::string> l1_files_to_move_later;
-  uint64_t l1_file_number = 0;
-  for (const auto& file : meta.levels[1].files) {
-    if (file.smallestkey[0] == 'a') {
-      l1_file_to_move = file.db_path + "/" + file.name;
-      l1_file_number = file.file_number;
-    } else {
-      l1_files_to_move_later.push_back(file.db_path + "/" + file.name);
-    }
-  }
-  ASSERT_FALSE(l1_file_to_move.empty());
-
-  // Set up sync point to verify trivial move path is taken
-  bool trivial_move_executed = false;
-  SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::CompactFilesImpl:TrivialMove",
-      [&](void* /*arg*/) { trivial_move_executed = true; });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  // Move the file from L1 to L6 - this should be a trivial move
-  // because the file doesn't overlap with anything in L6
-  std::vector<std::string> files_to_move = {l1_file_to_move};
-  ASSERT_OK(db->CompactFiles(compact_option, files_to_move, 6));
-
-  // Verify trivial move was executed
-  ASSERT_TRUE(trivial_move_executed);
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  // Verify the file is now in L6
-  db->GetColumnFamilyMetaData(&meta);
-  ASSERT_EQ(meta.levels[1].files.size(), 2);  // Two files remain in L1
-  ASSERT_EQ(meta.levels[6].files.size(), 1);  // One file in L6
-
-  // Verify it's the correct file in L6
-  bool found_file_in_l6 = false;
-  for (const auto& file : meta.levels[6].files) {
-    if (file.file_number == l1_file_number) {
-      found_file_in_l6 = true;
-      // Verify key range hasn't changed
-      ASSERT_EQ(file.smallestkey[0], 'a');
-      ASSERT_EQ(file.largestkey[0], 'a');
-      break;
-    }
-  }
-  ASSERT_TRUE(found_file_in_l6);
-
-  // Move the other 2 files from L1 to L6, with allow_trivial_move set to false.
-  // This will trigger a normal compaction, so the 2 files will be compacted
-  // into a single file in L6.
-  ASSERT_OK(db->CompactFiles(CompactionOptions(), l1_files_to_move_later, 6));
-
-  // Verify files in L6
-  db->GetColumnFamilyMetaData(&meta);
-  ASSERT_EQ(meta.levels[1].files.size(), 0);  // Zero files remain in L1
-  ASSERT_EQ(meta.levels[6].files.size(), 2);  // Two file in L6
-
-  // Verify data integrity - all keys should still be readable
-  for (int i = 0; i < 100; i++) {
-    std::string key = MakeKey("a", i);
-    std::string value;
-    ASSERT_OK(db->Get(ReadOptions(), key, &value));
-    ASSERT_EQ(value, "value_" + key);
-  }
-}
-
-TEST_F(CompactFilesTest, TrivialMoveBlockedByOverlap) {
-  Options options;
-  options.create_if_missing = true;
-  options.disable_auto_compactions = true;
-  options.compression = kNoCompression;
-  options.level_compaction_dynamic_level_bytes = false;
-  options.num_levels = 7;
-
-  std::unique_ptr<DB> db;
-  ASSERT_OK(DestroyDB(db_name_, options));
-  Status s = DB::Open(options, db_name_, &db);
-  ASSERT_OK(s);
-  ASSERT_NE(db.get(), nullptr);
-
-  // Create a file in L6 with keys [m00-m99] (wide range)
-  for (int i = 0; i < 100; i++) {
-    std::string key = MakeKey("m", i);
-    ASSERT_OK(db->Put(WriteOptions(), key, "value_" + key));
-  }
-  ASSERT_OK(db->Flush(FlushOptions()));
-
-  // Get L0 file
-  ColumnFamilyMetaData meta;
-  db->GetColumnFamilyMetaData(&meta);
-  std::vector<std::string> l0_files;
-  for (const auto& file : meta.levels[0].files) {
-    l0_files.push_back(file.db_path + "/" + file.name);
-  }
-
-  CompactionOptions compact_option;
-  compact_option.allow_trivial_move = true;
-
-  // Move to L6
-  ASSERT_OK(db->CompactFiles(compact_option, l0_files, 6));
-
-  // Now create a file in L1 with overlapping keys [m50-m60]
-  for (int i = 50; i <= 60; i++) {
-    std::string key = "m" + std::to_string(i);
-    ASSERT_OK(db->Put(WriteOptions(), key, "updated_value_" + key));
-  }
-  ASSERT_OK(db->Flush(FlushOptions()));
-
-  // Get the L0 file
-  db->GetColumnFamilyMetaData(&meta);
-  std::vector<std::string> l0_files_2;
-  for (const auto& file : meta.levels[0].files) {
-    l0_files_2.push_back(file.db_path + "/" + file.name);
-  }
-
-  // Move to L1
-  ASSERT_OK(db->CompactFiles(compact_option, l0_files_2, 1));
-
-  // Get the L1 file
-  db->GetColumnFamilyMetaData(&meta);
-  ASSERT_EQ(meta.levels[1].files.size(), 1);
-  std::string l1_file =
-      meta.levels[1].files[0].db_path + "/" + meta.levels[1].files[0].name;
-
-  // Set up sync point to verify full compaction path is taken
-  bool trivial_move_executed = false;
-  SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::CompactFilesImpl:TrivialMove",
-      [&](void* /*arg*/) { trivial_move_executed = true; });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  // Try to move from L1 to L6 - this should NOT be a trivial move
-  // because the file overlaps with the existing file in L6
-  ASSERT_OK(db->CompactFiles(compact_option, {l1_file}, 6));
-
-  // Verify trivial move was NOT executed (full compaction happened)
-  ASSERT_FALSE(trivial_move_executed);
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  // Verify the result - should have merged data in L6
-  db->GetColumnFamilyMetaData(&meta);
-  ASSERT_EQ(meta.levels[1].files.size(), 0);  // L1 should be empty
-  // L6 should have the merged file (may be 1 file if merged, or 2 if not)
-  ASSERT_GE(meta.levels[6].files.size(), 1);
-
-  // Verify updated values are present
-  for (int i = 50; i <= 60; i++) {
-    std::string key = "m" + std::to_string(i);
-    std::string value;
-    ASSERT_OK(db->Get(ReadOptions(), key, &value));
-    ASSERT_EQ(value, "updated_value_" + key);
-  }
+  delete db;
 }
 
 }  // namespace ROCKSDB_NAMESPACE

db/compaction/compaction.cc

@@ -281,9 +281,8 @@ Compaction::Compaction(
     std::vector<CompactionInputFiles> _inputs, int _output_level,
     uint64_t _target_file_size, uint64_t _max_compaction_bytes,
     uint32_t _output_path_id, CompressionType _compression,
-    CompressionOptions _compression_opts,
-    Temperature _output_temperature_override, uint32_t _max_subcompactions,
-    std::vector<FileMetaData*> _grandparents,
+    CompressionOptions _compression_opts, Temperature _output_temperature,
+    uint32_t _max_subcompactions, std::vector<FileMetaData*> _grandparents,
     std::optional<SequenceNumber> _earliest_snapshot,
     const SnapshotChecker* _snapshot_checker,
     CompactionReason _compaction_reason, const std::string& _trim_ts,
@@ -304,7 +303,7 @@ Compaction::Compaction(
       output_path_id_(_output_path_id),
       output_compression_(_compression),
       output_compression_opts_(_compression_opts),
-      output_temperature_override_(_output_temperature_override),
+      output_temperature_(_output_temperature),
       deletion_compaction_(_compaction_reason == CompactionReason::kFIFOTtl ||
                            _compaction_reason ==
                                CompactionReason::kFIFOMaxSize),
@@ -1129,17 +1128,4 @@ void Compaction::FilterInputsForCompactionIterator() {
   }
 }
 
-Temperature Compaction::GetOutputTemperature(bool is_proximal_level) const {
-  if (output_temperature_override_ != Temperature::kUnknown) {
-    return output_temperature_override_;
-  }
-
-  if (is_last_level() && !is_proximal_level &&
-      mutable_cf_options_.last_level_temperature != Temperature::kUnknown) {
-    return mutable_cf_options_.last_level_temperature;
-  }
-
-  return mutable_cf_options_.default_write_temperature;
-}
-
 }  // namespace ROCKSDB_NAMESPACE

db/compaction/compaction.h

@@ -90,8 +90,7 @@ class Compaction {
              uint64_t target_file_size, uint64_t max_compaction_bytes,
              uint32_t output_path_id, CompressionType compression,
              CompressionOptions compression_opts,
-             Temperature output_temperature_override,
-             uint32_t max_subcompactions,
+             Temperature output_temperature, uint32_t max_subcompactions,
              std::vector<FileMetaData*> grandparents,
              std::optional<SequenceNumber> earliest_snapshot,
              const SnapshotChecker* snapshot_checker,
@@ -180,10 +179,6 @@ class Compaction {
   const std::vector<CompactionInputFiles>* inputs() { return &inputs_; }
 
   // Returns the LevelFilesBrief of the specified compaction input level.
-  // Note that if the compaction includes standalone range deletion file,
-  // this function returns the result after filtering out input files covered
-  // by the range deletion file.
-  // Use inputs() if you want to get the original input files.
   const LevelFilesBrief* input_levels(size_t compaction_input_level) const {
     return &input_levels_[compaction_input_level];
   }
@@ -414,11 +409,7 @@ class Compaction {
 
   uint64_t max_compaction_bytes() const { return max_compaction_bytes_; }
 
-  // Order of precedence for temperature:
-  // 1. Override temp if not kUnknown
-  // 2. Temperature of the last level files if applicable
-  // 3. Default write temperature
-  Temperature GetOutputTemperature(bool is_proximal_level = false) const;
+  Temperature output_temperature() const { return output_temperature_; }
 
   uint32_t max_subcompactions() const { return max_subcompactions_; }
 
@@ -550,7 +541,7 @@ class Compaction {
   const uint32_t output_path_id_;
   CompressionType output_compression_;
   CompressionOptions output_compression_opts_;
-  Temperature output_temperature_override_;
+  Temperature output_temperature_;
   // If true, then the compaction can be done by simply deleting input files.
   const bool deletion_compaction_;
   // should it split the output file using the compact cursor?

db/compaction/compaction_iterator.cc

@@ -1310,14 +1310,14 @@ void CompactionIterator::PrepareOutput() {
             validity_info_.rep);
         assert(false);
       }
-
-      bool zeroed_seqno = false;
+      ikey_.sequence = 0;
+      last_key_seq_zeroed_ = true;
+      TEST_SYNC_POINT_CALLBACK("CompactionIterator::PrepareOutput:ZeroingSeq",
+                               &ikey_);
       if (!timestamp_size_) {
         current_key_.UpdateInternalKey(0, ikey_.type);
-        zeroed_seqno = true;
       } else if (full_history_ts_low_ && cmp_with_history_ts_low_ < 0) {
-        // For UDT, the seqno and timestamp could only be zeroed out after the
-        // key is below history_ts_low_.
+        // We can also zero out timestamp for better compression.
         // For the same user key (excluding timestamp), the timestamp-based
         // history can be collapsed to save some space if the timestamp is
         // older than *full_history_ts_low_.
@@ -1325,14 +1325,6 @@ void CompactionIterator::PrepareOutput() {
         const Slice ts_slice = kTsMin;
         ikey_.SetTimestamp(ts_slice);
         current_key_.UpdateInternalKey(0, ikey_.type, &ts_slice);
-        zeroed_seqno = true;
-      }
-
-      if (zeroed_seqno) {
-        ikey_.sequence = 0;
-        last_key_seq_zeroed_ = true;
-        TEST_SYNC_POINT_CALLBACK("CompactionIterator::PrepareOutput:ZeroingSeq",
-                                 &ikey_);
       }
     }
   }

db/compaction/compaction_iterator.h

@@ -270,16 +270,6 @@ class CompactionIterator {
   // true, unless `must_count_input_entries=true` was specified during iterator
   // creation (which ensures the count is always accurate).
   uint64_t NumInputEntryScanned() const { return input_.NumItered(); }
-
-  // Returns true if the current valid key was already scanned/counted during
-  // a lookahead operation in a previous iteration.
-  //
-  // REQUIRED: Valid() must be true
-  bool IsCurrentKeyAlreadyScanned() const {
-    assert(Valid());
-    return at_next_ || merge_out_iter_.Valid();
-  }
-
   Status InputStatus() const { return input_.status(); }
 
   bool IsDeleteRangeSentinelKey() const { return is_range_del_; }

db/compaction/compaction_job.h

@@ -142,9 +142,6 @@ class SubcompactionState;
 
 class CompactionJob {
  public:
-  // Constant false aborted flag, used for compaction service jobs
-  static const std::atomic<int> kCompactionAbortedFalse;
-
   CompactionJob(int job_id, Compaction* compaction,
                 const ImmutableDBOptions& db_options,
                 const MutableDBOptions& mutable_db_options,
@@ -160,7 +157,6 @@ class CompactionJob {
                 Env::Priority thread_pri,
                 const std::shared_ptr<IOTracer>& io_tracer,
                 const std::atomic<bool>& manual_compaction_canceled,
-                const std::atomic<int>& compaction_aborted,
                 const std::string& db_id = "",
                 const std::string& db_session_id = "",
                 std::string full_history_ts_low = "", std::string trim_ts = "",
@@ -180,20 +176,9 @@ class CompactionJob {
   // and organizing seqno <-> time info. `known_single_subcompact` is non-null
   // if we already have a known single subcompaction, with optional key bounds
   // (currently for executing a remote compaction).
-  //
-  // @param compaction_progress Previously saved compaction progress
-  //   to resume from. If empty, compaction starts fresh from the
-  //   beginning.
-  //
-  // @param compaction_progress_writer Writer for persisting
-  //   subcompaction progress periodically during compaction
-  //   execution. If nullptr, progress tracking is disabled and compaction
-  //   cannot be resumed later.
   void Prepare(
       std::optional<std::pair<std::optional<Slice>, std::optional<Slice>>>
-          known_single_subcompact,
-      const CompactionProgress& compaction_progress = CompactionProgress{},
-      log::Writer* compaction_progress_writer = nullptr);
+          known_single_subcompact);
 
   // REQUIRED mutex not held
   // Launch threads for each subcompaction and wait for them to finish. After
@@ -212,7 +197,6 @@ class CompactionJob {
 
  protected:
   void UpdateCompactionJobOutputStatsFromInternalStats(
-      const Status& status,
       const InternalStats::CompactionStatsFull& internal_stats) const;
 
   void LogCompaction();
@@ -254,10 +238,6 @@ class CompactionJob {
   // @param num_input_range_del if non-null, will be set to the number of range
   // deletion entries in this compaction input.
   //
-  // If any input file has potentially unreliable num_entries count (old SST
-  // files - details in implementation),
-  // job_stats_->has_accurate_num_input_records is set to false.
-  //
   // Returns true iff internal_stats_.output_level_stats.num_input_records and
   // num_input_range_del are calculated successfully.
   //
@@ -279,10 +259,6 @@ class CompactionJob {
   // consecutive groups such that each group has a similar size.
   void GenSubcompactionBoundaries();
 
-  void MaybeAssignCompactionProgressAndWriter(
-      const CompactionProgress& compaction_progress,
-      log::Writer* compaction_progress_writer);
-
   // Get the number of planned subcompactions based on max_subcompactions and
   // extra reserved resources
   uint64_t GetSubcompactionsLimit();
@@ -307,7 +283,6 @@ class CompactionJob {
   void RunSubcompactions();
   void UpdateTimingStats(uint64_t start_micros);
   void RemoveEmptyOutputs();
-  void CleanupAbortedSubcompactions();
   bool HasNewBlobFiles() const;
   Status CollectSubcompactionErrors();
   Status SyncOutputDirectories();
@@ -372,6 +347,11 @@ class CompactionJob {
     std::unique_ptr<InternalIterator> trim_history_iter;
   };
 
+  struct BlobFileResources {
+    std::vector<std::string> blob_file_paths;
+    std::unique_ptr<BlobFileBuilder> blob_file_builder;
+  };
+
   bool ShouldUseLocalCompaction(SubcompactionState* sub_compact);
   CompactionIOStatsSnapshot InitializeIOStats();
   Status SetupAndValidateCompactionFilter(
@@ -379,21 +359,20 @@ class CompactionJob {
       const CompactionFilter* configured_compaction_filter,
       const CompactionFilter*& compaction_filter,
       std::unique_ptr<CompactionFilter>& compaction_filter_from_factory);
-  void InitializeReadOptionsAndBoundaries(
-      size_t ts_sz, ReadOptions& read_options,
-      SubcompactionKeyBoundaries& boundaries);
+  void InitializeReadOptions(ColumnFamilyData* cfd, ReadOptions& read_options,
+                             SubcompactionKeyBoundaries& boundaries);
   InternalIterator* CreateInputIterator(
       SubcompactionState* sub_compact, ColumnFamilyData* cfd,
       SubcompactionInternalIterators& iterators,
       SubcompactionKeyBoundaries& boundaries, ReadOptions& read_options);
-  void CreateBlobFileBuilder(
-      SubcompactionState* sub_compact, ColumnFamilyData* cfd,
-      std::unique_ptr<BlobFileBuilder>& blob_file_builder,
-      const WriteOptions& write_options);
+  void CreateBlobFileBuilder(SubcompactionState* sub_compact,
+                             ColumnFamilyData* cfd,
+                             BlobFileResources& blob_resources,
+                             const WriteOptions& write_options);
   std::unique_ptr<CompactionIterator> CreateCompactionIterator(
       SubcompactionState* sub_compact, ColumnFamilyData* cfd,
       InternalIterator* input_iter, const CompactionFilter* compaction_filter,
-      MergeHelper& merge, std::unique_ptr<BlobFileBuilder>& blob_file_builder,
+      MergeHelper& merge, BlobFileResources& blob_resources,
       const WriteOptions& write_options);
   std::pair<CompactionFileOpenFunc, CompactionFileCloseFunc> CreateFileHandlers(
       SubcompactionState* sub_compact, SubcompactionKeyBoundaries& boundaries);
@@ -432,12 +411,12 @@ class CompactionJob {
   // update the thread status for starting a compaction.
   void ReportStartedCompaction(Compaction* compaction);
 
-  Status FinishCompactionOutputFile(
-      const Status& input_status,
-      const ParsedInternalKey& prev_iter_output_internal_key,
-      const Slice& next_table_min_key, const Slice* comp_start_user_key,
-      const Slice* comp_end_user_key, const CompactionIterator* c_iter,
-      SubcompactionState* sub_compact, CompactionOutputs& outputs);
+  Status FinishCompactionOutputFile(const Status& input_status,
+                                    SubcompactionState* sub_compact,
+                                    CompactionOutputs& outputs,
+                                    const Slice& next_table_min_key,
+                                    const Slice* comp_start_user_key,
+                                    const Slice* comp_end_user_key);
   Status InstallCompactionResults(bool* compaction_released);
   Status OpenCompactionOutputFile(SubcompactionState* sub_compact,
                                   CompactionOutputs& outputs);
@@ -465,7 +444,6 @@ class CompactionJob {
   VersionSet* versions_;
   const std::atomic<bool>* shutting_down_;
   const std::atomic<bool>& manual_compaction_canceled_;
-  const std::atomic<int>& compaction_aborted_;
   FSDirectory* db_directory_;
   FSDirectory* blob_output_directory_;
   InstrumentedMutex* db_mutex_;
@@ -515,9 +493,6 @@ class CompactionJob {
   // Setting this requires DBMutex.
   uint64_t options_file_number_ = 0;
 
-  // Writer for persisting compaction progress during compaction
-  log::Writer* compaction_progress_writer_ = nullptr;
-
   // Get table file name in where it's outputting to, which should also be in
   // `output_directory_`.
   virtual std::string GetTableFileName(uint64_t file_number);
@@ -525,43 +500,6 @@ class CompactionJob {
   // The Compaction Read and Write priorities are the same for different
   // scenarios, such as write stalled.
   Env::IOPriority GetRateLimiterPriority();
-
-  Status MaybeResumeSubcompactionProgressOnInputIterator(
-      SubcompactionState* sub_compact, InternalIterator* input_iter);
-
-  Status ReadOutputFilesTableProperties(
-      const autovector<FileMetaData>& temporary_output_file_allocation,
-      const ReadOptions& read_options,
-      std::vector<std::shared_ptr<const TableProperties>>&
-          output_files_table_properties,
-      bool is_proximal_level = false);
-
-  Status ReadTablePropertiesDirectly(
-      const ImmutableOptions& ioptions, const MutableCFOptions& moptions,
-      const FileMetaData* file_meta, const ReadOptions& read_options,
-      std::shared_ptr<const TableProperties>* tp);
-
-  void RestoreCompactionOutputs(
-      const ColumnFamilyData* cfd,
-      const std::vector<std::shared_ptr<const TableProperties>>&
-          output_files_table_properties,
-      SubcompactionProgressPerLevel& subcompaction_progress_per_level,
-      CompactionOutputs* outputs_to_restore);
-
-  bool ShouldUpdateSubcompactionProgress(
-      const SubcompactionState* sub_compact, const CompactionIterator* c_iter,
-      const ParsedInternalKey& prev_iter_output_internal_key,
-      const Slice& next_table_min_internal_key, const FileMetaData* meta) const;
-
-  void UpdateSubcompactionProgress(const CompactionIterator* c_iter,
-                                   const Slice next_table_min_key,
-                                   SubcompactionState* sub_compact);
-
-  Status PersistSubcompactionProgress(SubcompactionState* sub_compact);
-
-  void UpdateSubcompactionProgressPerLevel(
-      SubcompactionState* sub_compact, bool is_proximal_level,
-      SubcompactionProgress& subcompaction_progress);
 };
 
 // CompactionServiceInput is used the pass compaction information between two
@@ -711,9 +649,7 @@ class CompactionServiceCompactionJob : private CompactionJob {
 
   // REQUIRED: mutex held
   // Like CompactionJob::Prepare()
-  void Prepare(
-      const CompactionProgress& compaction_progress = CompactionProgress{},
-      log::Writer* compaction_progress_writer = nullptr);
+  void Prepare();
 
   // Run the compaction in current thread and return the result
   Status Run();

db/compaction/compaction_job_stats_test.cc

@@ -82,7 +82,7 @@ class CompactionJobStatsTest : public testing::Test,
   std::string dbname_;
   std::string alternative_wal_dir_;
   Env* env_;
-  std::unique_ptr<DB> db_;
+  DB* db_;
   std::vector<ColumnFamilyHandle*> handles_;
   uint32_t max_subcompactions_;
 
@@ -123,7 +123,7 @@ class CompactionJobStatsTest : public testing::Test,
   static void SetUpTestCase() {}
   static void TearDownTestCase() {}
 
-  DBImpl* dbfull() { return static_cast_with_check<DBImpl>(db_.get()); }
+  DBImpl* dbfull() { return static_cast_with_check<DBImpl>(db_); }
 
   void CreateColumnFamilies(const std::vector<std::string>& cfs,
                             const Options& options) {
@@ -162,8 +162,7 @@ class CompactionJobStatsTest : public testing::Test,
       column_families.emplace_back(cfs[i], options[i]);
     }
     DBOptions db_opts = DBOptions(options[0]);
-    auto s = DB::Open(db_opts, dbname_, column_families, &handles_, &db_);
-    return s;
+    return DB::Open(db_opts, dbname_, column_families, &handles_, &db_);
   }
 
   Status TryReopenWithColumnFamilies(const std::vector<std::string>& cfs,
@@ -180,7 +179,8 @@ class CompactionJobStatsTest : public testing::Test,
       delete h;
     }
     handles_.clear();
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
   }
 
   void DestroyAndReopen(const Options& options) {
@@ -743,7 +743,7 @@ TEST_P(CompactionJobStatsTest, CompactionJobStatsTest) {
     }
 
     ASSERT_OK(Flush(1));
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    ASSERT_OK(static_cast_with_check<DBImpl>(db_)->TEST_WaitForCompact());
 
     stats_checker->set_verify_next_comp_io_stats(true);
     std::atomic<bool> first_prepare_write(true);
@@ -944,7 +944,7 @@ TEST_P(CompactionJobStatsTest, UniversalCompactionTest) {
        start_key += key_base) {
     MakeTableWithKeyValues(&rnd, start_key, start_key + key_base - 1, kKeySize,
                            kValueSize, key_interval, compression_ratio, 1);
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    ASSERT_OK(static_cast_with_check<DBImpl>(db_)->TEST_WaitForCompact());
   }
   ASSERT_EQ(stats_checker->NumberOfUnverifiedStats(), 0U);
 }

db/compaction/compaction_job_test.cc

@@ -17,7 +17,6 @@
 #include "db/db_impl/db_impl.h"
 #include "db/error_handler.h"
 #include "db/version_set.h"
-#include "file/filename.h"
 #include "file/random_access_file_reader.h"
 #include "file/writable_file_writer.h"
 #include "options/options_helper.h"
@@ -211,12 +210,12 @@ class CompactionJobTestBase : public testing::Test {
         table_cache_(NewLRUCache(50000, 16)),
         write_buffer_manager_(db_options_.db_write_buffer_size),
         versions_(new VersionSet(
-            dbname_, &db_options_, mutable_db_options_, env_options_,
-            table_cache_.get(), &write_buffer_manager_, &write_controller_,
+            dbname_, &db_options_, env_options_, table_cache_.get(),
+            &write_buffer_manager_, &write_controller_,
             /*block_cache_tracer=*/nullptr,
             /*io_tracer=*/nullptr, /*db_id=*/"", /*db_session_id=*/"",
             /*daily_offpeak_time_utc=*/"",
-            /*error_handler=*/nullptr, /*unchanging=*/false)),
+            /*error_handler=*/nullptr, /*read_only=*/false)),
         shutting_down_(false),
         mock_table_factory_(new mock::MockTableFactory()),
         error_handler_(nullptr, db_options_, &mutex_),
@@ -546,13 +545,13 @@ class CompactionJobTestBase : public testing::Test {
     ASSERT_OK(s);
     db_options_.info_log = info_log;
 
-    versions_.reset(new VersionSet(
-        dbname_, &db_options_, mutable_db_options_, env_options_,
-        table_cache_.get(), &write_buffer_manager_, &write_controller_,
-        /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr,
-        test::kUnitTestDbId, /*db_session_id=*/"",
-        /*daily_offpeak_time_utc=*/"",
-        /*error_handler=*/nullptr, /*unchanging=*/false));
+    versions_.reset(
+        new VersionSet(dbname_, &db_options_, env_options_, table_cache_.get(),
+                       &write_buffer_manager_, &write_controller_,
+                       /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr,
+                       test::kUnitTestDbId, /*db_session_id=*/"",
+                       /*daily_offpeak_time_utc=*/"",
+                       /*error_handler=*/nullptr, /*read_only=*/false));
     compaction_job_stats_.Reset();
 
     VersionEdit new_db;
@@ -676,8 +675,8 @@ class CompactionJobTestBase : public testing::Test {
         &event_logger, false, false, dbname_, &compaction_job_stats_,
         Env::Priority::USER, nullptr /* IOTracer */,
         /*manual_compaction_canceled=*/kManualCompactionCanceledFalse,
-        CompactionJob::kCompactionAbortedFalse, env_->GenerateUniqueId(),
-        DBImpl::GenerateDbSessionId(nullptr), full_history_ts_low_);
+        env_->GenerateUniqueId(), DBImpl::GenerateDbSessionId(nullptr),
+        full_history_ts_low_);
     VerifyInitializationOfCompactionJobStats(compaction_job_stats_);
 
     compaction_job.Prepare(std::nullopt /*subcompact to be computed*/);
@@ -2409,6 +2408,7 @@ TEST_F(CompactionJobIOPriorityTest, GetRateLimiterPriority) {
                 kMaxSequenceNumber, 1, false, {kInvalidBlobFileNumber}, true,
                 Env::IO_LOW, Env::IO_LOW);
 }
+
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

db/compaction/compaction_outputs.cc

@@ -49,10 +49,8 @@ Status CompactionOutputs::Finish(
     meta->fd.file_size = current_bytes;
     meta->tail_size = builder_->GetTailSize();
     meta->marked_for_compaction = builder_->NeedCompact();
-    const TableProperties& tp = builder_->GetTableProperties();
-    meta->user_defined_timestamps_persisted =
-        static_cast<bool>(tp.user_defined_timestamps_persisted);
-    ExtractTimestampFromTableProperties(tp, meta);
+    meta->user_defined_timestamps_persisted = static_cast<bool>(
+        builder_->GetTableProperties().user_defined_timestamps_persisted);
   }
   current_output().finished = true;
   stats_.bytes_written += current_bytes;
@@ -280,11 +278,7 @@ bool CompactionOutputs::ShouldStopBefore(const CompactionIterator& c_iter) {
   }
 
   // reach the max file size
-  uint64_t estimated_file_size = current_output_file_size_;
-  if (compaction_->mutable_cf_options().target_file_size_is_upper_bound) {
-    estimated_file_size += builder_->EstimatedTailSize();
-  }
-  if (estimated_file_size >= compaction_->max_output_file_size()) {
+  if (current_output_file_size_ >= compaction_->max_output_file_size()) {
     return true;
   }
 
@@ -365,8 +359,7 @@ bool CompactionOutputs::ShouldStopBefore(const CompactionIterator& c_iter) {
 Status CompactionOutputs::AddToOutput(
     const CompactionIterator& c_iter,
     const CompactionFileOpenFunc& open_file_func,
-    const CompactionFileCloseFunc& close_file_func,
-    const ParsedInternalKey& prev_iter_output_internal_key) {
+    const CompactionFileCloseFunc& close_file_func) {
   Status s;
   bool is_range_del = c_iter.IsDeleteRangeSentinelKey();
   if (is_range_del && compaction_->bottommost_level()) {
@@ -377,8 +370,7 @@ Status CompactionOutputs::AddToOutput(
   }
   const Slice& key = c_iter.key();
   if (ShouldStopBefore(c_iter) && HasBuilder()) {
-    s = close_file_func(c_iter.InputStatus(), prev_iter_output_internal_key,
-                        key, &c_iter, *this);
+    s = close_file_func(*this, c_iter.InputStatus(), key);
     if (!s.ok()) {
       return s;
     }

db/compaction/compaction_outputs.h

@@ -21,8 +21,7 @@ namespace ROCKSDB_NAMESPACE {
 class CompactionOutputs;
 using CompactionFileOpenFunc = std::function<Status(CompactionOutputs&)>;
 using CompactionFileCloseFunc =
-    std::function<Status(const Status&, const ParsedInternalKey&, const Slice&,
-                         const CompactionIterator*, CompactionOutputs&)>;
+    std::function<Status(CompactionOutputs&, const Status&, const Slice&)>;
 
 // Files produced by subcompaction, most of the functions are used by
 // compaction_job Open/Close compaction file functions.
@@ -59,8 +58,6 @@ class CompactionOutputs {
                           precalculated_hash, is_proximal_level_);
   }
 
-  const std::vector<Output>& GetOutputs() const { return outputs_; }
-
   // Set new table builder for the current output
   void NewBuilder(const TableBuilderOptions& tboptions);
 
@@ -84,19 +81,6 @@ class CompactionOutputs {
 
   bool HasBlobFileAdditions() const { return !blob_file_additions_.empty(); }
 
-  // Get all file paths (SST and blob) created during compaction.
-  const std::vector<std::string>& GetOutputFilePaths() const {
-    return output_file_paths_;
-  }
-
-  std::vector<std::string>* GetOutputFilePathsPtr() {
-    return &output_file_paths_;
-  }
-
-  void AddOutputFilePath(const std::string& path) {
-    output_file_paths_.push_back(path);
-  }
-
   BlobGarbageMeter* CreateBlobGarbageMeter() {
     assert(!is_proximal_level_);
     blob_garbage_meter_ = std::make_unique<BlobGarbageMeter>();
@@ -211,10 +195,6 @@ class CompactionOutputs {
       std::pair<SequenceNumber, SequenceNumber> keep_seqno_range,
       const Slice& next_table_min_key, const std::string& full_history_ts_low);
 
-  void SetNumOutputRecords(uint64_t num_output_records) {
-    stats_.num_output_records = num_output_records;
-  }
-
  private:
   friend class SubcompactionState;
 
@@ -274,8 +254,7 @@ class CompactionOutputs {
   // close and open new compaction output with the functions provided.
   Status AddToOutput(const CompactionIterator& c_iter,
                      const CompactionFileOpenFunc& open_file_func,
-                     const CompactionFileCloseFunc& close_file_func,
-                     const ParsedInternalKey& prev_iter_output_internal_key);
+                     const CompactionFileCloseFunc& close_file_func);
 
   // Close the current output. `open_file_func` is needed for creating new file
   // for range-dels only output file.
@@ -291,12 +270,9 @@ class CompactionOutputs {
         !range_del_agg->IsEmpty()) {
       status = open_file_func(*this);
     }
-
     if (HasBuilder()) {
-      const ParsedInternalKey empty_internal_key{};
       const Slice empty_key{};
-      Status s = close_file_func(status, empty_internal_key, empty_key,
-                                 nullptr /* c_iter */, *this);
+      Status s = close_file_func(*this, status, empty_key);
       if (!s.ok() && status.ok()) {
         status = s;
       }
@@ -334,12 +310,6 @@ class CompactionOutputs {
   std::vector<BlobFileAddition> blob_file_additions_;
   std::unique_ptr<BlobGarbageMeter> blob_garbage_meter_;
 
-  // All file paths (SST and blob) created during compaction.
-  // Used for cleanup on abort - ensures orphan files are deleted even if
-  // they were removed from outputs_ or blob_file_additions_ (e.g., by
-  // RemoveLastEmptyOutput when file_size is 0 because builder was abandoned).
-  std::vector<std::string> output_file_paths_;
-
   // Per level's output stat
   InternalStats::CompactionStats stats_;
 

db/compaction/compaction_picker.cc

@@ -27,68 +27,12 @@
 
 namespace ROCKSDB_NAMESPACE {
 
-#ifndef NDEBUG
-static void AssertCleanCut(const InternalKeyComparator* icmp,
-                           VersionStorageInfo* vstorage,
-                           CompactionInputFiles* inputs, int level,
-                           Logger* logger) {
-  const std::vector<FileMetaData*>& level_files = vstorage->LevelFiles(level);
-  if (inputs->files.empty() || level_files.empty()) {
-    return;
-  }
-
-  const Comparator* ucmp = icmp->user_comparator();
-
-  // Find first and last input file indices in level
-  int first_input_idx = -1;
-  int last_input_idx = -1;
-  for (size_t i = 0; i < level_files.size(); i++) {
-    if (level_files[i] == inputs->files.front()) {
-      first_input_idx = static_cast<int>(i);
-    }
-    if (level_files[i] == inputs->files.back()) {
-      last_input_idx = static_cast<int>(i);
-    }
-  }
-
-  // Check file before first input
-  if (first_input_idx > 0) {
-    const FileMetaData* prev_file = level_files[first_input_idx - 1];
-    const FileMetaData* first_file = inputs->files.front();
-    int cmp = sstableKeyCompare(ucmp, prev_file->largest, first_file->smallest);
-    if (cmp == 0) {
-      ROCKS_LOG_ERROR(logger,
-                      "Clean cut violated: L%d unselected file %" PRIu64
-                      " adjacent to first selected file %" PRIu64,
-                      level, prev_file->fd.GetNumber(),
-                      first_file->fd.GetNumber());
-      assert(false);
-    }
-  }
-
-  // Check file after last input
-  if (last_input_idx >= 0 &&
-      static_cast<size_t>(last_input_idx) < level_files.size() - 1) {
-    const FileMetaData* last_file = inputs->files.back();
-    const FileMetaData* next_file = level_files[last_input_idx + 1];
-    int cmp = sstableKeyCompare(ucmp, last_file->largest, next_file->smallest);
-    if (cmp == 0) {
-      ROCKS_LOG_ERROR(logger,
-                      "Clean cut violated: L%d unselected file %" PRIu64
-                      " adjacent to last selected file %" PRIu64,
-                      level, next_file->fd.GetNumber(),
-                      last_file->fd.GetNumber());
-      assert(false);
-    }
-  }
-}
-#endif  // NDEBUG
-
-bool PickCostBasedIntraL0Compaction(
-    const std::vector<FileMetaData*>& level_files, size_t min_files_to_compact,
-    uint64_t max_compact_bytes_per_del_file, uint64_t max_compaction_bytes,
-    CompactionInputFiles* comp_inputs) {
-  TEST_SYNC_POINT("PickCostBasedIntraL0Compaction");
+bool FindIntraL0Compaction(const std::vector<FileMetaData*>& level_files,
+                           size_t min_files_to_compact,
+                           uint64_t max_compact_bytes_per_del_file,
+                           uint64_t max_compaction_bytes,
+                           CompactionInputFiles* comp_inputs) {
+  TEST_SYNC_POINT("FindIntraL0Compaction");
 
   size_t start = 0;
 
@@ -298,7 +242,7 @@ bool CompactionPicker::ExpandInputsToCleanCut(const std::string& /*cf_name*/,
     GetRange(*inputs, &smallest, &largest);
     inputs->clear();
     vstorage->GetOverlappingInputs(level, &smallest, &largest, &inputs->files,
-                                   hint_index, &hint_index, true, nullptr,
+                                   hint_index, &hint_index, true,
                                    next_smallest);
   } while (inputs->size() > old_size);
 
@@ -306,10 +250,6 @@ bool CompactionPicker::ExpandInputsToCleanCut(const std::string& /*cf_name*/,
   // inputs. thus, inputs should be non-empty here
   assert(!inputs->empty());
 
-#ifndef NDEBUG
-  AssertCleanCut(icmp_, vstorage, inputs, level, ioptions_.logger);
-#endif  // NDEBUG
-
   // If, after the expansion, there are files that are already under
   // compaction, then we must drop/cancel this compaction.
   if (AreFilesInCompaction(inputs->files)) {
@@ -435,13 +375,12 @@ Compaction* CompactionPicker::PickCompactionForCompactFiles(
     // without configurable `CompressionOptions`, which is inconsistent.
     compression_type = compact_options.compression;
   }
-
   auto c = new Compaction(
       vstorage, ioptions_, mutable_cf_options, mutable_db_options, input_files,
       output_level, compact_options.output_file_size_limit,
       mutable_cf_options.max_compaction_bytes, output_path_id, compression_type,
       GetCompressionOptions(mutable_cf_options, vstorage, output_level),
-      compact_options.output_temperature_override,
+      mutable_cf_options.default_write_temperature,
       compact_options.max_subcompactions,
       /* grandparents */ {}, earliest_snapshot, snapshot_checker,
       CompactionReason::kManualCompaction);
@@ -525,8 +464,7 @@ bool CompactionPicker::SetupOtherInputs(
     const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
     VersionStorageInfo* vstorage, CompactionInputFiles* inputs,
     CompactionInputFiles* output_level_inputs, int* parent_index,
-    int base_index, bool only_expand_towards_right,
-    const FileMetaData* starting_l0_file) {
+    int base_index, bool only_expand_towards_right) {
   assert(!inputs->empty());
   assert(output_level_inputs->empty());
   const int input_level = inputs->level;
@@ -582,11 +520,11 @@ bool CompactionPicker::SetupOtherInputs(
       // Round-robin compaction only allows expansion towards the larger side.
       vstorage->GetOverlappingInputs(input_level, &smallest, &all_limit,
                                      &expanded_inputs.files, base_index,
-                                     nullptr, true, starting_l0_file);
+                                     nullptr);
     } else {
       vstorage->GetOverlappingInputs(input_level, &all_start, &all_limit,
                                      &expanded_inputs.files, base_index,
-                                     nullptr, true, starting_l0_file);
+                                     nullptr);
     }
     uint64_t expanded_inputs_size = TotalFileSize(expanded_inputs.files);
     if (!ExpandInputsToCleanCut(cf_name, vstorage, &expanded_inputs)) {
@@ -671,8 +609,7 @@ Compaction* CompactionPicker::PickCompactionForCompactRange(
     int input_level, int output_level,
     const CompactRangeOptions& compact_range_options, const InternalKey* begin,
     const InternalKey* end, InternalKey** compaction_end, bool* manual_conflict,
-    uint64_t max_file_num_to_ignore, const std::string& trim_ts,
-    const std::string& full_history_ts_low) {
+    uint64_t max_file_num_to_ignore, const std::string& trim_ts) {
   // CompactionPickerFIFO has its own implementation of compact range
   assert(ioptions_.compaction_style != kCompactionStyleFIFO);
 
@@ -742,7 +679,8 @@ Compaction* CompactionPicker::PickCompactionForCompactRange(
         compact_range_options.target_path_id,
         GetCompressionType(vstorage, mutable_cf_options, output_level, 1),
         GetCompressionOptions(mutable_cf_options, vstorage, output_level),
-        Temperature::kUnknown, compact_range_options.max_subcompactions,
+        mutable_cf_options.default_write_temperature,
+        compact_range_options.max_subcompactions,
         /* grandparents */ {}, /* earliest_snapshot */ std::nullopt,
         /* snapshot_checker */ nullptr, CompactionReason::kManualCompaction,
         trim_ts, /* score */ -1,
@@ -751,8 +689,7 @@ Compaction* CompactionPicker::PickCompactionForCompactRange(
         compact_range_options.blob_garbage_collection_age_cutoff);
 
     RegisterCompaction(c);
-    vstorage->ComputeCompactionScore(ioptions_, mutable_cf_options,
-                                     full_history_ts_low);
+    vstorage->ComputeCompactionScore(ioptions_, mutable_cf_options);
     return c;
   }
 
@@ -934,8 +871,8 @@ Compaction* CompactionPicker::PickCompactionForCompactRange(
       GetCompressionType(vstorage, mutable_cf_options, output_level,
                          vstorage->base_level()),
       GetCompressionOptions(mutable_cf_options, vstorage, output_level),
-      Temperature::kUnknown, compact_range_options.max_subcompactions,
-      std::move(grandparents),
+      mutable_cf_options.default_write_temperature,
+      compact_range_options.max_subcompactions, std::move(grandparents),
       /* earliest_snapshot */ std::nullopt, /* snapshot_checker */ nullptr,
       CompactionReason::kManualCompaction, trim_ts, /* score */ -1,
       /* l0_files_might_overlap */ true,
@@ -949,8 +886,7 @@ Compaction* CompactionPicker::PickCompactionForCompactRange(
   // takes running compactions into account (by skipping files that are already
   // being compacted). Since we just changed compaction score, we recalculate it
   // here
-  vstorage->ComputeCompactionScore(ioptions_, mutable_cf_options,
-                                   full_history_ts_low);
+  vstorage->ComputeCompactionScore(ioptions_, mutable_cf_options);
 
   return compaction;
 }
@@ -1295,7 +1231,7 @@ void CompactionPicker::PickFilesMarkedForCompaction(
 
 bool CompactionPicker::GetOverlappingL0Files(
     VersionStorageInfo* vstorage, CompactionInputFiles* start_level_inputs,
-    int output_level, int* parent_index, const FileMetaData* starting_l0_file) {
+    int output_level, int* parent_index) {
   // Two level 0 compaction won't run at the same time, so don't need to worry
   // about files on level 0 being compacted.
   assert(level0_compactions_in_progress()->empty());
@@ -1306,11 +1242,7 @@ bool CompactionPicker::GetOverlappingL0Files(
   // which will include the picked file.
   start_level_inputs->files.clear();
   vstorage->GetOverlappingInputs(0, &smallest, &largest,
-                                 &(start_level_inputs->files),
-                                 /*hint_index=*/-1,
-                                 /*file_index=*/nullptr,
-                                 /*expand_range=*/true,
-                                 /*starting_l0_file=*/starting_l0_file);
+                                 &(start_level_inputs->files));
 
   // If we include more L0 files in the same compaction run it can
   // cause the 'smallest' and 'largest' key to get extended to a

db/compaction/compaction_picker.h

@@ -65,8 +65,7 @@ class CompactionPicker {
       const MutableDBOptions& mutable_db_options,
       const std::vector<SequenceNumber>& existing_snapshots,
       const SnapshotChecker* snapshot_checker, VersionStorageInfo* vstorage,
-      LogBuffer* log_buffer, const std::string& full_history_ts_low,
-      bool require_max_output_level = false) = 0;
+      LogBuffer* log_buffer, bool require_max_output_level) = 0;
 
   // The returned Compaction might not include the whole requested range.
   // In that case, compaction_end will be set to the next key that needs
@@ -83,8 +82,7 @@ class CompactionPicker {
       const CompactRangeOptions& compact_range_options,
       const InternalKey* begin, const InternalKey* end,
       InternalKey** compaction_end, bool* manual_conflict,
-      uint64_t max_file_num_to_ignore, const std::string& trim_ts,
-      const std::string& full_history_ts_low);
+      uint64_t max_file_num_to_ignore, const std::string& trim_ts);
 
   // The maximum allowed output level.  Default value is NumberLevels() - 1.
   virtual int MaxOutputLevel() const { return NumberLevels() - 1; }
@@ -205,16 +203,13 @@ class CompactionPicker {
       const std::vector<CompactionInputFiles>& inputs, int level,
       int proximal_level) const;
 
-  // @param starting_l0_file If not null, restricts L0 file selection to only
-  //                         include files at or older than starting_l0_file.
   bool SetupOtherInputs(const std::string& cf_name,
                         const MutableCFOptions& mutable_cf_options,
                         VersionStorageInfo* vstorage,
                         CompactionInputFiles* inputs,
                         CompactionInputFiles* output_level_inputs,
                         int* parent_index, int base_index,
-                        bool only_expand_towards_right = false,
-                        const FileMetaData* starting_l0_file = nullptr);
+                        bool only_expand_towards_right = false);
 
   void GetGrandparents(VersionStorageInfo* vstorage,
                        const CompactionInputFiles& inputs,
@@ -227,12 +222,9 @@ class CompactionPicker {
       CompactionInputFiles* start_level_inputs,
       std::function<bool(const FileMetaData*)> skip_marked_file);
 
-  // @param starting_l0_file If not null, restricts L0 file selection to only
-  //                         include files at or older than starting_l0_file.
   bool GetOverlappingL0Files(VersionStorageInfo* vstorage,
                              CompactionInputFiles* start_level_inputs,
-                             int output_level, int* parent_index,
-                             const FileMetaData* starting_l0_file = nullptr);
+                             int output_level, int* parent_index);
 
   // Register this compaction in the set of running compactions
   void RegisterCompaction(Compaction* c);
@@ -286,8 +278,7 @@ class NullCompactionPicker : public CompactionPicker {
       const std::vector<SequenceNumber>& /*existing_snapshots*/,
       const SnapshotChecker* /*snapshot_checker*/,
       VersionStorageInfo* /*vstorage*/, LogBuffer* /* log_buffer */,
-      const std::string& /*full_history_ts_low*/,
-      bool /*require_max_output_level*/) override {
+      bool /*require_max_output_level*/ = false) override {
     return nullptr;
   }
 
@@ -301,8 +292,8 @@ class NullCompactionPicker : public CompactionPicker {
       const CompactRangeOptions& /*compact_range_options*/,
       const InternalKey* /*begin*/, const InternalKey* /*end*/,
       InternalKey** /*compaction_end*/, bool* /*manual_conflict*/,
-      uint64_t /*max_file_num_to_ignore*/, const std::string& /*trim_ts*/,
-      const std::string& /*full_history_ts_low*/) override {
+      uint64_t /*max_file_num_to_ignore*/,
+      const std::string& /*trim_ts*/) override {
     return nullptr;
   }
 
@@ -328,10 +319,11 @@ class NullCompactionPicker : public CompactionPicker {
 //                                        files. Cannot be nullptr.
 //
 // @return                                true iff compaction was found.
-bool PickCostBasedIntraL0Compaction(
-    const std::vector<FileMetaData*>& level_files, size_t min_files_to_compact,
-    uint64_t max_compact_bytes_per_del_file, uint64_t max_compaction_bytes,
-    CompactionInputFiles* comp_inputs);
+bool FindIntraL0Compaction(const std::vector<FileMetaData*>& level_files,
+                           size_t min_files_to_compact,
+                           uint64_t max_compact_bytes_per_del_file,
+                           uint64_t max_compaction_bytes,
+                           CompactionInputFiles* comp_inputs);
 
 CompressionType GetCompressionType(const VersionStorageInfo* vstorage,
                                    const MutableCFOptions& mutable_cf_options,

db/compaction/compaction_picker_fifo.cc

@@ -9,7 +9,6 @@
 
 #include "db/compaction/compaction_picker_fifo.h"
 
-#include <algorithm>
 #include <cinttypes>
 #include <string>
 #include <vector>
@@ -32,29 +31,6 @@ uint64_t GetTotalFilesSize(const std::vector<FileMetaData*>& files) {
   }
   return total_size;
 }
-
-// Compute effective data size and capacity limit for FIFO compaction.
-// When max_data_files_size > 0 (blob-aware mode), the effective size includes
-// both SST and blob file sizes, and the limit is max_data_files_size.
-// Otherwise, only SST sizes are used with max_table_files_size as the limit.
-void GetEffectiveSizeAndLimit(const CompactionOptionsFIFO& fifo_opts,
-                              uint64_t total_sst_size, uint64_t total_blob_size,
-                              uint64_t* effective_size,
-                              uint64_t* effective_max) {
-  *effective_size = total_sst_size;
-  *effective_max = fifo_opts.max_table_files_size;
-  if (fifo_opts.max_data_files_size > 0) {
-    *effective_size += total_blob_size;
-    *effective_max = fifo_opts.max_data_files_size;
-  }
-}
-
-// Return the effective capacity limit for FIFO compaction.
-// Convenience wrapper when only the limit is needed (e.g., PickTTLCompaction).
-uint64_t GetEffectiveMax(const CompactionOptionsFIFO& fifo_opts) {
-  return fifo_opts.max_data_files_size > 0 ? fifo_opts.max_data_files_size
-                                           : fifo_opts.max_table_files_size;
-}
 }  // anonymous namespace
 
 bool FIFOCompactionPicker::NeedsCompaction(
@@ -102,10 +78,10 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
     for (auto ritr = level_files.rbegin(); ritr != level_files.rend(); ++ritr) {
       FileMetaData* f = *ritr;
       assert(f);
-      TableReader* reader = f->fd.pinned_reader.Get();
-      if (reader != nullptr && reader->GetTableProperties() != nullptr) {
+      if (f->fd.table_reader && f->fd.table_reader->GetTableProperties()) {
         uint64_t newest_key_time = f->TryGetNewestKeyTime();
-        uint64_t creation_time = reader->GetTableProperties()->creation_time;
+        uint64_t creation_time =
+            f->fd.table_reader->GetTableProperties()->creation_time;
         uint64_t est_newest_key_time = newest_key_time == kUnknownNewestKeyTime
                                            ? creation_time
                                            : newest_key_time;
@@ -122,43 +98,10 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
   // Return a nullptr and proceed to size-based FIFO compaction if:
   // 1. there are no files older than ttl OR
   // 2. there are a few files older than ttl, but deleting them will not bring
-  //    the total size to be less than the size threshold.
-  uint64_t effective_max =
-      GetEffectiveMax(mutable_cf_options.compaction_options_fifo);
-  // Estimate the effective remaining data after dropping TTL-expired SSTs.
-  // Each dropped SST also frees a proportional share of blob data.
-  //
-  // In multi-level FIFO (migration), we must use total SST across ALL levels
-  // as the reference, because total_blob covers all levels. Using only L0
-  // SST would inflate the blob estimate.
-  uint64_t effective_remaining = total_size;
-  if (mutable_cf_options.compaction_options_fifo.max_data_files_size > 0) {
-    uint64_t total_blob = vstorage->GetBlobStats().total_file_size;
-    // Compute total SST across all levels so the reference scope matches
-    // total_blob's scope (all levels).
-    uint64_t total_sst_all_levels = GetTotalFilesSize(level_files);
-    for (int level = 1; level < vstorage->num_levels(); ++level) {
-      total_sst_all_levels += GetTotalFilesSize(vstorage->LevelFiles(level));
-    }
-    // remaining_sst_all = total_sst_all - dropped_l0_sst
-    // total_size is the remaining L0 SST after removing expired files;
-    // original L0 SST minus remaining L0 SST = dropped.
-    uint64_t original_l0_sst = GetTotalFilesSize(level_files);
-    uint64_t dropped_sst = original_l0_sst - total_size;
-    uint64_t remaining_sst_all = total_sst_all_levels - dropped_sst;
-    // Proportional blob estimate: each SST byte "owns" a proportional
-    // share of blob bytes. Both reference sizes must come from the same
-    // scope (all levels) to avoid inflated estimates.
-    if (total_sst_all_levels > 0 && total_blob > 0) {
-      effective_remaining =
-          remaining_sst_all +
-          static_cast<uint64_t>(static_cast<double>(remaining_sst_all) /
-                                total_sst_all_levels * total_blob);
-    } else {
-      effective_remaining = remaining_sst_all;
-    }
-  }
-  if (inputs[0].files.empty() || effective_remaining > effective_max) {
+  //    the total size to be less than max_table_files_size threshold.
+  if (inputs[0].files.empty() ||
+      total_size >
+          mutable_cf_options.compaction_options_fifo.max_table_files_size) {
     return nullptr;
   }
 
@@ -166,9 +109,8 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
     assert(f);
     uint64_t newest_key_time = f->TryGetNewestKeyTime();
     uint64_t creation_time = 0;
-    TableReader* reader = f->fd.pinned_reader.Get();
-    if (reader != nullptr && reader->GetTableProperties() != nullptr) {
-      creation_time = reader->GetTableProperties()->creation_time;
+    if (f->fd.table_reader && f->fd.table_reader->GetTableProperties()) {
+      creation_time = f->fd.table_reader->GetTableProperties()->creation_time;
     }
     uint64_t est_newest_key_time = newest_key_time == kUnknownNewestKeyTime
                                        ? creation_time
@@ -182,7 +124,8 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
   Compaction* c = new Compaction(
       vstorage, ioptions_, mutable_cf_options, mutable_db_options,
       std::move(inputs), 0, 0, 0, 0, kNoCompression,
-      mutable_cf_options.compression_opts, Temperature::kUnknown,
+      mutable_cf_options.compression_opts,
+      mutable_cf_options.default_write_temperature,
       /* max_subcompactions */ 0, {}, /* earliest_snapshot */ std::nullopt,
       /* snapshot_checker */ nullptr, CompactionReason::kFIFOTtl,
       /* trim_ts */ "", vstorage->CompactionScore(0),
@@ -209,9 +152,7 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
     const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
     const MutableDBOptions& mutable_db_options, VersionStorageInfo* vstorage,
     LogBuffer* log_buffer) {
-  const auto& fifo_opts = mutable_cf_options.compaction_options_fifo;
-
-  // compute the total SST size and identify the last non-empty level
+  // compute the total size and identify the last non-empty level
   int last_level = 0;
   uint64_t total_size = 0;
   for (int level = 0; level < vstorage->num_levels(); ++level) {
@@ -224,13 +165,53 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
   const std::vector<FileMetaData*>& last_level_files =
       vstorage->LevelFiles(last_level);
 
-  // Compute effective size and limit for comparison.
-  uint64_t effective_size, effective_max;
-  GetEffectiveSizeAndLimit(fifo_opts, total_size,
-                           vstorage->GetBlobStats().total_file_size,
-                           &effective_size, &effective_max);
+  if (last_level == 0 &&
+      total_size <=
+          mutable_cf_options.compaction_options_fifo.max_table_files_size) {
+    // total size not exceeded, try to find intra level 0 compaction if enabled
+    const std::vector<FileMetaData*>& level0_files = vstorage->LevelFiles(0);
+    if (mutable_cf_options.compaction_options_fifo.allow_compaction &&
+        level0_files.size() > 0) {
+      CompactionInputFiles comp_inputs;
+      // try to prevent same files from being compacted multiple times, which
+      // could produce large files that may never TTL-expire. Achieve this by
+      // disallowing compactions with files larger than memtable (inflate its
+      // size by 10% to account for uncompressed L0 files that may have size
+      // slightly greater than memtable size limit).
+      size_t max_compact_bytes_per_del_file =
+          static_cast<size_t>(MultiplyCheckOverflow(
+              static_cast<uint64_t>(mutable_cf_options.write_buffer_size),
+              1.1));
+      if (FindIntraL0Compaction(
+              level0_files,
+              mutable_cf_options
+                  .level0_file_num_compaction_trigger /* min_files_to_compact */
+              ,
+              max_compact_bytes_per_del_file,
+              mutable_cf_options.max_compaction_bytes, &comp_inputs)) {
+        Compaction* c = new Compaction(
+            vstorage, ioptions_, mutable_cf_options, mutable_db_options,
+            {comp_inputs}, 0, 16 * 1024 * 1024 /* output file size limit */,
+            0 /* max compaction bytes, not applicable */,
+            0 /* output path ID */, mutable_cf_options.compression,
+            mutable_cf_options.compression_opts,
+            mutable_cf_options.default_write_temperature,
+            0 /* max_subcompactions */, {},
+            /* earliest_snapshot */ std::nullopt,
+            /* snapshot_checker */ nullptr,
+            CompactionReason::kFIFOReduceNumFiles,
+            /* trim_ts */ "", vstorage->CompactionScore(0),
+            /* l0_files_might_overlap */ true);
+        return c;
+      }
+    }
 
-  if (last_level == 0 && effective_size <= effective_max) {
+    ROCKS_LOG_BUFFER(
+        log_buffer,
+        "[%s] FIFO compaction: nothing to do. Total size %" PRIu64
+        ", max size %" PRIu64 "\n",
+        cf_name.c_str(), total_size,
+        mutable_cf_options.compaction_options_fifo.max_table_files_size);
     return nullptr;
   }
 
@@ -248,29 +229,11 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
   inputs[0].level = last_level;
 
   if (last_level == 0) {
-    // When using blob-aware sizing, use proportional estimation (same
-    // principle as EstimateTotalDataForSST): each SST "owns"
-    // effective_size / num_files of total data. This is an approximation
-    // — individual SSTs may reference different amounts of blob data,
-    // but uniform distribution is a reasonable estimate for FIFO dropping.
-    uint64_t remaining_size = effective_size;
-    const uint64_t num_files = last_level_files.size();
-    // Proportional estimate of data per file (SST + blob).
-    // Use max(1) to prevent stalling when effective_size < num_files.
-    const uint64_t data_per_file =
-        (fifo_opts.max_data_files_size > 0 && num_files > 0)
-            ? std::max(effective_size / num_files, uint64_t{1})
-            : 0;
-
     // In L0, right-most files are the oldest files.
     for (auto ritr = last_level_files.rbegin(); ritr != last_level_files.rend();
          ++ritr) {
       auto f = *ritr;
-      if (fifo_opts.max_data_files_size > 0) {
-        remaining_size -= std::min(remaining_size, data_per_file);
-      } else {
-        remaining_size -= std::min(remaining_size, f->fd.file_size);
-      }
+      total_size -= f->fd.file_size;
       inputs[0].files.push_back(f);
       char tmp_fsize[16];
       AppendHumanBytes(f->fd.GetFileSize(), tmp_fsize, sizeof(tmp_fsize));
@@ -278,11 +241,13 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
                        "[%s] FIFO compaction: picking file %" PRIu64
                        " with size %s for deletion",
                        cf_name.c_str(), f->fd.GetNumber(), tmp_fsize);
-      if (remaining_size <= effective_max) {
+      if (total_size <=
+          mutable_cf_options.compaction_options_fifo.max_table_files_size) {
         break;
       }
     }
-  } else if (effective_size > effective_max) {
+  } else if (total_size >
+             mutable_cf_options.compaction_options_fifo.max_table_files_size) {
     // If the last level is non-L0, we actually don't know which file is
     // logically the oldest since the file creation time only represents
     // when this file was compacted to this level, which is independent
@@ -292,36 +257,34 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
     // file with the smallest key will be deleted first.  This design decision
     // better serves a major type of FIFO use cases where smaller keys are
     // associated with older data.
-    const uint64_t num_files = last_level_files.size();
-    // Proportional estimate of data per file (SST + blob), same as L0 path.
-    const uint64_t data_per_file =
-        (fifo_opts.max_data_files_size > 0 && num_files > 0)
-            ? std::max(effective_size / num_files, uint64_t{1})
-            : 0;
     for (const auto& f : last_level_files) {
       if (f->being_compacted) {
         continue;
       }
-      if (fifo_opts.max_data_files_size > 0) {
-        effective_size -= std::min(effective_size, data_per_file);
-      } else {
-        effective_size -= std::min(effective_size, f->fd.file_size);
-      }
+      total_size -= f->fd.file_size;
       inputs[0].files.push_back(f);
       char tmp_fsize[16];
       AppendHumanBytes(f->fd.GetFileSize(), tmp_fsize, sizeof(tmp_fsize));
-      ROCKS_LOG_BUFFER(log_buffer,
-                       "[%s] FIFO compaction: picking file %" PRIu64
-                       " with size %s for deletion under total size %" PRIu64
-                       " vs max size %" PRIu64,
-                       cf_name.c_str(), f->fd.GetNumber(), tmp_fsize,
-                       effective_size, effective_max);
+      ROCKS_LOG_BUFFER(
+          log_buffer,
+          "[%s] FIFO compaction: picking file %" PRIu64
+          " with size %s for deletion under total size %" PRIu64
+          " vs max table files size %" PRIu64,
+          cf_name.c_str(), f->fd.GetNumber(), tmp_fsize, total_size,
+          mutable_cf_options.compaction_options_fifo.max_table_files_size);
 
-      if (effective_size <= effective_max) {
+      if (total_size <=
+          mutable_cf_options.compaction_options_fifo.max_table_files_size) {
         break;
       }
     }
   } else {
+    ROCKS_LOG_BUFFER(
+        log_buffer,
+        "[%s] FIFO compaction: nothing to do. Total size %" PRIu64
+        ", max size %" PRIu64 "\n",
+        cf_name.c_str(), total_size,
+        mutable_cf_options.compaction_options_fifo.max_table_files_size);
     return nullptr;
   }
 
@@ -331,7 +294,8 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
       /* target_file_size */ 0,
       /* max_compaction_bytes */ 0,
       /* output_path_id */ 0, kNoCompression,
-      mutable_cf_options.compression_opts, Temperature::kUnknown,
+      mutable_cf_options.compression_opts,
+      mutable_cf_options.default_write_temperature,
       /* max_subcompactions */ 0, {}, /* earliest_snapshot */ std::nullopt,
       /* snapshot_checker */ nullptr, CompactionReason::kFIFOMaxSize,
       /* trim_ts */ "", vstorage->CompactionScore(0),
@@ -458,282 +422,12 @@ Compaction* FIFOCompactionPicker::PickTemperatureChangeCompaction(
   return c;
 }
 
-Compaction* FIFOCompactionPicker::PickIntraL0Compaction(
-    const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
-    const MutableDBOptions& mutable_db_options, VersionStorageInfo* vstorage,
-    LogBuffer* log_buffer) {
-  const auto& fifo_opts = mutable_cf_options.compaction_options_fifo;
-
-  if (!fifo_opts.allow_compaction) {
-    return nullptr;
-  }
-
-  const std::vector<FileMetaData*>& level0_files = vstorage->LevelFiles(0);
-  if (level0_files.empty()) {
-    return nullptr;
-  }
-
-  if (fifo_opts.use_kv_ratio_compaction) {
-    if (fifo_opts.max_data_files_size == 0) {
-      ROCKS_LOG_BUFFER(
-          log_buffer,
-          "[%s] FIFO kv-ratio compaction: skipping — "
-          "max_data_files_size is 0, cannot compute target file size. ",
-          cf_name.c_str());
-    } else if (fifo_opts.max_data_files_size < fifo_opts.max_table_files_size) {
-      ROCKS_LOG_BUFFER(log_buffer,
-                       "[%s] FIFO kv-ratio compaction: skipping — "
-                       "max_data_files_size (%" PRIu64
-                       ") < max_table_files_size "
-                       "(%" PRIu64 ").",
-                       cf_name.c_str(), fifo_opts.max_data_files_size,
-                       fifo_opts.max_table_files_size);
-    } else {
-      return PickRatioBasedIntraL0Compaction(cf_name, mutable_cf_options,
-                                             mutable_db_options, vstorage,
-                                             log_buffer);
-    }
-    ROCKS_LOG_BUFFER(
-        log_buffer, "[%s] FIFO: falling back to cost-based intra-L0 compaction",
-        cf_name.c_str());
-  }
-
-  // Old intra-L0 path: merge small files using PickCostBasedIntraL0Compaction.
-  // Minimum files to compact follows level0_file_num_compaction_trigger.
-  // Try to prevent same files from being compacted multiple times, which
-  // could produce large files that may never TTL-expire. Achieve this by
-  // disallowing compactions with files larger than memtable (inflate its
-  // size by 10% to account for uncompressed L0 files that may have size
-  // slightly greater than memtable size limit).
-
-  CompactionInputFiles comp_inputs;
-  size_t max_compact_bytes_per_del_file =
-      static_cast<size_t>(MultiplyCheckOverflow(
-          static_cast<uint64_t>(mutable_cf_options.write_buffer_size), 1.1));
-  if (PickCostBasedIntraL0Compaction(
-          level0_files,
-          mutable_cf_options
-              .level0_file_num_compaction_trigger /* min_files_to_compact */,
-          max_compact_bytes_per_del_file,
-          mutable_cf_options.max_compaction_bytes, &comp_inputs)) {
-    Compaction* c = new Compaction(
-        vstorage, ioptions_, mutable_cf_options, mutable_db_options,
-        {comp_inputs}, 0, 16 * 1024 * 1024 /* output file size limit */,
-        0 /* max compaction bytes, not applicable */, 0 /* output path ID */,
-        mutable_cf_options.compression, mutable_cf_options.compression_opts,
-        Temperature::kUnknown, 0 /* max_subcompactions */, {},
-        /* earliest_snapshot */ std::nullopt,
-        /* snapshot_checker */ nullptr, CompactionReason::kFIFOReduceNumFiles,
-        /* trim_ts */ "", vstorage->CompactionScore(0),
-        /* l0_files_might_overlap */ true);
-    return c;
-  }
-
-  return nullptr;
-}
-
-Compaction* FIFOCompactionPicker::PickRatioBasedIntraL0Compaction(
-    const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
-    const MutableDBOptions& mutable_db_options, VersionStorageInfo* vstorage,
-    LogBuffer* log_buffer) {
-  const auto& fifo_opts = mutable_cf_options.compaction_options_fifo;
-  assert(fifo_opts.use_kv_ratio_compaction);
-  assert(fifo_opts.max_data_files_size > 0);
-
-  // During migration from level/universal compaction to FIFO, non-L0 levels
-  // may still contain files. The ratio-based algorithm only operates on L0,
-  // so skip it until PickSizeCompaction has drained all non-L0 levels.
-  // Once levels collapse to L0-only, this algorithm will kick in.
-  for (int level = 1; level < vstorage->num_levels(); ++level) {
-    if (!vstorage->LevelFiles(level).empty()) {
-      ROCKS_LOG_BUFFER(log_buffer,
-                       "[%s] FIFO kv-ratio compaction: skipping — non-L0 "
-                       "level %d still has %" ROCKSDB_PRIszt
-                       " files (migration in progress)",
-                       cf_name.c_str(), level,
-                       vstorage->LevelFiles(level).size());
-      return nullptr;
-    }
-  }
-
-  if (!level0_compactions_in_progress_.empty()) {
-    return nullptr;
-  }
-
-  const std::vector<FileMetaData*>& level0_files = vstorage->LevelFiles(0);
-  if (mutable_cf_options.level0_file_num_compaction_trigger <= 1) {
-    // trigger <= 0 is invalid; trigger == 1 means compact after every flush,
-    // which doesn't make sense for tiered merging (the tier boundary loop
-    // divides by trigger, so trigger == 1 would cause an infinite loop).
-    return nullptr;
-  }
-  const size_t trigger = static_cast<size_t>(
-      mutable_cf_options.level0_file_num_compaction_trigger);
-  if (level0_files.size() < trigger) {
-    return nullptr;
-  }
-
-  // Determine the target compacted file size.
-  //
-  // When max_compaction_bytes > 0 (explicitly set by user), use it directly
-  // as the target. This allows users to override the auto-calculated value.
-  //
-  // When max_compaction_bytes == 0 (default), auto-calculate from the data
-  // capacity and observed SST/blob ratio:
-  //   target = max_data_files_size * sst_ratio / trigger
-  //
-  // This is recomputed on every PickCompaction call. The computation is
-  // trivial (sum file sizes + arithmetic) and PickCompaction is only called
-  // once per flush or compaction completion, so no caching is needed.
-  uint64_t target = 0;
-  if (mutable_cf_options.max_compaction_bytes > 0) {
-    // User explicitly set max_compaction_bytes — use it as target
-    target = mutable_cf_options.max_compaction_bytes;
-  } else {
-    // Auto-calculate from capacity and observed SST/blob ratio
-    uint64_t total_sst = GetTotalFilesSize(level0_files);
-    uint64_t total_blob = vstorage->GetBlobStats().total_file_size;
-    uint64_t total_data = total_sst + total_blob;
-
-    if (total_data == 0 || total_sst == 0) {
-      return nullptr;
-    }
-
-    // Compute sst_ratio (inverse of EstimateTotalDataForSST's proportion):
-    // when no blob files exist, sst_ratio is 1.0 and the target becomes
-    // max_data_files_size / trigger, which is large. The algorithm will
-    // naturally not find small enough files to compact.
-    double sst_ratio =
-        (total_blob > 0) ? static_cast<double>(total_sst) / total_data : 1.0;
-
-    uint64_t total_sst_at_cap =
-        static_cast<uint64_t>(fifo_opts.max_data_files_size * sst_ratio);
-    target = total_sst_at_cap / trigger;
-
-    ROCKS_LOG_BUFFER(log_buffer,
-                     "[%s] FIFO ratio-based compaction: sst_ratio=%.4f, "
-                     "target_file_size=%" PRIu64,
-                     cf_name.c_str(), sst_ratio, target);
-  }
-  if (target == 0) {
-    return nullptr;
-  }
-
-  // Tiered size-based file selection.
-  //
-  // Tier boundaries form a geometric sequence descending from target:
-  //   ..., target/trigger^2, target/trigger, target
-  // For each boundary (smallest first), find contiguous L0 files with
-  // size < boundary. If their accumulated bytes >= boundary, merge them.
-  // The output (~boundary bytes) advances to the next tier. Files that
-  // reach target are "graduated" and never compacted again.
-  //
-  // Trade-off: write amplification vs L0 file count.
-  //
-  // Write amp: O(log(target/flush) / log(trigger)) per byte, instead of
-  //   O(target / (trigger * flush)) from flat merging. Each byte is
-  //   rewritten once per tier crossing.
-  //
-  // L0 file count: trigger + k * (trigger - 1) at steady state, where
-  //   k = ceil(log(target/flush) / log(trigger)). This is higher than
-  //   the original trigger target because intermediate tier files
-  //   accumulate while waiting for the next tier merge. The trade-off
-  //   is explicit: more L0 files in exchange for logarithmic (instead
-  //   of linear) write amplification.
-
-  // Build tier boundaries from smallest to largest.
-  // Stop at 10KB minimum — SST files of most workloads are larger than
-  // this, so lower boundaries would only waste CPU scanning L0 files.
-  // Files smaller than the lowest boundary simply merge at that boundary.
-  static constexpr uint64_t kMinTierBoundary = 10 * 1024;  // 10KB
-  std::vector<uint64_t> boundaries;
-  for (uint64_t b = target; b >= kMinTierBoundary; b /= trigger) {
-    boundaries.push_back(b);
-  }
-  if (boundaries.empty()) {
-    // target itself is below kMinTierBoundary — use target as the
-    // sole boundary so we can still compact at the target size.
-    boundaries.push_back(target);
-  }
-  std::reverse(boundaries.begin(), boundaries.end());
-
-  // For each tier boundary (smallest first), scan L0 for mergeable batches.
-  // L0 files are stored newest-first; oldest is at the end.
-  for (const uint64_t boundary : boundaries) {
-    for (size_t scan = level0_files.size(); scan > 0;) {
-      // Skip files >= boundary (they belong to higher tiers) or in-progress
-      if (level0_files[scan - 1]->fd.file_size >= boundary ||
-          level0_files[scan - 1]->being_compacted) {
-        --scan;
-        continue;
-      }
-
-      // Found a file < boundary — collect contiguous batch
-      std::vector<FileMetaData*> batch;
-      uint64_t accumulated = 0;
-      size_t pos = scan;
-      while (pos > 0 && level0_files[pos - 1]->fd.file_size < boundary &&
-             !level0_files[pos - 1]->being_compacted) {
-        // Don't let output exceed 2x boundary (prevent tier-skipping)
-        if (accumulated >= boundary &&
-            accumulated + level0_files[pos - 1]->fd.file_size > boundary * 2) {
-          break;
-        }
-        batch.push_back(level0_files[pos - 1]);
-        accumulated += level0_files[pos - 1]->fd.file_size;
-        --pos;
-      }
-
-      // Viable: >= 2 files and accumulated >= boundary
-      if (batch.size() >= 2 && accumulated >= boundary) {
-        CompactionInputFiles comp_inputs;
-        comp_inputs.level = 0;
-        comp_inputs.files = std::move(batch);
-
-        ROCKS_LOG_BUFFER(
-            log_buffer,
-            "[%s] FIFO kv-ratio compaction: picking %" ROCKSDB_PRIszt
-            " files (%" PRIu64 " bytes) at tier boundary %" PRIu64
-            " for intra-L0 compaction, target=%" PRIu64,
-            cf_name.c_str(), comp_inputs.files.size(), accumulated, boundary,
-            target);
-
-        Compaction* c = new Compaction(
-            vstorage, ioptions_, mutable_cf_options, mutable_db_options,
-            {comp_inputs}, 0, boundary /* output file size limit */,
-            0 /* max compaction bytes, not applicable */,
-            0 /* output path ID */, mutable_cf_options.compression,
-            mutable_cf_options.compression_opts, Temperature::kUnknown,
-            0 /* max_subcompactions */, {},
-            /* earliest_snapshot */ std::nullopt,
-            /* snapshot_checker */ nullptr,
-            CompactionReason::kFIFOReduceNumFiles,
-            /* trim_ts */ "", vstorage->CompactionScore(0),
-            /* l0_files_might_overlap */ true);
-        return c;
-      }
-
-      // This batch wasn't enough — advance past it
-      scan = pos;
-    }
-  }
-
-  return nullptr;
-}
-
-// The full_history_ts_low parameter is used to control bottommost file marking
-// for compaction when user-defined timestamps (UDT) are enabled.
-
-// TODO leverage full_history_ts_low for FIFO compaction, by trigggerring
-// compaction early for data that has already expired to achieve the goal of TTL
-// enforced compliance.
 Compaction* FIFOCompactionPicker::PickCompaction(
     const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
     const MutableDBOptions& mutable_db_options,
     const std::vector<SequenceNumber>& /* existing_snapshots */,
     const SnapshotChecker* /* snapshot_checker */, VersionStorageInfo* vstorage,
-    LogBuffer* log_buffer, const std::string& /* full_history_ts_low */,
-    bool /* require_max_output_level*/) {
+    LogBuffer* log_buffer, bool /* require_max_output_level*/) {
   Compaction* c = nullptr;
   if (mutable_cf_options.ttl > 0) {
     c = PickTTLCompaction(cf_name, mutable_cf_options, mutable_db_options,
@@ -743,22 +437,10 @@ Compaction* FIFOCompactionPicker::PickCompaction(
     c = PickSizeCompaction(cf_name, mutable_cf_options, mutable_db_options,
                            vstorage, log_buffer);
   }
-  // Intra-L0 compaction merges small files to reduce file count.
-  // It runs after size-based dropping: if PickSizeCompaction dropped files,
-  // it returned non-null and we skip this. Otherwise, we try to reduce
-  // L0 file count by merging small files together.
-  if (c == nullptr) {
-    c = PickIntraL0Compaction(cf_name, mutable_cf_options, mutable_db_options,
-                              vstorage, log_buffer);
-  }
   if (c == nullptr) {
     c = PickTemperatureChangeCompaction(
         cf_name, mutable_cf_options, mutable_db_options, vstorage, log_buffer);
   }
-  if (c == nullptr) {
-    ROCKS_LOG_BUFFER(log_buffer, "[%s] FIFO compaction: no compaction picked",
-                     cf_name.c_str());
-  }
   RegisterCompaction(c);
   return c;
 }
@@ -770,8 +452,7 @@ Compaction* FIFOCompactionPicker::PickCompactionForCompactRange(
     const CompactRangeOptions& /*compact_range_options*/,
     const InternalKey* /*begin*/, const InternalKey* /*end*/,
     InternalKey** compaction_end, bool* /*manual_conflict*/,
-    uint64_t /*max_file_num_to_ignore*/, const std::string& /*trim_ts*/,
-    const std::string& full_history_ts_low) {
+    uint64_t /*max_file_num_to_ignore*/, const std::string& /*trim_ts*/) {
 #ifdef NDEBUG
   (void)input_level;
   (void)output_level;
@@ -780,10 +461,10 @@ Compaction* FIFOCompactionPicker::PickCompactionForCompactRange(
   assert(output_level == 0);
   *compaction_end = nullptr;
   LogBuffer log_buffer(InfoLogLevel::INFO_LEVEL, ioptions_.logger);
-  Compaction* c = PickCompaction(
-      cf_name, mutable_cf_options, mutable_db_options,
-      /*existing_snapshots*/ {}, /*snapshot_checker*/ nullptr, vstorage,
-      &log_buffer, full_history_ts_low, /* require_max_output_level */ false);
+  Compaction* c =
+      PickCompaction(cf_name, mutable_cf_options, mutable_db_options,
+                     /*existing_snapshots*/ {}, /*snapshot_checker*/ nullptr,
+                     vstorage, &log_buffer);
   log_buffer.FlushBufferToLog();
   return c;
 }

db/compaction/compaction_picker_fifo.h

@@ -24,7 +24,6 @@ class FIFOCompactionPicker : public CompactionPicker {
       const std::vector<SequenceNumber>& /* existing_snapshots */,
       const SnapshotChecker* /* snapshot_checker */,
       VersionStorageInfo* version, LogBuffer* log_buffer,
-      const std::string& /* full_history_ts_low */,
       bool /* require_max_output_level*/ = false) override;
 
   Compaction* PickCompactionForCompactRange(
@@ -34,8 +33,7 @@ class FIFOCompactionPicker : public CompactionPicker {
       const CompactRangeOptions& compact_range_options,
       const InternalKey* begin, const InternalKey* end,
       InternalKey** compaction_end, bool* manual_conflict,
-      uint64_t max_file_num_to_ignore, const std::string& trim_ts,
-      const std::string& full_history_ts_low) override;
+      uint64_t max_file_num_to_ignore, const std::string& trim_ts) override;
 
   // The maximum allowed output level.  Always returns 0.
   int MaxOutputLevel() const override { return 0; }
@@ -55,28 +53,6 @@ class FIFOCompactionPicker : public CompactionPicker {
                                  VersionStorageInfo* version,
                                  LogBuffer* log_buffer);
 
-  // Intra-L0 compaction: merges small L0 files to reduce file count.
-  // Dispatches between two strategies based on configuration:
-  //   - use_kv_ratio_compaction = true: PickRatioBasedIntraL0Compaction
-  //   (BlobDB-optimized)
-  //   - use_kv_ratio_compaction = false: PickCostBasedIntraL0Compaction
-  //   (original)
-  // Only active when allow_compaction = true.
-  Compaction* PickIntraL0Compaction(const std::string& cf_name,
-                                    const MutableCFOptions& mutable_cf_options,
-                                    const MutableDBOptions& mutable_db_options,
-                                    VersionStorageInfo* vstorage,
-                                    LogBuffer* log_buffer);
-
-  // Capacity-derived intra-L0 compaction for BlobDB workloads.
-  // Uses the observed SST/blob ratio to compute a target file size,
-  // producing uniform files for predictable FIFO trimming.
-  // Called from PickIntraL0Compaction when use_kv_ratio_compaction = true.
-  Compaction* PickRatioBasedIntraL0Compaction(
-      const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
-      const MutableDBOptions& mutable_db_options, VersionStorageInfo* vstorage,
-      LogBuffer* log_buffer);
-
   // Will pick one file to compact at a time, starting from the oldest file.
   Compaction* PickTemperatureChangeCompaction(
       const std::string& cf_name, const MutableCFOptions& mutable_cf_options,

db/compaction/compaction_picker_level.cc

@@ -61,16 +61,14 @@ class LevelCompactionBuilder {
                          LogBuffer* log_buffer,
                          const MutableCFOptions& mutable_cf_options,
                          const ImmutableOptions& ioptions,
-                         const MutableDBOptions& mutable_db_options,
-                         const std::string& full_history_ts_low)
+                         const MutableDBOptions& mutable_db_options)
       : cf_name_(cf_name),
         vstorage_(vstorage),
         compaction_picker_(compaction_picker),
         log_buffer_(log_buffer),
         mutable_cf_options_(mutable_cf_options),
         ioptions_(ioptions),
-        mutable_db_options_(mutable_db_options),
-        full_history_ts_low_(full_history_ts_low) {}
+        mutable_db_options_(mutable_db_options) {}
 
   // Pick and return a compaction.
   Compaction* PickCompaction();
@@ -157,7 +155,6 @@ class LevelCompactionBuilder {
   const MutableCFOptions& mutable_cf_options_;
   const ImmutableOptions& ioptions_;
   const MutableDBOptions& mutable_db_options_;
-  const std::string& full_history_ts_low_;
   // Pick a path ID to place a newly generated file, with its level
   static uint32_t GetPathId(const ImmutableCFOptions& ioptions,
                             const MutableCFOptions& mutable_cf_options,
@@ -404,15 +401,7 @@ void LevelCompactionBuilder::SetupOtherFilesWithRoundRobinExpansion() {
   tmp_start_level_inputs = start_level_inputs_;
   // TODO (zichen): Future parallel round-robin may also need to update this
   // Constraint 1b (only expand till the end)
-  size_t next_index = start_index + 1;
-  const FileMetaData* last_file = start_level_inputs_.files.back();
-  for (size_t j = next_index; j < level_files.size(); j++) {
-    if (level_files[j] == last_file) {
-      next_index = j + 1;
-      break;
-    }
-  }
-  for (size_t i = next_index; i < level_files.size(); i++) {
+  for (size_t i = start_index + 1; i < level_files.size(); i++) {
     auto* f = level_files[i];
     if (f->being_compacted) {
       // Constraint 1a
@@ -568,7 +557,7 @@ Compaction* LevelCompactionBuilder::GetCompaction() {
       GetCompressionType(vstorage_, mutable_cf_options_, output_level_,
                          vstorage_->base_level()),
       GetCompressionOptions(mutable_cf_options_, vstorage_, output_level_),
-      Temperature::kUnknown,
+      mutable_cf_options_.default_write_temperature,
       /* max_subcompactions */ 0, std::move(grandparents_),
       /* earliest_snapshot */ std::nullopt, /* snapshot_checker */ nullptr,
       compaction_reason_,
@@ -582,8 +571,7 @@ Compaction* LevelCompactionBuilder::GetCompaction() {
   // takes running compactions into account (by skipping files that are already
   // being compacted). Since we just changed compaction score, we recalculate it
   // here
-  vstorage_->ComputeCompactionScore(ioptions_, mutable_cf_options_,
-                                    full_history_ts_low_);
+  vstorage_->ComputeCompactionScore(ioptions_, mutable_cf_options_);
   return c;
 }
 
@@ -922,10 +910,10 @@ bool LevelCompactionBuilder::PickIntraL0Compaction() {
     // resort to L0->L0 compaction yet.
     return false;
   }
-  return PickCostBasedIntraL0Compaction(
-      level_files, kMinFilesForIntraL0Compaction,
-      std::numeric_limits<uint64_t>::max(),
-      mutable_cf_options_.max_compaction_bytes, &start_level_inputs_);
+  return FindIntraL0Compaction(level_files, kMinFilesForIntraL0Compaction,
+                               std::numeric_limits<uint64_t>::max(),
+                               mutable_cf_options_.max_compaction_bytes,
+                               &start_level_inputs_);
 }
 
 bool LevelCompactionBuilder::PickSizeBasedIntraL0Compaction() {
@@ -988,11 +976,10 @@ Compaction* LevelCompactionPicker::PickCompaction(
     const MutableDBOptions& mutable_db_options,
     const std::vector<SequenceNumber>& /*existing_snapshots */,
     const SnapshotChecker* /*snapshot_checker*/, VersionStorageInfo* vstorage,
-    LogBuffer* log_buffer, const std::string& full_history_ts_low,
-    bool /* require_max_output_level*/) {
+    LogBuffer* log_buffer, bool /* require_max_output_level*/) {
   LevelCompactionBuilder builder(cf_name, vstorage, this, log_buffer,
                                  mutable_cf_options, ioptions_,
-                                 mutable_db_options, full_history_ts_low);
+                                 mutable_db_options);
   return builder.PickCompaction();
 }
 }  // namespace ROCKSDB_NAMESPACE

db/compaction/compaction_picker_level.h

@@ -26,7 +26,6 @@ class LevelCompactionPicker : public CompactionPicker {
       const std::vector<SequenceNumber>& /* existing_snapshots */,
       const SnapshotChecker* /* snapshot_checker */,
       VersionStorageInfo* vstorage, LogBuffer* log_buffer,
-      const std::string& full_history_ts_low,
       bool /*require_max_output_level*/ = false) override;
 
   bool NeedsCompaction(const VersionStorageInfo* vstorage) const override;

db/compaction/compaction_picker_universal.cc

@@ -39,7 +39,7 @@ class UniversalCompactionBuilder {
       const std::vector<SequenceNumber>& existing_snapshots,
       const SnapshotChecker* snapshot_checker, VersionStorageInfo* vstorage,
       UniversalCompactionPicker* picker, LogBuffer* log_buffer,
-      bool require_max_output_level, const std::string& full_history_ts_low)
+      bool require_max_output_level)
       : ioptions_(ioptions),
         icmp_(icmp),
         cf_name_(cf_name),
@@ -50,8 +50,7 @@ class UniversalCompactionBuilder {
         log_buffer_(log_buffer),
         require_max_output_level_(require_max_output_level),
         allow_ingest_behind_(ioptions.cf_allow_ingest_behind ||
-                             ioptions.allow_ingest_behind),
-        full_history_ts_low_(full_history_ts_low) {
+                             ioptions.allow_ingest_behind) {
     assert(icmp_);
     const auto* ucmp = icmp_->user_comparator();
     assert(ucmp);
@@ -451,7 +450,6 @@ class UniversalCompactionBuilder {
   std::map<uint64_t, size_t> file_marked_for_compaction_to_sorted_run_index_;
   bool require_max_output_level_;
   bool allow_ingest_behind_;
-  const std::string& full_history_ts_low_;
 
   std::vector<UniversalCompactionBuilder::SortedRun> CalculateSortedRuns(
       const VersionStorageInfo& vstorage, int last_level,
@@ -597,20 +595,16 @@ bool UniversalCompactionPicker::NeedsCompaction(
   return false;
 }
 
-// TODO leverage full_history_ts_low in universal compaction picking. It could
-// help reduce the same infinite compaction loop issue found in level
-// compaction.
 Compaction* UniversalCompactionPicker::PickCompaction(
     const std::string& cf_name, const MutableCFOptions& mutable_cf_options,
     const MutableDBOptions& mutable_db_options,
     const std::vector<SequenceNumber>& existing_snapshots,
     const SnapshotChecker* snapshot_checker, VersionStorageInfo* vstorage,
-    LogBuffer* log_buffer, const std::string& full_history_ts_low,
-    bool require_max_output_level) {
+    LogBuffer* log_buffer, bool require_max_output_level) {
   UniversalCompactionBuilder builder(
       ioptions_, icmp_, cf_name, mutable_cf_options, mutable_db_options,
       existing_snapshots, snapshot_checker, vstorage, this, log_buffer,
-      require_max_output_level, full_history_ts_low);
+      require_max_output_level);
   return builder.PickCompaction();
 }
 
@@ -831,8 +825,7 @@ Compaction* UniversalCompactionBuilder::PickCompaction() {
   RecordInHistogram(ioptions_.stats, NUM_FILES_IN_SINGLE_COMPACTION, num_files);
 
   picker_->RegisterCompaction(c);
-  vstorage_->ComputeCompactionScore(ioptions_, mutable_cf_options_,
-                                    full_history_ts_low_);
+  vstorage_->ComputeCompactionScore(ioptions_, mutable_cf_options_);
 
   TEST_SYNC_POINT_CALLBACK("UniversalCompactionBuilder::PickCompaction:Return",
                            c);
@@ -1100,7 +1093,7 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSortedRuns(
                                            output_level, 1, enable_compression),
                         GetCompressionOptions(mutable_cf_options_, vstorage_,
                                               output_level, enable_compression),
-                        Temperature::kUnknown,
+                        mutable_cf_options_.default_write_temperature,
                         /* max_subcompactions */ 0, grandparents,
                         /* earliest_snapshot */ std::nullopt,
                         /* snapshot_checker */ nullptr, compaction_reason,
@@ -1448,7 +1441,7 @@ Compaction* UniversalCompactionBuilder::PickIncrementalForReduceSizeAmp(
                          true /* enable_compression */),
       GetCompressionOptions(mutable_cf_options_, vstorage_, output_level,
                             true /* enable_compression */),
-      Temperature::kUnknown,
+      mutable_cf_options_.default_write_temperature,
       /* max_subcompactions */ 0, /* grandparents */ {},
       /* earliest_snapshot */ std::nullopt,
       /* snapshot_checker */ nullptr,
@@ -1551,18 +1544,9 @@ Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
     }
 
     if (output_level != 0) {
-      // For standalone range deletion, we don't want to compact it with newer
-      // L0 files that it doesn't cover.
-      const FileMetaData* starting_l0_file =
-          (start_level == 0 && start_level_inputs.size() == 1 &&
-           start_level_inputs.files[0]->FileIsStandAloneRangeTombstone())
-              ? start_level_inputs.files[0]
-              : nullptr;
-
       if (start_level == 0) {
         if (!picker_->GetOverlappingL0Files(vstorage_, &start_level_inputs,
-                                            output_level, nullptr,
-                                            starting_l0_file)) {
+                                            output_level, nullptr)) {
           return nullptr;
         }
       }
@@ -1573,8 +1557,7 @@ Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
       output_level_inputs.level = output_level;
       if (!picker_->SetupOtherInputs(cf_name_, mutable_cf_options_, vstorage_,
                                      &start_level_inputs, &output_level_inputs,
-                                     &parent_index, -1, false,
-                                     starting_l0_file)) {
+                                     &parent_index, -1)) {
         return nullptr;
       }
       inputs.push_back(start_level_inputs);
@@ -1611,7 +1594,7 @@ Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
       /* max_grandparent_overlap_bytes */ GetMaxOverlappingBytes(), path_id,
       GetCompressionType(vstorage_, mutable_cf_options_, output_level, 1),
       GetCompressionOptions(mutable_cf_options_, vstorage_, output_level),
-      Temperature::kUnknown,
+      mutable_cf_options_.default_write_temperature,
       /* max_subcompactions */ 0, grandparents, earliest_snapshot_,
       snapshot_checker_, CompactionReason::kFilesMarkedForCompaction,
       /* trim_ts */ "", score_,
@@ -1707,7 +1690,7 @@ Compaction* UniversalCompactionBuilder::PickCompactionWithSortedRunRange(
                          true /* enable_compression */),
       GetCompressionOptions(mutable_cf_options_, vstorage_, output_level,
                             true /* enable_compression */),
-      Temperature::kUnknown,
+      mutable_cf_options_.default_write_temperature,
       /* max_subcompactions */ 0, /* grandparents */ {},
       /* earliest_snapshot */ std::nullopt,
       /* snapshot_checker */ nullptr, compaction_reason,

db/compaction/compaction_picker_universal.h

@@ -26,8 +26,7 @@ class UniversalCompactionPicker : public CompactionPicker {
       const MutableDBOptions& mutable_db_options,
       const std::vector<SequenceNumber>& existing_snapshots,
       const SnapshotChecker* snapshot_checker, VersionStorageInfo* vstorage,
-      LogBuffer* log_buffer, const std::string& full_history_ts_low,
-      bool require_max_output_level = false) override;
+      LogBuffer* log_buffer, bool require_max_output_level = false) override;
   int MaxOutputLevel() const override { return NumberLevels() - 1; }
 
   bool NeedsCompaction(const VersionStorageInfo* vstorage) const override;

db/compaction/compaction_service_job.cc

@@ -117,14 +117,6 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(
   std::string debug_str_before_wait =
       compaction->input_version()->DebugString(/*hex=*/true);
 
-  // TODO: Update CompactionService API to support abort and resume
-  // functionality. Currently, remote compaction jobs cannot be aborted via
-  // AbortAllCompactions() because the CompactionService interface lacks methods
-  // to signal abort to remote workers and to properly resume after an abort.
-  // The API needs to be extended with:
-  // - A method to signal abort to running remote compaction jobs
-  // - A method to resume/re-enable scheduling after an abort is lifted
-
   ROCKS_LOG_INFO(db_options_.info_log,
                  "[%s] [JOB %d] Waiting for remote compaction...",
                  compaction->column_family_data()->GetName().c_str(), job_id_);
@@ -320,24 +312,21 @@ CompactionServiceCompactionJob::CompactionServiceCompactionJob(
     std::string output_path,
     const CompactionServiceInput& compaction_service_input,
     CompactionServiceResult* compaction_service_result)
-    : CompactionJob(
-          job_id, compaction, db_options, mutable_db_options, file_options,
-          versions, shutting_down, log_buffer, nullptr, output_directory,
-          nullptr, stats, db_mutex, db_error_handler, job_context,
-          std::move(table_cache), event_logger,
-          compaction->mutable_cf_options().paranoid_file_checks,
-          compaction->mutable_cf_options().report_bg_io_stats, dbname,
-          &(compaction_service_result->stats), Env::Priority::USER, io_tracer,
-          manual_compaction_canceled, CompactionJob::kCompactionAbortedFalse,
-          db_id, db_session_id,
-          compaction->column_family_data()->GetFullHistoryTsLow()),
+    : CompactionJob(job_id, compaction, db_options, mutable_db_options,
+                    file_options, versions, shutting_down, log_buffer, nullptr,
+                    output_directory, nullptr, stats, db_mutex,
+                    db_error_handler, job_context, std::move(table_cache),
+                    event_logger,
+                    compaction->mutable_cf_options().paranoid_file_checks,
+                    compaction->mutable_cf_options().report_bg_io_stats, dbname,
+                    &(compaction_service_result->stats), Env::Priority::USER,
+                    io_tracer, manual_compaction_canceled, db_id, db_session_id,
+                    compaction->column_family_data()->GetFullHistoryTsLow()),
       output_path_(std::move(output_path)),
       compaction_input_(compaction_service_input),
       compaction_result_(compaction_service_result) {}
 
-void CompactionServiceCompactionJob::Prepare(
-    const CompactionProgress& compaction_progress,
-    log::Writer* compaction_progress_writer) {
+void CompactionServiceCompactionJob::Prepare() {
   std::optional<Slice> begin;
   if (compaction_input_.has_begin) {
     begin = compaction_input_.begin;
@@ -346,8 +335,7 @@ void CompactionServiceCompactionJob::Prepare(
   if (compaction_input_.has_end) {
     end = compaction_input_.end;
   }
-  CompactionJob::Prepare(std::make_pair(begin, end), compaction_progress,
-                         compaction_progress_writer);
+  CompactionJob::Prepare(std::make_pair(begin, end));
 }
 
 Status CompactionServiceCompactionJob::Run() {
@@ -420,7 +408,7 @@ Status CompactionServiceCompactionJob::Run() {
   // 2. Update job-level output stats with the aggregated internal_stats_
   // Please note that input stats will be updated by primary host when all
   // subcompactions are finished
-  UpdateCompactionJobOutputStatsFromInternalStats(status, internal_stats_);
+  UpdateCompactionJobOutputStatsFromInternalStats(internal_stats_);
   // and set fields that are not propagated as part of the update
   compaction_result_->stats.is_manual_compaction = c->is_manual_compaction();
   compaction_result_->stats.is_full_compaction = c->is_full_compaction();

db/compaction/subcompaction_state.cc

@@ -38,11 +38,11 @@ OutputIterator SubcompactionState::GetOutputs() const {
                         compaction_outputs_.outputs_);
 }
 
-void SubcompactionState::Cleanup(Cache* cache, const Status& overall_status) {
+void SubcompactionState::Cleanup(Cache* cache) {
   proximal_level_outputs_.Cleanup();
   compaction_outputs_.Cleanup();
 
-  if (!status.ok() || !overall_status.ok()) {
+  if (!status.ok()) {
     for (const auto& out : GetOutputs()) {
       // If this file was inserted into the table cache then remove it here
       // because this compaction was not committed. This is not strictly
@@ -108,13 +108,11 @@ Slice SubcompactionState::LargestUserKey() const {
 Status SubcompactionState::AddToOutput(
     const CompactionIterator& iter, bool use_proximal_output,
     const CompactionFileOpenFunc& open_file_func,
-    const CompactionFileCloseFunc& close_file_func,
-    const ParsedInternalKey& prev_iter_output_internal_key) {
+    const CompactionFileCloseFunc& close_file_func) {
   // update target output
   current_outputs_ =
       use_proximal_output ? &proximal_level_outputs_ : &compaction_outputs_;
-  return current_outputs_->AddToOutput(iter, open_file_func, close_file_func,
-                                       prev_iter_output_internal_key);
+  return current_outputs_->AddToOutput(iter, open_file_func, close_file_func);
 }
 
 }  // namespace ROCKSDB_NAMESPACE

db/compaction/subcompaction_state.h

@@ -95,14 +95,6 @@ class SubcompactionState {
     proximal_level_outputs_.RemoveLastEmptyOutput();
   }
 
-  // Cleanup output builders for abandoning in-progress files.
-  void CleanupOutputs() {
-    compaction_outputs_.Cleanup();
-    if (compaction->SupportsPerKeyPlacement()) {
-      proximal_level_outputs_.Cleanup();
-    }
-  }
-
   void BuildSubcompactionJobInfo(
       SubcompactionJobInfo& subcompaction_job_info) const {
     const Compaction* c = compaction;
@@ -170,7 +162,7 @@ class SubcompactionState {
     }
   }
 
-  void Cleanup(Cache* cache, const Status& overall_status);
+  void Cleanup(Cache* cache);
 
   void AggregateCompactionOutputStats(
       InternalStats::CompactionStatsFull& internal_stats) const;
@@ -216,20 +208,10 @@ class SubcompactionState {
     return range_del_agg_ && !range_del_agg_->IsEmpty();
   }
 
-  void SetSubcompactionProgress(
-      const SubcompactionProgress& subcompaction_progress) {
-    subcompaction_progress_ = subcompaction_progress;
-  }
-
-  SubcompactionProgress& GetSubcompactionProgressRef() {
-    return subcompaction_progress_;
-  }
-
   // Add compaction_iterator key/value to the `Current` output group.
   Status AddToOutput(const CompactionIterator& iter, bool use_proximal_output,
                      const CompactionFileOpenFunc& open_file_func,
-                     const CompactionFileCloseFunc& close_file_func,
-                     const ParsedInternalKey& prev_iter_output_internal_key);
+                     const CompactionFileCloseFunc& close_file_func);
 
   // Close all compaction output files, both output_to_proximal_level outputs
   // and normal outputs.
@@ -259,8 +241,6 @@ class SubcompactionState {
   CompactionOutputs proximal_level_outputs_;
   CompactionOutputs* current_outputs_ = &compaction_outputs_;
   std::unique_ptr<CompactionRangeDelAggregator> range_del_agg_;
-
-  SubcompactionProgress subcompaction_progress_;
 };
 
 }  // namespace ROCKSDB_NAMESPACE

db/compaction/tiered_compaction_test.cc

@@ -1717,8 +1717,8 @@ TEST_P(PrecludeLastLevelTest, MigrationFromPreserveTimePartial) {
   ASSERT_EQ("0,0,0,0,0,0,1", FilesPerLevel());
 
   std::vector<KeyVersion> key_versions;
-  ASSERT_OK(GetAllKeyVersions(
-      db_.get(), {}, {}, std::numeric_limits<size_t>::max(), &key_versions));
+  ASSERT_OK(GetAllKeyVersions(db_, {}, {}, std::numeric_limits<size_t>::max(),
+                              &key_versions));
 
   // make sure there're more than 300 keys and first 100 keys are having seqno
   // zeroed out, the last 100 key seqno not zeroed out
@@ -2319,8 +2319,8 @@ TEST_P(PrecludeLastLevelTest, LastLevelOnlyCompactionPartial) {
   ASSERT_GT(GetSstSizeHelper(Temperature::kUnknown), 0);
 
   std::vector<KeyVersion> key_versions;
-  ASSERT_OK(GetAllKeyVersions(
-      db_.get(), {}, {}, std::numeric_limits<size_t>::max(), &key_versions));
+  ASSERT_OK(GetAllKeyVersions(db_, {}, {}, std::numeric_limits<size_t>::max(),
+                              &key_versions));
 
   // make sure there're more than 300 keys and first 100 keys are having seqno
   // zeroed out, the last 100 key seqno not zeroed out

db/comparator_db_test.cc

@@ -258,12 +258,12 @@ class ComparatorDBTest
  private:
   std::string dbname_;
   Env* env_;
-  std::unique_ptr<DB> db_;
+  DB* db_;
   Options last_options_;
   std::unique_ptr<const Comparator> comparator_guard;
 
  public:
-  ComparatorDBTest() : env_(Env::Default()) {
+  ComparatorDBTest() : env_(Env::Default()), db_(nullptr) {
     kTestComparator = BytewiseComparator();
     dbname_ = test::PerThreadDBPath("comparator_db_test");
     BlockBasedTableOptions toptions;
@@ -274,12 +274,12 @@ class ComparatorDBTest
   }
 
   ~ComparatorDBTest() override {
-    db_.reset();
+    delete db_;
     EXPECT_OK(DestroyDB(dbname_, last_options_));
     kTestComparator = BytewiseComparator();
   }
 
-  DB* GetDB() { return db_.get(); }
+  DB* GetDB() { return db_; }
 
   void SetOwnedComparator(const Comparator* cmp, bool owner = true) {
     if (owner) {
@@ -301,12 +301,14 @@ class ComparatorDBTest
   }
 
   void Destroy() {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     ASSERT_OK(DestroyDB(dbname_, last_options_));
   }
 
   Status TryReopen() {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     last_options_.create_if_missing = true;
 
     return DB::Open(last_options_, dbname_, &db_);
@@ -316,7 +318,7 @@ class ComparatorDBTest
 INSTANTIATE_TEST_CASE_P(FormatDef, ComparatorDBTest,
                         testing::Values(test::kDefaultFormatVersion));
 INSTANTIATE_TEST_CASE_P(FormatLatest, ComparatorDBTest,
-                        testing::Values(kLatestBbtFormatVersion));
+                        testing::Values(kLatestFormatVersion));
 
 TEST_P(ComparatorDBTest, Bytewise) {
   for (int rand_seed = 301; rand_seed < 306; rand_seed++) {

db/convenience.cc

@@ -65,7 +65,7 @@ Status VerifySstFileChecksum(const Options& options,
 }
 
 Status VerifySstFileChecksumInternal(const Options& options,
-                                     const FileOptions& file_options,
+                                     const EnvOptions& env_options,
                                      const ReadOptions& read_options,
                                      const std::string& file_path,
                                      const SequenceNumber& largest_seqno) {
@@ -74,8 +74,8 @@ Status VerifySstFileChecksumInternal(const Options& options,
   InternalKeyComparator internal_comparator(options.comparator);
   ImmutableOptions ioptions(options);
 
-  Status s =
-      ioptions.fs->NewRandomAccessFile(file_path, file_options, &file, nullptr);
+  Status s = ioptions.fs->NewRandomAccessFile(
+      file_path, FileOptions(env_options), &file, nullptr);
   if (s.ok()) {
     s = ioptions.fs->GetFileSize(file_path, IOOptions(), &file_size, nullptr);
   } else {
@@ -94,7 +94,7 @@ Status VerifySstFileChecksumInternal(const Options& options,
   const bool kImmortal = true;
   auto reader_options = TableReaderOptions(
       ioptions, options.prefix_extractor, options.compression_manager.get(),
-      file_options, internal_comparator, options.block_protection_bytes_per_key,
+      env_options, internal_comparator, options.block_protection_bytes_per_key,
       false /* skip_filters */, !kImmortal, false /* force_direct_prefetch */,
       -1 /* level */);
   reader_options.largest_seqno = largest_seqno;

db/convenience_impl.h

@@ -5,11 +5,10 @@
 
 #pragma once
 #include "rocksdb/db.h"
-#include "rocksdb/file_system.h"
 
 namespace ROCKSDB_NAMESPACE {
 Status VerifySstFileChecksumInternal(const Options& options,
-                                     const FileOptions& file_options,
+                                     const EnvOptions& env_options,
                                      const ReadOptions& read_options,
                                      const std::string& file_path,
                                      const SequenceNumber& largest_seqno = 0);

db/corruption_test.cc

@@ -73,7 +73,7 @@ class CorruptionTest : public testing::Test {
   std::string dbname_;
   std::shared_ptr<Cache> tiny_cache_;
   Options options_;
-  std::unique_ptr<DB> db_;
+  DB* db_;
 
   CorruptionTest() {
     // If LRU cache shard bit is smaller than 2 (or -1 which will automatically
@@ -105,7 +105,8 @@ class CorruptionTest : public testing::Test {
     SyncPoint::GetInstance()->DisableProcessing();
     SyncPoint::GetInstance()->LoadDependency({});
     SyncPoint::GetInstance()->ClearAllCallBacks();
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     if (getenv("KEEP_DB")) {
       fprintf(stdout, "db is still at %s\n", dbname_.c_str());
     } else {
@@ -115,12 +116,14 @@ class CorruptionTest : public testing::Test {
     }
   }
 
-  void CloseDb() { db_.reset(); }
-
-  DBImpl* dbfull() { return static_cast_with_check<DBImpl>(db_.get()); }
+  void CloseDb() {
+    delete db_;
+    db_ = nullptr;
+  }
 
   Status TryReopen(Options* options = nullptr) {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     Options opt = (options ? *options : options_);
     if (opt.env == Options().env) {
       // If env is not overridden, replace it with ErrorEnv.
@@ -138,7 +141,8 @@ class CorruptionTest : public testing::Test {
   void Reopen(Options* options = nullptr) { ASSERT_OK(TryReopen(options)); }
 
   void RepairDB() {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     ASSERT_OK(::ROCKSDB_NAMESPACE::RepairDB(dbname_, options_));
   }
 
@@ -147,7 +151,8 @@ class CorruptionTest : public testing::Test {
     WriteBatch batch;
     for (int i = 0; i < n; i++) {
       if (flush_every != 0 && i != 0 && i % flush_every == 0) {
-        ASSERT_OK(dbfull()->TEST_FlushMemTable());
+        DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+        ASSERT_OK(dbi->TEST_FlushMemTable());
       }
       // if ((i % 100) == 0) fprintf(stderr, "@ %d of %d\n", i, n);
       Slice key = Key(i + start, &key_space);
@@ -431,14 +436,14 @@ TEST_F(CorruptionTest, NewFileErrorDuringWrite) {
 
 TEST_F(CorruptionTest, TableFile) {
   Build(100);
-  DBImpl* dbi = dbfull();
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
   ASSERT_OK(dbi->TEST_FlushMemTable());
   ASSERT_OK(dbi->TEST_CompactRange(0, nullptr, nullptr));
   ASSERT_OK(dbi->TEST_CompactRange(1, nullptr, nullptr));
 
   Corrupt(kTableFile, 100, 1);
   Check(99, 99);
-  ASSERT_NOK(db_->VerifyChecksum());
+  ASSERT_NOK(dbi->VerifyChecksum());
 }
 
 TEST_F(CorruptionTest, VerifyChecksumReadahead) {
@@ -455,14 +460,14 @@ TEST_F(CorruptionTest, VerifyChecksumReadahead) {
   Reopen(&options);
 
   Build(10000);
-  DBImpl* dbi = dbfull();
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
   ASSERT_OK(dbi->TEST_FlushMemTable());
   ASSERT_OK(dbi->TEST_CompactRange(0, nullptr, nullptr));
   ASSERT_OK(dbi->TEST_CompactRange(1, nullptr, nullptr));
 
   senv.count_random_reads_ = true;
   senv.random_read_counter_.Reset();
-  ASSERT_OK(db_->VerifyChecksum());
+  ASSERT_OK(dbi->VerifyChecksum());
 
   // Make sure the counter is enabled.
   ASSERT_GT(senv.random_read_counter_.Read(), 0);
@@ -475,7 +480,7 @@ TEST_F(CorruptionTest, VerifyChecksumReadahead) {
   senv.random_read_bytes_counter_ = 0;
   ReadOptions ro;
   ro.readahead_size = size_t{32 * 1024};
-  ASSERT_OK(db_->VerifyChecksum(ro));
+  ASSERT_OK(dbi->VerifyChecksum(ro));
   // The SST file is about 10MB. We set readahead size to 32KB.
   // Give 0 to 20 reads for metadata blocks, and allow real read
   // to range from 24KB to 48KB. The lower bound would be:
@@ -489,7 +494,8 @@ TEST_F(CorruptionTest, VerifyChecksumReadahead) {
   // disabled).
   options.allow_mmap_reads = true;
   Reopen(&options);
-  ASSERT_OK(db_->VerifyChecksum(ro));
+  dbi = static_cast<DBImpl*>(db_);
+  ASSERT_OK(dbi->VerifyChecksum(ro));
 
   CloseDb();
 }
@@ -502,16 +508,18 @@ TEST_F(CorruptionTest, TableFileIndexData) {
   Reopen(&options);
   // build 2 tables, flush at 5000
   Build(10000, 5000);
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+  ASSERT_OK(dbi->TEST_FlushMemTable());
 
   // corrupt an index block of an entire file
   Corrupt(kTableFile, -2000, 500);
   options.paranoid_checks = false;
   Reopen(&options);
+  dbi = static_cast_with_check<DBImpl>(db_);
   // one full file may be readable, since only one was corrupted
   // the other file should be fully non-readable, since index was corrupted
   Check(0, 5000, ReadOptions(true, true));
-  ASSERT_NOK(db_->VerifyChecksum());
+  ASSERT_NOK(dbi->VerifyChecksum());
 
   // In paranoid mode, the db cannot be opened due to the corrupted file.
   ASSERT_TRUE(TryReopen().IsCorruption());
@@ -519,7 +527,8 @@ TEST_F(CorruptionTest, TableFileIndexData) {
 
 TEST_F(CorruptionTest, TableFileFooterMagic) {
   Build(100);
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+  ASSERT_OK(dbi->TEST_FlushMemTable());
   Check(100, 100);
   // Corrupt the whole footer
   Corrupt(kTableFile, -100, 100);
@@ -534,7 +543,8 @@ TEST_F(CorruptionTest, TableFileFooterMagic) {
 
 TEST_F(CorruptionTest, TableFileFooterNotMagic) {
   Build(100);
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+  ASSERT_OK(dbi->TEST_FlushMemTable());
   Check(100, 100);
   // Corrupt footer except magic number
   Corrupt(kTableFile, -100, 92);
@@ -569,7 +579,8 @@ TEST_F(CorruptionTest, DBOpenWithWrongFileSize) {
     for (auto* cfh : cfhs) {
       delete cfh;
     }
-    ASSERT_OK(dbfull()->TEST_FlushMemTable());
+    DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+    ASSERT_OK(dbi->TEST_FlushMemTable());
 
     // ********************************************
     // Corrupt the file by making the file bigger
@@ -590,8 +601,7 @@ TEST_F(CorruptionTest, DBOpenWithWrongFileSize) {
   // true
   options_.paranoid_checks = true;
   std::vector<ColumnFamilyHandle*> cfhs;
-  Status s;
-  s = DB::Open(options_, dbname_, cf_descs, &cfhs, &db_);
+  auto s = DB::Open(options_, dbname_, cf_descs, &cfhs, &db_);
   ASSERT_TRUE(s.IsCorruption());
   ASSERT_TRUE(s.ToString().find("file size mismatch") != std::string::npos);
 
@@ -616,7 +626,8 @@ TEST_F(CorruptionTest, DBOpenWithWrongFileSize) {
 
 TEST_F(CorruptionTest, TableFileWrongSize) {
   Build(100);
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+  ASSERT_OK(dbi->TEST_FlushMemTable());
   Check(100, 100);
 
   // ********************************************
@@ -699,11 +710,12 @@ TEST_F(CorruptionTest, SequenceNumberRecovery) {
 
 TEST_F(CorruptionTest, CorruptedDescriptor) {
   ASSERT_OK(db_->Put(WriteOptions(), "foo", "hello"));
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+  ASSERT_OK(dbi->TEST_FlushMemTable());
   CompactRangeOptions cro;
   cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
   ASSERT_OK(
-      db_->CompactRange(cro, db_->DefaultColumnFamily(), nullptr, nullptr));
+      dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
 
   Corrupt(kDescriptorFile, 0, 1000);
   Status s = TryReopen();
@@ -722,7 +734,7 @@ TEST_F(CorruptionTest, CompactionInputError) {
   options.env = env_.get();
   Reopen(&options);
   Build(10);
-  DBImpl* dbi = dbfull();
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
   ASSERT_OK(dbi->TEST_FlushMemTable());
   ASSERT_OK(dbi->TEST_CompactRange(0, nullptr, nullptr));
   ASSERT_OK(dbi->TEST_CompactRange(1, nullptr, nullptr));
@@ -730,12 +742,12 @@ TEST_F(CorruptionTest, CompactionInputError) {
 
   Corrupt(kTableFile, 100, 1);
   Check(9, 9);
-  ASSERT_NOK(db_->VerifyChecksum());
+  ASSERT_NOK(dbi->VerifyChecksum());
 
   // Force compactions by writing lots of values
   Build(10000);
   Check(10000, 10000);
-  ASSERT_NOK(db_->VerifyChecksum());
+  ASSERT_NOK(dbi->VerifyChecksum());
 }
 
 TEST_F(CorruptionTest, CompactionInputErrorParanoid) {
@@ -746,14 +758,14 @@ TEST_F(CorruptionTest, CompactionInputErrorParanoid) {
   options.write_buffer_size = 131072;
   options.max_write_buffer_number = 2;
   Reopen(&options);
-  DBImpl* dbi = dbfull();
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
 
   // Fill levels >= 1
-  for (int level = 1; level < db_->NumberLevels(); level++) {
-    ASSERT_OK(db_->Put(WriteOptions(), "", "begin"));
-    ASSERT_OK(db_->Put(WriteOptions(), "~", "end"));
+  for (int level = 1; level < dbi->NumberLevels(); level++) {
+    ASSERT_OK(dbi->Put(WriteOptions(), "", "begin"));
+    ASSERT_OK(dbi->Put(WriteOptions(), "~", "end"));
     ASSERT_OK(dbi->TEST_FlushMemTable());
-    for (int comp_level = 0; comp_level < db_->NumberLevels() - level;
+    for (int comp_level = 0; comp_level < dbi->NumberLevels() - level;
          ++comp_level) {
       ASSERT_OK(dbi->TEST_CompactRange(comp_level, nullptr, nullptr));
     }
@@ -761,7 +773,7 @@ TEST_F(CorruptionTest, CompactionInputErrorParanoid) {
 
   Reopen(&options);
 
-  dbi = dbfull();
+  dbi = static_cast_with_check<DBImpl>(db_);
   Build(10);
   ASSERT_OK(dbi->TEST_FlushMemTable());
   ASSERT_OK(dbi->TEST_WaitForCompact());
@@ -769,7 +781,7 @@ TEST_F(CorruptionTest, CompactionInputErrorParanoid) {
 
   CorruptTableFileAtLevel(0, 100, 1);
   Check(9, 9);
-  ASSERT_NOK(db_->VerifyChecksum());
+  ASSERT_NOK(dbi->VerifyChecksum());
 
   // Write must eventually fail because of corrupted table
   Status s;
@@ -788,16 +800,17 @@ TEST_F(CorruptionTest, CompactionInputErrorParanoid) {
 
 TEST_F(CorruptionTest, UnrelatedKeys) {
   Build(10);
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+  ASSERT_OK(dbi->TEST_FlushMemTable());
   Corrupt(kTableFile, 100, 1);
-  ASSERT_NOK(db_->VerifyChecksum());
+  ASSERT_NOK(dbi->VerifyChecksum());
 
   std::string tmp1, tmp2;
   ASSERT_OK(db_->Put(WriteOptions(), Key(1000, &tmp1), Value(1000, &tmp2)));
   std::string v;
   ASSERT_OK(db_->Get(ReadOptions(), Key(1000, &tmp1), &v));
   ASSERT_EQ(Value(1000, &tmp2).ToString(), v);
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  ASSERT_OK(dbi->TEST_FlushMemTable());
   ASSERT_OK(db_->Get(ReadOptions(), Key(1000, &tmp1), &v));
   ASSERT_EQ(Value(1000, &tmp2).ToString(), v);
 }
@@ -844,12 +857,14 @@ TEST_F(CorruptionTest, FileSystemStateCorrupted) {
     Reopen(&options);
     Build(10);
     ASSERT_OK(db_->Flush(FlushOptions()));
+    DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
     std::vector<LiveFileMetaData> metadata;
-    db_->GetLiveFilesMetaData(&metadata);
+    dbi->GetLiveFilesMetaData(&metadata);
     ASSERT_GT(metadata.size(), 0);
     std::string filename = dbname_ + metadata[0].name;
 
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
 
     if (iter == 0) {  // corrupt file size
       std::unique_ptr<WritableFile> file;
@@ -881,7 +896,8 @@ TEST_F(CorruptionTest, ParanoidFileChecksOnFlush) {
   options.create_if_missing = true;
   Status s;
   for (const auto& mode : corruption_modes) {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     s = DestroyDB(dbname_, options);
     ASSERT_OK(s);
     std::shared_ptr<mock::MockTableFactory> mock =
@@ -908,7 +924,8 @@ TEST_F(CorruptionTest, ParanoidFileChecksOnCompact) {
   options.create_if_missing = true;
   Status s;
   for (const auto& mode : corruption_modes) {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     s = DestroyDB(dbname_, options);
     ASSERT_OK(s);
     std::shared_ptr<mock::MockTableFactory> mock =
@@ -917,11 +934,12 @@ TEST_F(CorruptionTest, ParanoidFileChecksOnCompact) {
     ASSERT_OK(DB::Open(options, dbname_, &db_));
     assert(db_ != nullptr);  // suppress false clang-analyze report
     Build(100, 2);
-    ASSERT_OK(dbfull()->TEST_FlushMemTable());
+    DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+    ASSERT_OK(dbi->TEST_FlushMemTable());
     mock->SetCorruptionMode(mode);
     CompactRangeOptions cro;
     cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-    s = db_->CompactRange(cro, db_->DefaultColumnFamily(), nullptr, nullptr);
+    s = dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr);
     if (mode == mock::MockTableFactory::kCorruptNone) {
       ASSERT_OK(s);
     } else {
@@ -937,7 +955,8 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRangeFirst) {
   options.paranoid_file_checks = true;
   options.create_if_missing = true;
   for (bool do_flush : {true, false}) {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     ASSERT_OK(DestroyDB(dbname_, options));
     ASSERT_OK(DB::Open(options, dbname_, &db_));
     std::string start, end;
@@ -954,11 +973,12 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRangeFirst) {
     if (do_flush) {
       ASSERT_OK(db_->Flush(FlushOptions()));
     } else {
-      ASSERT_OK(dbfull()->TEST_FlushMemTable());
+      DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+      ASSERT_OK(dbi->TEST_FlushMemTable());
       CompactRangeOptions cro;
       cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
       ASSERT_OK(
-          db_->CompactRange(cro, db_->DefaultColumnFamily(), nullptr, nullptr));
+          dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
     }
     db_->ReleaseSnapshot(snap);
   }
@@ -971,7 +991,8 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRange) {
   options.paranoid_file_checks = true;
   options.create_if_missing = true;
   for (bool do_flush : {true, false}) {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     ASSERT_OK(DestroyDB(dbname_, options));
     ASSERT_OK(DB::Open(options, dbname_, &db_));
     assert(db_ != nullptr);  // suppress false clang-analyze report
@@ -991,11 +1012,12 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRange) {
     if (do_flush) {
       ASSERT_OK(db_->Flush(FlushOptions()));
     } else {
-      ASSERT_OK(dbfull()->TEST_FlushMemTable());
+      DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+      ASSERT_OK(dbi->TEST_FlushMemTable());
       CompactRangeOptions cro;
       cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
       ASSERT_OK(
-          db_->CompactRange(cro, db_->DefaultColumnFamily(), nullptr, nullptr));
+          dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
     }
     db_->ReleaseSnapshot(snap);
   }
@@ -1008,7 +1030,8 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRangeLast) {
   options.paranoid_file_checks = true;
   options.create_if_missing = true;
   for (bool do_flush : {true, false}) {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     ASSERT_OK(DestroyDB(dbname_, options));
     ASSERT_OK(DB::Open(options, dbname_, &db_));
     assert(db_ != nullptr);  // suppress false clang-analyze report
@@ -1025,11 +1048,12 @@ TEST_F(CorruptionTest, ParanoidFileChecksWithDeleteRangeLast) {
     if (do_flush) {
       ASSERT_OK(db_->Flush(FlushOptions()));
     } else {
-      ASSERT_OK(dbfull()->TEST_FlushMemTable());
+      DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+      ASSERT_OK(dbi->TEST_FlushMemTable());
       CompactRangeOptions cro;
       cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
       ASSERT_OK(
-          db_->CompactRange(cro, db_->DefaultColumnFamily(), nullptr, nullptr));
+          dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
     }
     db_->ReleaseSnapshot(snap);
   }
@@ -1042,7 +1066,8 @@ TEST_F(CorruptionTest, LogCorruptionErrorsInCompactionIterator) {
   options.create_if_missing = true;
   options.allow_data_in_errors = true;
   auto mode = mock::MockTableFactory::kCorruptKey;
-  db_.reset();
+  delete db_;
+  db_ = nullptr;
   ASSERT_OK(DestroyDB(dbname_, options));
 
   std::shared_ptr<mock::MockTableFactory> mock =
@@ -1054,11 +1079,12 @@ TEST_F(CorruptionTest, LogCorruptionErrorsInCompactionIterator) {
   assert(db_ != nullptr);  // suppress false clang-analyze report
   Build(100, 2);
 
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+  ASSERT_OK(dbi->TEST_FlushMemTable());
   CompactRangeOptions cro;
   cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
   Status s =
-      db_->CompactRange(cro, db_->DefaultColumnFamily(), nullptr, nullptr);
+      dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr);
   ASSERT_NOK(s);
   ASSERT_TRUE(s.IsCorruption());
 }
@@ -1069,7 +1095,8 @@ TEST_F(CorruptionTest, CompactionKeyOrderCheck) {
   options.env = env_.get();
   options.paranoid_file_checks = false;
   options.create_if_missing = true;
-  db_.reset();
+  delete db_;
+  db_ = nullptr;
   ASSERT_OK(DestroyDB(dbname_, options));
   std::shared_ptr<mock::MockTableFactory> mock =
       std::make_shared<mock::MockTableFactory>();
@@ -1078,13 +1105,14 @@ TEST_F(CorruptionTest, CompactionKeyOrderCheck) {
   assert(db_ != nullptr);  // suppress false clang-analyze report
   mock->SetCorruptionMode(mock::MockTableFactory::kCorruptReorderKey);
   Build(100, 2);
-  ASSERT_OK(dbfull()->TEST_FlushMemTable());
+  DBImpl* dbi = static_cast_with_check<DBImpl>(db_);
+  ASSERT_OK(dbi->TEST_FlushMemTable());
 
   mock->SetCorruptionMode(mock::MockTableFactory::kCorruptNone);
   CompactRangeOptions cro;
   cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
   ASSERT_NOK(
-      db_->CompactRange(cro, db_->DefaultColumnFamily(), nullptr, nullptr));
+      dbi->CompactRange(cro, dbi->DefaultColumnFamily(), nullptr, nullptr));
 }
 
 TEST_F(CorruptionTest, FlushKeyOrderCheck) {
@@ -1111,7 +1139,7 @@ TEST_F(CorruptionTest, FlushKeyOrderCheck) {
         }
       });
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-  Status s = dbfull()->TEST_FlushMemTable();
+  Status s = static_cast_with_check<DBImpl>(db_)->TEST_FlushMemTable();
   ASSERT_NOK(s);
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearAllCallBacks();
@@ -1235,7 +1263,7 @@ TEST_P(CrashDuringRecoveryWithCorruptionTest, CrashDuringRecovery) {
   // while other don't.
   {
     ASSERT_OK(DB::Open(options, dbname_, cf_descs, &handles, &db_));
-    auto* dbimpl = dbfull();
+    auto* dbimpl = static_cast_with_check<DBImpl>(db_);
     assert(dbimpl);
 
     // Write one key to test_cf.

db/cuckoo_table_db_test.cc

@@ -21,18 +21,18 @@ class CuckooTableDBTest : public testing::Test {
  private:
   std::string dbname_;
   Env* env_;
-  std::unique_ptr<DB> db_;
+  DB* db_;
 
  public:
   CuckooTableDBTest() : env_(Env::Default()) {
     dbname_ = test::PerThreadDBPath("cuckoo_table_db_test");
     EXPECT_OK(DestroyDB(dbname_, Options()));
-    db_.reset();
+    db_ = nullptr;
     Reopen();
   }
 
   ~CuckooTableDBTest() override {
-    db_.reset();
+    delete db_;
     EXPECT_OK(DestroyDB(dbname_, Options()));
   }
 
@@ -47,11 +47,12 @@ class CuckooTableDBTest : public testing::Test {
     return options;
   }
 
-  DBImpl* dbfull() { return static_cast_with_check<DBImpl>(db_.get()); }
+  DBImpl* dbfull() { return static_cast_with_check<DBImpl>(db_); }
 
   // The following util methods are copied from plain_table_db_test.
   void Reopen(Options* options = nullptr) {
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     Options opts;
     if (options != nullptr) {
       opts = *options;
@@ -65,7 +66,8 @@ class CuckooTableDBTest : public testing::Test {
   void DestroyAndReopen(Options* options) {
     assert(options);
     ASSERT_OK(db_->Close());
-    db_.reset();
+    delete db_;
+    db_ = nullptr;
     ASSERT_OK(DestroyDB(dbname_, *options));
     Reopen(options);
   }
@@ -128,7 +130,7 @@ TEST_F(CuckooTableDBTest, Flush) {
   ASSERT_OK(dbfull()->TEST_FlushMemTable());
 
   TablePropertiesCollection ptc;
-  ASSERT_OK(dbfull()->GetPropertiesOfAllTables(&ptc));
+  ASSERT_OK(static_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
   VerifySstUniqueIds(ptc);
   ASSERT_EQ(1U, ptc.size());
   ASSERT_EQ(3U, ptc.begin()->second->num_entries);
@@ -145,7 +147,7 @@ TEST_F(CuckooTableDBTest, Flush) {
   ASSERT_OK(Put("key6", "v6"));
   ASSERT_OK(dbfull()->TEST_FlushMemTable());
 
-  ASSERT_OK(dbfull()->GetPropertiesOfAllTables(&ptc));
+  ASSERT_OK(static_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
   VerifySstUniqueIds(ptc);
   ASSERT_EQ(2U, ptc.size());
   auto row = ptc.begin();
@@ -163,7 +165,7 @@ TEST_F(CuckooTableDBTest, Flush) {
   ASSERT_OK(Delete("key5"));
   ASSERT_OK(Delete("key4"));
   ASSERT_OK(dbfull()->TEST_FlushMemTable());
-  ASSERT_OK(dbfull()->GetPropertiesOfAllTables(&ptc));
+  ASSERT_OK(static_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
   VerifySstUniqueIds(ptc);
   ASSERT_EQ(3U, ptc.size());
   row = ptc.begin();
@@ -188,7 +190,7 @@ TEST_F(CuckooTableDBTest, FlushWithDuplicateKeys) {
   ASSERT_OK(dbfull()->TEST_FlushMemTable());
 
   TablePropertiesCollection ptc;
-  ASSERT_OK(dbfull()->GetPropertiesOfAllTables(&ptc));
+  ASSERT_OK(static_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc));
   VerifySstUniqueIds(ptc);
   ASSERT_EQ(1U, ptc.size());
   ASSERT_EQ(2U, ptc.begin()->second->num_entries);

db/db_basic_test.cc

@@ -91,15 +91,17 @@ class DBBasicTest : public DBTestBase {
 TEST_F(DBBasicTest, OpenWhenOpen) {
   Options options = CurrentOptions();
   options.env = env_;
-  std::unique_ptr<DB> db2;
+  DB* db2 = nullptr;
   Status s = DB::Open(options, dbname_, &db2);
-  ASSERT_NOK(s) << [&db2]() {
-    db2.reset();
+  ASSERT_NOK(s) << [db2]() {
+    delete db2;
     return "db2 open: ok";
   }();
   ASSERT_EQ(Status::Code::kIOError, s.code());
   ASSERT_EQ(Status::SubCode::kNone, s.subcode());
   ASSERT_TRUE(strstr(s.getState(), "lock ") != nullptr);
+
+  delete db2;
 }
 
 TEST_F(DBBasicTest, EnableDirectIOWithZeroBuf) {
@@ -240,43 +242,6 @@ TEST_F(DBBasicTest, ReadOnlyDB) {
             Status::Code::kNotSupported);
 }
 
-TEST_F(DBBasicTest, ReadOnlyDBFlushWAL) {
-  // Test that FlushWAL returns NotSupported on read-only DB, and that
-  // GetLiveFilesStorageInfo works correctly even with manual_wal_flush=true.
-  // This is a regression test for a bug where GetLiveFilesStorageInfo would
-  // crash on read-only DBs with manual_wal_flush=true because FlushWAL
-  // accessed logs_.back() on an empty deque.
-  auto options = CurrentOptions();
-  options.manual_wal_flush = true;
-  DestroyAndReopen(options);
-  ASSERT_OK(Put("foo", "v1"));
-  ASSERT_OK(Put("bar", "v2"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put("baz", "v3"));  // Unflushed data in WAL
-  Close();
-
-  // Reopen as read-only
-  ASSERT_OK(ReadOnlyReopen(options));
-  ASSERT_EQ("v1", Get("foo"));
-  ASSERT_EQ("v2", Get("bar"));
-  ASSERT_EQ("v3", Get("baz"));
-
-  // FlushWAL should return NotSupported (not crash)
-  ASSERT_EQ(db_->FlushWAL(/*sync=*/false).code(), Status::Code::kNotSupported);
-  ASSERT_EQ(db_->FlushWAL(/*sync=*/true).code(), Status::Code::kNotSupported);
-
-  // GetLiveFilesStorageInfo should succeed (previously crashed with
-  // manual_wal_flush=true because it called FlushWAL which accessed
-  // logs_.back() on empty deque)
-  LiveFilesStorageInfoOptions lfsi_opts;
-  lfsi_opts.wal_size_for_flush = 0;
-  std::vector<LiveFileStorageInfo> files;
-  ASSERT_OK(db_->GetLiveFilesStorageInfo(lfsi_opts, &files));
-  ASSERT_GT(files.size(), 0);
-
-  Close();
-}
-
 TEST_F(DBBasicTest, ReadOnlyDBWithWriteDBIdToManifestSet) {
   auto options = CurrentOptions();
   options.write_dbid_to_manifest = false;
@@ -584,14 +549,14 @@ TEST_F(DBBasicTest, GetSnapshot) {
 
 TEST_F(DBBasicTest, CheckLock) {
   do {
-    std::unique_ptr<DB> localdb;
+    DB* localdb = nullptr;
     Options options = CurrentOptions();
     ASSERT_OK(TryReopen(options));
 
     // second open should fail
     Status s = DB::Open(options, dbname_, &localdb);
-    ASSERT_NOK(s) << [&localdb]() {
-      localdb.reset();
+    ASSERT_NOK(s) << [localdb]() {
+      delete localdb;
       return "localdb open: ok";
     }();
 #ifdef OS_LINUX
@@ -710,6 +675,30 @@ TEST_F(DBBasicTest, Flush) {
   } while (ChangeCompactOptions());
 }
 
+TEST_F(DBBasicTest, ManifestRollOver) {
+  do {
+    Options options;
+    options.max_manifest_file_size = 10;  // 10 bytes
+    options = CurrentOptions(options);
+    CreateAndReopenWithCF({"pikachu"}, options);
+    {
+      ASSERT_OK(Put(1, "manifest_key1", std::string(1000, '1')));
+      ASSERT_OK(Put(1, "manifest_key2", std::string(1000, '2')));
+      ASSERT_OK(Put(1, "manifest_key3", std::string(1000, '3')));
+      uint64_t manifest_before_flush = dbfull()->TEST_Current_Manifest_FileNo();
+      ASSERT_OK(Flush(1));  // This should trigger LogAndApply.
+      uint64_t manifest_after_flush = dbfull()->TEST_Current_Manifest_FileNo();
+      ASSERT_GT(manifest_after_flush, manifest_before_flush);
+      ReopenWithColumnFamilies({"default", "pikachu"}, options);
+      ASSERT_GT(dbfull()->TEST_Current_Manifest_FileNo(), manifest_after_flush);
+      // check if a new manifest file got inserted or not.
+      ASSERT_EQ(std::string(1000, '1'), Get(1, "manifest_key1"));
+      ASSERT_EQ(std::string(1000, '2'), Get(1, "manifest_key2"));
+      ASSERT_EQ(std::string(1000, '3'), Get(1, "manifest_key3"));
+    }
+  } while (ChangeCompactOptions());
+}
+
 TEST_F(DBBasicTest, IdentityAcrossRestarts) {
   constexpr size_t kMinIdSize = 10;
   do {
@@ -860,7 +849,7 @@ TEST_F(DBBasicTest, Snapshot) {
     ASSERT_OK(Put(1, "foo", "1v3"));
 
     {
-      ManagedSnapshot s3(db_.get());
+      ManagedSnapshot s3(db_);
       ASSERT_EQ(3U, GetNumSnapshots());
       ASSERT_EQ(time_snap1, GetTimeOldestSnapshots());
       ASSERT_EQ(GetSequenceOldestSnapshots(), s1->GetSequenceNumber());
@@ -983,7 +972,7 @@ TEST_F(DBBasicTest, DBOpen_Options) {
   Destroy(options);
 
   // Does not exist, and create_if_missing == false: error
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   options.create_if_missing = false;
   Status s = DB::Open(options, dbname_, &db);
   ASSERT_TRUE(strstr(s.ToString().c_str(), "does not exist") != nullptr);
@@ -995,7 +984,8 @@ TEST_F(DBBasicTest, DBOpen_Options) {
   ASSERT_OK(s);
   ASSERT_TRUE(db != nullptr);
 
-  db.reset();
+  delete db;
+  db = nullptr;
 
   // Does exist, and error_if_exists == true: error
   options.create_if_missing = false;
@@ -1011,7 +1001,8 @@ TEST_F(DBBasicTest, DBOpen_Options) {
   ASSERT_OK(s);
   ASSERT_TRUE(db != nullptr);
 
-  db.reset();
+  delete db;
+  db = nullptr;
 }
 
 TEST_F(DBBasicTest, CompactOnFlush) {
@@ -1316,7 +1307,7 @@ TEST_F(DBBasicTest, DBClose) {
   std::string dbname = test::PerThreadDBPath("db_close_test");
   ASSERT_OK(DestroyDB(dbname, options));
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   TestEnv* env = new TestEnv(env_);
   std::unique_ptr<TestEnv> local_env_guard(env);
   options.create_if_missing = true;
@@ -1329,14 +1320,14 @@ TEST_F(DBBasicTest, DBClose) {
   ASSERT_EQ(env->GetCloseCount(), 1);
   ASSERT_EQ(s, Status::IOError());
 
-  db.reset();
+  delete db;
   ASSERT_EQ(env->GetCloseCount(), 1);
 
   // Do not call DB::Close() and ensure our logger Close() still gets called
   s = DB::Open(options, dbname, &db);
   ASSERT_OK(s);
   ASSERT_TRUE(db != nullptr);
-  db.reset();
+  delete db;
   ASSERT_EQ(env->GetCloseCount(), 2);
 
   // close by WaitForCompact() with close_db option
@@ -1351,7 +1342,7 @@ TEST_F(DBBasicTest, DBClose) {
   // see TestLogger::CloseHelper()
   ASSERT_EQ(s, Status::IOError());
 
-  db.reset();
+  delete db;
   ASSERT_EQ(env->GetCloseCount(), 3);
 
   // Provide our own logger and ensure DB::Close() does not close it
@@ -1362,7 +1353,7 @@ TEST_F(DBBasicTest, DBClose) {
 
   s = db->Close();
   ASSERT_EQ(s, Status::OK());
-  db.reset();
+  delete db;
   ASSERT_EQ(env->GetCloseCount(), 3);
   options.info_log.reset();
   ASSERT_EQ(env->GetCloseCount(), 4);
@@ -1380,7 +1371,7 @@ TEST_F(DBBasicTest, DBCloseAllDirectoryFDs) {
 
   ASSERT_OK(DestroyDB(dbname, options));
 
-  std::unique_ptr<DB> db;
+  DB* db = nullptr;
   std::unique_ptr<Env> env = NewCompositeEnv(
       std::make_shared<CountedFileSystem>(FileSystem::Default()));
   options.create_if_missing = true;
@@ -1398,7 +1389,7 @@ TEST_F(DBBasicTest, DBCloseAllDirectoryFDs) {
   ASSERT_EQ(counted_fs->counters()->dir_opens,
             counted_fs->counters()->dir_closes);
   ASSERT_OK(s);
-  db.reset();
+  delete db;
 }
 
 TEST_F(DBBasicTest, DBCloseFlushError) {
@@ -1460,7 +1451,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetMultiCF) {
   }
 
   int get_sv_count = 0;
-  ROCKSDB_NAMESPACE::DBImpl* db = dbfull();
+  ROCKSDB_NAMESPACE::DBImpl* db = static_cast_with_check<DBImpl>(db_);
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
       "DBImpl::MultiCFSnapshot::AfterRefSV", [&](void* /*arg*/) {
         if (++get_sv_count == 2) {
@@ -1532,9 +1523,10 @@ TEST_P(DBMultiGetTestWithParam, MultiGetMultiCF) {
   ASSERT_EQ(values[2], std::get<2>(cf_kv_vec[1]) + "_2");
 
   for (int cf = 0; cf < 8; ++cf) {
-    auto* cfd = static_cast_with_check<ColumnFamilyHandleImpl>(
-                    dbfull()->GetColumnFamilyHandle(cf))
-                    ->cfd();
+    auto* cfd =
+        static_cast_with_check<ColumnFamilyHandleImpl>(
+            static_cast_with_check<DBImpl>(db_)->GetColumnFamilyHandle(cf))
+            ->cfd();
     ASSERT_NE(cfd->TEST_GetLocalSV()->Get(), SuperVersion::kSVInUse);
     ASSERT_NE(cfd->TEST_GetLocalSV()->Get(), SuperVersion::kSVObsolete);
   }
@@ -1620,9 +1612,10 @@ TEST_P(DBMultiGetTestWithParam, MultiGetMultiCFMutex) {
               "cf" + std::to_string(j) + "_val" + std::to_string(retries));
   }
   for (int i = 0; i < 8; ++i) {
-    auto* cfd = static_cast_with_check<ColumnFamilyHandleImpl>(
-                    dbfull()->GetColumnFamilyHandle(i))
-                    ->cfd();
+    auto* cfd =
+        static_cast_with_check<ColumnFamilyHandleImpl>(
+            static_cast_with_check<DBImpl>(db_)->GetColumnFamilyHandle(i))
+            ->cfd();
     ASSERT_NE(cfd->TEST_GetLocalSV()->Get(), SuperVersion::kSVInUse);
   }
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
@@ -1646,7 +1639,7 @@ TEST_P(DBMultiGetTestWithParam, MultiGetMultiCFSnapshot) {
   }
 
   int get_sv_count = 0;
-  ROCKSDB_NAMESPACE::DBImpl* db = dbfull();
+  ROCKSDB_NAMESPACE::DBImpl* db = static_cast_with_check<DBImpl>(db_);
   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
       "DBImpl::MultiCFSnapshot::AfterRefSV", [&](void* /*arg*/) {
         if (++get_sv_count == 2) {
@@ -1687,9 +1680,10 @@ TEST_P(DBMultiGetTestWithParam, MultiGetMultiCFSnapshot) {
     ASSERT_EQ(values[j], "cf" + std::to_string(j) + "_val");
   }
   for (int i = 0; i < 8; ++i) {
-    auto* cfd = static_cast_with_check<ColumnFamilyHandleImpl>(
-                    dbfull()->GetColumnFamilyHandle(i))
-                    ->cfd();
+    auto* cfd =
+        static_cast_with_check<ColumnFamilyHandleImpl>(
+            static_cast_with_check<DBImpl>(db_)->GetColumnFamilyHandle(i))
+            ->cfd();
     ASSERT_NE(cfd->TEST_GetLocalSV()->Get(), SuperVersion::kSVInUse);
   }
 }
@@ -2535,319 +2529,6 @@ TEST_P(DBMultiGetTestWithParam, MultiGetBatchedValueSizeMultiLevelMerge) {
   }
 }
 
-TEST_P(DBMultiGetTestWithParam, MultiGetMemtableBatchLookup) {
-#ifndef USE_COROUTINES
-  if (std::get<1>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test requires coroutine support");
-    return;
-  }
-#endif  // USE_COROUTINES
-  // Skip for unbatched MultiGet
-  if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
-    return;
-  }
-  Options options = CurrentOptions();
-  options.memtable_batch_lookup_optimization = true;
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  // Insert sorted keys into memtable
-  for (int i = 0; i < 100; i++) {
-    ASSERT_OK(Put(1, Key(i), "val" + std::to_string(i)));
-  }
-  // Delete some keys
-  ASSERT_OK(Delete(1, Key(25)));
-  ASSERT_OK(Delete(1, Key(75)));
-
-  // MultiGet a batch of keys - mix of existing, deleted, and missing
-  // Store key strings to keep Slice data alive
-  std::vector<std::string> key_strs = {Key(0),  Key(10), Key(25), Key(50),
-                                       Key(75), Key(99), Key(200)};
-  std::vector<Slice> keys(key_strs.begin(), key_strs.end());
-
-  std::vector<PinnableSlice> values(keys.size());
-  std::vector<Status> statuses(keys.size());
-
-  ReadOptions ro;
-  ro.async_io = std::get<1>(GetParam());
-  db_->MultiGet(ro, handles_[1], keys.size(), keys.data(), values.data(),
-                statuses.data(), true);
-
-  ASSERT_OK(statuses[0]);
-  ASSERT_EQ(values[0].ToString(), "val0");
-  ASSERT_OK(statuses[1]);
-  ASSERT_EQ(values[1].ToString(), "val10");
-  ASSERT_TRUE(statuses[2].IsNotFound());  // deleted
-  ASSERT_OK(statuses[3]);
-  ASSERT_EQ(values[3].ToString(), "val50");
-  ASSERT_TRUE(statuses[4].IsNotFound());  // deleted
-  ASSERT_OK(statuses[5]);
-  ASSERT_EQ(values[5].ToString(), "val99");
-  ASSERT_TRUE(statuses[6].IsNotFound());  // never inserted
-}
-
-TEST_P(DBMultiGetTestWithParam, MultiGetBatchLookupOverwrite) {
-#ifndef USE_COROUTINES
-  if (std::get<1>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test requires coroutine support");
-    return;
-  }
-#endif  // USE_COROUTINES
-  if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
-    return;
-  }
-  Options options = CurrentOptions();
-  options.memtable_batch_lookup_optimization = true;
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  // Insert, then overwrite some keys
-  for (int i = 0; i < 50; i++) {
-    ASSERT_OK(Put(1, Key(i), "old" + std::to_string(i)));
-  }
-  for (int i = 0; i < 50; i += 5) {
-    ASSERT_OK(Put(1, Key(i), "new" + std::to_string(i)));
-  }
-
-  std::vector<std::string> key_strs;
-  for (int i = 0; i < 50; i += 5) {
-    key_strs.push_back(Key(i));
-  }
-  std::vector<Slice> keys(key_strs.begin(), key_strs.end());
-  std::vector<PinnableSlice> values(keys.size());
-  std::vector<Status> statuses(keys.size());
-
-  ReadOptions ro;
-  ro.async_io = std::get<1>(GetParam());
-  db_->MultiGet(ro, handles_[1], keys.size(), keys.data(), values.data(),
-                statuses.data(), true);
-
-  for (size_t i = 0; i < keys.size(); i++) {
-    ASSERT_OK(statuses[i]);
-    ASSERT_EQ(values[i].ToString(), "new" + std::to_string(i * 5));
-  }
-}
-
-TEST_P(DBMultiGetTestWithParam, MultiGetBatchLookupWithFlush) {
-#ifndef USE_COROUTINES
-  if (std::get<1>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test requires coroutine support");
-    return;
-  }
-#endif  // USE_COROUTINES
-  if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
-    return;
-  }
-  Options options = CurrentOptions();
-  options.memtable_batch_lookup_optimization = true;
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  // Put data into SST
-  for (int i = 0; i < 50; i++) {
-    ASSERT_OK(Put(1, Key(i), "sst" + std::to_string(i)));
-  }
-  ASSERT_OK(Flush(1));
-
-  // Put different data into memtable (overlapping some keys)
-  for (int i = 25; i < 75; i++) {
-    ASSERT_OK(Put(1, Key(i), "mem" + std::to_string(i)));
-  }
-
-  // MultiGet keys spanning both SST and memtable
-  std::vector<std::string> key_strs = {Key(10), Key(30), Key(60), Key(80)};
-  std::vector<Slice> keys(key_strs.begin(), key_strs.end());
-
-  std::vector<PinnableSlice> values(keys.size());
-  std::vector<Status> statuses(keys.size());
-
-  ReadOptions ro;
-  ro.async_io = std::get<1>(GetParam());
-  db_->MultiGet(ro, handles_[1], keys.size(), keys.data(), values.data(),
-                statuses.data(), true);
-
-  ASSERT_OK(statuses[0]);
-  ASSERT_EQ(values[0].ToString(), "sst10");
-  ASSERT_OK(statuses[1]);
-  ASSERT_EQ(values[1].ToString(), "mem30");
-  ASSERT_OK(statuses[2]);
-  ASSERT_EQ(values[2].ToString(), "mem60");
-  ASSERT_TRUE(statuses[3].IsNotFound());
-}
-
-TEST_P(DBMultiGetTestWithParam, MultiGetBatchLookupWithMerge) {
-#ifndef USE_COROUTINES
-  if (std::get<1>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test requires coroutine support");
-    return;
-  }
-#endif  // USE_COROUTINES
-  if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
-    return;
-  }
-  Options options = CurrentOptions();
-  options.memtable_batch_lookup_optimization = true;
-  options.merge_operator = MergeOperators::CreateStringAppendOperator();
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  // Put base values
-  ASSERT_OK(Put(1, Key(1), "a"));
-  ASSERT_OK(Put(1, Key(2), "x"));
-  // Merge on top
-  ASSERT_OK(Merge(1, Key(1), "b"));
-  ASSERT_OK(Merge(1, Key(1), "c"));
-  ASSERT_OK(Merge(1, Key(2), "y"));
-
-  std::vector<std::string> key_strs = {Key(1), Key(2), Key(3)};
-  std::vector<Slice> keys(key_strs.begin(), key_strs.end());
-
-  std::vector<PinnableSlice> values(keys.size());
-  std::vector<Status> statuses(keys.size());
-
-  ReadOptions ro;
-  ro.async_io = std::get<1>(GetParam());
-  db_->MultiGet(ro, handles_[1], keys.size(), keys.data(), values.data(),
-                statuses.data(), true);
-
-  ASSERT_OK(statuses[0]);
-  ASSERT_EQ(values[0].ToString(), "a,b,c");
-  ASSERT_OK(statuses[1]);
-  ASSERT_EQ(values[1].ToString(), "x,y");
-  ASSERT_TRUE(statuses[2].IsNotFound());
-}
-
-TEST_F(DBBasicTest, MultiGetBatchLookupDisabledByDefault) {
-  // Verify that finger search is off by default and MultiGet still works
-  Options options = CurrentOptions();
-  ASSERT_FALSE(options.memtable_batch_lookup_optimization);
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  ASSERT_OK(Put(1, "k1", "v1"));
-  ASSERT_OK(Put(1, "k2", "v2"));
-
-  std::vector<Slice> keys = {"k1", "k2", "k3"};
-  std::vector<PinnableSlice> values(3);
-  std::vector<Status> statuses(3);
-
-  db_->MultiGet(ReadOptions(), handles_[1], 3, keys.data(), values.data(),
-                statuses.data(), true);
-
-  ASSERT_OK(statuses[0]);
-  ASSERT_EQ(values[0].ToString(), "v1");
-  ASSERT_OK(statuses[1]);
-  ASSERT_EQ(values[1].ToString(), "v2");
-  ASSERT_TRUE(statuses[2].IsNotFound());
-}
-
-TEST_P(DBMultiGetTestWithParam, MultiGetBatchLookupWithParanoid) {
-#ifndef USE_COROUTINES
-  if (std::get<1>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test requires coroutine support");
-    return;
-  }
-#endif  // USE_COROUTINES
-  if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
-    return;
-  }
-  Options options = CurrentOptions();
-  options.memtable_batch_lookup_optimization = true;
-  options.paranoid_memory_checks = true;
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  // Insert sorted keys into memtable
-  for (int i = 0; i < 100; i++) {
-    ASSERT_OK(Put(1, Key(i), "val" + std::to_string(i)));
-  }
-  ASSERT_OK(Delete(1, Key(25)));
-
-  // MultiGet with both batch optimization and paranoid checks enabled
-  std::vector<std::string> key_strs = {Key(0),  Key(10), Key(25),
-                                       Key(50), Key(99), Key(200)};
-  std::vector<Slice> keys(key_strs.begin(), key_strs.end());
-
-  std::vector<PinnableSlice> values(keys.size());
-  std::vector<Status> statuses(keys.size());
-
-  ReadOptions ro;
-  ro.async_io = std::get<1>(GetParam());
-  db_->MultiGet(ro, handles_[1], keys.size(), keys.data(), values.data(),
-                statuses.data(), true);
-
-  ASSERT_OK(statuses[0]);
-  ASSERT_EQ(values[0].ToString(), "val0");
-  ASSERT_OK(statuses[1]);
-  ASSERT_EQ(values[1].ToString(), "val10");
-  ASSERT_TRUE(statuses[2].IsNotFound());  // deleted
-  ASSERT_OK(statuses[3]);
-  ASSERT_EQ(values[3].ToString(), "val50");
-  ASSERT_OK(statuses[4]);
-  ASSERT_EQ(values[4].ToString(), "val99");
-  ASSERT_TRUE(statuses[5].IsNotFound());  // never inserted
-}
-
-TEST_P(DBMultiGetTestWithParam, MultiGetBatchLookupSnapshot) {
-#ifndef USE_COROUTINES
-  if (std::get<1>(GetParam())) {
-    ROCKSDB_GTEST_SKIP("This test requires coroutine support");
-    return;
-  }
-#endif  // USE_COROUTINES
-  if (!std::get<0>(GetParam())) {
-    ROCKSDB_GTEST_BYPASS("This test is only for batched MultiGet");
-    return;
-  }
-  Options options = CurrentOptions();
-  options.memtable_batch_lookup_optimization = true;
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  ASSERT_OK(Put(1, Key(1), "v1_old"));
-  ASSERT_OK(Put(1, Key(2), "v2_old"));
-
-  const Snapshot* snap = db_->GetSnapshot();
-
-  // Write new values after snapshot
-  ASSERT_OK(Put(1, Key(1), "v1_new"));
-  ASSERT_OK(Put(1, Key(2), "v2_new"));
-  ASSERT_OK(Put(1, Key(3), "v3_new"));
-
-  // MultiGet with snapshot should see old values
-  std::vector<std::string> key_strs = {Key(1), Key(2), Key(3)};
-  std::vector<Slice> keys(key_strs.begin(), key_strs.end());
-
-  std::vector<PinnableSlice> values(keys.size());
-  std::vector<Status> statuses(keys.size());
-
-  ReadOptions ro;
-  ro.snapshot = snap;
-  ro.async_io = std::get<1>(GetParam());
-  db_->MultiGet(ro, handles_[1], keys.size(), keys.data(), values.data(),
-                statuses.data(), true);
-
-  ASSERT_OK(statuses[0]);
-  ASSERT_EQ(values[0].ToString(), "v1_old");
-  ASSERT_OK(statuses[1]);
-  ASSERT_EQ(values[1].ToString(), "v2_old");
-  ASSERT_TRUE(statuses[2].IsNotFound());  // didn't exist at snapshot
-
-  db_->ReleaseSnapshot(snap);
-
-  // MultiGet without snapshot should see new values
-  for (auto& v : values) {
-    v.Reset();
-  }
-  db_->MultiGet(ReadOptions(), handles_[1], keys.size(), keys.data(),
-                values.data(), statuses.data(), true);
-
-  ASSERT_OK(statuses[0]);
-  ASSERT_EQ(values[0].ToString(), "v1_new");
-  ASSERT_OK(statuses[1]);
-  ASSERT_EQ(values[1].ToString(), "v2_new");
-  ASSERT_OK(statuses[2]);
-  ASSERT_EQ(values[2].ToString(), "v3_new");
-}
-
 INSTANTIATE_TEST_CASE_P(DBMultiGetTestWithParam, DBMultiGetTestWithParam,
                         testing::Combine(testing::Bool(), testing::Bool()));
 
@@ -3607,8 +3288,8 @@ TEST_F(DBBasicTest, GetAllKeyVersions) {
     ASSERT_OK(Delete(std::to_string(i)));
   }
   std::vector<KeyVersion> key_versions;
-  ASSERT_OK(GetAllKeyVersions(
-      db_.get(), {}, {}, std::numeric_limits<size_t>::max(), &key_versions));
+  ASSERT_OK(GetAllKeyVersions(db_, {}, {}, std::numeric_limits<size_t>::max(),
+                              &key_versions));
   ASSERT_EQ(kNumInserts + kNumDeletes + kNumUpdates, key_versions.size());
   for (size_t i = 0; i < kNumInserts + kNumDeletes + kNumUpdates; i++) {
     if (i % 3 == 0) {
@@ -3617,7 +3298,7 @@ TEST_F(DBBasicTest, GetAllKeyVersions) {
       ASSERT_EQ(key_versions[i].GetTypeName(), "TypeValue");
     }
   }
-  ASSERT_OK(GetAllKeyVersions(db_.get(), handles_[0], {}, {},
+  ASSERT_OK(GetAllKeyVersions(db_, handles_[0], {}, {},
                               std::numeric_limits<size_t>::max(),
                               &key_versions));
   ASSERT_EQ(kNumInserts + kNumDeletes + kNumUpdates, key_versions.size());
@@ -3632,14 +3313,14 @@ TEST_F(DBBasicTest, GetAllKeyVersions) {
   for (size_t i = 0; i + 1 != kNumDeletes; ++i) {
     ASSERT_OK(Delete(1, std::to_string(i)));
   }
-  ASSERT_OK(GetAllKeyVersions(db_.get(), handles_[1], {}, {},
+  ASSERT_OK(GetAllKeyVersions(db_, handles_[1], {}, {},
                               std::numeric_limits<size_t>::max(),
                               &key_versions));
   ASSERT_EQ(kNumInserts + kNumDeletes + kNumUpdates - 3, key_versions.size());
 
   // Change from historical behavior: empty key is now interpreted literally as
   // a legal key (rather than as a "not present" key)
-  ASSERT_OK(GetAllKeyVersions(db_.get(), handles_[1], Slice(), Slice(),
+  ASSERT_OK(GetAllKeyVersions(db_, handles_[1], Slice(), Slice(),
                               std::numeric_limits<size_t>::max(),
                               &key_versions));
   ASSERT_EQ(key_versions.size(), 0);
@@ -4211,75 +3892,6 @@ TEST_F(DBBasicTest, SkipWALIfMissingTableFiles) {
   ASSERT_OK(iter->status());
 }
 
-TEST_F(DBBasicTest, BestEffortRecoveryFailureWithTableCacheUseAfterFree) {
-  Options options = CurrentOptions();
-  options.create_if_missing = true;
-  options.env = env_;
-  // Force multiple manifest files
-  options.max_manifest_file_size = 1;
-  options.max_manifest_space_amp_pct = 0;
-
-  DestroyAndReopen(options);
-
-  // Disable file deletions to preserve old manifest files for
-  // best-efforts recovery to succeed
-  ASSERT_OK(db_->DisableFileDeletions());
-
-  // Create multiple SST files to populate TableCache during
-  // best-efforts recovery
-  for (int i = 0; i < 10; i++) {
-    ASSERT_OK(Put("key" + std::to_string(i),
-                  std::string(1000, static_cast<char>('a' + i))));
-    ASSERT_OK(Flush());
-  }
-
-  // Verify we have multiple manifest files
-  std::vector<std::string> files;
-  ASSERT_OK(env_->GetChildren(dbname_, &files));
-  int manifest_count = 0;
-  for (const auto& file : files) {
-    if (file.find("MANIFEST") != std::string::npos) {
-      manifest_count++;
-    }
-  }
-  ASSERT_GE(manifest_count, 2);
-
-  // Inject corruption after TableCache is populated (count > 3), but only once
-  // (injected flag) to allow best-effort recovery to trigger retry and succeed.
-  // This coerce the bug: first recovery caches SSTs with reference to column
-  // family's options in table cache and retry deletes column family so the
-  // reference becomes dangling.
-  int count = 0;
-  bool injected = false;
-  SyncPoint::GetInstance()->SetCallBack(
-      "VersionBuilder::CheckConsistencyBeforeReturn", [&](void* arg) {
-        count++;
-        if (count > 3 && !injected) {
-          ASSERT_NE(nullptr, arg);
-          *(static_cast<Status*>(arg)) =
-              Status::Corruption("Injected corruption");
-          injected = true;
-        }
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  options.best_efforts_recovery = true;
-
-  Status s = TryReopen(options);
-  ASSERT_OK(s);
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-
-  for (int i = 0; i < 10; i++) {
-    std::string value;
-    // Without the fix, ASAN detects use-after-free when accessing cached SST
-    // files that hold dangling references to deleted ioptions.
-    s = db_->Get(ReadOptions(), "key" + std::to_string(i), &value);
-    ASSERT_TRUE(s.ok() || s.IsNotFound());
-  }
-}
-
 TEST_F(DBBasicTest, DisableTrackWal) {
   // If WAL tracking was enabled, and then disabled during reopen,
   // the previously tracked WALs should be removed from MANIFEST.
@@ -5780,94 +5392,6 @@ INSTANTIATE_TEST_CASE_P(DBBasicTestDeadline, DBBasicTestDeadline,
                         ::testing::Values(std::make_tuple(true, false),
                                           std::make_tuple(false, true),
                                           std::make_tuple(true, true)));
-
-// FileSystemWrapper that captures FileOptions passed to NewRandomAccessFile
-// for .sst files, so we can verify file_checksum fields are populated.
-class ChecksumCapturingFS : public FileSystemWrapper {
- public:
-  explicit ChecksumCapturingFS(const std::shared_ptr<FileSystem>& base)
-      : FileSystemWrapper(base) {}
-
-  static const char* kClassName() { return "ChecksumCapturingFS"; }
-  const char* Name() const override { return kClassName(); }
-
-  IOStatus NewRandomAccessFile(const std::string& fname,
-                               const FileOptions& opts,
-                               std::unique_ptr<FSRandomAccessFile>* result,
-                               IODebugContext* dbg) override {
-    if (fname.find(".sst") != std::string::npos) {
-      std::lock_guard<std::mutex> lock(mu_);
-      captured_file_checksum_ = opts.file_checksum;
-      captured_file_checksum_func_name_ = opts.file_checksum_func_name;
-      capture_count_++;
-    }
-    return target()->NewRandomAccessFile(fname, opts, result, dbg);
-  }
-
-  std::string GetCapturedFileChecksum() {
-    std::lock_guard<std::mutex> lock(mu_);
-    return captured_file_checksum_;
-  }
-
-  std::string GetCapturedFileChecksumFuncName() {
-    std::lock_guard<std::mutex> lock(mu_);
-    return captured_file_checksum_func_name_;
-  }
-
-  int GetCaptureCount() {
-    std::lock_guard<std::mutex> lock(mu_);
-    return capture_count_;
-  }
-
-  void Reset() {
-    std::lock_guard<std::mutex> lock(mu_);
-    captured_file_checksum_.clear();
-    captured_file_checksum_func_name_.clear();
-    capture_count_ = 0;
-  }
-
- private:
-  std::mutex mu_;
-  std::string captured_file_checksum_;
-  std::string captured_file_checksum_func_name_;
-  int capture_count_ = 0;
-};
-
-TEST_F(DBBasicTest, FileChecksumInFileOptions) {
-  // Verify that file_checksum and file_checksum_func_name from FileMetaData
-  // are propagated through FileOptions when opening SST files.
-  auto capturing_fs =
-      std::make_shared<ChecksumCapturingFS>(env_->GetFileSystem());
-  std::unique_ptr<Env> env(new CompositeEnvWrapper(env_, capturing_fs));
-
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.env = env.get();
-  options.file_checksum_gen_factory = GetFileChecksumGenCrc32cFactory();
-  DestroyAndReopen(options);
-
-  // Write data and flush to create an SST with a file checksum.
-  ASSERT_OK(Put("key1", "value1"));
-  ASSERT_OK(Flush());
-
-  // Reset captures, then reopen to trigger TableCache SST open.
-  capturing_fs->Reset();
-  Reopen(options);
-
-  // Read to trigger SST open through TableCache::GetTableReader.
-  ASSERT_EQ("value1", Get("key1"));
-
-  // Verify that checksum fields were populated.
-  ASSERT_GT(capturing_fs->GetCaptureCount(), 0);
-  ASSERT_FALSE(capturing_fs->GetCapturedFileChecksum().empty());
-  ASSERT_NE(capturing_fs->GetCapturedFileChecksumFuncName(),
-            capturing_fs->GetCapturedFileChecksum());
-  ASSERT_EQ(capturing_fs->GetCapturedFileChecksumFuncName(),
-            "FileChecksumCrc32c");
-
-  Close();
-}
-
 }  // namespace ROCKSDB_NAMESPACE
 
 int main(int argc, char** argv) {

db/db_block_cache_test.cc

@@ -466,90 +466,6 @@ TEST_F(DBBlockCacheTest, WarmCacheWithDataBlocksDuringFlush) {
             options.statistics->getTickerCount(BLOCK_CACHE_DATA_ADD));
 }
 
-// Cache wrapper that tracks the priority of each Insert call.
-namespace {
-class PriorityTrackingCache : public CacheWrapper {
- public:
-  explicit PriorityTrackingCache(std::shared_ptr<Cache> target)
-      : CacheWrapper(std::move(target)) {}
-
-  const char* Name() const override { return "PriorityTrackingCache"; }
-
-  Status Insert(const Slice& key, ObjectPtr value,
-                const CacheItemHelper* helper, size_t charge,
-                Handle** handle = nullptr, Priority priority = Priority::LOW,
-                const Slice& compressed_value = Slice(),
-                CompressionType type = kNoCompression) override {
-    insert_priorities_.push_back(priority);
-    return CacheWrapper::Insert(key, value, helper, charge, handle, priority,
-                                compressed_value, type);
-  }
-
-  void ResetPriorities() { insert_priorities_.clear(); }
-
-  bool HasPriority(Priority p) const {
-    return std::find(insert_priorities_.begin(), insert_priorities_.end(), p) !=
-           insert_priorities_.end();
-  }
-
- private:
-  std::vector<Priority> insert_priorities_;
-};
-}  // namespace
-
-TEST_F(DBBlockCacheTest, WarmCacheWithDataBlocksDuringCompaction) {
-  Options options = CurrentOptions();
-  options.create_if_missing = true;
-  options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
-  options.disable_auto_compactions = true;
-
-  auto tracking_cache =
-      std::make_shared<PriorityTrackingCache>(NewLRUCache(1 << 25, 0, false));
-
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = tracking_cache;
-  table_options.cache_index_and_filter_blocks = false;
-  table_options.prepopulate_block_cache =
-      BlockBasedTableOptions::PrepopulateBlockCache::kFlushAndCompaction;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  DestroyAndReopen(options);
-
-  std::string value(kValueSize, 'a');
-
-  // Flush warming: inserts should use LOW priority.
-  tracking_cache->ResetPriorities();
-  ASSERT_OK(Put("key", value));
-  ASSERT_OK(Flush());
-  EXPECT_TRUE(tracking_cache->HasPriority(Cache::Priority::LOW));
-  EXPECT_FALSE(tracking_cache->HasPriority(Cache::Priority::BOTTOM));
-
-  // Write overlapping key to force a real merge compaction (not trivial move).
-  ASSERT_OK(Put("key", value + "2"));
-  ASSERT_OK(Flush());
-
-  auto data_add_before =
-      options.statistics->getTickerCount(BLOCK_CACHE_DATA_ADD);
-
-  // Compaction warming: data block inserts should use BOTTOM priority.
-  // Internal cache bookkeeping (e.g., cache entry stats) may insert at HIGH,
-  // so we check for BOTTOM presence and LOW absence.
-  tracking_cache->ResetPriorities();
-  CompactRangeOptions cro;
-  cro.bottommost_level_compaction = BottommostLevelCompaction::kForceOptimized;
-  ASSERT_OK(db_->CompactRange(cro, /*begin=*/nullptr, /*end=*/nullptr));
-  EXPECT_GT(options.statistics->getTickerCount(BLOCK_CACHE_DATA_ADD),
-            data_add_before);
-  EXPECT_TRUE(tracking_cache->HasPriority(Cache::Priority::BOTTOM));
-  EXPECT_FALSE(tracking_cache->HasPriority(Cache::Priority::LOW));
-
-  // Compaction output is in cache — reads should have zero misses.
-  auto data_miss_before =
-      options.statistics->getTickerCount(BLOCK_CACHE_DATA_MISS);
-  ASSERT_EQ(value + "2", Get("key"));
-  EXPECT_EQ(data_miss_before,
-            options.statistics->getTickerCount(BLOCK_CACHE_DATA_MISS));
-}
-
 // This test cache data, index and filter blocks during flush.
 class DBBlockCacheTest1 : public DBTestBase,
                           public ::testing::WithParamInterface<uint32_t> {
@@ -704,36 +620,6 @@ TEST_F(DBBlockCacheTest, DynamicOptions) {
   ASSERT_EQ(0, st->getAndResetTickerCount(BLOCK_CACHE_DATA_MISS));
   ASSERT_EQ(1, st->getAndResetTickerCount(BLOCK_CACHE_DATA_HIT));
 
-  // Switch to kFlushAndCompaction
-  ++i;
-  ASSERT_OK(dbfull()->SetOptions(
-      {{"block_based_table_factory",
-        "{prepopulate_block_cache=kFlushAndCompaction;}"}}));
-
-  ASSERT_OK(Put(std::to_string(i), value));
-  ASSERT_OK(Flush());
-  // Flush warming still works
-  ASSERT_EQ(1, st->getAndResetTickerCount(BLOCK_CACHE_DATA_ADD));
-
-  ASSERT_EQ(value, Get(std::to_string(i)));
-  ASSERT_EQ(0, st->getAndResetTickerCount(BLOCK_CACHE_DATA_ADD));
-  ASSERT_EQ(0, st->getAndResetTickerCount(BLOCK_CACHE_DATA_MISS));
-  ASSERT_EQ(1, st->getAndResetTickerCount(BLOCK_CACHE_DATA_HIT));
-
-  // Switch back to kDisable
-  ++i;
-  ASSERT_OK(dbfull()->SetOptions(
-      {{"block_based_table_factory", "{prepopulate_block_cache=kDisable;}"}}));
-
-  ASSERT_OK(Put(std::to_string(i), value));
-  ASSERT_OK(Flush());
-  ASSERT_EQ(0, st->getAndResetTickerCount(BLOCK_CACHE_DATA_ADD));
-
-  ASSERT_EQ(value, Get(std::to_string(i)));
-  ASSERT_EQ(1, st->getAndResetTickerCount(BLOCK_CACHE_DATA_ADD));
-  ASSERT_EQ(1, st->getAndResetTickerCount(BLOCK_CACHE_DATA_MISS));
-  ASSERT_EQ(0, st->getAndResetTickerCount(BLOCK_CACHE_DATA_HIT));
-
   ++i;
   // NOT YET SUPPORTED
   // FIXME: find a way to make this fail again (until well supported)
@@ -1775,7 +1661,7 @@ TEST_P(DBBlockCacheKeyTest, StableCacheKeys) {
   std::string export_files_dir = dbname_ + "/exported";
   ExportImportFilesMetaData* metadata_ptr_ = nullptr;
   Checkpoint* checkpoint;
-  ASSERT_OK(Checkpoint::Create(db_.get(), &checkpoint));
+  ASSERT_OK(Checkpoint::Create(db_, &checkpoint));
   ASSERT_OK(checkpoint->ExportColumnFamily(handles_[1], export_files_dir,
                                            &metadata_ptr_));
   ASSERT_NE(metadata_ptr_, nullptr);
@@ -1812,7 +1698,7 @@ TEST_P(DBBlockCacheKeyTest, StableCacheKeys) {
   // StableCacheKeyTestFS, Checkpoint will resort to full copy not hard link.
   // (Checkpoint  not available in LITE mode to test this.)
   auto db_copy_name = dbname_ + "-copy";
-  ASSERT_OK(Checkpoint::Create(db_.get(), &checkpoint));
+  ASSERT_OK(Checkpoint::Create(db_, &checkpoint));
   ASSERT_OK(checkpoint->CreateCheckpoint(db_copy_name));
   delete checkpoint;
 

db/db_bloom_filter_test.cc

@@ -137,6 +137,11 @@ class SliceTransformLimitedDomainGeneric : public SliceTransform {
     // prefix will be x????
     return src.size() >= 5;
   }
+
+  bool InRange(const Slice& dst) const override {
+    // prefix will be x????
+    return dst.size() == 5;
+  }
 };
 
 // KeyMayExist can lead to a few false positives, but not false negatives.
@@ -705,20 +710,12 @@ class AlwaysTrueBitsBuilder : public FilterBitsBuilder {
     count_ = 0;
     // Interpreted as "always true" filter (0 probes over 1 byte of
     // payload, 5 bytes metadata)
-    return Slice("\0\0\0\0\0\0", kAlwaysTrueFilterBytes);
+    return Slice("\0\0\0\0\0\0", 6);
   }
   using FilterBitsBuilder::Finish;
   size_t ApproximateNumEntries(size_t) override { return SIZE_MAX; }
-  size_t CalculateSpace(size_t /* num_entries */) override {
-    return kAlwaysTrueFilterBytes;
-  }
-  double EstimatedFpRate(size_t /* num_entries */,
-                         size_t /* bytes */) override {
-    return 1.0;
-  }
 
  private:
-  static constexpr size_t kAlwaysTrueFilterBytes = 6;
   size_t count_ = 0;
 };
 
@@ -917,14 +914,14 @@ INSTANTIATE_TEST_CASE_P(
     ::testing::Values(
         std::make_tuple(kAutoBloom,
                         FilterPartitioning::kCoupledPartitionedFilter,
-                        kLatestBbtFormatVersion),
+                        kLatestFormatVersion),
         std::make_tuple(kAutoBloom,
                         FilterPartitioning::kDecoupledPartitionedFilter,
-                        kLatestBbtFormatVersion),
+                        kLatestFormatVersion),
         std::make_tuple(kAutoBloom, FilterPartitioning::kUnpartitionedFilter,
-                        kLatestBbtFormatVersion),
+                        kLatestFormatVersion),
         std::make_tuple(kAutoRibbon, FilterPartitioning::kUnpartitionedFilter,
-                        kLatestBbtFormatVersion)));
+                        kLatestFormatVersion)));
 #endif  // !defined(ROCKSDB_VALGRIND_RUN) || defined(ROCKSDB_FULL_VALGRIND_RUN)
 
 TEST_F(DBBloomFilterTest, BloomFilterRate) {
@@ -2072,6 +2069,11 @@ class SliceTransformLimitedDomain : public SliceTransform {
     // prefix will be x????
     return src.size() >= 5 && src[0] == 'x';
   }
+
+  bool InRange(const Slice& dst) const override {
+    // prefix will be x????
+    return dst.size() == 5 && dst[0] == 'x';
+  }
 };
 
 TEST_F(DBBloomFilterTest, PrefixExtractorWithFilter1) {
@@ -4135,7 +4137,7 @@ TEST_F(DBBloomFilterTest, SstQueryFilter) {
 
   using Keys = std::vector<std::string>;
   auto RangeQuery =
-      [factory, db = db_.get()](
+      [factory, db = db_](
           std::string lb, std::string ub,
           std::shared_ptr<SstQueryFilterConfigsManager::Factory> alt_factory =
               nullptr) {