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

ddl: rewrites some DDL tests #33277

Merged
merged 17 commits into from
Mar 23, 2022
Merged

ddl: rewrites some DDL tests #33277

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f931511
done
wjhuang2016 Mar 14, 2022
5c0e100
refine
wjhuang2016 Mar 14, 2022
bf255c8
save-314
wjhuang2016 Mar 14, 2022
7a85b8d
save
wjhuang2016 Mar 15, 2022
9b47c75
merge
wjhuang2016 Mar 17, 2022
1ef9a81
save
wjhuang2016 Mar 17, 2022
1951813
done
wjhuang2016 Mar 21, 2022
b9053f3
merge
wjhuang2016 Mar 21, 2022
896581d
refine test
wjhuang2016 Mar 21, 2022
18b9d43
add licence
wjhuang2016 Mar 21, 2022
1582177
fix import
wjhuang2016 Mar 21, 2022
3d13f36
fix check
wjhuang2016 Mar 21, 2022
1d10da3
fix test
wjhuang2016 Mar 21, 2022
e106669
fix test
wjhuang2016 Mar 21, 2022
d30fb86
fix licence
wjhuang2016 Mar 22, 2022
7a93637
fix licence
wjhuang2016 Mar 22, 2022
5dc12b1
Merge branch 'master' into rewrite_column_test
ti-chi-bot Mar 23, 2022
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
911 changes: 911 additions & 0 deletions ddl/cancel_ddl_test.go
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions ddl/column.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func createColumnInfo(tblInfo *model.TableInfo, colInfo *model.ColumnInfo, pos *

func checkAddColumn(t *meta.Meta, job *model.Job) (*model.TableInfo, *model.ColumnInfo, *model.ColumnInfo, *ast.ColumnPosition, int, error) {
schemaID := job.SchemaID
tblInfo, err := getTableInfoAndCancelFaultJob(t, job, schemaID)
tblInfo, err := GetTableInfoAndCancelFaultJob(t, job, schemaID)
if err != nil {
return nil, nil, nil, nil, 0, errors.Trace(err)
}
Expand Down Expand Up @@ -258,7 +258,7 @@ func onAddColumn(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64, err error)

func checkAddColumns(t *meta.Meta, job *model.Job) (*model.TableInfo, []*model.ColumnInfo, []*model.ColumnInfo, []*ast.ColumnPosition, []int, []bool, error) {
schemaID := job.SchemaID
tblInfo, err := getTableInfoAndCancelFaultJob(t, job, schemaID)
tblInfo, err := GetTableInfoAndCancelFaultJob(t, job, schemaID)
if err != nil {
return nil, nil, nil, nil, nil, nil, errors.Trace(err)
}
Expand Down Expand Up @@ -497,7 +497,7 @@ func onDropColumns(t *meta.Meta, job *model.Job) (ver int64, _ error) {

func checkDropColumns(t *meta.Meta, job *model.Job) (*model.TableInfo, []*model.ColumnInfo, int, []*model.IndexInfo, error) {
schemaID := job.SchemaID
tblInfo, err := getTableInfoAndCancelFaultJob(t, job, schemaID)
tblInfo, err := GetTableInfoAndCancelFaultJob(t, job, schemaID)
if err != nil {
return nil, nil, 0, nil, errors.Trace(err)
}
Expand Down Expand Up @@ -639,7 +639,7 @@ func onDropColumn(t *meta.Meta, job *model.Job) (ver int64, _ error) {

func checkDropColumn(t *meta.Meta, job *model.Job) (*model.TableInfo, *model.ColumnInfo, []*model.IndexInfo, error) {
schemaID := job.SchemaID
tblInfo, err := getTableInfoAndCancelFaultJob(t, job, schemaID)
tblInfo, err := GetTableInfoAndCancelFaultJob(t, job, schemaID)
if err != nil {
return nil, nil, nil, errors.Trace(err)
}
Expand Down Expand Up @@ -783,7 +783,7 @@ func getModifyColumnInfo(t *meta.Meta, job *model.Job) (*model.DBInfo, *model.Ta
return nil, nil, nil, jobParam, errors.Trace(err)
}

tblInfo, err := getTableInfoAndCancelFaultJob(t, job, job.SchemaID)
tblInfo, err := GetTableInfoAndCancelFaultJob(t, job, job.SchemaID)
if err != nil {
return nil, nil, nil, jobParam, errors.Trace(err)
}
Expand Down Expand Up @@ -1711,7 +1711,7 @@ func checkForNullValue(ctx context.Context, sctx sessionctx.Context, isDataTrunc
}

func updateColumnDefaultValue(t *meta.Meta, job *model.Job, newCol *model.ColumnInfo, oldColName *model.CIStr) (ver int64, _ error) {
tblInfo, err := getTableInfoAndCancelFaultJob(t, job, job.SchemaID)
tblInfo, err := GetTableInfoAndCancelFaultJob(t, job, job.SchemaID)
if err != nil {
return ver, errors.Trace(err)
}
Expand Down
Loading