wip

Author: ndyakov

.github/actions/run-tests/action.yml

@@ -22,6 +22,7 @@ runs:
       run: |
         set -e
         redis_major_version=$(echo "$REDIS_VERSION" | grep -oP '^\d+')
+        redis_version_np=$(echo "$REDIS_VERSION" | grep -oP '^\d+.\d+')
         if (( redis_major_version < 8 )); then
           echo "Using redis-stack for module tests"
         else
@@ -36,7 +37,7 @@ runs:
         )
         
         if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
-          echo "REDIS_MAJOR_VERSION=${redis_major_version}" >> $GITHUB_ENV
+          echo "REDIS_VERSION=${redis_version_np}" >> $GITHUB_ENV
           echo "REDIS_IMAGE=redis:${{ inputs.redis-version }}" >> $GITHUB_ENV
           echo "CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test:${redis_version_mapping[$REDIS_VERSION]}" >> $GITHUB_ENV
         else
@@ -58,5 +59,4 @@ runs:
         --ginkgo.skip-file="sentinel_test.go" \
         --ginkgo.skip-file="pubsub_test.go" \
         --ginkgo.skip-file="gears_commands_test.go" \
-        --ginkgo.label-filter="!NonRedisEnterprise"
       shell: bash

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.21.x, 1.22.x, 1.23.x]
+        go-version: [1.22.x, 1.23.x]
 
     steps:
       - name: Set up ${{ matrix.go-version }}
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.21.x, 1.23.x]
+        go-version: [1.22.x, 1.23.x]
 
     steps:
       - name: Set up ${{ matrix.go-version }}

.github/workflows/doctests.yaml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ "1.21", "1.22", "1.23" ]
+        go-version: ["1.22", "1.23"]
 
     steps:
       - name: Set up ${{ matrix.go-version }}
@@ -38,4 +38,4 @@ jobs:
 
       - name: Test doc examples
         working-directory: ./doctests
-        run: go test
+        run: go test -v

.github/workflows/test-redis-enterprise.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Test
         env:
           RE_CLUSTER: true
-          REDIS_MAJOR_VERSION: 7
+          REDIS_VERSION: "7.4"
         run: |
           go test \
           --ginkgo.skip-file="ring_test.go" \

Makefile

@@ -1,5 +1,5 @@
 GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
-export REDIS_MAJOR_VERSION := 7
+export REDIS_VERSION := "7.2"
 
 redisstackdocker.start:
 	docker start go-redis-redis-stack || docker run -d --name go-redis-redis-stack  -p 6379:6379 -e REDIS_ARGS="--enable-debug-command yes --enable-module-command yes" redis/redis-stack-server:latest

acl_commands_test.go

