From ea5fce98104ac64b17a21c979322259d82f57cea Mon Sep 17 00:00:00 2001
From: Sydonian <794346190@qq.com>
Date: Mon, 11 Mar 2024 11:27:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/distlock/internal/acquire_actor.go      | 6 +++---
 pkgs/distlock/internal/service_info_actor.go | 4 ++--
 pkgs/task/manager.go                         | 6 +++---
 pkgs/task/task.go                            | 4 ++--
 utils/io/join.go                             | 4 ++--
 utils/{lo => lo2}/lo.go                      | 2 +-
 utils/{lo => lo2}/lo_test.go                 | 2 +-
 utils/{sort => sort2}/sort.go                | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)
 rename utils/{lo => lo2}/lo.go (96%)
 rename utils/{lo => lo2}/lo_test.go (99%)
 rename utils/{sort => sort2}/sort.go (98%)

diff --git a/pkgs/distlock/internal/acquire_actor.go b/pkgs/distlock/internal/acquire_actor.go
index 78589b8..d53f199 100644
--- a/pkgs/distlock/internal/acquire_actor.go
+++ b/pkgs/distlock/internal/acquire_actor.go
@@ -10,7 +10,7 @@ import (
 
 	"gitlink.org.cn/cloudream/common/pkgs/future"
 	"gitlink.org.cn/cloudream/common/pkgs/logger"
-	mylo "gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 	"gitlink.org.cn/cloudream/common/utils/serder"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/concurrency"
@@ -84,7 +84,7 @@ func (a *AcquireActor) Acquire(ctx context.Context, req LockRequest) (string, er
 			return
 		}
 
-		a.acquirings = mylo.Remove(a.acquirings, info)
+		a.acquirings = lo2.Remove(a.acquirings, info)
 		if info.LastErr != nil {
 			info.Callback.SetError(info.LastErr)
 		} else {
@@ -213,7 +213,7 @@ func (a *AcquireActor) doAcquiring() error {
 		}
 
 		req.Callback.SetValue(reqData.ID)
-		a.acquirings = mylo.RemoveAt(a.acquirings, i)
+		a.acquirings = lo2.RemoveAt(a.acquirings, i)
 		break
 	}
 
diff --git a/pkgs/distlock/internal/service_info_actor.go b/pkgs/distlock/internal/service_info_actor.go
index a940574..dcbac71 100644
--- a/pkgs/distlock/internal/service_info_actor.go
+++ b/pkgs/distlock/internal/service_info_actor.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/google/uuid"
 	"gitlink.org.cn/cloudream/common/pkgs/logger"
-	mylo "gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 	"gitlink.org.cn/cloudream/common/utils/serder"
 	clientv3 "go.etcd.io/etcd/client/v3"
 )
@@ -191,6 +191,6 @@ func (a *ServiceInfoActor) OnLockRequestEvent(evt LockRequestEvent) {
 	if evt.IsLocking {
 		status.LockRequestIDs = append(status.LockRequestIDs, evt.Data.ID)
 	} else {
-		status.LockRequestIDs = mylo.Remove(status.LockRequestIDs, evt.Data.ID)
+		status.LockRequestIDs = lo2.Remove(status.LockRequestIDs, evt.Data.ID)
 	}
 }
diff --git a/pkgs/task/manager.go b/pkgs/task/manager.go
index 9f7b276..b925e18 100644
--- a/pkgs/task/manager.go
+++ b/pkgs/task/manager.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	mylo "gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 )
 
 type Manager[TCtx any] struct {
@@ -108,12 +108,12 @@ func (m *Manager[TCtx]) executeTask(task *Task[TCtx]) {
 
 			// 立刻删除任务，或者延迟一段时间再删除
 			if opt.RemovingDelay == 0 {
-				m.tasks = mylo.Remove(m.tasks, task)
+				m.tasks = lo2.Remove(m.tasks, task)
 			} else {
 				go func() {
 					<-time.After(opt.RemovingDelay)
 					m.lock.Lock()
-					m.tasks = mylo.Remove(m.tasks, task)
+					m.tasks = lo2.Remove(m.tasks, task)
 					m.lock.Unlock()
 				}()
 			}
diff --git a/pkgs/task/task.go b/pkgs/task/task.go
index 7f6ff35..2210f86 100644
--- a/pkgs/task/task.go
+++ b/pkgs/task/task.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	mylo "gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 )
 
 type CompleteOption struct {
@@ -82,7 +82,7 @@ func (t *Task[TCtx]) WaitTimeout(timeout time.Duration) bool {
 	select {
 	case <-time.After(timeout):
 		t.waiterLock.Lock()
-		t.waiters = mylo.Remove(t.waiters, waiter)
+		t.waiters = lo2.Remove(t.waiters, waiter)
 		t.waiterLock.Unlock()
 
 		return false
diff --git a/utils/io/join.go b/utils/io/join.go
index 09c294e..cbd1a37 100644
--- a/utils/io/join.go
+++ b/utils/io/join.go
@@ -3,7 +3,7 @@ package io
 import (
 	"io"
 
-	"gitlink.org.cn/cloudream/common/utils/lo"
+	"gitlink.org.cn/cloudream/common/utils/lo2"
 	"gitlink.org.cn/cloudream/common/utils/math"
 )
 
@@ -81,7 +81,7 @@ func (s *chunkedJoin) Read(buf []byte) (int, error) {
 	}
 
 	if err == io.EOF {
-		s.inputs = lo.RemoveAt(s.inputs, s.currentInput)
+		s.inputs = lo2.RemoveAt(s.inputs, s.currentInput)
 		// 此处不需要+1
 		if len(s.inputs) > 0 {
 			s.currentInput = s.currentInput % len(s.inputs)
diff --git a/utils/lo/lo.go b/utils/lo2/lo.go
similarity index 96%
rename from utils/lo/lo.go
rename to utils/lo2/lo.go
index 1852af3..f399ed7 100644
--- a/utils/lo/lo.go
+++ b/utils/lo2/lo.go
@@ -1,4 +1,4 @@
-package lo
+package lo2
 
 import "github.com/samber/lo"
 
diff --git a/utils/lo/lo_test.go b/utils/lo2/lo_test.go
similarity index 99%
rename from utils/lo/lo_test.go
rename to utils/lo2/lo_test.go
index b6ff303..9182cb7 100644
--- a/utils/lo/lo_test.go
+++ b/utils/lo2/lo_test.go
@@ -1,4 +1,4 @@
-package lo
+package lo2
 
 import (
 	"testing"
diff --git a/utils/sort/sort.go b/utils/sort2/sort.go
similarity index 98%
rename from utils/sort/sort.go
rename to utils/sort2/sort.go
index f469e0b..d594352 100644
--- a/utils/sort/sort.go
+++ b/utils/sort2/sort.go
@@ -1,4 +1,4 @@
-package sort
+package sort2
 
 import (
 	"sort"