remove unused function

pingcap · Jun 30, 2022 · d5f91a4 · d5f91a4
1 parent e4d94f8
commit d5f91a4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 157 deletions.
diff --git a/ddl/column.go b/ddl/column.go
@@ -274,131 +274,6 @@ func setIndicesState(indexInfos []*model.IndexInfo, state model.SchemaState) {
 	}
 }
 
-func onDropColumns(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64, _ error) {
-	tblInfo, colInfos, delCount, idxInfos, err := checkDropColumns(t, job)
-	if err != nil {
-		return ver, errors.Trace(err)
-	}
-	if len(colInfos) == 0 {
-		job.State = model.JobStateCancelled
-		return ver, nil
-	}
-
-	originalState := colInfos[0].State
-	switch colInfos[0].State {
-	case model.StatePublic:
-		// public -> write only
-		setColumnsState(colInfos, model.StateWriteOnly)
-		setIndicesState(idxInfos, model.StateWriteOnly)
-		for _, colInfo := range colInfos {
-			err = checkDropColumnForStatePublic(tblInfo, colInfo)
-			if err != nil {
-				return ver, errors.Trace(err)
-			}
-		}
-		ver, err = updateVersionAndTableInfoWithCheck(d, t, job, tblInfo, originalState != colInfos[0].State)
-		if err != nil {
-			return ver, errors.Trace(err)
-		}
-		job.SchemaState = model.StateWriteOnly
-	case model.StateWriteOnly:
-		// write only -> delete only
-		setColumnsState(colInfos, model.StateDeleteOnly)
-		if len(idxInfos) > 0 {
-			newIndices := make([]*model.IndexInfo, 0, len(tblInfo.Indices))
-			for _, idx := range tblInfo.Indices {
-				if !indexInfoContains(idx.ID, idxInfos) {
-					newIndices = append(newIndices, idx)
-				}
-			}
-			tblInfo.Indices = newIndices
-		}
-		ver, err = updateVersionAndTableInfo(d, t, job, tblInfo, originalState != colInfos[0].State)
-		if err != nil {
-			return ver, errors.Trace(err)
-		}
-		job.Args = append(job.Args, indexInfosToIDList(idxInfos))
-		job.SchemaState = model.StateDeleteOnly
-	case model.StateDeleteOnly:
-		// delete only -> reorganization
-		setColumnsState(colInfos, model.StateDeleteReorganization)
-		ver, err = updateVersionAndTableInfo(d, t, job, tblInfo, originalState != colInfos[0].State)
-		if err != nil {
-			return ver, errors.Trace(err)
-		}
-		job.SchemaState = model.StateDeleteReorganization
-	case model.StateDeleteReorganization:
-		// reorganization -> absent
-		// All reorganization jobs are done, drop this column.
-		tblInfo.Columns = tblInfo.Columns[:len(tblInfo.Columns)-delCount]
-		setColumnsState(colInfos, model.StateNone)
-		ver, err = updateVersionAndTableInfo(d, t, job, tblInfo, originalState != colInfos[0].State)
-		if err != nil {
-			return ver, errors.Trace(err)
-		}
-
-		// Finish this job.
-		if job.IsRollingback() {
-			job.FinishTableJob(model.JobStateRollbackDone, model.StateNone, ver, tblInfo)
-		} else {
-			job.FinishTableJob(model.JobStateDone, model.StateNone, ver, tblInfo)
-			job.Args = append(job.Args, getPartitionIDs(tblInfo))
-		}
-	default:
-		err = dbterror.ErrInvalidDDLJob.GenWithStackByArgs("table", tblInfo.State)
-	}
-	return ver, errors.Trace(err)
-}
-
-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)
-	if err != nil {
-		return nil, nil, 0, nil, errors.Trace(err)
-	}
-
-	var colNames []model.CIStr
-	var ifExists []bool
-	// indexIds is used to make sure we don't truncate args when decoding the rawArgs.
-	var indexIds []int64
-	err = job.DecodeArgs(&colNames, &ifExists, &indexIds)
-	if err != nil {
-		job.State = model.JobStateCancelled
-		return nil, nil, 0, nil, errors.Trace(err)
-	}
-
-	newColNames := make([]model.CIStr, 0, len(colNames))
-	colInfos := make([]*model.ColumnInfo, 0, len(colNames))
-	newIfExists := make([]bool, 0, len(colNames))
-	indexInfos := make([]*model.IndexInfo, 0)
-	for i, colName := range colNames {
-		colInfo := model.FindColumnInfo(tblInfo.Columns, colName.L)
-		if colInfo == nil || colInfo.Hidden {
-			if ifExists[i] {
-				// TODO: Should return a warning.
-				logutil.BgLogger().Warn(fmt.Sprintf("column %s doesn't exist", colName))
-				continue
-			}
-			job.State = model.JobStateCancelled
-			return nil, nil, 0, nil, dbterror.ErrCantDropFieldOrKey.GenWithStack("column %s doesn't exist", colName)
-		}
-		if err = isDroppableColumn(job.MultiSchemaInfo != nil, tblInfo, colName); err != nil {
-			job.State = model.JobStateCancelled
-			return nil, nil, 0, nil, errors.Trace(err)
-		}
-		newColNames = append(newColNames, colName)
-		newIfExists = append(newIfExists, ifExists[i])
-		colInfos = append(colInfos, colInfo)
-		idxInfos := listIndicesWithColumn(colName.L, tblInfo.Indices)
-		indexInfos = append(indexInfos, idxInfos...)
-	}
-	job.Args = []interface{}{newColNames, newIfExists}
-	if len(indexIds) > 0 {
-		job.Args = append(job.Args, indexIds)
-	}
-	return tblInfo, colInfos, len(colInfos), indexInfos, nil
-}
-
 func checkDropColumnForStatePublic(tblInfo *model.TableInfo, colInfo *model.ColumnInfo) (err error) {
 	// Set this column's offset to the last and reset all following columns' offsets.
 	adjustColumnInfoInDropColumn(tblInfo, colInfo.Offset)

diff --git a/ddl/rollingback.go b/ddl/rollingback.go
@@ -207,38 +207,6 @@ func rollingbackDropColumn(t *meta.Meta, job *model.Job) (ver int64, err error)
 	return ver, nil
 }
 
