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

planner, executor: check col.OrigColName instead of col.ColName in isCoveringIndex #9637

Merged
merged 3 commits into from
Mar 12, 2019
Merged

planner, executor: check col.OrigColName instead of col.ColName in isCoveringIndex #9637

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d96599
planner, executor: check col.OrigColName instead of col.ColName in is…
XuHuaiyu Mar 11, 2019
1c366aa
set origColName as ColName in buildDataSource
XuHuaiyu Mar 11, 2019
9cf5a55
Merge branch 'master' into check_index_filter
XuHuaiyu Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,6 +1307,12 @@ func (s *testSuite) TestIndexScan(c *C) {
tk.MustExec("create table t(a varchar(50) primary key, b int, c int, index idx(b))")
tk.MustExec("insert into t values('aa', 1, 1)")
tk.MustQuery("select * from t use index(idx) where a > 'a'").Check(testkit.Rows("aa 1 1"))

// fix issue9636
tk.MustExec("drop table if exists t")
tk.MustExec("CREATE TABLE `t` (a int, KEY (a))")
result = tk.MustQuery(`SELECT * FROM (SELECT * FROM (SELECT a as d FROM t WHERE a IN ('100')) AS x WHERE x.d < "123" ) tmp_count"`)
result.Check(testkit.Rows())
}

func (s *testSuite) TestIndexReverseOrder(c *C) {
Expand Down
3 changes: 2 additions & 1 deletion planner/core/find_best_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,8 @@ func isCoveringIndex(columns []*expression.Column, indexColumns []*model.IndexCo
isIndexColumn := false
for _, indexCol := range indexColumns {
isFullLen := indexCol.Length == types.UnspecifiedLength || indexCol.Length == col.RetType.Flen
if col.ColName.L == indexCol.Name.L && isFullLen {
// We use col.OrigColName instead of col.ColName
Copy link
Member

Choose a reason for hiding this comment

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

I think adding the issue link here can help others to understand.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

if col.OrigColName.L == indexCol.Name.L && isFullLen {
Copy link
Member

@zz-jason zz-jason Mar 11, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Are there other places which use col.ColName.L instead of col.OrigColName.L?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure.
It needs to be checked.

Copy link
Contributor

@eurekaka eurekaka Mar 11, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Can we check UniqueID here for this case?

Copy link
Member

Choose a reason for hiding this comment

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

No... There's no place store the result converting model.IndexInfo.Columns to expression.Columns. So in many places we use model.IndexColumn directly compares with expression.Column

isIndexColumn = true
break
}
Expand Down