Merge branch 'ndyakov/feature/CAE-1313-maint-cluster' into ndyakov/CAE-1910-proxy-tests

Author: ndyakov

.github/wordlist.txt

@@ -76,3 +76,4 @@ oauth
 entraid
 MiB
 KiB
+oldstable

.github/workflows/build.yml

@@ -22,8 +22,10 @@ jobs:
           - "8.2.x" # Redis CE 8.2
           - "8.0.x" # Redis CE 8.0
         go-version:
+          - "1.21.x"
           - "1.23.x"
-          - "1.24.x"
+          - oldstable
+          - stable
 
     steps:
       - name: Set up ${{ matrix.go-version }}
@@ -78,8 +80,10 @@ jobs:
             - "8.2.x" # Redis CE 8.2
             - "8.0.x" # Redis CE 8.0
           go-version:
+            - "1.21.x"
             - "1.23.x"
-            - "1.24.x"
+            - oldstable
+            - stable
 
     steps:
       - name: Checkout code

README.md

@@ -21,13 +21,12 @@ In `go-redis` we are aiming to support the last three releases of Redis. Current
 - [Redis 8.2](https://raw.githubusercontent.com/redis/redis/8.2/00-RELEASENOTES) - using Redis CE 8.2 
 - [Redis 8.4](https://raw.githubusercontent.com/redis/redis/8.4/00-RELEASENOTES) - using Redis CE 8.4
 
-Although the `go.mod` states it requires at minimum `go 1.18`, our CI is configured to run the tests against all three
-versions of Redis and latest two versions of Go ([1.23](https://go.dev/doc/devel/release#go1.23.0),
-[1.24](https://go.dev/doc/devel/release#go1.24.0)). We observe that some modules related test may not pass with
+Although the `go.mod` states it requires at minimum `go 1.21`, our CI is configured to run the tests against all three
+versions of Redis and multiple versions of Go ([1.21](https://go.dev/doc/devel/release#go1.21.0),
+[1.23](https://go.dev/doc/devel/release#go1.23.0), oldstable, and stable). We observe that some modules related test may not pass with
 Redis Stack 7.2 and some commands are changed with Redis CE 8.0.
 Although it is not officially supported, `go-redis/v9`  should be able to work with any Redis 7.0+.
-Please do refer to the documentation and the tests if you experience any issues. We do plan to update the go version
-in the `go.mod` to `go 1.24` in one of the next releases.
+Please do refer to the documentation and the tests if you experience any issues.
 
 ## How do I Redis?
 

doctests/timeseries_tut_test.go

@@ -5,16 +5,24 @@ package example_commands_test
 import (
 	"context"
 	"fmt"
-	"maps"
 	"math"
-	"slices"
 	"sort"
 
 	"github.com/redis/go-redis/v9"
 )
 
 // HIDE_END
 
+// mapKeys returns a slice of all keys from the map (Go 1.21 compatible)
+// TODO: Once minimum Go version is upgraded to 1.23+, replace with slices.Collect(maps.Keys(m))
+func mapKeys[K comparable, V any](m map[K]V) []K {
+	keys := make([]K, 0, len(m))
+	for k := range m {
+		keys = append(keys, k)
+	}
+	return keys
+}
+
 func ExampleClient_timeseries_create() {
 	ctx := context.Background()
 
@@ -417,7 +425,7 @@ func ExampleClient_timeseries_query_multi() {
 		panic(err)
 	}
 
-	res28Keys := slices.Collect(maps.Keys(res28))
+	res28Keys := mapKeys(res28)
 	sort.Strings(res28Keys)
 
 	for _, k := range res28Keys {
@@ -457,7 +465,7 @@ func ExampleClient_timeseries_query_multi() {
 		panic(err)
 	}
 
-	res29Keys := slices.Collect(maps.Keys(res29))
+	res29Keys := mapKeys(res29)
 	sort.Strings(res29Keys)
 
 	for _, k := range res29Keys {
@@ -505,7 +513,7 @@ func ExampleClient_timeseries_query_multi() {
 		panic(err)
 	}
 
-	res30Keys := slices.Collect(maps.Keys(res30))
+	res30Keys := mapKeys(res30)
 	sort.Strings(res30Keys)
 
 	for _, k := range res30Keys {
@@ -550,7 +558,7 @@ func ExampleClient_timeseries_query_multi() {
 		panic(err)
 	}
 
-	res31Keys := slices.Collect(maps.Keys(res31))
+	res31Keys := mapKeys(res31)
 	sort.Strings(res31Keys)
 
 	for _, k := range res31Keys {
@@ -857,7 +865,7 @@ func ExampleClient_timeseries_aggmulti() {
 		panic(err)
 	}
 
-	res44Keys := slices.Collect(maps.Keys(res44))
+	res44Keys := mapKeys(res44)
 	sort.Strings(res44Keys)
 
 	for _, k := range res44Keys {
@@ -905,7 +913,7 @@ func ExampleClient_timeseries_aggmulti() {
 		panic(err)
 	}
 
-	res45Keys := slices.Collect(maps.Keys(res45))
+	res45Keys := mapKeys(res45)
 	sort.Strings(res45Keys)
 
 	for _, k := range res45Keys {

example/cluster-mget/go.mod

@@ -1,6 +1,6 @@
 module github.com/redis/go-redis/example/cluster-mget
 
-go 1.18
+go 1.21
 
 replace github.com/redis/go-redis/v9 => ../..
 

example/del-keys-without-ttl/go.mod

@@ -1,6 +1,6 @@
 module github.com/redis/go-redis/example/del-keys-without-ttl
 
-go 1.18
+go 1.21
 
 replace github.com/redis/go-redis/v9 => ../..
 

example/digest-optimistic-locking/go.mod

@@ -1,6 +1,6 @@
 module github.com/redis/go-redis/example/digest-optimistic-locking
 
-go 1.18
+go 1.21
 
 replace github.com/redis/go-redis/v9 => ../..
 

example/hll/go.mod

@@ -1,6 +1,6 @@
 module github.com/redis/go-redis/example/hll
 
-go 1.18
+go 1.21
 
 replace github.com/redis/go-redis/v9 => ../..
 

example/hset-struct/go.mod

@@ -1,6 +1,6 @@
 module github.com/redis/go-redis/example/scan-struct
 
-go 1.18
+go 1.21
 
 replace github.com/redis/go-redis/v9 => ../..
 

example/lua-scripting/go.mod

@@ -1,6 +1,6 @@
 module github.com/redis/go-redis/example/lua-scripting
 
-go 1.18
+go 1.21
 
 replace github.com/redis/go-redis/v9 => ../..