diff options
| author | chrislu <chris.lu@gmail.com> | 2024-12-19 19:23:27 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-12-19 19:25:06 -0800 |
| commit | ec155022e7e8d0f30bfcfa169248ec3ecc40e960 (patch) | |
| tree | 613416a40b45bd67bb9baf87be9843798a487914 /weed/filer | |
| parent | a1a76ccb8c3316baf269aa856ba268d53e0943ba (diff) | |
| download | seaweedfs-ec155022e7e8d0f30bfcfa169248ec3ecc40e960.tar.xz seaweedfs-ec155022e7e8d0f30bfcfa169248ec3ecc40e960.zip | |
"golang.org/x/exp/slices" => "slices" and go fmt
Diffstat (limited to 'weed/filer')
| -rw-r--r-- | weed/filer/filechunks2_test.go | 2 | ||||
| -rw-r--r-- | weed/filer/filechunks_read.go | 2 | ||||
| -rw-r--r-- | weed/filer/filer_notify.go | 2 | ||||
| -rw-r--r-- | weed/filer/meta_replay.go | 3 | ||||
| -rw-r--r-- | weed/filer/redis/universal_redis_store.go | 2 | ||||
| -rw-r--r-- | weed/filer/redis3/redis_cluster_store.go | 2 | ||||
| -rw-r--r-- | weed/filer/redis3/redis_sentinel_store.go | 2 | ||||
| -rw-r--r-- | weed/filer/redis3/redis_store.go | 2 | ||||
| -rw-r--r-- | weed/filer/stream.go | 4 |
9 files changed, 10 insertions, 11 deletions
diff --git a/weed/filer/filechunks2_test.go b/weed/filer/filechunks2_test.go index 6728aec0d..dfa971f86 100644 --- a/weed/filer/filechunks2_test.go +++ b/weed/filer/filechunks2_test.go @@ -2,8 +2,8 @@ package filer import ( "github.com/stretchr/testify/assert" - "golang.org/x/exp/slices" "log" + "slices" "testing" "github.com/seaweedfs/seaweedfs/weed/glog" diff --git a/weed/filer/filechunks_read.go b/weed/filer/filechunks_read.go index 11b297a3c..756e18b34 100644 --- a/weed/filer/filechunks_read.go +++ b/weed/filer/filechunks_read.go @@ -3,7 +3,7 @@ package filer import ( "container/list" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" - "golang.org/x/exp/slices" + "slices" ) func readResolvedChunks(chunks []*filer_pb.FileChunk, startOffset int64, stopOffset int64) (visibles *IntervalList[*VisibleInterval]) { diff --git a/weed/filer/filer_notify.go b/weed/filer/filer_notify.go index 621d4c227..4c99da72a 100644 --- a/weed/filer/filer_notify.go +++ b/weed/filer/filer_notify.go @@ -123,7 +123,7 @@ func (f *Filer) ReadPersistedLogBuffer(startPosition log_buffer.MessagePosition, err = fmt.Errorf("reading from persisted logs: %v", visitErr) return } - var logEntry *filer_pb.LogEntry + var logEntry *filer_pb.LogEntry for { logEntry, visitErr = visitor.GetNext() if visitErr != nil { diff --git a/weed/filer/meta_replay.go b/weed/filer/meta_replay.go index 0432e17de..f6b009e92 100644 --- a/weed/filer/meta_replay.go +++ b/weed/filer/meta_replay.go @@ -37,10 +37,9 @@ func Replay(filerStore FilerStore, resp *filer_pb.SubscribeMetadataResponse) err return nil } - // ParallelProcessDirectoryStructure processes each entry in parallel, and also ensure parent directories are processed first. // This also assumes the parent directories are in the entryChan already. -func ParallelProcessDirectoryStructure(entryChan chan *Entry, concurrency int, eachEntryFn func(entry *Entry)(error)) (firstErr error) { +func ParallelProcessDirectoryStructure(entryChan chan *Entry, concurrency int, eachEntryFn func(entry *Entry) error) (firstErr error) { executors := util.NewLimitedConcurrentExecutor(concurrency) diff --git a/weed/filer/redis/universal_redis_store.go b/weed/filer/redis/universal_redis_store.go index 8c8d6539c..5e7c850d0 100644 --- a/weed/filer/redis/universal_redis_store.go +++ b/weed/filer/redis/universal_redis_store.go @@ -3,7 +3,7 @@ package redis import ( "context" "fmt" - "golang.org/x/exp/slices" + "slices" "strings" "time" diff --git a/weed/filer/redis3/redis_cluster_store.go b/weed/filer/redis3/redis_cluster_store.go index a8858bfa9..cb8c1896d 100644 --- a/weed/filer/redis3/redis_cluster_store.go +++ b/weed/filer/redis3/redis_cluster_store.go @@ -1,9 +1,9 @@ package redis3 import ( - "github.com/redis/go-redis/v9" "github.com/go-redsync/redsync/v4" "github.com/go-redsync/redsync/v4/redis/goredis/v9" + "github.com/redis/go-redis/v9" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/util" ) diff --git a/weed/filer/redis3/redis_sentinel_store.go b/weed/filer/redis3/redis_sentinel_store.go index 2e0a8d4ae..b9b0354e0 100644 --- a/weed/filer/redis3/redis_sentinel_store.go +++ b/weed/filer/redis3/redis_sentinel_store.go @@ -3,9 +3,9 @@ package redis3 import ( "time" - "github.com/redis/go-redis/v9" "github.com/go-redsync/redsync/v4" "github.com/go-redsync/redsync/v4/redis/goredis/v9" + "github.com/redis/go-redis/v9" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/util" ) diff --git a/weed/filer/redis3/redis_store.go b/weed/filer/redis3/redis_store.go index 339115563..fbcb6d10d 100644 --- a/weed/filer/redis3/redis_store.go +++ b/weed/filer/redis3/redis_store.go @@ -1,9 +1,9 @@ package redis3 import ( - "github.com/redis/go-redis/v9" "github.com/go-redsync/redsync/v4" "github.com/go-redsync/redsync/v4/redis/goredis/v9" + "github.com/redis/go-redis/v9" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/util" ) diff --git a/weed/filer/stream.go b/weed/filer/stream.go index fdb443b53..2f55e3e44 100644 --- a/weed/filer/stream.go +++ b/weed/filer/stream.go @@ -9,14 +9,14 @@ import ( "sync" "time" - "golang.org/x/exp/slices" + "slices" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/seaweedfs/seaweedfs/weed/wdclient" util_http "github.com/seaweedfs/seaweedfs/weed/util/http" + "github.com/seaweedfs/seaweedfs/weed/wdclient" ) var getLookupFileIdBackoffSchedule = []time.Duration{ |
