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

ddl: fix panic in TestParallelDDL #16969

Merged
merged 8 commits into from
May 9, 2020
Merged

ddl: fix panic in TestParallelDDL #16969

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e64c2c
ddl: fix panic in TestParallelDDL
lance6716 May 3, 2020
3fb74d1
ddl: reduce alloc
lance6716 May 3, 2020
ce5bb04
Merge branch 'master' of https://github.com/pingcap/tidb
lance6716 May 3, 2020
273ba01
remove test code
lance6716 May 3, 2020
9c8b400
Merge branch 'master' into master
wjhuang2016 May 9, 2020
66023b8
Update reorg.go
lance6716 May 9, 2020
c60a15c
Update reorg.go
lance6716 May 9, 2020
58cc505
Merge branch 'master' into master
AilinKid May 9, 2020
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: 1 addition & 5 deletions ddl/column.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,7 @@ func createColumnInfo(tblInfo *model.TableInfo, colInfo *model.ColumnInfo, pos *

// Append the column info to the end of the tblInfo.Columns.
// It will reorder to the right offset in "Columns" when it state change to public.
newCols := make([]*model.ColumnInfo, 0, len(cols)+1)
newCols = append(newCols, cols...)
newCols = append(newCols, colInfo)

tblInfo.Columns = newCols
tblInfo.Columns = append(cols, colInfo)
return colInfo, pos, offset, nil
}

Expand Down
7 changes: 6 additions & 1 deletion ddl/reorg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,13 @@ func getTableTotalCount(w *worker, tblInfo *model.TableInfo) int64 {
}
defer w.sessPool.put(ctx)

executor, ok := ctx.(sqlexec.RestrictedSQLExecutor)
// `mock.Context` is used in tests, which doesn't implement RestrictedSQLExecutor
if !ok {
return statistics.PseudoRowCount
}
sql := fmt.Sprintf("select table_rows from information_schema.tables where tidb_table_id=%v;", tblInfo.ID)
rows, _, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(sql)
rows, _, err := executor.ExecRestrictedSQL(sql)
if err != nil {
return statistics.PseudoRowCount
}
Expand Down