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

statistics: add lru cache implement for statsCacheInner #34323

Merged
merged 19 commits into from
May 6, 2022

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Apr 28, 2022

What problem does this PR solve?

Issue Number: ref #34052

Problem Summary:

What is changed and how it works?

add lru cache implement for statsCacheInner.

The evict policy is desribed in this document

Check List

Tests

  • Unit test

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 Apr 28, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • chrysan
  • xuyifangreeneyes

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 28, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Apr 28, 2022

Signed-off-by: yisaer <[email protected]>
@Yisaer Yisaer marked this pull request as draft April 29, 2022 03:51
@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 29, 2022
@Yisaer Yisaer marked this pull request as ready for review April 29, 2022 05:53
@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 Apr 29, 2022
Yisaer added 2 commits April 29, 2022 16:07
Signed-off-by: yisaer <[email protected]>
Signed-off-by: yisaer <[email protected]>
statistics/handle/lru_cache.go Outdated Show resolved Hide resolved
statistics/handle/lru_cache.go Outdated Show resolved Hide resolved
statistics/handle/lru_cache.go Outdated Show resolved Hide resolved
statistics/handle/lru_cache.go Outdated Show resolved Hide resolved
statistics/handle/lru_cache.go Outdated Show resolved Hide resolved
Signed-off-by: yisaer <[email protected]>

address the comment

Signed-off-by: yisaer <[email protected]>
@Yisaer Yisaer force-pushed the introduce_statscache_lru branch from 33abdad to 107d4c0 Compare May 5, 2022 03:48
Yisaer added 2 commits May 5, 2022 17:02
Signed-off-by: yisaer <[email protected]>
Signed-off-by: yisaer <[email protected]>
@Yisaer Yisaer requested a review from chrysan May 5, 2022 13:35
Copy link
Contributor

@chrysan chrysan left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 5, 2022
s.lru.put(tblID, idxID, idx, newTblMem.IndicesMemUsage[idxID], true, false)
}
// tbl mem usage might be changed due to evict
element.tblMemUsage = element.tbl.MemoryUsage()
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it duplicated with element.tbl.MemoryUsage() which is called in onEvict?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right, it's unnecessary now, updated.

Signed-off-by: yisaer <[email protected]>
@Yisaer Yisaer force-pushed the introduce_statscache_lru branch from 55a7a68 to e45dc60 Compare May 6, 2022 03:01

type lruCacheItem struct {
tblID int64
id int64
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we just use Index.ID and Column.ID to set lruCacheItem.id here?

Copy link
Contributor

Choose a reason for hiding this comment

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

We will differentiate between index and column in the next pr.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right

defer s.RUnlock()
totalCost := int64(0)
for tblID, ele := range s.elements {
s.freshTableCost(tblID, ele)
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it safe to call freshTableCost with RLock? freshTableCost call innerItemLruCache.put which does some writes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nice catch, updated.

Signed-off-by: yisaer <[email protected]>
if !ok {
return nil, false
}
return ele.Value.(*lruCacheItem), true
Copy link
Contributor

@xuyifangreeneyes xuyifangreeneyes May 6, 2022

Choose a reason for hiding this comment

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

Do we need to call c.cache.MoveToFront here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nice catch, updated.

Yisaer added 2 commits May 6, 2022 14:50
Signed-off-by: yisaer <[email protected]>
Signed-off-by: yisaer <[email protected]>
item := curr.Value.(*lruCacheItem)
newLRU.put(item.tblID, item.id, item.innerItem, item.innerMemUsage, false, false)
curr = curr.Prev()
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to copy c.onEvict here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, onEvict will be set in newStatsLruCache.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated.

Signed-off-by: yisaer <[email protected]>
Signed-off-by: yisaer <[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 May 6, 2022
Signed-off-by: yisaer <[email protected]>
@Yisaer
Copy link
Contributor Author

Yisaer commented May 6, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 39edbe3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 6, 2022
@ti-chi-bot ti-chi-bot merged commit 0f0a2ca into pingcap:master May 6, 2022
@sre-bot
Copy link
Contributor

sre-bot commented May 6, 2022

TiDB MergeCI notify

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🟢 all 34 tests passed 28 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 11 tests passed 10 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 12 tests passed 6 min 43 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 14 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 13 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 1 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 14 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 55 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 15 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

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/XXL Denotes a PR that changes 1000+ 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.

5 participants