Upgrading server dependancies (#8154)

4 files changed, 11 insertions, 25 deletions

diff --git a/vendor/github.com/go-redis/redis/internal/hashtag/hashtag.go b/vendor/github.com/go-redis/redis/internal/hashtag/hashtag.go
index 2866488e5..8c7ebbfa6 100644
--- a/vendor/github.com/go-redis/redis/internal/hashtag/hashtag.go
+++ b/vendor/github.com/go-redis/redis/internal/hashtag/hashtag.go
@@ -55,13 +55,17 @@ func Key(key string) string {
 	return key
 }
 
+func RandomSlot() int {
+	return rand.Intn(SlotNumber)
+}
+
 // hashSlot returns a consistent slot number between 0 and 16383
 // for any given string key.
 func Slot(key string) int {
-	key = Key(key)
 	if key == "" {
-		return rand.Intn(SlotNumber)
+		return RandomSlot()
 	}
+	key = Key(key)
 	return int(crc16sum(key)) % SlotNumber
 }
 
diff --git a/vendor/github.com/go-redis/redis/internal/proto/scan.go b/vendor/github.com/go-redis/redis/internal/proto/scan.go
index 03c8b59aa..0329ffd99 100644
--- a/vendor/github.com/go-redis/redis/internal/proto/scan.go
+++ b/vendor/github.com/go-redis/redis/internal/proto/scan.go
@@ -123,8 +123,9 @@ func ScanSlice(data []string, slice interface{}) error {
 	next := internal.MakeSliceNextElemFunc(v)
 	for i, s := range data {
 		elem := next()
-		if err := Scan(internal.StringToBytes(s), elem.Addr().Interface()); err != nil {
-			return fmt.Errorf("redis: ScanSlice(index=%d value=%q) failed: %s", i, s, err)
+		if err := Scan([]byte(s), elem.Addr().Interface()); err != nil {
+			err = fmt.Errorf("redis: ScanSlice index=%d value=%q failed: %s", i, s, err)
+			return err
 		}
 	}
 
diff --git a/vendor/github.com/go-redis/redis/internal/safe.go b/vendor/github.com/go-redis/redis/internal/safe.go
index 870fe541f..dc5f4cc8a 100644
--- a/vendor/github.com/go-redis/redis/internal/safe.go
+++ b/vendor/github.com/go-redis/redis/internal/safe.go
@@ -5,7 +5,3 @@ package internal
 func BytesToString(b []byte) string {
 	return string(b)
 }
-
-func StringToBytes(s string) []byte {
-	return []byte(s)
-}
diff --git a/vendor/github.com/go-redis/redis/internal/unsafe.go b/vendor/github.com/go-redis/redis/internal/unsafe.go
index c18b25c17..3ae48c14b 100644
--- a/vendor/github.com/go-redis/redis/internal/unsafe.go
+++ b/vendor/github.com/go-redis/redis/internal/unsafe.go
@@ -3,25 +3,10 @@
 package internal
 
 import (
-	"reflect"
 	"unsafe"
 )
 
+// BytesToString converts byte slice to string.
 func BytesToString(b []byte) string {
-	bytesHeader := (*reflect.SliceHeader)(unsafe.Pointer(&b))
-	strHeader := reflect.StringHeader{
-		Data: bytesHeader.Data,
-		Len:  bytesHeader.Len,
-	}
-	return *(*string)(unsafe.Pointer(&strHeader))
-}
-
-func StringToBytes(s string) []byte {
-	sh := (*reflect.StringHeader)(unsafe.Pointer(&s))
-	bh := reflect.SliceHeader{
-		Data: sh.Data,
-		Len:  sh.Len,
-		Cap:  sh.Len,
-	}
-	return *(*[]byte)(unsafe.Pointer(&bh))
+	return *(*string)(unsafe.Pointer(&b))
 }