Skip to content

Commit 2aa9a6c

Browse files
authored
Merge branch 'master' into expose-parse-float
2 parents c00a455 + f174acb commit 2aa9a6c

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ runs:
2525
2626
# Mapping of redis version to redis testing containers
2727
declare -A redis_version_mapping=(
28-
["8.0-RC2"]="8.0-RC2-pre"
28+
["8.0.1"]="8.0.1-pre"
2929
["7.4.2"]="rs-7.4.0-v2"
3030
["7.2.7"]="rs-7.2.0-v14"
3131
)

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
redis-version:
21-
- "8.0-RC2" # 8.0 RC2
21+
- "8.0.1" # 8.0.1
2222
- "7.4.2" # should use redis stack 7.4
2323
go-version:
2424
- "1.23.x"
@@ -43,7 +43,7 @@ jobs:
4343
4444
# Mapping of redis version to redis testing containers
4545
declare -A redis_version_mapping=(
46-
["8.0-RC2"]="8.0-RC2-pre"
46+
["8.0.1"]="8.0.1-pre"
4747
["7.4.2"]="rs-7.4.0-v2"
4848
)
4949
if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
@@ -72,7 +72,7 @@ jobs:
7272
fail-fast: false
7373
matrix:
7474
redis-version:
75-
- "8.0-RC2" # 8.0 RC2
75+
- "8.0.1" # 8.0.1
7676
- "7.4.2" # should use redis stack 7.4
7777
- "7.2.7" # should redis stack 7.2
7878
go-version:

main_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ var _ = BeforeSuite(func() {
100100

101101
fmt.Printf("RECluster: %v\n", RECluster)
102102
fmt.Printf("RCEDocker: %v\n", RCEDocker)
103-
fmt.Printf("REDIS_VERSION: %v\n", RedisVersion)
103+
fmt.Printf("REDIS_VERSION: %.1f\n", RedisVersion)
104+
fmt.Printf("CLIENT_LIBS_TEST_IMAGE: %v\n", os.Getenv("CLIENT_LIBS_TEST_IMAGE"))
104105

105106
if RedisVersion < 7.0 || RedisVersion > 9 {
106107
panic("incorrect or not supported redis version")

search_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,17 +1932,20 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
19321932
Expect(val).To(BeEquivalentTo("OK"))
19331933
WaitForIndexing(client, "aggTimeoutHeavy")
19341934

1935-
const totalDocs = 10000
1935+
const totalDocs = 100000
19361936
for i := 0; i < totalDocs; i++ {
19371937
key := fmt.Sprintf("doc%d", i)
19381938
_, err := client.HSet(ctx, key, "n", i).Result()
19391939
Expect(err).NotTo(HaveOccurred())
19401940
}
1941+
// default behaviour was changed in 8.0.1, set to fail to validate the timeout was triggered
1942+
err = client.ConfigSet(ctx, "search-on-timeout", "fail").Err()
1943+
Expect(err).NotTo(HaveOccurred())
19411944

19421945
options := &redis.FTAggregateOptions{
19431946
SortBy: []redis.FTAggregateSortBy{{FieldName: "@n", Desc: true}},
19441947
LimitOffset: 0,
1945-
Limit: 100,
1948+
Limit: 100000,
19461949
Timeout: 1, // 1 ms timeout, expected to trigger a timeout error.
19471950
}
19481951
_, err = client.FTAggregateWithArgs(ctx, "aggTimeoutHeavy", "*", options).Result()

0 commit comments

Comments
 (0)