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.

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

txn: rename snapshot related methods in txnManager. #35912

Merged
merged 8 commits into from
Jul 5, 2022

Conversation

SpadeA-Tang
Copy link
Contributor

@SpadeA-Tang SpadeA-Tang commented Jul 4, 2022

Signed-off-by: SpadeA-Tang [email protected]

What problem does this PR solve?

Issue Number: close #35915

Problem Summary:

What is changed and how it works?

Rename GetReadSnapshot to GetSnapshotWithStmtReadTS and GetForUpdateSnapshot to GetSnapshotWithStmtForUpdateTS in txnManager.

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

Signed-off-by: SpadeA-Tang <[email protected]>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 4, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lcwangchao
  • youjiali1995

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 do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Jul 4, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 4, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jul 4, 2022

GetReadSnapshot() (kv.Snapshot, error)
// GetForUpdateSnapshot get snapshot with for update ts
GetForUpdateSnapshot() (kv.Snapshot, error)
// GetSnapshotWithStmtReadTS get snapshot with read ts
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// GetSnapshotWithStmtReadTS get snapshot with read ts
// GetSnapshotWithStmtReadTS gets snapshot with read ts

GetForUpdateSnapshot() (kv.Snapshot, error)
// GetSnapshotWithStmtReadTS get snapshot with read ts
GetSnapshotWithStmtReadTS() (kv.Snapshot, error)
// GetSnapshotWithStmtForUpdateTS get snapshot with for update ts
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// GetSnapshotWithStmtForUpdateTS get snapshot with for update ts
// GetSnapshotWithStmtForUpdateTS gets snapshot with for update ts

@@ -94,14 +94,16 @@ func (m *txnManager) GetStmtForUpdateTS() (uint64, error) {
return ts, nil
}

func (m *txnManager) GetReadSnapshot() (kv.Snapshot, error) {
// GetSnapshotWithStmtReadTS get snapshot with read ts
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// GetSnapshotWithStmtReadTS get snapshot with read ts
// GetSnapshotWithStmtReadTS gets snapshot with read ts

if m.ctxProvider == nil {
return nil, errors.New("context provider not set")
}
return m.ctxProvider.GetSnapshotWithStmtReadTS()
}

func (m *txnManager) GetForUpdateSnapshot() (kv.Snapshot, error) {
// GetSnapshotWithStmtForUpdateTS get snapshot with for update ts
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// GetSnapshotWithStmtForUpdateTS get snapshot with for update ts
// GetSnapshotWithStmtForUpdateTS gets snapshot with for update ts

Signed-off-by: SpadeA-Tang <[email protected]>
Signed-off-by: SpadeA-Tang <[email protected]>
@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 Jul 4, 2022
@hawkingrei
Copy link
Member

/run-mysql-test

@xhebox
Copy link
Contributor

xhebox commented Jul 4, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 996897d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 4, 2022
@lcwangchao
Copy link
Collaborator

/merge

@SpadeA-Tang
Copy link
Contributor Author

/run-check_dev_2

1 similar comment
@hawkingrei
Copy link
Member

/run-check_dev_2

@SpadeA-Tang
Copy link
Contributor Author

/run-unit-test

@SpadeA-Tang
Copy link
Contributor Author

/run-mysql-test

@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 5, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 5, 2022
@ti-chi-bot ti-chi-bot merged commit 441c9cd into pingcap:master Jul 5, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jul 5, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test 🟥 failed 2, success 9, total 11 18 min New failing
idc-jenkins-ci/integration-cdc-test 🟢 all 35 tests passed 25 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 11 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 45 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 41 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 41 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 34 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 21 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 12 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

morgo added a commit to morgo/tidb that referenced this pull request Jul 6, 2022
* 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)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. 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
Development

Successfully merging this pull request may close these issues.

Method name mismatch between TxnManager and Context Provider.
7 participants