Test: redis cache

pkg/cache/redis.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/gob"
 	"github.com/HFO4/cloudreve/pkg/util"
-	"github.com/garyburd/redigo/redis"
+	"github.com/gomodule/redigo/redis"
 	"strconv"
 	"time"
 )
@@ -18,6 +18,30 @@ type item struct {
 	Value interface{}
 }
 
+func serializer(value interface{}) ([]byte, error) {
+	var buffer bytes.Buffer
+	enc := gob.NewEncoder(&buffer)
+	storeValue := item{
+		Value: value,
+	}
+	err := enc.Encode(storeValue)
+	if err != nil {
+		return nil, err
+	}
+	return buffer.Bytes(), nil
+}
+
+func deserializer(value []byte) (interface{}, error) {
+	var res item
+	buffer := bytes.NewReader(value)
+	dec := gob.NewDecoder(buffer)
+	err := dec.Decode(&res)
+	if err != nil {
+		return nil, err
+	}
+	return res.Value, nil
+}
+
 // NewRedisStore 创建新的redis存储
 func NewRedisStore(size int, network, address, password, database string) *RedisStore {
 	return &RedisStore{
@@ -55,46 +79,42 @@ func (store *RedisStore) Set(key string, value interface{}) error {
 	rc := store.pool.Get()
 	defer rc.Close()
 
-	var buffer bytes.Buffer
-	enc := gob.NewEncoder(&buffer)
-	storeValue := item{
-		Value: value,
-	}
-	err := enc.Encode(storeValue)
+	serialized, err := serializer(value)
 	if err != nil {
 		return err
 	}
 
-	if rc.Err() == nil {
-		_, err := rc.Do("SET", key, buffer.Bytes())
-		if err != nil {
-			return err
-		}
-		return nil
+	if rc.Err() != nil {
+		return rc.Err()
 	}
 
-	return rc.Err()
+	_, err = rc.Do("SET", key, serialized)
+	if err != nil {
+		return err
+	}
+	return nil
+
 }
 
 // Get 取值
 func (store *RedisStore) Get(key string) (interface{}, bool) {
 	rc := store.pool.Get()
 	defer rc.Close()
+	if rc.Err() != nil {
+		return nil, false
+	}
 
 	v, err := redis.Bytes(rc.Do("GET", key))
+	if err != nil || v == nil {
+		return nil, false
+	}
+
+	finalValue, err := deserializer(v)
 	if err != nil {
 		return nil, false
 	}
 
-	var res item
-	buffer := bytes.NewReader(v)
-	dec := gob.NewDecoder(buffer)
-	err = dec.Decode(&res)
-	if err != nil {
-		return nil, false
-	}
-
-	return res.Value, true
+	return finalValue, true
 
 }
 
@@ -102,6 +122,9 @@ func (store *RedisStore) Get(key string) (interface{}, bool) {
 func (store *RedisStore) Gets(keys []string, prefix string) (map[string]interface{}, []string) {
 	rc := store.pool.Get()
 	defer rc.Close()
+	if rc.Err() != nil {
+		return nil, keys
+	}
 
 	var queryKeys = make([]string, len(keys))
 	for key, value := range keys {
@@ -117,14 +140,11 @@ func (store *RedisStore) Gets(keys []string, prefix string) (map[string]interfac
 	var missed = make([]string, 0, len(keys))
 
 	for key, value := range v {
-		var decoded item
-		buffer := bytes.NewReader(value)
-		dec := gob.NewDecoder(buffer)
-		err = dec.Decode(&decoded)
-		if err != nil || decoded.Value == nil {
+		decoded, err := deserializer(value)
+		if err != nil || decoded == nil {
 			missed = append(missed, keys[key])
 		} else {
-			res[keys[key]] = decoded.Value
+			res[keys[key]] = decoded
 		}
 	}
 	// 解码所得值
@@ -135,20 +155,18 @@ func (store *RedisStore) Gets(keys []string, prefix string) (map[string]interfac
 func (store *RedisStore) Sets(values map[string]interface{}, prefix string) error {
 	rc := store.pool.Get()
 	defer rc.Close()
+	if rc.Err() != nil {
+		return rc.Err()
+	}
 	var setValues = make(map[string]interface{})
 
 	// 编码待设置值
 	for key, value := range values {
-		var buffer bytes.Buffer
-		enc := gob.NewEncoder(&buffer)
-		storeValue := item{
-			Value: value,
-		}
-		err := enc.Encode(storeValue)
+		serialized, err := serializer(value)
 		if err != nil {
 			return err
 		}
-		setValues[prefix+key] = buffer.Bytes()
+		setValues[prefix+key] = serialized
 	}
 
 	if rc.Err() == nil {