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

expr: fix tikv crash when conv empty string #12672

Merged
merged 5 commits into from May 30, 2022

Conversation

wshwsh12
Copy link
Contributor

@wshwsh12 wshwsh12 commented May 27, 2022

What is changed and how it works?

Issue Number: Close #12673

What's Changed:

Fix tikv crash when conv empty string

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

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

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM
  • Breaking backward compatibility

Release note

Fix tikv crash when conv empty string

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 27, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • sticnarf
  • youjiali1995

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.

Comment on lines 619 to 622
if iter.peek().is_none() {
return None;
}
let head = *iter.peek().unwrap();
Copy link
Contributor

Choose a reason for hiding this comment

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

It can be simplify it as:

Suggested change
if iter.peek().is_none() {
return None;
}
let head = *iter.peek().unwrap();
let head = *iter.peek()?;

Signed-off-by: wshwsh12 <793703860@qq.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Status: PR - There is already 1 approval label May 27, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Status: PR - There are already 2 approvals needs-cherry-pick-release-4.0 Type: Need cherry pick to release 4.0 needs-cherry-pick-release-5.0 Type: Need cherry pick to release 5.0 needs-cherry-pick-release-5.1 Type: Need cherry pick to release 5.1 needs-cherry-pick-release-5.2 Type: Need cherry pick to release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Type: Need cherry pick to release-5.4 needs-cherry-pick-release-6.0 needs-cherry-pick-release-6.1 and removed status/LGT1 Status: PR - There is already 1 approval do-not-merge/needs-triage-completed labels May 27, 2022
@wshwsh12
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@wshwsh12: 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

@wshwsh12: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

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.

@sticnarf
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@sticnarf: 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: feefa06

@ti-chi-bot ti-chi-bot merged commit 62d7777 into tikv:master May 30, 2022
ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 30, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #12688

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 30, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #12689

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 30, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #12690

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 30, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #12691

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 30, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #12692

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 30, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #12693

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 30, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.0 in PR #12694

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 30, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.1 in PR #12695

ti-chi-bot added a commit that referenced this pull request Jun 14, 2022
ref #12672, close #12673

Fix tikv crash when conv empty string

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Shenghui Wu <793703860@qq.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
ti-chi-bot added a commit that referenced this pull request Jun 21, 2022
ref #12672, close #12673

Fix tikv crash when conv empty string

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Shenghui Wu <793703860@qq.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
ti-chi-bot added a commit that referenced this pull request Aug 19, 2022
ref #12672, close #12673

Fix tikv crash when conv empty string

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Shenghui Wu <793703860@qq.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
ti-chi-bot added a commit that referenced this pull request Dec 9, 2022
ref #12672, close #12673

Fix tikv crash when conv empty string

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Shenghui Wu <793703860@qq.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-4.0 Type: Need cherry pick to release 4.0 needs-cherry-pick-release-5.0 Type: Need cherry pick to release 5.0 needs-cherry-pick-release-5.1 Type: Need cherry pick to release 5.1 needs-cherry-pick-release-5.2 Type: Need cherry pick to release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Type: Need cherry pick to release-5.4 needs-cherry-pick-release-6.0 needs-cherry-pick-release-6.1 release-note size/XS 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.

tikv crash when conv empty string
7 participants