executor: add some memory tracker in HashJoin #33918
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
ti-chi-bot
added
release-note-none
10 tasks
XuHuaiyu
reviewed
Apr 13, 2022
executor/hash_table.go
Outdated
| @@ -273,6 +277,7 @@ type baseHashTable interface { | |||
| Put(hashKey uint64, rowPtr chunk.RowPtr) | |||
| Get(hashKey uint64) (rowPtrs []chunk.RowPtr) | |||
| Len() uint64 | |||
| GetMemoryDelta() int64 | |||
There was a problem hiding this comment.
Add a comment for this func
executor/hash_table.go
Outdated
| @@ -283,6 +288,9 @@ type unsafeHashTable struct { | |||
| hashMap map[uint64]*entry | |||
| entryStore *entryStore | |||
| length uint64 | |||
|
|
|||
| bInMap int64 // indicate there are 2^bInMap buckets in hashMap | |||
| memDelta int64 | |||
| // GetMemoryDelta gets the memDelta of the concurrentMapHashTable. | ||
| func (ht *unsafeHashTable) GetMemoryDelta() int64 { | ||
| memDelta := ht.memDelta | ||
| ht.memDelta = 0 |
executor/hash_table.go
Outdated
| // concurrentMapHashTable is a concurrent hash table built on concurrentMap | ||
| type concurrentMapHashTable struct { | ||
| hashMap concurrentMap | ||
| entryStore *entryStore | ||
| length uint64 | ||
| memDelta int64 |
|
Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/57dfb7a02868431ea1613d17e0da03aa5ad99049 |
XuHuaiyu
reviewed
Apr 19, 2022
executor/hash_table.go
Outdated
| @@ -357,3 +387,15 @@ func (ht *concurrentMapHashTable) Get(hashKey uint64) (rowPtrs []chunk.RowPtr) { | |||
| } | |||
| return | |||
| } | |||
|
|
|||
| // GetMemoryDelta gets the memDelta of the concurrentMapHashTable. Memory delta will be cleared after each fetch. | |||
| func (ht *concurrentMapHashTable) GetMemoryDelta() int64 { | |||
XuHuaiyu
approved these changes
Apr 19, 2022
guo-shaoge
approved these changes
Apr 19, 2022
ti-chi-bot
added
status/LGT2
|
/merge |
|
This pull request has been accepted and is ready to merge. Commit hash: 7d358db
|
ti-chi-bot
added
the
status/can-merge
|
/run-all-tests |
TiDB MergeCI notify
|
This was referenced May 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: ref #33877
close #35627
close #35628
Problem Summary:
What is changed and how it works?
Track the memory usage of Golang map and entryStore in HashJoin.
Check List
Tests
Side effects
Documentation
Release note
Please refer to Release Notes Language Style Guide to write a quality release note.