From 8c41835d23aa427d86caf0e024a46ad0dc3748de Mon Sep 17 00:00:00 2001 From: CooooolFrog Date: Tue, 4 Jul 2023 10:51:31 +0800 Subject: [PATCH] refactor: refactor by cr --- .../batch_transfer_leader_test.go | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/server/coordinator/procedure/operation/transferleader/batch_transfer_leader_test.go b/server/coordinator/procedure/operation/transferleader/batch_transfer_leader_test.go index eabef036..35dc2d1c 100644 --- a/server/coordinator/procedure/operation/transferleader/batch_transfer_leader_test.go +++ b/server/coordinator/procedure/operation/transferleader/batch_transfer_leader_test.go @@ -57,42 +57,50 @@ func TestBatchProcedure(t *testing.T) { // Procedures with same type and version. for i := 0; i < 3; i++ { - procedures = createMockProcedure(i, 0, 0, 0, procedures) + shardWithVersion := map[storage.ShardID]uint64{} + shardWithVersion[storage.ShardID(i)] = 0 + p := CreateMockProcedure(storage.ClusterID(0), 0, 0, shardWithVersion) + procedures = append(procedures, p) } _, err := transferleader.NewBatchTransferLeaderProcedure(0, procedures) re.NoError(err) // Procedure with different clusterID for i := 0; i < 3; i++ { - createMockProcedure(i, uint64(i), 0, procedure.TransferLeader, procedures) + shardWithVersion := map[storage.ShardID]uint64{} + shardWithVersion[storage.ShardID(i)] = 0 + p := CreateMockProcedure(storage.ClusterID(i), 0, procedure.TransferLeader, shardWithVersion) + procedures = append(procedures, p) } _, err = transferleader.NewBatchTransferLeaderProcedure(0, procedures) re.Error(err) // Procedures with different type. for i := 0; i < 3; i++ { - createMockProcedure(i, 0, 0, procedure.Typ(i), procedures) + shardWithVersion := map[storage.ShardID]uint64{} + shardWithVersion[storage.ShardID(i)] = 0 + p := CreateMockProcedure(0, 0, procedure.Typ(i), shardWithVersion) + procedures = append(procedures, p) } _, err = transferleader.NewBatchTransferLeaderProcedure(0, procedures) re.Error(err) // Procedures with different version. for i := 0; i < 3; i++ { - createMockProcedure(0, 0, 0, procedure.Typ(i), procedures) + shardWithVersion := map[storage.ShardID]uint64{} + shardWithVersion[storage.ShardID(0)] = uint64(i) + p := CreateMockProcedure(0, 0, procedure.Typ(i), shardWithVersion) + procedures = append(procedures, p) } _, err = transferleader.NewBatchTransferLeaderProcedure(0, procedures) re.Error(err) } -func createMockProcedure(shardID int, clusterID uint64, clusterVersion uint64, typ procedure.Typ, procedures []procedure.Procedure) []procedure.Procedure { - shardWithVersion := map[storage.ShardID]uint64{} - shardWithVersion[storage.ShardID(shardID)] = 0 - p := mockProcedure{ - ClusterID: storage.ClusterID(clusterID), +func CreateMockProcedure(clusterID storage.ClusterID, clusterVersion uint64, typ procedure.Typ, shardWithVersion map[storage.ShardID]uint64) procedure.Procedure { + return mockProcedure{ + ClusterID: clusterID, clusterVersion: clusterVersion, typ: typ, ShardWithVersion: shardWithVersion, } - procedures = append(procedures, p) - return procedures }