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

*: Rename the function with “withCollation” postfix #3790

Merged
merged 10 commits into from
May 24, 2022
Merged

*: Rename the function with “withCollation” postfix #3790

merged 10 commits into from
May 24, 2022

Conversation

ywqzzy
Copy link
Contributor

@ywqzzy ywqzzy commented Jan 4, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #4985

Problem Summary:

What is changed and how it works?

Rename the function, and fix some clang-tidy errors.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Release note

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 4, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • SeaRise
  • fuzhe1989

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 4, 2022
@ywqzzy ywqzzy changed the title *:Rename column.compareAtWithCollator [WIP]*:Rename column.compareAtWithCollator Jan 4, 2022
@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 Jan 4, 2022
@ywqzzy ywqzzy changed the title [WIP]*:Rename column.compareAtWithCollator *:Rename column.compareAtWithCollator Jan 4, 2022
@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 Jan 4, 2022
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 4, 2022

/cc @SeaRise @fuzhe1989

@ywqzzy ywqzzy mentioned this pull request Jan 4, 2022
Closed
@fuzhe1989 fuzhe1989 requested a review from windtalker January 4, 2022 05:45
@ywqzzy
Copy link
Contributor Author

ywqzzy commented Jan 11, 2022

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Jan 11, 2022

Coverage detail: https://ci-internal.pingcap.net/job/tics_ghpr_unit_test/924/cobertura/
(Coverage detail url is limited office network access)

lines: 43.6% (49724 out of 114003)
branches: 6.4% (80897 out of 1261184)

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 20, 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 May 24, 2022
@ywqzzy ywqzzy changed the title *:Rename column.compareAtWithCollator *: Rename column.compareAtWithCollator May 24, 2022
@ywqzzy ywqzzy changed the title *: Rename column.compareAtWithCollator *: Rename the function with “withCollation” postfix May 24, 2022
@ywqzzy
Copy link
Contributor Author

ywqzzy commented May 24, 2022

/run-all-tests

@ywqzzy
Copy link
Contributor Author

ywqzzy commented May 24, 2022

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented May 24, 2022

Coverage for changed files

Filename                                   Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Columns/ColumnNullable.cpp                     229               172    24.89%          41                24    41.46%         375               270    28.00%         152               121    20.39%
Columns/ColumnNullable.h                        24                 8    66.67%          24                 8    66.67%          36                13    63.89%           0                 0         -
Columns/ColumnString.cpp                       140                86    38.57%          16                10    37.50%         259               157    39.38%          82                53    35.37%
Columns/ColumnString.h                          77                28    63.64%          33                11    66.67%         191                96    49.74%          30                13    56.67%
Columns/IColumn.h                               48                33    31.25%          38                23    39.47%          82                63    23.17%          10                10     0.00%
Core/SortCursor.h                               75                48    36.00%          33                24    27.27%         145               101    30.34%          32                20    37.50%
DataStreams/WindowBlockInputStream.cpp         160                32    80.00%          18                 0   100.00%         379                87    77.04%         124                31    75.00%
Interpreters/sortBlock.cpp                     111                43    61.26%          10                 2    80.00%         150                54    64.00%          72                32    55.56%
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                          864               450    47.92%         213               102    52.11%        1617               841    47.99%         502               280    44.22%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18220      9784             46.30%    203964  97946        51.98%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 24, 2022
@ywqzzy
Copy link
Contributor Author

ywqzzy commented May 24, 2022

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented May 24, 2022

Coverage for changed files

Filename                                   Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Columns/ColumnNullable.cpp                     229               172    24.89%          41                24    41.46%         375               270    28.00%         152               121    20.39%
Columns/ColumnNullable.h                        24                 8    66.67%          24                 8    66.67%          36                13    63.89%           0                 0         -
Columns/ColumnString.cpp                       140                86    38.57%          16                10    37.50%         259               157    39.38%          82                53    35.37%
Columns/ColumnString.h                          77                28    63.64%          33                11    66.67%         191                96    49.74%          30                13    56.67%
Columns/IColumn.h                               48                33    31.25%          38                23    39.47%          82                63    23.17%          10                10     0.00%
Core/SortCursor.h                               75                48    36.00%          33                24    27.27%         145               101    30.34%          32                20    37.50%
DataStreams/WindowBlockInputStream.cpp         160                32    80.00%          18                 0   100.00%         379                87    77.04%         124                31    75.00%
Interpreters/sortBlock.cpp                     111                43    61.26%          10                 2    80.00%         150                54    64.00%          72                32    55.56%
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                          864               450    47.92%         213               102    52.11%        1617               841    47.99%         502               280    44.22%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18220      9784             46.30%    203964  97974        51.97%

