Skip to content
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

Jump to bottom

sessionctx/variable: remove skipInit from non-session scoped variables #35801

Merged
merged 10 commits into from Jul 6, 2022
Merged

sessionctx/variable: remove skipInit from non-session scoped variables #35801

merged 10 commits into from Jul 6, 2022

Conversation

morgo
Copy link
Contributor

@morgo morgo commented Jun 28, 2022

What problem does this PR solve?

Issue Number: ref #35051

Problem Summary:

This removes skipInit from non session scoped variables. It's a completely safe change, since these variables will skipInit anyway because of line 525:

tidb/sessionctx/variable/variable.go

Lines 515 to 526 in ed5e63a

func (sv *SysVar) SkipInit() bool {
if sv.skipInit || sv.IsNoop {
return true
}
// These a special "Global-only" sysvars that for backward compatibility
// are currently cached in the session. Please don't add to this list.
switch sv.Name {
case TiDBRowFormatVersion:
return false
}
return !sv.HasSessionScope()
}

Explanation: skipInit means skip loading into the session and non-session variables don't need to load into the session.

What is changed and how it works?

Function neutral code improvement

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

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

@morgo morgo requested a review from a team as a code owner June 28, 2022 14:27
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 28, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CbcWestwolf
  • xhebox

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 28, 2022
@morgo morgo requested a review from bb7133 June 28, 2022 14:27
@sre-bot
Copy link
Contributor

sre-bot commented Jun 28, 2022 •
edited

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/825055f025530d037c239c1215acf3aee5e59daf

@morgo
Copy link
Contributor Author

morgo commented Jun 28, 2022

Note: I used the added test I wrote to discover which sysvars did not have session scope. It looks like these are all instance scoped variables.

  • skipInit was required for the non-native instance scope (aka session).
  • it is not required for native ScopeInstance.

cc @CbcWestwolf

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 29, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 29, 2022
bb7133
bb7133 approved these changes Jul 6, 2022
View reviewed changes
Copy link
Member

@bb7133 bb7133 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bb7133
Copy link
Member

bb7133 commented Jul 6, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 0d898cb

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 6, 2022
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 6, 2022
morgo added 2 commits July 6, 2022 08:31
@morgo
Merge remote-tracking branch 'upstream/master' into improve-skip-init
10c7409 
* upstream/master: (77 commits)
  infoschema: add a simply store for DM's SchemaTracker (pingcap#35954)
  planner: refactor "access object" related logic and prepare for binary plan (pingcap#35890)
  telemetry: Initialize telemetry asynchronously (pingcap#35898)
  sessionctx/variable: convert TiDBLogFileMaxDays and TiDBConfig to ScopeInstance (pingcap#35733)
  session, sessionctx/variable: ensure sysvars are always in lower case (pingcap#35659)
  *: add telemetry support for multi-schema change (pingcap#35977)
  topsql: compress plan instead of dropping it (pingcap#35973)
  *: use pdqsort to improve sort performance (pingcap#34404)
  ddl: refine GetDDLInfo function (pingcap#35969)
  *: Make the code cleaner in session.ExecutePreparedStmt (pingcap#35943)
  ddl: remove `onDropIndexes` (pingcap#35960)
  ddl: refine history job code (pingcap#35967)
  sessionctx,kv,planner: add system variable for fine_grained_shuffle (pingcap#35256)
  *: change remote cache (pingcap#35968)
  *: enable gosec (pingcap#35873)
  plancodec: fix a miss case in conversion (pingcap#35957)
  ddl: support drop indexes for multi-schema change (pingcap#35883)
  pdutil: fix unstable test TestPauseSchedulersByKeyRange (pingcap#35949)
  br: optimize communication with tikv stores. pingcap#31722 (pingcap#35147)
  txn: rename snapshot related methods in txnManager. (pingcap#35912)
  ...
@morgo
Merge remote-tracking branch 'origin/improve-skip-init' into improve-…
4adf903 
…skip-init

* origin/improve-skip-init:
@ti-chi-bot ti-chi-bot removed status/can-merge Indicates a PR has been approved by a committer. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 6, 2022
@morgo
Copy link
Contributor Author

morgo commented Jul 6, 2022

/run-unit-test

@morgo
Copy link
Contributor Author

morgo commented Jul 6, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 825055f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 6, 2022
@morgo
Copy link
Contributor Author

morgo commented Jul 6, 2022

/run-check_dev_2

@ti-chi-bot ti-chi-bot merged commit 2eb101a into pingcap:master Jul 6, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jul 6, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 35 tests passed 24 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 11 tests passed 20 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 12 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 9 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 0 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 4 min 51 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 21 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 2 min 54 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 54 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@morgo morgo deleted the improve-skip-init branch July 6, 2022 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bb7133 bb7133 bb7133 approved these changes

@xhebox xhebox xhebox approved these changes

@CbcWestwolf CbcWestwolf CbcWestwolf approved these changes

Assignees
No one assigned
Labels
release-note-none size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@morgo @ti-chi-bot @sre-bot @bb7133 @xhebox @CbcWestwolf @hawkingrei