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, util: fix UnionScan Next() skip reading data when passed chunk capacity is 0 (#36961) #37334

Merged
merged 3 commits into from
Sep 30, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 24, 2022

cherry-pick #36961 to release-6.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/37334

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/37334:release-6.1-81a93a6977e5

What problem does this PR solve?

Issue Number: close #36903

Problem Summary:

What is changed and how it works?

In the old UnionScan executor code, if an empty chk is passed to UnionScan.Next(chk) , the UnionScan executor will not read any data.

This bug could be trigger in select pkey from t_vwvgdc where 0 <> 0 union select pkey from t_vwvgdc;
The union first children return empty chunk, and the chunk is reused for the second children (union scan) to read data.

mysql> explain select pkey from t_vwvgdc where 0 <> 0 union select pkey from t_vwvgdc;
+------------------------------+---------+-----------+----------------+-------------------------------------------------------+
| id                           | estRows | task      | access object  | operator info                                         |
+------------------------------+---------+-----------+----------------+-------------------------------------------------------+
| HashAgg_13                   | 24.20   | root      |                | group by:Column#7, funcs:firstrow(Column#7)->Column#7 |
| └─Union_14                   | 29.00   | root      |                |                                                       |
|   ├─TableDual_16             | 0.00    | root      |                | rows:0                                                |
|   └─UnionScan_18             | 29.00   | root      |                |                                                       |
|     └─TableReader_20         | 29.00   | root      |                | data:TableFullScan_19                                 |
|       └─TableFullScan_19     | 29.00   | cop[tikv] | table:t_vwvgdc | keep order:false, stats:pseudo                        |
+------------------------------+---------+-----------+----------------+-------------------------------------------------------+
6 rows in set (0.00 sec)

Now I change req.GrowAndReset(us.maxChunkSize) to ensure capacity > 0 for the req.

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.

Fix a bug that UnionScan's Next() function skips reading data when the passed chunk's capacity is 0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 24, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • qw4990
  • 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 do-not-merge/cherry-pick-not-approved do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 24, 2022
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 24, 2022
@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/6.1-cherry-pick labels Aug 24, 2022
@ti-srebot ti-srebot added this to the v6.1.1 milestone Aug 24, 2022
@ti-srebot
Copy link
Contributor Author

@tiancaiamao you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 25, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Aug 25, 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 Aug 30, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 30, 2022
@wjhuang2016
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 6dbf405

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

@ti-srebot: 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.

@ti-chi-bot ti-chi-bot merged commit 25936bb into pingcap:release-6.1 Sep 30, 2022
@xhebox xhebox deleted the release-6.1-81a93a6977e5 branch September 30, 2022 03:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. 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. type/6.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants