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

Fix incorrect window function cancellation handling #5818

Merged
merged 5 commits into from
Sep 8, 2022
Merged

Fix incorrect window function cancellation handling #5818

merged 5 commits into from
Sep 8, 2022

Conversation

SeaRise
Copy link
Contributor

@SeaRise SeaRise commented Sep 8, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #5814

Problem Summary:

What is changed and how it works?

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

Fix the bug that window function may cause tiflash crash when canceled.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 8, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • mengxin9014
  • windtalker

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/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/needs-triage-completed and removed do-not-merge/needs-linked-issue labels Sep 8, 2022
@SeaRise
Copy link
Contributor Author

SeaRise commented Sep 8, 2022

/run-check-issue-triage-complete

@SeaRise
Copy link
Contributor Author

SeaRise commented Sep 8, 2022

/check-issue-triage-complete

@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.2 release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/needs-triage-completed release-note-none Denotes a PR that doesn't merit a release note. labels Sep 8, 2022
@SeaRise
Copy link
Contributor Author

SeaRise commented Sep 8, 2022

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Sep 8, 2022

Coverage for changed files

Filename                       Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
WindowBlockInputStream.cpp         191                23    87.96%          24                 0   100.00%         469                86    81.66%         144                24    83.33%
WindowBlockInputStream.h            23                 1    95.65%          15                 1    93.33%          48                 9    81.25%          14                 0   100.00%
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                              214                24    88.79%          39                 1    97.44%         517                95    81.62%         158                24    84.81%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18668      8196             56.10%    216012  84367        60.94%

full coverage report (for internal network access only)

mengxin9014
mengxin9014 reviewed Sep 8, 2022
View reviewed changes
dbms/src/DataStreams/WindowBlockInputStream.cpp Outdated
@@ -91,6 +104,8 @@ Block WindowBlockInputStream::readImpl()
tryCalculate();
}

if (auto res = returnIfCancelledOrKilled(); res.has_value())
return res.value();
Copy link
Contributor

Choose a reason for hiding this comment

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

When query was canceled or killed, we should return {} or Block{}?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

tiflash/dbms/src/DataStreams/IProfilingBlockInputStream.cpp

Lines 60 to 63 in 949bd03

Block res;
if (isCancelledOrThrowIfKilled())
return res;

same as IProfilingBlockInputStream, return Block{} directly.

@SeaRise SeaRise requested a review from mengxin9014 September 8, 2022 07:09
windtalker
windtalker approved these changes Sep 8, 2022
View reviewed changes
Copy link
Contributor

@windtalker windtalker 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 Sep 8, 2022
mengxin9014
mengxin9014 approved these changes Sep 8, 2022
View reviewed changes
Copy link
Contributor

@mengxin9014 mengxin9014 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 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 8, 2022
@SeaRise
Copy link
Contributor Author

SeaRise commented Sep 8, 2022

/merge

@ti-chi-bot
Copy link
Member

@SeaRise: 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: d394b25

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 8, 2022
@ti-chi-bot
Copy link
Member

@SeaRise: 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 Sep 8, 2022

Coverage for changed files

Filename                       Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
WindowBlockInputStream.cpp         191                23    87.96%          24                 0   100.00%         469                86    81.66%         144                24    83.33%
WindowBlockInputStream.h            23                 1    95.65%          15                 1    93.33%          48                 9    81.25%          14                 0   100.00%
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                              214                24    88.79%          39                 1    97.44%         517                95    81.62%         158                24    84.81%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18687      8130             56.49%    216178  83613        61.32%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit 8ffb734 into pingcap:master Sep 8, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #5826.

ti-chi-bot pushed a commit to ti-chi-bot/tiflash that referenced this pull request Sep 8, 2022
@SeaRise @ti-chi-bot
This is an automated cherry-pick of pingcap#5818
3f8d7f6 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Sep 8, 2022
Merged
12 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #5827.

@ti-chi-bot ti-chi-bot mentioned this pull request Sep 8, 2022
Closed
12 tasks
ti-chi-bot added a commit that referenced this pull request Sep 9, 2022
@ti-chi-bot
Fix incorrect window function cancellation handling (#5818) (#5826)
d16dde3 
close #5814
@SeaRise SeaRise deleted the fix_cancel_bug_for_window branch October 31, 2022 06:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mengxin9014 mengxin9014 mengxin9014 approved these changes

@windtalker windtalker windtalker approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.2 release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 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.

TiFlash down for the error of WindowFunctionLeadLagBase
5 participants
@SeaRise @ti-chi-bot @sre-bot @windtalker @mengxin9014