-func rollingbackDropColumns(t *meta.Meta, job *model.Job) (ver int64, err error) {
-	_, colInfos, _, idxInfos, err := checkDropColumns(t, job)
-	if err != nil {
-		return ver, errors.Trace(err)
-	}
-
-	for _, indexInfo := range idxInfos {
-		switch indexInfo.State {
-		case model.StateWriteOnly, model.StateDeleteOnly, model.StateDeleteReorganization, model.StateNone:
-			// We can not rollback now, so just continue to drop index.
-			// In function isJobRollbackable will let job rollback when state is StateNone.
-			// When there is no index related to the drop columns job it is OK, but when there has indices, we should
-			// make sure the job is not rollback.
-			job.State = model.JobStateRunning
-			return ver, nil
-		case model.StatePublic:
-		default:
-			return ver, dbterror.ErrInvalidDDLState.GenWithStackByArgs("index", indexInfo.State)
-		}
-	}
-
-	// StatePublic means when the job is not running yet.
-	if colInfos[0].State == model.StatePublic {
-		job.State = model.JobStateCancelled
-		return ver, dbterror.ErrCancelledDDLJob
-	}
-	// In the state of drop columns `write only -> delete only -> reorganization`,
-	// We can not rollback now, so just continue to drop columns.
-	job.State = model.JobStateRunning
-	return ver, nil
-}
-
 func rollingbackDropIndex(t *meta.Meta, job *model.Job) (ver int64, err error) {
 	_, indexInfo, err := checkDropIndex(t, job)
 	if err != nil {