Skip to content

statistics, config: rightly deal with innodb_lock_wait_timeout when to load stats #65632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ti-chi-bot merged 10 commits into from
Jan 19, 2026
Merged

statistics, config: rightly deal with innodb_lock_wait_timeout when to load stats #65632

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2bbcc26
config: do not load innodb_lock_wait_timeout when to load play replayer
hawkingrei Jan 19, 2026
053a85d
config: do not load innodb_lock_wait_timeout when to load play replayer
hawkingrei Jan 19, 2026
312bd6b
config: do not load innodb_lock_wait_timeout when to load play replayer
hawkingrei Jan 19, 2026
4005322
config: do not load innodb_lock_wait_timeout when to load play replayer
hawkingrei Jan 19, 2026
6887e42
config: do not load innodb_lock_wait_timeout when to load play replayer
hawkingrei Jan 19, 2026
c3a49d3
statistics, config: rightly deal with innodb_lock_wait_timeout when t…
hawkingrei Jan 19, 2026
8bf38d0
Update pkg/statistics/handle/util/util.go
hawkingrei Jan 19, 2026
46ca467
Update pkg/executor/plan_replayer.go
hawkingrei Jan 19, 2026
b11c213
update
hawkingrei Jan 19, 2026
d9c79c1
rename LoadConfig
hawkingrei Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkg/util/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ import (
"go.uber.org/zap"
)

var blackSystemVariableForPlanReplayerLoad = map[string]struct{}{
"innodb_lock_wait_timeout": {}, // It is unncessary to load this variable for plan replayer.
}

// LoadConfig loads system variables from a toml reader. it is only for plan replayer and test.
func LoadConfig(ctx sessionctx.Context, v io.ReadCloser) (unLoadVars []string, err error) {
varMap := make(map[string]string)
Expand All @@ -38,6 +42,9 @@ func LoadConfig(ctx sessionctx.Context, v io.ReadCloser) (unLoadVars []string, e
unLoadVars = make([]string, 0)
vars := ctx.GetSessionVars()
for name, value := range varMap {
if _, ok := blackSystemVariableForPlanReplayerLoad[name]; ok {
continue
}
sysVar := variable.GetSysVar(name)
if sysVar == nil {
unLoadVars = append(unLoadVars, name)
Expand Down
Loading
⚡