From d66af122c70589a78897dfef01a46eda426977ca Mon Sep 17 00:00:00 2001 From: John Guo Date: Wed, 8 Feb 2023 19:07:05 +0800 Subject: [PATCH] fix issue #2331 (#2432) --- contrib/nosql/redis/redis_z_unit_gcache_adapter_test.go | 4 ++-- os/gcache/gcache_adapter_redis.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/nosql/redis/redis_z_unit_gcache_adapter_test.go b/contrib/nosql/redis/redis_z_unit_gcache_adapter_test.go index bc3ab29dd..e780f51b4 100644 --- a/contrib/nosql/redis/redis_z_unit_gcache_adapter_test.go +++ b/contrib/nosql/redis/redis_z_unit_gcache_adapter_test.go @@ -246,7 +246,7 @@ func Test_AdapterRedis_SetIfNotExistFunc(t *testing.T) { return 11, nil }, 0) t.AssertNil(err) - t.Assert(exist, false) + t.Assert(exist, true) }) } @@ -257,7 +257,7 @@ func Test_AdapterRedis_SetIfNotExistFuncLock(t *testing.T) { return 11, nil }, 0) t.AssertNil(err) - t.Assert(exist, false) + t.Assert(exist, true) }) } diff --git a/os/gcache/gcache_adapter_redis.go b/os/gcache/gcache_adapter_redis.go index 78198d75d..b9cb45b35 100644 --- a/os/gcache/gcache_adapter_redis.go +++ b/os/gcache/gcache_adapter_redis.go @@ -121,17 +121,17 @@ func (c *AdapterRedis) SetIfNotExist(ctx context.Context, key interface{}, value } ok, err = c.redis.SetNX(ctx, redisKey, value) if err != nil { - return false, err + return ok, err } if ok && duration > 0 { // Set the expiration. _, err = c.redis.Expire(ctx, redisKey, int64(duration.Seconds())) if err != nil { - return false, err + return ok, err } - return true, err + return ok, err } - return false, err + return ok, err } // SetIfNotExistFunc sets `key` with result of function `f` and returns true