full coverage report (for internal network access only)

@sre-bot
Copy link
Collaborator

sre-bot commented May 24, 2022

Coverage for changed files

Filename                                   Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Columns/ColumnNullable.cpp                     229               172    24.89%          41                24    41.46%         375               270    28.00%         152               121    20.39%
Columns/ColumnNullable.h                        24                 8    66.67%          24                 8    66.67%          36                13    63.89%           0                 0         -
Columns/ColumnString.cpp                       140                86    38.57%          16                10    37.50%         259               157    39.38%          82                53    35.37%
Columns/ColumnString.h                          77                28    63.64%          33                11    66.67%         191                96    49.74%          30                13    56.67%
Columns/IColumn.h                               48                33    31.25%          38                23    39.47%          82                63    23.17%          10                10     0.00%
Core/SortCursor.h                               75                48    36.00%          33                24    27.27%         145               101    30.34%          32                20    37.50%
DataStreams/WindowBlockInputStream.cpp         160                32    80.00%          18                 0   100.00%         379                87    77.04%         124                31    75.00%
Interpreters/sortBlock.cpp                     111                43    61.26%          10                 2    80.00%         150                54    64.00%          72                32    55.56%
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                          864               450    47.92%         213               102    52.11%        1617               841    47.99%         502               280    44.22%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18220      9784             46.30%    203964  97960        51.97%

full coverage report (for internal network access only)

@ywqzzy
Copy link
Contributor Author

ywqzzy commented May 24, 2022

/merge

@ti-chi-bot
Copy link
Member

@ywqzzy: 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: fe8e2d5

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

sre-bot commented May 24, 2022

Coverage for changed files

Filename                                   Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Columns/ColumnNullable.cpp                     229               172    24.89%          41                24    41.46%         375               270    28.00%         152               121    20.39%
Columns/ColumnNullable.h                        24                 8    66.67%          24                 8    66.67%          36                13    63.89%           0                 0         -
Columns/ColumnString.cpp                       140                86    38.57%          16                10    37.50%         259               157    39.38%          82                53    35.37%
Columns/ColumnString.h                          77                28    63.64%          33                11    66.67%         191                96    49.74%          30                13    56.67%
Columns/IColumn.h                               48                33    31.25%          38                23    39.47%          82                63    23.17%          10                10     0.00%
Core/SortCursor.h                               75                48    36.00%          33                24    27.27%         145               101    30.34%          32                20    37.50%
DataStreams/WindowBlockInputStream.cpp         160                32    80.00%          18                 0   100.00%         379                87    77.04%         124                31    75.00%
Interpreters/sortBlock.cpp                     111                43    61.26%          10                 2    80.00%         150                54    64.00%          72                32    55.56%
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                          864               450    47.92%         213               102    52.11%        1617               841    47.99%         502               280    44.22%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18220      9784             46.30%    203963  97985        51.96%

full coverage report (for internal network access only)

@ti-chi-bot
Copy link
Member

@ywqzzy: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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 May 24, 2022

Coverage for changed files

Filename                                   Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Columns/ColumnNullable.cpp                     229               172    24.89%          41                24    41.46%         375               270    28.00%         152               121    20.39%
Columns/ColumnNullable.h                        24                 8    66.67%          24                 8    66.67%          36                13    63.89%           0                 0         -
Columns/ColumnString.cpp                       140                86    38.57%          16                10    37.50%         259               157    39.38%          82                53    35.37%
Columns/ColumnString.h                          77                28    63.64%          33                11    66.67%         191                96    49.74%          30                13    56.67%
Columns/IColumn.h                               48                33    31.25%          38                23    39.47%          82                63    23.17%          10                10     0.00%
Core/SortCursor.h                               75                48    36.00%          33                24    27.27%         145               101    30.34%          32                20    37.50%
DataStreams/WindowBlockInputStream.cpp         160                32    80.00%          18                 0   100.00%         379                87    77.04%         124                31    75.00%
Interpreters/sortBlock.cpp                     111                43    61.26%          10                 2    80.00%         150                54    64.00%          72                32    55.56%
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                          864               450    47.92%         213               102    52.11%        1617               841    47.99%         502               280    44.22%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18243      9785             46.36%    204105  98018        51.98%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit 3674439 into pingcap:master May 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SeaRise SeaRise SeaRise approved these changes

@fuzhe1989 fuzhe1989 fuzhe1989 approved these changes

@windtalker windtalker Awaiting requested review from windtalker

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

Rename the function with “withCollation” postfix.
5 participants
@ywqzzy @ti-chi-bot @sre-bot @fuzhe1989 @SeaRise