fix redis decode, fix get multi

acoshift · Apr 9, 2017 · 3e9e0cd · 3e9e0cd
1 parent 6d48f7b
commit 3e9e0cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/cache/redis/redis.go b/cache/redis/redis.go
@@ -75,7 +75,7 @@ func (cache *Cache) GetMulti(keys []*datastore.Key, dst interface{}) error {
 			return err
 		}
 		if len(b) > 0 {
-			decode(b, reflect.Indirect(reflect.ValueOf(dst)).Index(i).Interface())
+			decode(b, reflect.Indirect(reflect.ValueOf(dst)).Index(i).Addr().Interface())
 		}
 	}
 	if cache.ExtendTTL {

diff --git a/get.go b/get.go
@@ -75,6 +75,10 @@ func (client *Client) GetByKeys(ctx context.Context, keys []*datastore.Key, dst
 		dst = rs.Interface()
 	}
 
+	if len(keys) == 0 {
+		return nil
+	}
+
 	if client.Cache != nil {
 		err := client.Cache.GetMulti(keys, dst)
 		if err == nil {
@@ -88,10 +92,12 @@ func (client *Client) GetByKeys(ctx context.Context, keys []*datastore.Key, dst
 				}
 			}
 			l := len(nfKeys)
-			nfDstRf := reflect.MakeSlice(rf.Type(), l, l)
-			err := client.getByKeys(ctx, keys, nfDstRf.Interface())
-			for i, k := range nfMap {
-				rf.Index(k).Set(nfDstRf.Index(i))
+			if l > 0 {
+				nfDstRf := reflect.MakeSlice(rf.Type(), l, l)
+				err = client.getByKeys(ctx, nfKeys, nfDstRf.Interface())
+				for i, k := range nfMap {
+					rf.Index(k).Set(nfDstRf.Index(i))
+				}
 			}
 			SetKeys(keys, dst)
 			if err != nil {