Skip to content

Commit 85b8301

Browse files
committed
Add dialect 1 test & fix ft.search
1 parent 4fae9a1 commit 85b8301

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

search_commands.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1671,11 +1671,12 @@ func (cmd *FTSearchCmd) readReply(rd *proto.Reader) (err error) {
16711671
data, err := rd.ReadSlice()
16721672
if err != nil {
16731673
cmd.err = err
1674-
return nil
1674+
return err
16751675
}
16761676
cmd.val, err = parseFTSearch(data, cmd.options.NoContent, cmd.options.WithScores, cmd.options.WithPayloads, cmd.options.WithSortKeys)
16771677
if err != nil {
16781678
cmd.err = err
1679+
return err
16791680
}
16801681
return nil
16811682
}
@@ -1899,7 +1900,7 @@ func (c cmdable) FTSearchWithArgs(ctx context.Context, index string, query strin
18991900
}
19001901
}
19011902
if options.SortByWithCount {
1902-
args = append(args, "WITHCOUT")
1903+
args = append(args, "WITHCOUNT")
19031904
}
19041905
}
19051906
if options.LimitOffset >= 0 && options.Limit > 0 {

search_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
127127

128128
res3, err := client.FTSearchWithArgs(ctx, "num", "foo", &redis.FTSearchOptions{NoContent: true, SortBy: []redis.FTSearchSortBy{sortBy2}, SortByWithCount: true}).Result()
129129
Expect(err).NotTo(HaveOccurred())
130-
Expect(res3.Total).To(BeEquivalentTo(int64(0)))
130+
Expect(res3.Total).To(BeEquivalentTo(int64(3)))
131131

132132
})
133133

@@ -925,15 +925,15 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
925925
client.HSet(ctx, "c", "v", "aaaaabaa")
926926

927927
searchOptions := &redis.FTSearchOptions{
928-
Return: []redis.FTSearchReturn{{FieldName: "__v_score"}},
929-
SortBy: []redis.FTSearchSortBy{{FieldName: "__v_score", Asc: true}},
928+
Return: []redis.FTSearchReturn{{FieldName: "v"}},
929+
SortBy: []redis.FTSearchSortBy{{FieldName: "v", Asc: true}},
930+
Limit: 10,
930931
DialectVersion: 1,
931-
Params: map[string]interface{}{"vec": "aaaaaaaa"},
932932
}
933-
res, err := client.FTSearchWithArgs(ctx, "idx1", "*=>[KNN 2 @v $vec]", searchOptions).Result()
933+
res, err := client.FTSearchWithArgs(ctx, "idx1", "*", searchOptions).Result()
934934
Expect(err).NotTo(HaveOccurred())
935935
Expect(res.Docs[0].ID).To(BeEquivalentTo("a"))
936-
Expect(res.Docs[0].Fields["__v_score"]).To(BeEquivalentTo("0"))
936+
Expect(res.Docs[0].Fields["v"]).To(BeEquivalentTo("aaaaaaaa"))
937937
})
938938

939939
It("should FTCreate VECTOR with default dialect", Label("search", "ftcreate"), func() {

0 commit comments

Comments
 (0)