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

executor,expression: avoid to append nil to warnings #36304

Merged
merged 11 commits into from
Aug 5, 2022

Conversation

zyguan
Copy link
Contributor

@zyguan zyguan commented Jul 19, 2022

Signed-off-by: zyguan zhongyangguan@gmail.com

What problem does this PR solve?

Issue Number: close #31569

Problem Summary: two issues are described in #31569:

  1. nil pointer exception was thrown when show warnings.
  2. the warning messages were incompleted (missing template args).

What is changed and how it works?

Previously we always append the warning error even when it's a nil here, which leads to the first issue. This PR uses sc.HandleTruncate to handle trancate warnings uniformly and amends warnings generated on inserting.

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

Signed-off-by: zyguan <zhongyangguan@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 19, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • tangenta
  • xhebox

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 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-6.0 needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 19, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 25, 2022
@hawkingrei
Copy link
Member

/run-all-tests

@xhebox xhebox requested review from tangenta and lysu August 2, 2022 09:54
@zyguan zyguan removed the request for review from lysu August 2, 2022 10:33
@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 Aug 4, 2022
@tangenta
Copy link
Contributor

tangenta commented Aug 4, 2022

@zyguan Please fix the following failed integration tests:

TestInsertWrongValueForField – executor
TestInsert – executor
TestInsertIgnore – executor
TestIssue10402 – executor
TestStringtoDecimal – executor
TestIssue17745 – executor
TestShowWarnings – showtest_test
TestIssue19892 – expression
TestConvertToBit – expression

@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 Aug 4, 2022
Signed-off-by: zyguan <zhongyangguan@gmail.com>
@zyguan
Copy link
Contributor Author

zyguan commented Aug 4, 2022

/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented Aug 4, 2022

@zyguan
Copy link
Contributor Author

zyguan commented Aug 4, 2022

Please fix the following failed integration tests

Fixed, @tangenta @xhebox PTAL.

@zyguan
Copy link
Contributor Author

zyguan commented Aug 4, 2022

/merge

@ti-chi-bot
Copy link
Member

@zyguan: /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.

@xhebox
Copy link
Contributor

xhebox commented Aug 5, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 3b6487e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 5, 2022
@ti-chi-bot ti-chi-bot merged commit 6418350 into pingcap:master Aug 5, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 5, 2022
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #36929

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

cherry pick to release-6.0 in PR #36930

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

cherry pick to release-6.1 in PR #36931

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

cherry pick to release-6.2 in PR #36932

@sre-bot
Copy link
Contributor

sre-bot commented Aug 5, 2022

TiDB MergeCI notify

🔴 Bad News! [1] CI still failing after this pr merged.
These failed integration tests don't seem to be introduced by the current PR.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/common-test 🔴 failed 2, success 9, total 11 15 min Existing failure
idc-jenkins-ci/integration-cdc-test 🟢 all 36 tests passed 28 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 17 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 8 min 0 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 29 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 20 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 5 min 30 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 12 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 4 min 10 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. 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
Development

Successfully merging this pull request may close these issues.

some unexpected warning message when dealing with 0 ENUM
8 participants