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

raftstore, tikv_util: move QueryStats from raftstore to tikv_util component #13506

Merged
merged 11 commits into from Sep 22, 2022

Conversation

zeminzhou
Copy link
Contributor

@zeminzhou zeminzhou commented Sep 21, 2022

Signed-off-by: zeminzhou zhouzemin@pingcap.com

What is changed and how it works?

Issue Number: close#13505

What's Changed:

Move QueryStats from raftstore to tikv_util component to resolve test_pd_client's dependency on raftstore

Check List

Tests

  • Unit test
  • Integration test
None

Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 21, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • haojinming
  • pingyu

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.

Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
@zeminzhou
Copy link
Contributor Author

/cc @pingyu @haojinming

Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
Copy link
Contributor

@haojinming haojinming 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 Status: PR - There is already 1 approval label Sep 21, 2022
Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
@ti-chi-bot ti-chi-bot added size/XL and removed size/M labels Sep 21, 2022
Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
@@ -0,0 +1,14 @@
// Copyright 2016 TiKV Project Authors. Licensed under Apache-2.0.
Copy link
Contributor

Choose a reason for hiding this comment

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

2016 -> 2022. The same to other new files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done, thinks, PTAL~

.iter()
.any(|rp| rp.get_store_id() == lp.get_store_id() && rp.get_role() == lp.get_role())
})
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggest to move unit tests from raftstore to 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.

Moved, thinks.

Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
Signed-off-by: zeminzhou <zhouzemin@pingcap.com>
Copy link
Contributor

@pingyu pingyu 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 status/LGT2 Status: PR - There are already 2 approvals and removed status/LGT1 Status: PR - There is already 1 approval labels Sep 22, 2022
@zeminzhou
Copy link
Contributor Author

/cc @Connor1996 PTAL~, thanks!

@Connor1996
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

@Connor1996: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

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

Commit hash: e3ba3bb

@ti-chi-bot ti-chi-bot added the status/can-merge Status: Can merge to base branch label Sep 22, 2022
@ti-chi-bot ti-chi-bot merged commit d0850ce into tikv:master Sep 22, 2022
@ti-chi-bot ti-chi-bot added this to the Pool milestone Sep 22, 2022
@zeminzhou zeminzhou deleted the address-circular-dependency branch October 18, 2022 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none size/XXL status/can-merge Status: Can merge to base branch status/LGT2 Status: PR - There are already 2 approvals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants