aboutsummaryrefslogtreecommitdiff
path: root/weed/storage
diff options
context:
space:
mode:
authorjustin <leyou240@live.cn>2022-04-18 10:35:43 +0800
committerjustin <leyou240@live.cn>2022-04-18 10:35:43 +0800
commit3551ca2fcf423464afb2db4b5792c22ec94c2bfd (patch)
treeee1f372e32fb03d93aeb0825ec0f068ef1fce161 /weed/storage
parentc6ec5269f4b34d79ab8e13050623501b8befda32 (diff)
downloadseaweedfs-3551ca2fcf423464afb2db4b5792c22ec94c2bfd.tar.xz
seaweedfs-3551ca2fcf423464afb2db4b5792c22ec94c2bfd.zip
enhancement: replace sort.Slice with slices.SortFunc to reduce reflection
Diffstat (limited to 'weed/storage')
-rw-r--r--weed/storage/disk_location_ec.go8
-rw-r--r--weed/storage/erasure_coding/ec_volume.go7
-rw-r--r--weed/storage/store_ec.go6
3 files changed, 9 insertions, 12 deletions
diff --git a/weed/storage/disk_location_ec.go b/weed/storage/disk_location_ec.go
index 3f56d797b..5fa5316fd 100644
--- a/weed/storage/disk_location_ec.go
+++ b/weed/storage/disk_location_ec.go
@@ -2,10 +2,10 @@ package storage
import (
"fmt"
+ "golang.org/x/exp/slices"
"os"
"path"
"regexp"
- "sort"
"strconv"
"github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
@@ -128,11 +128,9 @@ func (l *DiskLocation) loadAllEcShards() (err error) {
}
dirEntries = append(dirEntries, indexDirEntries...)
}
-
- sort.Slice(dirEntries, func(i, j int) bool {
- return dirEntries[i].Name() < dirEntries[j].Name()
+ slices.SortFunc(dirEntries, func(a, b os.DirEntry) bool {
+ return a.Name() < b.Name()
})
-
var sameVolumeShards []string
var prevVolumeId needle.VolumeId
for _, fileInfo := range dirEntries {
diff --git a/weed/storage/erasure_coding/ec_volume.go b/weed/storage/erasure_coding/ec_volume.go
index f4cde310f..4dd07ec40 100644
--- a/weed/storage/erasure_coding/ec_volume.go
+++ b/weed/storage/erasure_coding/ec_volume.go
@@ -5,9 +5,9 @@ import (
"fmt"
"github.com/chrislusf/seaweedfs/weed/pb"
"github.com/chrislusf/seaweedfs/weed/storage/volume_info"
+ "golang.org/x/exp/slices"
"math"
"os"
- "sort"
"sync"
"time"
@@ -82,9 +82,8 @@ func (ev *EcVolume) AddEcVolumeShard(ecVolumeShard *EcVolumeShard) bool {
}
}
ev.Shards = append(ev.Shards, ecVolumeShard)
- sort.Slice(ev.Shards, func(i, j int) bool {
- return ev.Shards[i].VolumeId < ev.Shards[j].VolumeId ||
- ev.Shards[i].VolumeId == ev.Shards[j].VolumeId && ev.Shards[i].ShardId < ev.Shards[j].ShardId
+ slices.SortFunc(ev.Shards, func(a, b *EcVolumeShard) bool {
+ return a.VolumeId < b.VolumeId || a.VolumeId == b.VolumeId && a.ShardId < b.ShardId
})
return true
}
diff --git a/weed/storage/store_ec.go b/weed/storage/store_ec.go
index 70e1593a0..0c9de45aa 100644
--- a/weed/storage/store_ec.go
+++ b/weed/storage/store_ec.go
@@ -4,9 +4,9 @@ import (
"context"
"fmt"
"github.com/chrislusf/seaweedfs/weed/pb"
+ "golang.org/x/exp/slices"
"io"
"os"
- "sort"
"sync"
"time"
@@ -389,8 +389,8 @@ func (s *Store) EcVolumes() (ecVolumes []*erasure_coding.EcVolume) {
}
location.ecVolumesLock.RUnlock()
}
- sort.Slice(ecVolumes, func(i, j int) bool {
- return ecVolumes[i].VolumeId > ecVolumes[j].VolumeId
+ slices.SortFunc(ecVolumes, func(a, b *erasure_coding.EcVolume) bool {
+ return a.VolumeId > b.VolumeId
})
return ecVolumes
}