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

Refine some include headers & add option ENABLE_FAILPOINTS #2296

Merged
merged 8 commits into from
Jul 6, 2021
Merged

Refine some include headers & add option ENABLE_FAILPOINTS #2296

merged 8 commits into from
Jul 6, 2021

Conversation

JaySon-Huang
Copy link
Contributor

@JaySon-Huang JaySon-Huang commented Jul 1, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: related to #2295

What is changed and how it works?

  • Only include these files when need:
    • <Common/Config/cpptoml.h>
    • <tipb/select.pb.h> in <Interpreters/TimezoneInfo.h>
    • <Flash/Coprocessor/DAGContext.h> in <Interpreters/Context.h>
  • Add "ENABLE_FAILPOINTS" so that we can build a release binary with failpoint enabled with
    cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_TESTS=OFF -DENABLE_FAILPOINTS=ON ..

This can remove dependency for some targets (page_storage for example) and make it easier to write and run unit tests.

Related changes

Check List

Tests

  • No code

Side effects

Release note

  • No release note

JaySon-Huang and others added 4 commits June 30, 2021 20:59
@JaySon-Huang
Reduce include header dependency
81f7d34 
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
@JaySon-Huang
Cleanup cpptoml includes
25e22f5 
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
@JaySon-Huang
Refine TimezoneInfo include headers
9cf6d9a 
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
@JaySon-Huang
Merge branch 'master' into remove_dependency
7b118b6
@JaySon-Huang JaySon-Huang mentioned this pull request Jul 1, 2021
Merged
@JaySon-Huang
Fix compile error
76b255d 
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
@JaySon-Huang
format code
62e2456 
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
@JaySon-Huang
Copy link
Contributor Author

/run-all-tests

@JaySon-Huang JaySon-Huang mentioned this pull request Jul 1, 2021
Closed
3 tasks
@JaySon-Huang
Copy link
Contributor Author

/run-all-tests

@JaySon-Huang
Copy link
Contributor Author

Could somebody help me to get this PR merged? @leiysky @windtalker @flowbehappy

leiysky
leiysky approved these changes Jul 6, 2021
View reviewed changes
Copy link
Contributor

@leiysky leiysky 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-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 6, 2021
@JaySon-Huang
Copy link
Contributor Author

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 6, 2021
@ti-srebot
Copy link
Collaborator

/run-all-tests

@JaySon-Huang JaySon-Huang changed the title Refine some include headers Refine some include headers & add option ENABLE_FAILPOINTS Jul 6, 2021
@ti-srebot ti-srebot merged commit 9d51ac4 into pingcap:master Jul 6, 2021
@JaySon-Huang JaySon-Huang deleted the remove_dependency branch July 6, 2021 07:53
@JaySon-Huang JaySon-Huang added needs-cherry-pick-release-5.0 PR which needs to be cherry-picked to release-5.0 needs-cherry-pick-release-5.1 PR which needs to be cherry-picked to release-5.1 needs-cherry-pick-release-4.0 PR which needs to be cherry-picked to release-4.0 labels Jul 23, 2021
@ti-srebot ti-srebot mentioned this pull request Jul 23, 2021
Merged
@ti-srebot
Copy link
Collaborator

cherry pick to release-5.1 in PR #2479

@ti-srebot ti-srebot mentioned this pull request Jul 23, 2021
Closed
@ti-srebot
Copy link
Collaborator

cherry pick to release-5.0 in PR #2480

@ti-srebot ti-srebot mentioned this pull request Jul 23, 2021
Merged
@ti-srebot
Copy link
Collaborator

cherry pick to release-4.0 in PR #2481

JaySon-Huang added a commit that referenced this pull request Jul 29, 2021
@ti-srebot @JaySon-Huang
Refine some include headers & add option ENABLE_FAILPOINTS (#2296) (#…
46faabe 
…2481)

* cherry pick #2296 to release-4.0

Co-authored-by: JaySon <tshent@qq.com>
Co-authored-by: JaySon-Huang <jayson.hjs@gmail.com>
JaySon-Huang added a commit that referenced this pull request Aug 3, 2021
@ti-srebot @JaySon-Huang
Refine some include headers & add option ENABLE_FAILPOINTS (#2296) (#…
0ac962a 
…2479)

* cherry pick #2296 to release-5.1

Co-authored-by: JaySon <tshent@qq.com>
@LittleFall LittleFall mentioned this pull request Apr 7, 2022
Merged
12 tasks
LittleFall pushed a commit to LittleFall/tiflash that referenced this pull request Apr 7, 2022
@JaySon-Huang @LittleFall
Refine some include headers & add option ENABLE_FAILPOINTS (pingcap…
3775b05 
…#2296)
@LittleFall
Copy link
Contributor

/run-cherr-picker

LittleFall pushed a commit to LittleFall/tiflash that referenced this pull request Apr 11, 2022
@JaySon-Huang @LittleFall
cherry pick pingcap#2296 to release-5.0
e269899 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
LittleFall added a commit to LittleFall/tiflash that referenced this pull request Apr 11, 2022
@LittleFall
partially cherry-pick pingcap#2296, pass ci.
9bdac2a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leiysky leiysky leiysky approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-4.0 PR which needs to be cherry-picked to release-4.0 needs-cherry-pick-release-5.0 PR which needs to be cherry-picked to release-5.0 needs-cherry-pick-release-5.1 PR which needs to be cherry-picked to release-5.1 status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JaySon-Huang @ti-srebot @LittleFall @leiysky