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

planner: unify the Compile and CompileExecStmt functions #37065

Merged
merged 28 commits into from Aug 16, 2022
Merged

planner: unify the Compile and CompileExecStmt functions #37065

merged 28 commits into from Aug 16, 2022

Conversation

Reminiscent
Copy link
Contributor

@Reminiscent Reminiscent commented Aug 12, 2022 •
edited

What problem does this PR solve?

Issue Number: ref #36598

Problem Summary:
Unify the Compile and CompileExecStmt functions.

What is changed and how it works?

Merge two code path to one. Remove the compileExecStmt function.

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

@Reminiscent Reminiscent added the sig/planner SIG: Planner label Aug 12, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 12, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Yisaer
  • qw4990

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/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 12, 2022
@Reminiscent Reminiscent marked this pull request as ready for review August 15, 2022 03:41
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 15, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 15, 2022 •
edited by ti-chi-bot

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

@qw4990
Copy link
Contributor

qw4990 commented Aug 15, 2022

image

qw4990
qw4990 reviewed Aug 16, 2022
View reviewed changes
executor/compiler.go Outdated Show resolved Hide resolved
@Reminiscent
Copy link
Contributor Author

Before:

BenchmarkPreparedPointGet-8   	   91663	     13660 ns/op
BenchmarkPreparedPointGet-8   	   93900	     15041 ns/op
BenchmarkPreparedPointGet-8   	   83596	     15692 ns/op
BenchmarkPreparedPointGet-8   	   81136	     13961 ns/op
BenchmarkPreparedPointGet-8   	   77779	     14269 ns/op
BenchmarkPreparedPointGet-8   	   86884	     12839 ns/op
BenchmarkPreparedPointGet-8   	   87831	     13402 ns/op
BenchmarkPreparedPointGet-8   	   88008	     15516 ns/op
BenchmarkPreparedPointGet-8   	   88774	     12524 ns/op
BenchmarkPreparedPointGet-8   	   89527	     14190 ns/op
PASS
ok  	github.com/pingcap/tidb/session	90.827s

After

BenchmarkPreparedPointGet-8   	   73947	     19245 ns/op
BenchmarkPreparedPointGet-8   	   91230	     16121 ns/op
BenchmarkPreparedPointGet-8   	   85304	     16173 ns/op
BenchmarkPreparedPointGet-8   	   74562	     14947 ns/op
BenchmarkPreparedPointGet-8   	   79216	     13717 ns/op
BenchmarkPreparedPointGet-8   	   81313	     14361 ns/op
BenchmarkPreparedPointGet-8   	   86010	     15865 ns/op
BenchmarkPreparedPointGet-8   	   81261	     15151 ns/op
BenchmarkPreparedPointGet-8   	   82580	     14639 ns/op
BenchmarkPreparedPointGet-8   	   86884	     13717 ns/op
PASS
ok  	github.com/pingcap/tidb/session	94.921s

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 16, 2022
Reminiscent
Reminiscent commented Aug 16, 2022
View reviewed changes
executor/adapter.go
Comment on lines +303 to +318

sctx := a.Ctx
cmd32 := atomic.LoadUint32(&sctx.GetSessionVars().CommandValue)
cmd := byte(cmd32)
var pi processinfoSetter
if raw, ok := sctx.(processinfoSetter); ok {
pi = raw
sql := a.OriginText()
maxExecutionTime := getMaxExecutionTime(sctx)
// Update processinfo, ShowProcess() will use it.
pi.SetProcessInfo(sql, time.Now(), cmd, maxExecutionTime)
if sctx.GetSessionVars().StmtCtx.StmtType == "" {
sctx.GetSessionVars().StmtCtx.StmtType = GetStmtLabel(a.StmtNode)
}
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This part is copied from the ExecStmt.Exec. We should set the process information here or we will failed to get the result for explain for connection ....

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This function is short path. It only do the little things.(compare to rumStmt). We will refactor those part in the later PR.

Reminiscent
Reminiscent commented Aug 16, 2022
View reviewed changes
session/session.go
Comment on lines +2330 to +2336
durCompile := time.Since(s.sessionVars.StartTime)
s.GetSessionVars().DurationCompile = durCompile

stmtCtx := s.GetSessionVars().StmtCtx
stmt.Text = preparedObj.PreparedAst.Stmt.Text()
stmtCtx.OriginalSQL = stmt.Text
stmtCtx.InitSQLDigest(preparedObj.NormalizedSQL, preparedObj.SQLDigest)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This part is copied from the deleted function CompileExecutePreparedStmt.

@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 Aug 16, 2022
@qw4990
Copy link
Contributor

qw4990 commented Aug 16, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: aa06119

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 16, 2022
@ti-chi-bot ti-chi-bot merged commit b705a13 into pingcap:master Aug 16, 2022
@Reminiscent Reminiscent deleted the refactor-PC-compile branch August 16, 2022 11:00
@sre-bot
Copy link
Contributor

sre-bot commented Aug 16, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 36 tests passed 29 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 17 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 14 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 7 min 12 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 5 min 52 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 41 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 23 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 32 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 52 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@Reminiscent Reminiscent mentioned this pull request Aug 23, 2022
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qw4990 qw4990 qw4990 approved these changes

@Yisaer Yisaer Yisaer approved these changes

Assignees
No one assigned
Labels
epic/plan-cache release-note-none sig/planner SIG: Planner size/L Denotes a PR that changes 100-499 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
5 participants
@Reminiscent @ti-chi-bot @sre-bot @qw4990 @Yisaer