Merge remote-tracking branch 'origin/master' into damon/cache-setnx

# Conflicts:
#	cache/redis/client_interface.go

cache/redis/client_interface.go

@@ -15,6 +15,7 @@ type redisClient interface {
 	Set(ctx context.Context, key string, value interface{}, expiration time.Duration) *redis.StatusCmd
 	Del(ctx context.Context, keys ...string) *redis.IntCmd
 	Pipeline() redis.Pipeliner
+	Watch(ctx context.Context, fn func(tx *redis.Tx) error, keys ...string) error
 	SetNX(ctx context.Context, key string, value interface{}, expiration time.Duration) *redis.BoolCmd
 	SetXX(ctx context.Context, key string, value interface{}, expiration time.Duration) *redis.BoolCmd
 

cache/redis/redis.go

@@ -234,6 +234,10 @@ func (r *Redis) Delete(ctx context.Context, key string) error {
 	return nil
 }
 
+func (r *Redis) Watch(ctx context.Context, fn func(tx *redis.Tx) error, keys ...string) error {
+	return r.client.Watch(ctx, fn, keys...)
+}
+
 func (r *Redis) IsAvailable(ctx context.Context) bool {
 	return r.client.Ping(ctx).Err() == nil
 }

cache/redis/redis_test.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/alicebob/miniredis/v2"
+	"github.com/redis/go-redis/v9"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -214,6 +215,40 @@ func TestRedis_Delete(t *testing.T) {
 	}
 }
 
+func TestRedis_Watch(t *testing.T) {
+	redisInitFns := []redisInitFn{redisInit, redisClusterInit}
+	for _, redisInit := range redisInitFns {
+		t.Run("", func(t *testing.T) {
+			r, err := redisInit(t)
+			assert.Nil(t, err)
+
+			ctx := context.TODO()
+			key := "test"
+			err = r.Watch(ctx, func(tx *redis.Tx) error {
+				n, err := tx.Get(ctx, key).Int()
+				if err != nil && err != redis.Nil {
+					return err
+				}
+
+				// Actual operation (local in optimistic lock).
+				n++
+
+				// Operation is commited only if the watched keys remain unchanged.
+				_, err = tx.TxPipelined(ctx, func(pipe redis.Pipeliner) error {
+					pipe.Set(ctx, key, fmt.Sprintf("%d", n), 0)
+					return nil
+				})
+				return err
+			}, key)
+			assert.Nil(t, err)
+
+			newValue, err := r.GetBytes(context.TODO(), key)
+			assert.Nil(t, err)
+			assert.Equal(t, "1", string(newValue))
+		})
+	}
+}
+
 func TestRedis_IsAvailable(t *testing.T) {
 	redisInitFns := []redisInitFn{redisInit, redisClusterInit}
 	for _, redisInit := range redisInitFns {