aboutsummaryrefslogtreecommitdiff
path: root/weed/filer/redis3
diff options
context:
space:
mode:
Diffstat (limited to 'weed/filer/redis3')
-rw-r--r--weed/filer/redis3/ItemList.go7
-rw-r--r--weed/filer/redis3/item_list_serde.go2
-rw-r--r--weed/filer/redis3/kv_directory_children.go3
-rw-r--r--weed/filer/redis3/kv_directory_children_test.go5
-rw-r--r--weed/filer/redis3/redis_cluster_store.go4
-rw-r--r--weed/filer/redis3/redis_sentinel_store.go4
-rw-r--r--weed/filer/redis3/redis_store.go4
-rw-r--r--weed/filer/redis3/skiplist_element_store.go3
-rw-r--r--weed/filer/redis3/universal_redis_store.go2
-rw-r--r--weed/filer/redis3/universal_redis_store_kv.go2
10 files changed, 16 insertions, 20 deletions
diff --git a/weed/filer/redis3/ItemList.go b/weed/filer/redis3/ItemList.go
index cb6043a78..c576cbeb4 100644
--- a/weed/filer/redis3/ItemList.go
+++ b/weed/filer/redis3/ItemList.go
@@ -4,8 +4,7 @@ import (
"bytes"
"context"
"fmt"
-
- "github.com/redis/go-redis/v9"
+ "github.com/go-redis/redis/v8"
"github.com/seaweedfs/seaweedfs/weed/util/skiplist"
)
@@ -400,9 +399,9 @@ func (nl *ItemList) NodeSize(node *skiplist.SkipListElementReference) int {
func (nl *ItemList) NodeAddMember(node *skiplist.SkipListElementReference, names ...string) error {
key := fmt.Sprintf("%s%dm", nl.prefix, node.ElementPointer)
- var members []redis.Z
+ var members []*redis.Z
for _, name := range names {
- members = append(members, redis.Z{
+ members = append(members, &redis.Z{
Score: 0,
Member: name,
})
diff --git a/weed/filer/redis3/item_list_serde.go b/weed/filer/redis3/item_list_serde.go
index f4410b61b..e71243838 100644
--- a/weed/filer/redis3/item_list_serde.go
+++ b/weed/filer/redis3/item_list_serde.go
@@ -1,7 +1,7 @@
package redis3
import (
- "github.com/redis/go-redis/v9"
+ "github.com/go-redis/redis/v8"
"github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/util/skiplist"
"google.golang.org/protobuf/proto"
diff --git a/weed/filer/redis3/kv_directory_children.go b/weed/filer/redis3/kv_directory_children.go
index d496eae01..422500ed7 100644
--- a/weed/filer/redis3/kv_directory_children.go
+++ b/weed/filer/redis3/kv_directory_children.go
@@ -3,8 +3,7 @@ package redis3
import (
"context"
"fmt"
-
- "github.com/redis/go-redis/v9"
+ "github.com/go-redis/redis/v8"
"github.com/seaweedfs/seaweedfs/weed/glog"
)
diff --git a/weed/filer/redis3/kv_directory_children_test.go b/weed/filer/redis3/kv_directory_children_test.go
index 600195e31..9d7acacf1 100644
--- a/weed/filer/redis3/kv_directory_children_test.go
+++ b/weed/filer/redis3/kv_directory_children_test.go
@@ -3,12 +3,11 @@ package redis3
import (
"context"
"fmt"
+ "github.com/go-redis/redis/v8"
+ "github.com/stvp/tempredis"
"strconv"
"testing"
"time"
-
- "github.com/redis/go-redis/v9"
- "github.com/stvp/tempredis"
)
var names = []string{
diff --git a/weed/filer/redis3/redis_cluster_store.go b/weed/filer/redis3/redis_cluster_store.go
index cb8c1896d..1efa8e9b0 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/go-redis/redis/v8"
"github.com/go-redsync/redsync/v4"
- "github.com/go-redsync/redsync/v4/redis/goredis/v9"
- "github.com/redis/go-redis/v9"
+ "github.com/go-redsync/redsync/v4/redis/goredis/v8"
"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 b9b0354e0..4135d9956 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/go-redis/redis/v8"
"github.com/go-redsync/redsync/v4"
- "github.com/go-redsync/redsync/v4/redis/goredis/v9"
- "github.com/redis/go-redis/v9"
+ "github.com/go-redsync/redsync/v4/redis/goredis/v8"
"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 fbcb6d10d..9b98459e6 100644
--- a/weed/filer/redis3/redis_store.go
+++ b/weed/filer/redis3/redis_store.go
@@ -1,9 +1,9 @@
package redis3
import (
+ "github.com/go-redis/redis/v8"
"github.com/go-redsync/redsync/v4"
- "github.com/go-redsync/redsync/v4/redis/goredis/v9"
- "github.com/redis/go-redis/v9"
+ "github.com/go-redsync/redsync/v4/redis/goredis/v8"
"github.com/seaweedfs/seaweedfs/weed/filer"
"github.com/seaweedfs/seaweedfs/weed/util"
)
diff --git a/weed/filer/redis3/skiplist_element_store.go b/weed/filer/redis3/skiplist_element_store.go
index 834e18718..b589e3e77 100644
--- a/weed/filer/redis3/skiplist_element_store.go
+++ b/weed/filer/redis3/skiplist_element_store.go
@@ -3,8 +3,7 @@ package redis3
import (
"context"
"fmt"
-
- "github.com/redis/go-redis/v9"
+ "github.com/go-redis/redis/v8"
"github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/util/skiplist"
"google.golang.org/protobuf/proto"
diff --git a/weed/filer/redis3/universal_redis_store.go b/weed/filer/redis3/universal_redis_store.go
index 51675d971..2fb9a5b3f 100644
--- a/weed/filer/redis3/universal_redis_store.go
+++ b/weed/filer/redis3/universal_redis_store.go
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
- "github.com/redis/go-redis/v9"
+ "github.com/go-redis/redis/v8"
redsync "github.com/go-redsync/redsync/v4"
"github.com/seaweedfs/seaweedfs/weed/filer"
diff --git a/weed/filer/redis3/universal_redis_store_kv.go b/weed/filer/redis3/universal_redis_store_kv.go
index fd665d5d4..280eb4a96 100644
--- a/weed/filer/redis3/universal_redis_store_kv.go
+++ b/weed/filer/redis3/universal_redis_store_kv.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "github.com/redis/go-redis/v9"
+ "github.com/go-redis/redis/v8"
"github.com/seaweedfs/seaweedfs/weed/filer"
)