@@ -242,7 +242,7 @@ var _ = Describe("ACL permissions", Label("NonRedisEnterprise"), func() {
 	})
 
 	It("set permissions for module commands", func() {
-		SkipBeforeRedisMajor(8, "permissions for modules are supported for Redis Version >=8")
+		SkipBeforeRedisVersion(8, "permissions for modules are supported for Redis Version >=8")
 		Expect(client.FlushDB(ctx).Err()).NotTo(HaveOccurred())
 		val, err := client.FTCreate(ctx, "txt", &redis.FTCreateOptions{}, &redis.FieldSchema{FieldName: "txt", FieldType: redis.SearchFieldTypeText}).Result()
 		Expect(err).NotTo(HaveOccurred())
@@ -322,7 +322,7 @@ var _ = Describe("ACL permissions", Label("NonRedisEnterprise"), func() {
 	})
 
 	It("set permissions for module categories", func() {
-		SkipBeforeRedisMajor(8, "permissions for modules are supported for Redis Version >=8")
+		SkipBeforeRedisVersion(8, "permissions for modules are supported for Redis Version >=8")
 		Expect(client.FlushDB(ctx).Err()).NotTo(HaveOccurred())
 		val, err := client.FTCreate(ctx, "txt", &redis.FTCreateOptions{}, &redis.FieldSchema{FieldName: "txt", FieldType: redis.SearchFieldTypeText}).Result()
 		Expect(err).NotTo(HaveOccurred())
@@ -419,7 +419,7 @@ var _ = Describe("ACL Categories", func() {
 	})
 
 	It("lists acl categories and subcategories with Modules", func() {
-		SkipBeforeRedisMajor(8, "modules are included in acl for redis version >= 8")
+		SkipBeforeRedisVersion(8, "modules are included in acl for redis version >= 8")
 		aclTestCase := map[string]string{
 			"search":     "FT.CREATE",
 			"bloom":      "bf.add",

commands_test.go

@@ -194,6 +194,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should ClientKillByFilter with MAXAGE", Label("NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			var s []string
 			started := make(chan bool)
 			done := make(chan bool)
@@ -345,7 +346,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should ConfigGet Modules", func() {
-			SkipBeforeRedisMajor(8, "Config doesn't include modules before Redis 8")
+			SkipBeforeRedisVersion(8, "Config doesn't include modules before Redis 8")
 			expected := map[string]string{
 				"search-*": "search-timeout",
 				"ts-*":     "ts-retention-policy",
@@ -380,7 +381,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should ConfigGet with Modules", Label("NonRedisEnterprise"), func() {
-			SkipBeforeRedisMajor(8, "config get won't return modules configs before redis 8")
+			SkipBeforeRedisVersion(8, "config get won't return modules configs before redis 8")
 			configGet := client.ConfigGet(ctx, "*")
 			Expect(configGet.Err()).NotTo(HaveOccurred())
 			Expect(configGet.Val()).To(HaveKey("maxmemory"))
@@ -391,7 +392,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should ConfigSet FT DIALECT", func() {
-			SkipBeforeRedisMajor(8, "config doesn't include modules before Redis 8")
+			SkipBeforeRedisVersion(8, "config doesn't include modules before Redis 8")
 			defaultState, err := client.ConfigGet(ctx, "search-default-dialect").Result()
 			Expect(err).NotTo(HaveOccurred())
 
@@ -437,13 +438,13 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should ConfigSet fail for ReadOnly", func() {
-			SkipBeforeRedisMajor(8, "Config doesn't include modules before Redis 8")
+			SkipBeforeRedisVersion(8, "Config doesn't include modules before Redis 8")
 			_, err := client.ConfigSet(ctx, "search-max-doctablesize", "100000").Result()
 			Expect(err).To(HaveOccurred())
 		})
 
 		It("should ConfigSet Modules", func() {
-			SkipBeforeRedisMajor(8, "Config doesn't include modules before Redis 8")
+			SkipBeforeRedisVersion(8, "Config doesn't include modules before Redis 8")
 			defaults := map[string]string{}
 			expected := map[string]string{
 				"search-timeout":      "100",
@@ -484,7 +485,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should Fail ConfigSet Modules", func() {
-			SkipBeforeRedisMajor(8, "Config doesn't include modules before Redis 8")
+			SkipBeforeRedisVersion(8, "Config doesn't include modules before Redis 8")
 			expected := map[string]string{
 				"search-timeout":      "-100",
 				"ts-retention-policy": "-10",
@@ -533,7 +534,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should Info Modules", Label("redis.info"), func() {
-			SkipBeforeRedisMajor(8, "modules are included in info for Redis Version >= 8")
+			SkipBeforeRedisVersion(8, "modules are included in info for Redis Version >= 8")
 			info := client.Info(ctx)
 			Expect(info.Err()).NotTo(HaveOccurred())
 			Expect(info.Val()).NotTo(BeNil())
@@ -558,7 +559,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should InfoMap Modules", Label("redis.info"), func() {
-			SkipBeforeRedisMajor(8, "modules are included in info for Redis Version >= 8")
+			SkipBeforeRedisVersion(8, "modules are included in info for Redis Version >= 8")
 			info := client.InfoMap(ctx)
 			Expect(info.Err()).NotTo(HaveOccurred())
 			Expect(info.Val()).NotTo(BeNil())
@@ -1332,6 +1333,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HScan without values", Label("NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			for i := 0; i < 1000; i++ {
 				sadd := client.HSet(ctx, "myhash", fmt.Sprintf("key%d", i), "hello")
 				Expect(sadd.Err()).NotTo(HaveOccurred())
@@ -2625,6 +2627,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HExpire", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			res, err := client.HExpire(ctx, "no_such_key", 10*time.Second, "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(res).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -2640,6 +2643,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HPExpire", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			res, err := client.HPExpire(ctx, "no_such_key", 10*time.Second, "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(res).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -2655,6 +2659,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HExpireAt", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			resEmpty, err := client.HExpireAt(ctx, "no_such_key", time.Now().Add(10*time.Second), "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(resEmpty).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -2670,6 +2675,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HPExpireAt", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			resEmpty, err := client.HPExpireAt(ctx, "no_such_key", time.Now().Add(10*time.Second), "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(resEmpty).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -2685,6 +2691,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HPersist", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			resEmpty, err := client.HPersist(ctx, "no_such_key", "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(resEmpty).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -2708,6 +2715,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HExpireTime", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			resEmpty, err := client.HExpireTime(ctx, "no_such_key", "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(resEmpty).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -2727,6 +2735,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HPExpireTime", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			resEmpty, err := client.HPExpireTime(ctx, "no_such_key", "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(resEmpty).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -2747,6 +2756,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HTTL", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			resEmpty, err := client.HTTL(ctx, "no_such_key", "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(resEmpty).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -2766,6 +2776,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should HPTTL", Label("hash-expiration", "NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			resEmpty, err := client.HPTTL(ctx, "no_such_key", "field1", "field2", "field3").Result()
 			Expect(err).To(BeNil())
 			Expect(resEmpty).To(BeEquivalentTo([]int64{-2, -2, -2}))
@@ -6040,6 +6051,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should XRead LastEntry", Label("NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			res, err := client.XRead(ctx, &redis.XReadArgs{
 				Streams: []string{"stream"},
 				Count:   2, // we expect 1 message
@@ -6057,6 +6069,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should XRead LastEntry from two streams", Label("NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			res, err := client.XRead(ctx, &redis.XReadArgs{
 				Streams: []string{"stream", "stream"},
 				ID:      "+",
@@ -6079,6 +6092,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("should XRead LastEntry blocks", Label("NonRedisEnterprise"), func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			start := time.Now()
 			go func() {
 				defer GinkgoRecover()
@@ -7332,6 +7346,7 @@ var _ = Describe("Commands", func() {
 		})
 
 		It("Shows function stats", func() {
+			SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 			defer client.FunctionKill(ctx)
 
 			// We can not run blocking commands in Redis functions, so we're using an infinite loop,

iterator_test.go

@@ -85,6 +85,7 @@ var _ = Describe("ScanIterator", func() {
 	})
 
 	It("should hscan across multiple pages", func() {
+		SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 		Expect(hashSeed(71)).NotTo(HaveOccurred())
 
 		var vals []string
@@ -100,6 +101,7 @@ var _ = Describe("ScanIterator", func() {
 	})
 
 	It("should hscan without values across multiple pages", Label("NonRedisEnterprise"), func() {
+		SkipBeforeRedisVersion(7.4, "doesn't work with older redis stack images")
 		Expect(hashSeed(71)).NotTo(HaveOccurred())
 
 		var vals []string

main_test.go

@@ -70,20 +70,20 @@ var RECluster = false
 // Redis Community Edition Docker
 var RCEDocker = false
 
-// Notes the major version of redis we are executing tests.
+// Notes version of redis we are executing tests against.
 // This can be used before we change the bsm fork of ginkgo for one,
-// which have support for label sets, so we can filter tests per redis major version.
-var RedisMajorVersion = 7
+// which have support for label sets, so we can filter tests per redis version.
+var RedisVersion float64 = 7.2
 
-func SkipBeforeRedisMajor(version int, msg string) {
-	if RedisMajorVersion < version {
-		Skip(fmt.Sprintf("(redis major version < %d) %s", version, msg))
+func SkipBeforeRedisVersion(version float64, msg string) {
+	if RedisVersion < version {
+		Skip(fmt.Sprintf("(redis version < %f) %s", version, msg))
 	}
 }
 
-func SkipAfterRedisMajor(version int, msg string) {
-	if RedisMajorVersion > version {
-		Skip(fmt.Sprintf("(redis major version > %d) %s", version, msg))
+func SkipAfterRedisVersion(version float64, msg string) {
+	if RedisVersion > version {
+		Skip(fmt.Sprintf("(redis version > %f) %s", version, msg))
 	}
 }
 
@@ -104,18 +104,18 @@ var _ = BeforeSuite(func() {
 	RECluster, _ = strconv.ParseBool(os.Getenv("RE_CLUSTER"))
 	RCEDocker, _ = strconv.ParseBool(os.Getenv("RCE_DOCKER"))
 
-	RedisMajorVersion, _ = strconv.Atoi(os.Getenv("REDIS_MAJOR_VERSION"))
+	RedisVersion, _ = strconv.ParseFloat(os.Getenv("REDIS_VERSION"), 64)
 
-	if RedisMajorVersion == 0 {
-		RedisMajorVersion = 7
+	if RedisVersion == 0 {
+		RedisVersion = 7.2
 	}
 
 	fmt.Printf("RECluster: %v\n", RECluster)
 	fmt.Printf("RCEDocker: %v\n", RCEDocker)
-	fmt.Printf("REDIS_MAJOR_VERSION: %v\n", RedisMajorVersion)
+	fmt.Printf("REDIS_VERSION: %v\n", RedisVersion)
 
-	if RedisMajorVersion < 6 || RedisMajorVersion > 8 {
-		panic("incorrect or not supported redis major version")
+	if RedisVersion < 7.0 || RedisVersion > 9 {
+		panic("incorrect or not supported redis version")
 	}
 
 	if !RECluster && !RCEDocker {
@@ -204,7 +204,7 @@ func redisOptions() *redis.Options {
 	}
 	return &redis.Options{
 		Addr: redisAddr,
-		DB:   15,
+		DB:   0,
 
 		DialTimeout:           10 * time.Second,
 		ReadTimeout:           30 * time.Second,
@@ -256,7 +256,9 @@ func performAsync(n int, cbs ...func(int)) *sync.WaitGroup {
 	var wg sync.WaitGroup
 	for _, cb := range cbs {
 		wg.Add(n)
-		for i := 0; i < n; i++ {
+		// start from 1, so we can skip db 0 where such test is executed with
+		// select db command
+		for i := 1; i <= n; i++ {
 			go func(cb func(int), i int) {
 				defer GinkgoRecover()
 				defer wg.Done()

race_test.go

@@ -138,7 +138,7 @@ var _ = Describe("races", func() {
 	})
 
 	It("should select db", Label("NonRedisEnterprise"), func() {
-		err := client.Set(ctx, "db", 1, 0).Err()
+		err := client.Set(ctx, "db", 0, 0).Err()
 		Expect(err).NotTo(HaveOccurred())
 
 		perform(C, func(id int) {
@@ -159,7 +159,7 @@ var _ = Describe("races", func() {
 
 		n, err := client.Get(ctx, "db").Int64()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(n).To(Equal(int64(1)))
+		Expect(n).To(Equal(int64(0)))
 	})
 
 	It("should select DB with read timeout", func() {