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

Poco_INCLUDE_DIRS should not be a cached entry #4384

Merged
merged 3 commits into from
Mar 24, 2022
Merged

Poco_INCLUDE_DIRS should not be a cached entry #4384

merged 3 commits into from
Mar 24, 2022

Conversation

gengliqi
Copy link
Contributor

@gengliqi gengliqi commented Mar 22, 2022 •
edited
Loading

Signed-off-by: gengliqi gengliqiii@gmail.com

What problem does this PR solve?

Issue Number: close #4385

Problem Summary:

What is changed and how it works?

See #4385

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 22, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SchrodingerZhu
  • solotzg

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/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 22, 2022
@SchrodingerZhu
Copy link
Contributor

SchrodingerZhu commented Mar 23, 2022 •
edited
Loading

Do we ever use FindPoco.cmake anymore since @zanmato1984 bundled all deps into TiFlash?

A particular use case should be that you compiled pingcap/poco and installed that on your own; otherwise it shouldn't make sense as our own fork of poco already diverged with upstream. Does this describe your situation?

@gengliqi
Copy link
Contributor Author

Do we ever use FindPoco.cmake anymore since @zanmato1984 bundled all deps into TiFlash?

A particular use case should be that you compiled pingcap/poco and installed that on your own; otherwise it shouldn't make sense as our own fork of poco already diverged with upstream. Does this describe your situation?

In my case, I remove some directories in contri including poco by accident and the poco has been installed before through Homebrew.
Then I find the reload of cmake has some errors. After I rerun git submodule update --init, the reload of cmake still failed in the below code because Poco_INCLUDE_DIRS was cached before and the length of it is one.

tiflash/dbms/src/Interpreters/CMakeLists.txt

Lines 45 to 46 in 2b71569

list(GET Poco_INCLUDE_DIRS 0 Poco_Foundation_INCLUDE_DIR)
list(GET Poco_INCLUDE_DIRS 1 Poco_Util_INCLUDE_DIR)

It seems we can set USE_INTERNAL_POCO_LIBRARY to OFF to use the unbundled poco in other places then FindPoco.cmake will be used.

SchrodingerZhu
SchrodingerZhu approved these changes Mar 23, 2022
View reviewed changes
Copy link
Contributor

@SchrodingerZhu SchrodingerZhu left a comment

Choose a reason for hiding this comment

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

Caching dirs may lead some problem after error recover. I am good with the fix here.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 23, 2022
@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 Mar 23, 2022
@gengliqi
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@gengliqi: 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: f0889595944cebe69b9e382dc4d214bb3820e987

@ti-chi-bot ti-chi-bot added status/can-merge Indicates a PR has been approved by a committer. do-not-merge/needs-linked-issue labels Mar 23, 2022
@gengliqi
XXX_INCLUDE_DIRS should not be cached & close #4385
20d7c54 
Signed-off-by: gengliqi <gengliqiii@gmail.com>
@ti-chi-bot ti-chi-bot added do-not-merge/needs-linked-issue and removed status/can-merge Indicates a PR has been approved by a committer. labels Mar 23, 2022
@gengliqi
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@gengliqi: 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: 20d7c54

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 23, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Mar 23, 2022

Coverage for changed files

no c/c++ source change detected

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17040      9576             43.80%    191887  97047        49.42%

full coverage report (for internal network access only)

@gengliqi
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@gengliqi: 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.

@sre-bot
Copy link
Collaborator

sre-bot commented Mar 23, 2022

Coverage for changed files

no c/c++ source change detected

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17040      9576             43.80%    191887  97039        49.43%

full coverage report (for internal network access only)

@gengliqi
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@gengliqi: 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.

@sre-bot
Copy link
Collaborator

sre-bot commented Mar 23, 2022

Coverage for changed files

no c/c++ source change detected

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17040      9576             43.80%    191887  97053        49.42%

full coverage report (for internal network access only)

@solotzg
Copy link
Contributor

solotzg commented Mar 24, 2022

clode #4385 rather than close https://github.com/pingcap/tiflash/pull/4385

@gengliqi
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@gengliqi: 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.

@sre-bot
Copy link
Collaborator

sre-bot commented Mar 24, 2022

Coverage for changed files

no c/c++ source change detected

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
17044      9571             43.85%    191826  97042        49.41%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit 18ba35e into pingcap:master Mar 24, 2022
@gengliqi gengliqi deleted the poco-include-dirs-cache branch March 24, 2022 10:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SchrodingerZhu SchrodingerZhu SchrodingerZhu approved these changes

@solotzg solotzg solotzg approved these changes

@zanmato1984 zanmato1984 Awaiting requested review from zanmato1984

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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.

Poco_INCLUDE_DIRS should not be a cached entry
5 participants
@gengliqi @ti-chi-bot @SchrodingerZhu @sre-bot @solotzg