redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-04-17 20:17:02 +03:00
Code

Merge branch 'master' into ndyakov/token-based-auth

Browse Source
This commit is contained in:
Nedyalko Dyakov 2025-04-03 16:12:38 +03:00 committed by GitHub
commit 847f1f9daa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/run-tests/action.yml vendored
View File

@ -25,7 +25,7 @@ runs:
# Mapping of redis version to redis testing containers # Mapping of redis version to redis testing containers
declare -A redis_version_mapping=( declare -A redis_version_mapping=(
["8.0-M05"]="8.0-M05-pre" ["8.0-RC1"]="8.0-RC1-pre"
["7.4.2"]="rs-7.4.0-v2" ["7.4.2"]="rs-7.4.0-v2"
["7.2.7"]="rs-7.2.0-v14" ["7.2.7"]="rs-7.2.0-v14"
) )

6
.github/workflows/build.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
redis-version: redis-version:
- "8.0-M05" # 8.0 milestone 5 - "8.0-RC1" # 8.0 RC1
- "7.4.2" # should use redis stack 7.4 - "7.4.2" # should use redis stack 7.4
go-version: go-version:
- "1.23.x" - "1.23.x"
@ -43,7 +43,7 @@ jobs:
# Mapping of redis version to redis testing containers # Mapping of redis version to redis testing containers
declare -A redis_version_mapping=( declare -A redis_version_mapping=(
["8.0-M05"]="8.0-M05-pre" ["8.0-RC1"]="8.0-RC1-pre"
["7.4.2"]="rs-7.4.0-v2" ["7.4.2"]="rs-7.4.0-v2"
) )
if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then if [[ -v redis_version_mapping[$REDIS_VERSION] ]]; then
@ -72,7 +72,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
redis-version: redis-version:
- "8.0-M05" # 8.0 milestone 5 - "8.0-RC1" # 8.0 RC1
- "7.4.2" # should use redis stack 7.4 - "7.4.2" # should use redis stack 7.4
- "7.2.7" # should redis stack 7.2 - "7.2.7" # should redis stack 7.2
go-version: go-version:

2
pubsub.go
View File

@ -432,7 +432,7 @@ func (c *PubSub) ReceiveTimeout(ctx context.Context, timeout time.Duration) (int
return nil, err return nil, err
} }
err = cn.WithReader(context.Background(), timeout, func(rd *proto.Reader) error { err = cn.WithReader(ctx, timeout, func(rd *proto.Reader) error {
return c.cmd.readReply(rd) return c.cmd.readReply(rd)
}) })

2
search_test.go
View File

@ -381,7 +381,7 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
// up until redis 8 the default scorer was TFIDF, in redis 8 it is BM25 // up until redis 8 the default scorer was TFIDF, in redis 8 it is BM25
// this test expect redis major version >= 8 // this test expect redis major version >= 8
It("should FTSearch WithScores", Label("search", "ftsearch"), func() { It("should FTSearch WithScores", Label("search", "ftsearch"), func() {
SkipBeforeRedisVersion(7.9, "default scorer is not BM25") SkipBeforeRedisVersion(7.9, "default scorer is not BM25STD")
text1 := &redis.FieldSchema{FieldName: "description", FieldType: redis.SearchFieldTypeText} text1 := &redis.FieldSchema{FieldName: "description", FieldType: redis.SearchFieldTypeText}
val, err := client.FTCreate(ctx, "idx1", &redis.FTCreateOptions{}, text1).Result() val, err := client.FTCreate(ctx, "idx1", &redis.FTCreateOptions{}, text1).Result()