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

dml: fix index column offset beyond the range #25699

Merged
merged 10 commits into from
Jul 15, 2021
Merged

dml: fix index column offset beyond the range #25699

merged 10 commits into from
Jul 15, 2021

Conversation

AilinKid
Copy link
Contributor

@AilinKid AilinKid commented Jun 23, 2021 •
edited
Loading

Signed-off-by: ailinkid 314806019@qq.com

What problem does this PR solve?

Issue Number: close #25342

What is changed and how it works?

Make the DELETE statement aware of middle state column, while user can't see them yet (non-explicit usage).
(some indexes convering the dropping-column need check the middle state column to remove the index record)

Check List

Tests

  • Unit test
  • Integration test

Release note

  • dml: fix index column offset beyond the range

@AilinKid
fix index column offset beyound the range
9a3e777 
Signed-off-by: ailinkid <314806019@qq.com>
@AilinKid AilinKid requested a review from a team as a code owner June 23, 2021 04:37
@AilinKid AilinKid requested review from XuHuaiyu and removed request for a team June 23, 2021 04:37
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 23, 2021
@AilinKid
.
43da42e 
Signed-off-by: ailinkid <314806019@qq.com>
@AilinKid AilinKid requested review from zimulala and xiongjiwei and removed request for XuHuaiyu June 23, 2021 04:40
wjhuang2016
wjhuang2016 reviewed Jun 23, 2021
View reviewed changes
Copy link
Member

@wjhuang2016 wjhuang2016 left a comment

Choose a reason for hiding this comment

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

It seems that this PR will revert #17048

@github-actions github-actions bot added the sig/sql-infra SIG: SQL Infra label Jun 23, 2021
@AilinKid
Copy link
Contributor Author

AilinKid commented Jun 23, 2021 •
edited
Loading

It seems that this PR will revert #17048

Yes, kind of, 17048's target test has worked under the latter fix of jiwei's use of NotExplicitUsable, using the deletableCol is the better choice here.

zimulala
zimulala reviewed Jul 12, 2021
View reviewed changes
Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

So could we remove FullHiddenColsAndVisibleCols?

planner/core/logical_plan_builder.go Outdated
@@ -3903,7 +3903,7 @@ func (b *PlanBuilder) buildDataSource(ctx context.Context, tn *ast.TableName, as
columns = tbl.WritableCols()
} else if b.inDeleteStmt {
// All hidden columns are needed because we need to delete the expression index that consists of hidden columns.
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to update this comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

FullHiddenColsAndVisibleCols() is useful and depended in the case of partion prune, so I keeped it.

func (s *partitionProcessor) reconstructTableColNames(ds *DataSource) ([]*types.FieldName, error) {
	names := make([]*types.FieldName, 0, len(ds.TblCols))
	colsInfo := ds.table.FullHiddenColsAndVisibleCols()
	colsInfoMap := make(map[int64]*table.Column, len(colsInfo))
	for _, c := range colsInfo {
		colsInfoMap[c.ID] = c
	}
        ...

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 15, 2021
zimulala
zimulala approved these changes Jul 15, 2021
View reviewed changes
Copy link
Contributor

@zimulala zimulala 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
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • wjhuang2016
  • zimulala

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 15, 2021
@zimulala
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 130165d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 15, 2021
@AilinKid
Copy link
Contributor Author

/merge

@ti-chi-bot ti-chi-bot merged commit d05b6f4 into pingcap:master Jul 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjhuang2016 wjhuang2016 wjhuang2016 approved these changes

@zimulala zimulala zimulala approved these changes

@xiongjiwei xiongjiwei Awaiting requested review from xiongjiwei

Assignees
No one assigned
Labels
sig/sql-infra SIG: SQL Infra 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.

dml: delete statement return index column out of bound
4 participants
@AilinKid @ti-chi-bot @zimulala @wjhuang2016