@@ -469,30 +469,26 @@ type testCancelJob struct {
469469
470470func buildCancelJobTests (firstID int64 ) []testCancelJob {
471471 err := errCancelledDDLJob
472- errs := []error {err }
473472 noErrs := []error {nil }
474473 tests := []testCancelJob {
475474 {act : model .ActionAddIndex , jobIDs : []int64 {firstID + 1 }, cancelRetErrs : noErrs , cancelState : model .StateDeleteOnly , ddlRetErr : err },
476475 {act : model .ActionAddIndex , jobIDs : []int64 {firstID + 2 }, cancelRetErrs : noErrs , cancelState : model .StateWriteOnly , ddlRetErr : err },
477476 {act : model .ActionAddIndex , jobIDs : []int64 {firstID + 3 }, cancelRetErrs : noErrs , cancelState : model .StateWriteReorganization , ddlRetErr : err },
478477 {act : model .ActionAddIndex , jobIDs : []int64 {firstID + 4 }, cancelRetErrs : []error {admin .ErrCancelFinishedDDLJob .GenByArgs (firstID + 4 )}, cancelState : model .StatePublic , ddlRetErr : err },
479478
480- // TODO: after fix drop index and create table rollback bug, the below test cases maybe need to change.
481- {act : model .ActionDropIndex , jobIDs : []int64 {firstID + 5 }, cancelRetErrs : errs , cancelState : model .StateWriteOnly , ddlRetErr : err },
482- {act : model .ActionDropIndex , jobIDs : []int64 {firstID + 6 }, cancelRetErrs : errs , cancelState : model .StateDeleteOnly , ddlRetErr : err },
483- {act : model .ActionDropIndex , jobIDs : []int64 {firstID + 7 }, cancelRetErrs : errs , cancelState : model .StateDeleteReorganization , ddlRetErr : err },
484- {act : model .ActionDropIndex , jobIDs : []int64 {firstID + 8 }, cancelRetErrs : []error {admin .ErrCancelFinishedDDLJob .GenByArgs (firstID + 8 )}, cancelState : model .StateNone , ddlRetErr : err },
479+ // Test cancel drop index job , see TestCancelDropIndex.
485480
486481 // TODO: add create table back after we fix the cancel bug.
487482 //{act: model.ActionCreateTable, jobIDs: []int64{firstID + 9}, cancelRetErrs: noErrs, cancelState: model.StatePublic, ddlRetErr: err},
488- {act : model .ActionAddColumn , jobIDs : []int64 {firstID + 9 }, cancelRetErrs : noErrs , cancelState : model .StateDeleteOnly , ddlRetErr : err },
489- {act : model .ActionAddColumn , jobIDs : []int64 {firstID + 10 }, cancelRetErrs : noErrs , cancelState : model .StateWriteOnly , ddlRetErr : err },
490- {act : model .ActionAddColumn , jobIDs : []int64 {firstID + 11 }, cancelRetErrs : noErrs , cancelState : model .StateWriteReorganization , ddlRetErr : err },
491- {act : model .ActionAddColumn , jobIDs : []int64 {firstID + 12 }, cancelRetErrs : []error {admin .ErrCancelFinishedDDLJob .GenByArgs (firstID + 12 )}, cancelState : model .StatePublic , ddlRetErr : err },
492-
493- {act : model .ActionDropColumn , jobIDs : []int64 {firstID + 13 }, cancelRetErrs : []error {admin .ErrCannotCancelDDLJob .GenByArgs (firstID + 13 )}, cancelState : model .StateWriteOnly , ddlRetErr : err },
494- {act : model .ActionDropColumn , jobIDs : []int64 {firstID + 14 }, cancelRetErrs : []error {admin .ErrCannotCancelDDLJob .GenByArgs (firstID + 14 )}, cancelState : model .StateDeleteOnly , ddlRetErr : err },
495- {act : model .ActionDropColumn , jobIDs : []int64 {firstID + 15 }, cancelRetErrs : []error {admin .ErrCannotCancelDDLJob .GenByArgs (firstID + 15 )}, cancelState : model .StateDeleteReorganization , ddlRetErr : err },
483+
484+ {act : model .ActionAddColumn , jobIDs : []int64 {firstID + 5 }, cancelRetErrs : noErrs , cancelState : model .StateDeleteOnly , ddlRetErr : err },
485+ {act : model .ActionAddColumn , jobIDs : []int64 {firstID + 6 }, cancelRetErrs : noErrs , cancelState : model .StateWriteOnly , ddlRetErr : err },
486+ {act : model .ActionAddColumn , jobIDs : []int64 {firstID + 7 }, cancelRetErrs : noErrs , cancelState : model .StateWriteReorganization , ddlRetErr : err },
487+ {act : model .ActionAddColumn , jobIDs : []int64 {firstID + 8 }, cancelRetErrs : []error {admin .ErrCancelFinishedDDLJob .GenByArgs (firstID + 8 )}, cancelState : model .StatePublic , ddlRetErr : err },
488+
489+ {act : model .ActionDropColumn , jobIDs : []int64 {firstID + 9 }, cancelRetErrs : []error {admin .ErrCannotCancelDDLJob .GenByArgs (firstID + 9 )}, cancelState : model .StateWriteOnly , ddlRetErr : err },
490+ {act : model .ActionDropColumn , jobIDs : []int64 {firstID + 10 }, cancelRetErrs : []error {admin .ErrCannotCancelDDLJob .GenByArgs (firstID + 10 )}, cancelState : model .StateDeleteOnly , ddlRetErr : err },
491+ {act : model .ActionDropColumn , jobIDs : []int64 {firstID + 11 }, cancelRetErrs : []error {admin .ErrCannotCancelDDLJob .GenByArgs (firstID + 11 )}, cancelState : model .StateDeleteReorganization , ddlRetErr : err },
496492 }
497493
498494 return tests
@@ -626,23 +622,8 @@ func (s *testDDLSuite) TestCancelJob(c *C) {
626622 c .Assert (txn .Commit (context .Background ()), IsNil )
627623 s .checkAddIdx (c , d , dbInfo .ID , tblInfo .ID , idxOrigName , true )
628624
629- // for dropping index
630- idxName := []interface {}{model .NewCIStr ("idx" )}
631- test = & tests [4 ]
632- doDDLJobErrWithSchemaState (ctx , d , c , dbInfo .ID , tblInfo .ID , model .ActionDropIndex , idxName , & test .cancelState )
633- c .Check (errors .ErrorStack (checkErr ), Equals , "" )
634- test = & tests [5 ]
635- doDDLJobErrWithSchemaState (ctx , d , c , dbInfo .ID , tblInfo .ID , model .ActionDropIndex , idxName , & test .cancelState )
636- c .Check (errors .ErrorStack (checkErr ), Equals , "" )
637- test = & tests [6 ]
638- doDDLJobErrWithSchemaState (ctx , d , c , dbInfo .ID , tblInfo .ID , model .ActionDropIndex , idxName , & test .cancelState )
639- c .Check (errors .ErrorStack (checkErr ), Equals , "" )
640- test = & tests [7 ]
641- testDropIndex (c , ctx , d , dbInfo , tblInfo , "idx" )
642- c .Check (errors .ErrorStack (checkErr ), Equals , "" )
643-
644625 // for add column
645- test = & tests [8 ]
626+ test = & tests [4 ]
646627 addingColName := "colA"
647628 newColumnDef := & ast.ColumnDef {
648629 Name : & ast.ColumnName {Name : model .NewCIStr (addingColName )},
@@ -655,39 +636,38 @@ func (s *testDDLSuite) TestCancelJob(c *C) {
655636 doDDLJobErrWithSchemaState (ctx , d , c , dbInfo .ID , tblInfo .ID , model .ActionAddColumn , addColumnArgs , & cancelState )
656637 c .Check (errors .ErrorStack (checkErr ), Equals , "" )
657638 s .checkAddColumn (c , d , dbInfo .ID , tblInfo .ID , addingColName , false )
658- test = & tests [9 ]
639+ test = & tests [5 ]
659640 doDDLJobErrWithSchemaState (ctx , d , c , dbInfo .ID , tblInfo .ID , model .ActionAddColumn , addColumnArgs , & cancelState )
660641 c .Check (errors .ErrorStack (checkErr ), Equals , "" )
661642 s .checkAddColumn (c , d , dbInfo .ID , tblInfo .ID , addingColName , false )
662- test = & tests [10 ]
643+ test = & tests [6 ]
663644 doDDLJobErrWithSchemaState (ctx , d , c , dbInfo .ID , tblInfo .ID , model .ActionAddColumn , addColumnArgs , & cancelState )
664645 c .Check (errors .ErrorStack (checkErr ), Equals , "" )
665646 s .checkAddColumn (c , d , dbInfo .ID , tblInfo .ID , addingColName , false )
666- test = & tests [11 ]
647+ test = & tests [7 ]
667648 testAddColumn (c , ctx , d , dbInfo , tblInfo , addColumnArgs )
668649 c .Check (errors .ErrorStack (checkErr ), Equals , "" )
669650 s .checkAddColumn (c , d , dbInfo .ID , tblInfo .ID , addingColName , true )
670651
671652 // for drop column.
672- test = & tests [12 ]
653+ test = & tests [8 ]
673654 dropColName := "c1"
674655 dropColumnArgs := []interface {}{model .NewCIStr (dropColName )}
675656 s .checkCancelDropColumn (c , d , dbInfo .ID , tblInfo .ID , dropColName , false )
676657 testCancelDropColumn (c , ctx , d , dbInfo , tblInfo , dropColumnArgs )
677658 c .Check (errors .ErrorStack (checkErr ), Equals , "" )
678659 s .checkCancelDropColumn (c , d , dbInfo .ID , tblInfo .ID , dropColName , true )
679660
680- test = & tests [13 ]
681-
682- dropColName = "c2"
661+ test = & tests [9 ]
662+ dropColName = "c3"
683663 dropColumnArgs = []interface {}{model .NewCIStr (dropColName )}
684664 s .checkCancelDropColumn (c , d , dbInfo .ID , tblInfo .ID , dropColName , false )
685665 testCancelDropColumn (c , ctx , d , dbInfo , tblInfo , dropColumnArgs )
686666 c .Check (errors .ErrorStack (checkErr ), Equals , "" )
687667 s .checkCancelDropColumn (c , d , dbInfo .ID , tblInfo .ID , dropColName , true )
688668
689- test = & tests [14 ]
690- dropColName = "c3 "
669+ test = & tests [10 ]
670+ dropColName = "c4 "
691671 dropColumnArgs = []interface {}{model .NewCIStr (dropColName )}
692672 s .checkCancelDropColumn (c , d , dbInfo .ID , tblInfo .ID , dropColName , false )
693673 testCancelDropColumn (c , ctx , d , dbInfo , tblInfo , dropColumnArgs )
0 commit comments