Simplified code, reused similar function.

Author: mjonss

pkg/ddl/partition.go

@@ -2035,8 +2035,8 @@ func CheckDropTablePartition(meta *model.TableInfo, partLowerNames []string) err
 	return nil
 }
 
-// updateDroppingPartitionInfo move dropping partitions to DroppingDefinitions, and return partitionIDs
-func updateDroppingPartitionInfo(tblInfo *model.TableInfo, partLowerNames []string) []int64 {
+// updateDroppingPartitionInfo move dropping partitions to DroppingDefinitions
+func updateDroppingPartitionInfo(tblInfo *model.TableInfo, partLowerNames []string) {
 	oldDefs := tblInfo.Partition.Definitions
 	newDefs := make([]model.PartitionDefinition, 0, len(oldDefs)-len(partLowerNames))
 	droppingDefs := make([]model.PartitionDefinition, 0, len(partLowerNames))
@@ -2061,7 +2061,6 @@ func updateDroppingPartitionInfo(tblInfo *model.TableInfo, partLowerNames []stri
 
 	tblInfo.Partition.Definitions = newDefs
 	tblInfo.Partition.DroppingDefinitions = droppingDefs
-	return pids
 }
 
 func getPartitionDef(tblInfo *model.TableInfo, partName string) (index int, def *model.PartitionDefinition, _ error) {
@@ -2237,7 +2236,7 @@ func (w *worker) onDropTablePartition(jobCtx *jobContext, job *model.Job) (ver i
 		// Reason, see https://github.com/pingcap/tidb/issues/55888
 		// Only mark the partitions as to be dropped, so they are not used, but not yet removed.
 		originalDefs := tblInfo.Partition.Definitions
-		_ = updateDroppingPartitionInfo(tblInfo, partNames)
+		updateDroppingPartitionInfo(tblInfo, partNames)
 		tblInfo.Partition.Definitions = originalDefs
 		job.SchemaState = model.StateWriteOnly
 		tblInfo.Partition.DDLState = job.SchemaState
@@ -2248,7 +2247,7 @@ func (w *worker) onDropTablePartition(jobCtx *jobContext, job *model.Job) (ver i
 		// Since the previous state do not use the dropping partitions,
 		// we can now actually remove them, allowing to write into the overlapping range
 		// of the higher range partition or LIST default partition.
-		_ = updateDroppingPartitionInfo(tblInfo, partNames)
+		updateDroppingPartitionInfo(tblInfo, partNames)
 		err = dropLabelRules(jobCtx.stepCtx, job.SchemaName, tblInfo.Name.L, partNames)
 		if err != nil {
 			// TODO: Add failpoint error/cancel injection and test failure/rollback and cancellation!
@@ -3164,7 +3163,7 @@ func (w *worker) onReorganizePartition(jobCtx *jobContext, job *model.Job) (ver
 		// move the adding definition into tableInfo.
 		updateAddingPartitionInfo(partInfo, tblInfo)
 		orgDefs := tblInfo.Partition.Definitions
-		_ = updateDroppingPartitionInfo(tblInfo, partNames)
+		updateDroppingPartitionInfo(tblInfo, partNames)
 		// Reset original partitions, and keep DroppedDefinitions
 		tblInfo.Partition.Definitions = orgDefs
 

pkg/table/tables/index.go

@@ -28,7 +28,6 @@ import (
 	"github.com/pingcap/tidb/pkg/tablecodec"
 	"github.com/pingcap/tidb/pkg/types"
 	"github.com/pingcap/tidb/pkg/util"
-	"github.com/pingcap/tidb/pkg/util/codec"
 	"github.com/pingcap/tidb/pkg/util/intest"
 	"github.com/pingcap/tidb/pkg/util/rowcodec"
 	"github.com/pingcap/tidb/pkg/util/tracing"
@@ -297,19 +296,21 @@ func (c *index) create(sctx table.MutateContext, txn kv.Transaction, indexedValu
 			// Note that a partitioned table cannot be temporary table
 			value, err = txn.Get(ctx, key)
 			if err == nil && len(value) != 0 {
-				partHandle, errPart := GetPartitionHandleFromVal(value)
+				handle, errPart := tablecodec.DecodeHandleInIndexValue(value)
 				if errPart != nil {
 					return nil, errPart
 				}
-				for _, id := range c.tblInfo.Partition.IDsInDDLToIgnore() {
-					if id == partHandle.PartitionID {
-						// Simply overwrite it
-						err = txn.SetAssertion(key, kv.SetAssertUnknown)
-						if err != nil {
-							return nil, err
+				if partHandle, ok := handle.(kv.PartitionHandle); ok {
+					for _, id := range c.tblInfo.Partition.IDsInDDLToIgnore() {
+						if id == partHandle.PartitionID {
+							// Simply overwrite it
+							err = txn.SetAssertion(key, kv.SetAssertUnknown)
+							if err != nil {
+								return nil, err
+							}
+							value = nil
+							break
 						}
-						value = nil
-						break
 					}
 				}
 			}
@@ -583,32 +584,6 @@ func FetchDuplicatedHandle(ctx context.Context, key kv.Key, distinct bool,
 	return true, nil, nil
 }
 
-// GetPartitionHandleFromVal creates a PartitionHandle from a global index value
-func GetPartitionHandleFromVal(val []byte) (*kv.PartitionHandle, error) {
-	seg := tablecodec.SplitIndexValue(val)
-	var handle kv.Handle
-	if len(seg.IntHandle) != 0 {
-		handle = tablecodec.DecodeIntHandleInIndexValue(seg.IntHandle)
-	}
-	if len(seg.CommonHandle) != 0 {
-		var err error
-		handle, err = kv.NewCommonHandle(seg.CommonHandle)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if len(seg.PartitionID) != 0 {
-		_, pid, err := codec.DecodeInt(seg.PartitionID)
-		if err != nil {
-			return nil, err
-		}
-		partHandle := kv.NewPartitionHandle(pid, handle)
-		return &partHandle, nil
-	}
-
-	return nil, nil
-}
-
 func fetchDuplicatedHandleForTempIndexKey(ctx context.Context, tempKey kv.Key, distinct bool,
 	txn kv.Transaction, tableID int64) (foundKey bool, dupHandle kv.Handle, err error) {
 	tempRawVal, err := getKeyInTxn(ctx, txn, tempKey)