Skip to content

Commit

Permalink
*: fix compiler warning
Browse files Browse the repository at this point in the history
Signed-off-by: BornChanger <[email protected]>
  • Loading branch information
BornChanger committed Jun 21, 2023
1 parent 626f631 commit 3a31dfa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,7 @@ func sortSnapshotBackups(backupsList []*v1alpha1.VolumeBackup) []*v1alpha1.Volum
// it's for test only now
func sortAllSnapshotBackups(backupsList []*v1alpha1.VolumeBackup) []*v1alpha1.VolumeBackup {
var ascBackupList = make([]*v1alpha1.VolumeBackup, 0)

for _, backup := range backupsList {
ascBackupList = append(ascBackupList, backup)
}
ascBackupList = append(ascBackupList, backupsList...)

sort.Slice(ascBackupList, func(i, j int) bool {
return ascBackupList[i].CreationTimestamp.Unix() < ascBackupList[j].CreationTimestamp.Unix()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package backupschedule
import (
"context"
"fmt"
old_v1alpha1 "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
oldv1alpha1 "github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
"strconv"
"testing"
"time"
Expand All @@ -43,7 +43,7 @@ func TestManager(t *testing.T) {
bs.Namespace = "ns"
bs.Name = "bsname"
bs.Spec.BackupTemplate.Template.BR = &v1alpha1.BRConfig{}
bs.Spec.BackupTemplate.Template.S3 = &old_v1alpha1.S3StorageProvider{}
bs.Spec.BackupTemplate.Template.S3 = &oldv1alpha1.S3StorageProvider{}

// test pause
bs.Spec.Pause = true
Expand Down Expand Up @@ -204,7 +204,7 @@ func TestBuildBackup(t *testing.T) {

// test BR != nil
bs.Spec.BackupTemplate.Template.BR = &v1alpha1.BRConfig{}
bs.Spec.BackupTemplate.Template.S3 = &old_v1alpha1.S3StorageProvider{}
bs.Spec.BackupTemplate.Template.S3 = &oldv1alpha1.S3StorageProvider{}

bk.Spec.Template.BR = bs.Spec.BackupTemplate.Template.BR.DeepCopy()
bk.Spec.Template.S3 = bs.Spec.BackupTemplate.Template.S3.DeepCopy()
Expand Down

0 comments on commit 3a31dfa

Please sign in to comment.