Revert "Merge branch 'master' of https://github.com/seaweedfs/seaweedfs"

This reverts commit 2e5aa06026, reversing
changes made to 4d414f54a2.

weed/storage/disk_location_ec.go

@@ -7,7 +7,6 @@ import (
 	"path"
 	"regexp"
 	"strconv"
-	"strings"
 
 	"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
 	"github.com/seaweedfs/seaweedfs/weed/storage/needle"
@@ -145,8 +144,8 @@ func (l *DiskLocation) loadAllEcShards() (err error) {
 		}
 		dirEntries = append(dirEntries, indexDirEntries...)
 	}
-	slices.SortFunc(dirEntries, func(a, b os.DirEntry) int {
-		return strings.Compare(a.Name(), b.Name())
+	slices.SortFunc(dirEntries, func(a, b os.DirEntry) bool {
+		return a.Name() < b.Name()
 	})
 	var sameVolumeShards []string
 	var prevVolumeId needle.VolumeId

weed/storage/erasure_coding/ec_volume.go

@@ -84,11 +84,8 @@ func (ev *EcVolume) AddEcVolumeShard(ecVolumeShard *EcVolumeShard) bool {
 		}
 	}
 	ev.Shards = append(ev.Shards, ecVolumeShard)
-	slices.SortFunc(ev.Shards, func(a, b *EcVolumeShard) int {
-		if a.VolumeId != b.VolumeId {
-			return int(a.VolumeId - b.VolumeId)
-		}
-		return int(a.ShardId - b.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
 }

weed/storage/store_ec.go

@@ -400,8 +400,8 @@ func (s *Store) EcVolumes() (ecVolumes []*erasure_coding.EcVolume) {
 		}
 		location.ecVolumesLock.RUnlock()
 	}
-	slices.SortFunc(ecVolumes, func(a, b *erasure_coding.EcVolume) int {
-		return int(b.VolumeId - a.VolumeId)
+	slices.SortFunc(ecVolumes, func(a, b *erasure_coding.EcVolume) bool {
+		return a.VolumeId > b.VolumeId
 	})
 	return ecVolumes
 }