tidb icon indicating copy to clipboard operation
tidb copied to clipboard

planner: Fix bug in the plan cache when the metadata lock is disabled. (#64795)

Open ti-chi-bot opened this issue 2 weeks ago • 4 comments

This is an automated cherry-pick of #64795

What problem does this PR solve?

Issue Number: close #64351

Problem Summary:

When global.tidb_enable_metadata_lock is set to off, the StatementContext.MDLRelatedTableIDs field is not populated. This field is used to populate the tbls and dbNames fields in PlanCacheStmt object, and as a result, the StatementContext.TblInfo2UnionScan field is not populated, which may result in the plan cache returning the incorrect plan.

What changed and how does it work?

MDLRelatedTableIDs is only used to setup PlanCacheStmt, so this patch:

  • renames MDLRelatedTableIDs to RelatedTableIDs,
  • changes tryLockMDLAndUpdateSchemaIfNecessary to always add the table id to RelatedTableIDs,
  • and adds a test for the issue.

Check List

Tests

  • [x] Unit test
  • [ ] Integration test
  • [ ] Manual test (add detailed scripts or steps below)
  • [ ] No need to test
    • [ ] I checked and no code files have been changed.

Side effects

  • [ ] Performance regression: Consumes more CPU
  • [ ] Performance regression: Consumes more Memory
  • [ ] Breaking backward compatibility

Documentation

  • [ ] Affects user behaviors
  • [ ] Contains syntax changes
  • [ ] Contains variable changes
  • [ ] Contains experimental features
  • [ ] Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

ti-chi-bot avatar Dec 11 '25 00:12 ti-chi-bot

@wddevries This PR has conflicts, I have hold it. Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

ti-chi-bot avatar Dec 11 '25 00:12 ti-chi-bot

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot[bot] avatar Dec 11 '25 00:12 ti-chi-bot[bot]

/retest

EmmaDuDu avatar Dec 13 '25 13:12 EmmaDuDu

Codecov Report

:white_check_mark: All modified and coverable lines are covered by tests. :warning: Please upload report for BASE (release-8.5@7c29611). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.5     #64965   +/-   ##
================================================
  Coverage               ?   77.2214%           
================================================
  Files                  ?       1686           
  Lines                  ?     474653           
  Branches               ?          0           
================================================
  Hits                   ?     366534           
  Misses                 ?      85775           
  Partials               ?      22344           
Flag Coverage Δ
integration 51.7132% <100.0000%> (?)
unit 72.1260% <100.0000%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.9278% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 65.6047% <0.0000%> (?)
:rocket: New features to boost your workflow:
  • :snowflake: Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • :package: JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

codecov[bot] avatar Dec 14 '25 22:12 codecov[bot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qw4990, terry1purcell

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment Approvers can cancel approval by writing /approve cancel in a comment

ti-chi-bot[bot] avatar Dec 15 '25 06:12 ti-chi-bot[bot]

[LGTM Timeline notifier]

Timeline:

  • 2025-12-14 23:11:20.988992932 +0000 UTC m=+1428225.802770494: :ballot_box_with_check: agreed by terry1purcell.
  • 2025-12-15 06:17:46.140866695 +0000 UTC m=+1453810.954644257: :ballot_box_with_check: agreed by qw4990.

ti-chi-bot[bot] avatar Dec 15 '25 06:12 ti-chi-bot[bot]

/unhold

qw4990 avatar Dec 15 '25 06:12 qw4990