unistack-org/micro-store-redis
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

fixup slice override
Some checks failed
build / test (push) Failing after 7s
Details
build / lint (push) Failing after 7s
Details
codeql / analyze (go) (push) Failing after 10s
Details

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2024-09-25 15:26:52 +03:00
parent f9cdd41c94
commit 256e61a437
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
redis.go
View File

@ -218,9 +218,11 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
defer cancel() defer cancel()
} }
var rkeys []string
if r.opts.Namespace != "" || options.Namespace != "" { if r.opts.Namespace != "" || options.Namespace != "" {
rkeys = make([]string, len(keys))
for idx, key := range keys { for idx, key := range keys {
keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key) rkeys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
} }
} }
@ -228,10 +230,18 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
ts := time.Now() ts := time.Now()
var rvals []interface{} var rvals []interface{}
var err error var err error
if r.cli.Client != nil { if r.opts.Namespace != "" || options.Namespace != "" {
rvals, err = r.cli.Client.MGet(ctx, keys...).Result() if r.cli.Client != nil {
rvals, err = r.cli.Client.MGet(ctx, rkeys...).Result()
} else {
rvals, err = r.cli.ClusterClient.MGet(ctx, rkeys...).Result()
}
} else { } else {
rvals, err = r.cli.ClusterClient.MGet(ctx, keys...).Result() if r.cli.Client != nil {
rvals, err = r.cli.Client.MGet(ctx, keys...).Result()
} else {
rvals, err = r.cli.ClusterClient.MGet(ctx, keys...).Result()
}
} }
setSpanError(ctx, err) setSpanError(ctx, err)
te := time.Since(ts) te := time.Since(ts)
@ -308,19 +318,29 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
defer cancel() defer cancel()
} }
var rkeys []string
if r.opts.Namespace != "" || options.Namespace != "" { if r.opts.Namespace != "" || options.Namespace != "" {
rkeys = make([]string, len(keys))
for idx, key := range keys { for idx, key := range keys {
keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key) rkeys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
} }
} }
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc() r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
ts := time.Now() ts := time.Now()
var err error var err error
if r.cli.Client != nil { if r.opts.Namespace != "" || options.Namespace != "" {
err = r.cli.Client.Del(ctx, keys...).Err() if r.cli.Client != nil {
err = r.cli.Client.Del(ctx, rkeys...).Err()
} else {
err = r.cli.ClusterClient.Del(ctx, rkeys...).Err()
}
} else { } else {
err = r.cli.ClusterClient.Del(ctx, keys...).Err() if r.cli.Client != nil {
err = r.cli.Client.Del(ctx, keys...).Err()
} else {
err = r.cli.ClusterClient.Del(ctx, keys...).Err()
}
} }
setSpanError(ctx, err) setSpanError(ctx, err)
te := time.Since(ts) te := time.Since(ts)