修改包名

agent/internal/task/storage_load_package.go

@@ -15,7 +15,7 @@ import (
 	cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
 	myio "gitlink.org.cn/cloudream/common/utils/io"
 	myref "gitlink.org.cn/cloudream/common/utils/reflect"
-	mysort "gitlink.org.cn/cloudream/common/utils/sort"
+	"gitlink.org.cn/cloudream/common/utils/sort2"
 	"gitlink.org.cn/cloudream/storage/common/consts"
 	stgglb "gitlink.org.cn/cloudream/storage/common/globals"
 	stgmod "gitlink.org.cn/cloudream/storage/common/models"
@@ -290,8 +290,8 @@ func (t *StorageLoadPackage) sortDownloadNodes(coorCli *coormq.Client, obj stgmo
 		node.Blocks = append(node.Blocks, b)
 	}
 
-	return mysort.Sort(lo.Values(downloadNodeMap), func(left, right *downloadNodeInfo) int {
-		return mysort.Cmp(left.Distance, right.Distance)
+	return sort2.Sort(lo.Values(downloadNodeMap), func(left, right *downloadNodeInfo) int {
+		return sort2.Cmp(left.Distance, right.Distance)
 	}), nil
 }
 

common/pkgs/distlock/lockprovider/ipfs_lock.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"gitlink.org.cn/cloudream/common/pkgs/distlock"
-	mylo "gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 )
 
 const (
@@ -129,9 +129,9 @@ func (l *IPFSNodeLock) Lock(reqID string, lock distlock.Lock) error {
 func (l *IPFSNodeLock) Unlock(reqID string, lock distlock.Lock) error {
 	switch lock.Name {
 	case IPFSBuzyLock:
-		l.buzyReqIDs = mylo.Remove(l.buzyReqIDs, reqID)
+		l.buzyReqIDs = lo2.Remove(l.buzyReqIDs, reqID)
 	case IPFSGCLock:
-		l.gcReqIDs = mylo.Remove(l.gcReqIDs, reqID)
+		l.gcReqIDs = lo2.Remove(l.gcReqIDs, reqID)
 	default:
 		return fmt.Errorf("unknow lock name: %s", lock.Name)
 	}

common/pkgs/distlock/lockprovider/metadata_lock.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/samber/lo"
 	"gitlink.org.cn/cloudream/common/pkgs/distlock"
-	mylo "gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 )
 
 const (
@@ -96,10 +96,10 @@ func (l *MetadataLock) removeElementLock(lock distlock.Lock, locks []*metadataEl
 		return locks
 	}
 
-	lck.requestIDs = mylo.Remove(lck.requestIDs, reqID)
+	lck.requestIDs = lo2.Remove(lck.requestIDs, reqID)
 
 	if len(lck.requestIDs) == 0 {
-		locks = mylo.RemoveAt(locks, index)
+		locks = lo2.RemoveAt(locks, index)
 	}
 
 	return locks

common/pkgs/distlock/lockprovider/storage_lock.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"gitlink.org.cn/cloudream/common/pkgs/distlock"
-	mylo "gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 )
 
 const (
@@ -129,9 +129,9 @@ func (l *StorageNodeLock) Lock(reqID string, lock distlock.Lock) error {
 func (l *StorageNodeLock) Unlock(reqID string, lock distlock.Lock) error {
 	switch lock.Name {
 	case StorageBuzyLock:
-		l.buzyReqIDs = mylo.Remove(l.buzyReqIDs, reqID)
+		l.buzyReqIDs = lo2.Remove(l.buzyReqIDs, reqID)
 	case StorageGCLock:
-		l.gcReqIDs = mylo.Remove(l.gcReqIDs, reqID)
+		l.gcReqIDs = lo2.Remove(l.gcReqIDs, reqID)
 	default:
 		return fmt.Errorf("unknow lock name: %s", lock.Name)
 	}

common/pkgs/distlock/reqbuilder/lock_request_builder.go

@@ -2,7 +2,7 @@ package reqbuilder
 
 import (
 	"gitlink.org.cn/cloudream/common/pkgs/distlock"
-	mylo "gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 )
 
 type LockRequestBuilder struct {
@@ -15,7 +15,7 @@ func NewBuilder() *LockRequestBuilder {
 
 func (b *LockRequestBuilder) Build() distlock.LockRequest {
 	return distlock.LockRequest{
-		Locks: mylo.ArrayClone(b.locks),
+		Locks: lo2.ArrayClone(b.locks),
 	}
 }
 

common/pkgs/ioswitch/switch.go

@@ -8,7 +8,7 @@ import (
 
 	"gitlink.org.cn/cloudream/common/pkgs/future"
 	"gitlink.org.cn/cloudream/common/pkgs/logger"
-	"gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 )
 
 var ErrPlanFinished = errors.New("plan is finished")
@@ -232,7 +232,7 @@ func (s *Switch) StreamReady(planID PlanID, stream Stream) {
 			return
 		}
 
-		plan.waittings = lo.RemoveAt(plan.waittings, i)
+		plan.waittings = lo2.RemoveAt(plan.waittings, i)
 		wa.Complete()
 		return
 	}

common/pkgs/iterator/download_object_iterator.go

@@ -13,7 +13,7 @@ import (
 	cdssdk "gitlink.org.cn/cloudream/common/sdks/storage"
 
 	myio "gitlink.org.cn/cloudream/common/utils/io"
-	mysort "gitlink.org.cn/cloudream/common/utils/sort"
+	"gitlink.org.cn/cloudream/common/utils/sort2"
 	"gitlink.org.cn/cloudream/storage/common/consts"
 	stgglb "gitlink.org.cn/cloudream/storage/common/globals"
 	stgmod "gitlink.org.cn/cloudream/storage/common/models"
@@ -267,8 +267,8 @@ func (iter *DownloadObjectIterator) sortDownloadNodes(obj stgmodels.ObjectDetail
 		node.Blocks = append(node.Blocks, b)
 	}
 
-	return mysort.Sort(lo.Values(downloadNodeMap), func(left, right *DownloadNodeInfo) int {
-		return mysort.Cmp(left.Distance, right.Distance)
+	return sort2.Sort(lo.Values(downloadNodeMap), func(left, right *DownloadNodeInfo) int {
+		return sort2.Cmp(left.Distance, right.Distance)
 	}), nil
 }