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

executor: introduce hashRowContainer.GetMatchedRows method #36848

Merged
merged 12 commits into from
Aug 3, 2022
Merged

executor: introduce hashRowContainer.GetMatchedRows method #36848

merged 12 commits into from
Aug 3, 2022

Conversation

XuHuaiyu
Copy link
Contributor

@XuHuaiyu XuHuaiyu commented Aug 3, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #36847

Problem Summary:

What is changed and how it works?

Introduce the hashRowContainer.GetMatchedRows method since we do not need the Ptr info in HashJoinExec.joinMatchedProbeSideRow2Chunk

Check List

Tests

Before this commit:
TPCDS Q95 costs 126s

After this commit:
TPCDS Q95 costs 113s
飞书20220803-171505

Side effects

  • N/A

Documentation

  • N/A

Release note

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 3, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • guo-shaoge
  • 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 release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 3, 2022
@XuHuaiyu XuHuaiyu added needs-cherry-pick-6.2 type/enhancement The issue or PR belongs to an enhancement. labels Aug 3, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 3, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 3, 2022 •
edited
Loading

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

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

qw4990 commented Aug 3, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9e61c37

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

XuHuaiyu commented Aug 3, 2022

/merge

zanmato1984
zanmato1984 reviewed Aug 3, 2022
View reviewed changes
executor/hash_table.go
@@ -112,10 +112,18 @@ func (c *hashRowContainer) ShallowCopy() *hashRowContainer {
return &newHRC
}

// GetMatchedRows get matched rows from probeRow. It can be called
// in multiple goroutines while each goroutine should keep its own
// h and buf.
Copy link
Contributor

Choose a reason for hiding this comment

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

”h and buf"?

Copy link
Contributor Author

@XuHuaiyu XuHuaiyu Aug 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

This comment is a copy of GetMatchedRowsAndPtrs.

zanmato1984
zanmato1984 reviewed Aug 3, 2022
View reviewed changes
executor/join.go
func (e *HashJoinExec) joinMatchedProbeSideRow2Chunk(workerID uint, probeKey uint64, probeSideRow chunk.Row, hCtx *hashContext,
rowContainer *hashRowContainer, joinResult *hashjoinWorkerResult) (bool, *hashjoinWorkerResult) {
var err error
e.buildSideRows[workerID], e.buildSideRowPtrs[workerID], err = rowContainer.GetMatchedRowsAndPtrs(probeKey, probeSideRow, hCtx, e.buildSideRows[workerID], e.buildSideRowPtrs[workerID])
e.buildSideRows[workerID], err = rowContainer.GetMatchedRows(probeKey, probeSideRow, hCtx, e.buildSideRows[workerID])
Copy link
Contributor

Choose a reason for hiding this comment

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

How is this change preventing false sharing of e.buildSideRows?

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 PR does not handle the false sharing thing

@ti-chi-bot ti-chi-bot merged commit 3a74656 into pingcap:master Aug 3, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 3, 2022
@XuHuaiyu @ti-srebot
cherry pick pingcap#36848 to release-6.2
e5b5b0e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 3, 2022
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-6.2 in PR #36864

@sre-bot
Copy link
Contributor

sre-bot commented Aug 3, 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/integration-cdc-test 🟥 failed 1, success 35, total 36 28 min New failing
idc-jenkins-ci-tidb/integration-common-test 🔴 failed 1, success 16, total 17 13 min Existing failure
idc-jenkins-ci-tidb/tics-test 🔴 failed 1, success 0, total 1 6 min 14 sec Existing failure
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 14 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 2 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 54 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 43 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 59 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 47 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

ti-chi-bot pushed a commit that referenced this pull request Aug 4, 2022
@ti-srebot
executor: introduce hashRowContainer.GetMatchedRows method (#36848) (#…
9e909bf 
…36864)

close #36847
XuHuaiyu added a commit to XuHuaiyu/tidb that referenced this pull request Dec 26, 2022
@XuHuaiyu
Revert "executor: introduce hashRowContainer.GetMatchedRows method (p…
c20af2e 
…ingcap#36848)"

This reverts commit 3a74656.
@XuHuaiyu XuHuaiyu mentioned this pull request Dec 26, 2022
Closed
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zanmato1984 zanmato1984 zanmato1984 left review comments

@guo-shaoge guo-shaoge guo-shaoge approved these changes

@qw4990 qw4990 qw4990 approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

tpcds q95 runs slower using v6.2 comparing with v6.1
8 participants
@XuHuaiyu @ti-chi-bot @sre-bot @qw4990 @ti-srebot @zanmato1984 @guo-shaoge @hawkingrei