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 columns_to_read contains _tidb_rowid #7283

Merged
merged 5 commits into from
Apr 12, 2023
Merged

fix columns_to_read contains _tidb_rowid #7283

merged 5 commits into from
Apr 12, 2023

Conversation

Lloyd-Pottiger
Copy link
Contributor

@Lloyd-Pottiger Lloyd-Pottiger commented Apr 12, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #5829

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

None

@Lloyd-Pottiger
fix
405102e 
Signed-off-by: Lloyd-Pottiger <[email protected]>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 12, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JaySon-Huang
  • JinheLin

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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue labels Apr 12, 2023
@Lloyd-Pottiger
Copy link
Contributor Author

/run-integration-test

1 similar comment
@Lloyd-Pottiger
Copy link
Contributor Author

/run-integration-test

JaySon-Huang
JaySon-Huang reviewed Apr 12, 2023
View reviewed changes
dbms/src/Storages/StorageDeltaMerge.cpp
handle.name = EXTRA_HANDLE_COLUMN_NAME;
table_scan_column_info.push_back(handle);
continue;
}
auto iter = std::find_if(
Copy link
Contributor

Choose a reason for hiding this comment

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

Better show the col.id and col.name in L783 in case similar problem happen again

tiflash/dbms/src/Storages/StorageDeltaMerge.cpp

Lines 779 to 783 in 405102e

auto iter = std::find_if(
table_infos.begin(),
table_infos.end(),
[col](const ColumnInfo & c) -> bool { return c.id == col.id; });
RUNTIME_CHECK(iter != table_infos.end());

Copy link
Contributor

Choose a reason for hiding this comment

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

And also L761

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Better show the col.id and col.name in L783 in case similar problem happen again

done

And also L761

columns_to_read will contain extre column, so there is no need to check in L761

@Lloyd-Pottiger
fix
e913c46 
Signed-off-by: Lloyd-Pottiger <[email protected]>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 12, 2023
@Lloyd-Pottiger
add ExtraTableIDColumnID
fbd24c8 
Signed-off-by: Lloyd-Pottiger <[email protected]>
@Lloyd-Pottiger
fmt
bfbf6c1 
Signed-off-by: Lloyd-Pottiger <[email protected]>
@Lloyd-Pottiger
Copy link
Contributor Author

/run-integration-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 12, 2023
JaySon-Huang
JaySon-Huang reviewed Apr 12, 2023
View reviewed changes
dbms/src/Flash/Coprocessor/DAGUtils.cpp Outdated
auto column_index = decodeDAGInt64(expr.val());
if (column_index < 0 || column_index >= static_cast<Int64>(input_col.size()))
{
throw TiFlashException("Column index out of bound", Errors::Coprocessor::BadRequest);
Copy link
Contributor

@JaySon-Huang JaySon-Huang Apr 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

show the expr.ShortDebugString() and input_col.size() when error happen

JaySon-Huang
JaySon-Huang approved these changes Apr 12, 2023
View reviewed changes
Copy link
Contributor

@JaySon-Huang JaySon-Huang left a comment

Choose a reason for hiding this comment

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

LGTM with a comment

@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 Apr 12, 2023
@Lloyd-Pottiger
add more msg
e5421b5 
Signed-off-by: Lloyd-Pottiger <[email protected]>
@Lloyd-Pottiger
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@Lloyd-Pottiger: 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: e5421b5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 12, 2023
@JinheLin
Copy link
Contributor

/run-integration-test

1 similar comment
@Lloyd-Pottiger
Copy link
Contributor Author

/run-integration-test

@ti-chi-bot ti-chi-bot merged commit 56507d9 into pingcap:master Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ywqzzy ywqzzy ywqzzy approved these changes

@JinheLin JinheLin JinheLin approved these changes

@JaySon-Huang JaySon-Huang JaySon-Huang approved these changes

Assignees
No one assigned
Labels
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. 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.
5 participants
@Lloyd-Pottiger @ti-chi-bot @JinheLin @JaySon-Huang @ywqzzy