From 7d888157d5b1a607261af52c5424bbf28ffe78b1 Mon Sep 17 00:00:00 2001 From: Christopher Golling Date: Tue, 3 Dec 2024 14:27:53 -0700 Subject: [PATCH 1/4] SortByWithCount FTSearchOptions fix --- search_commands.go | 2 +- search_test.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/search_commands.go b/search_commands.go index e4df0b6fc..ede084e4e 100644 --- a/search_commands.go +++ b/search_commands.go @@ -1775,7 +1775,7 @@ func FTSearchQuery(query string, options *FTSearchOptions) SearchQuery { } } if options.SortByWithCount { - queryArgs = append(queryArgs, "WITHCOUT") + queryArgs = append(queryArgs, "WITHCOUNT") } } if options.LimitOffset >= 0 && options.Limit > 0 { diff --git a/search_test.go b/search_test.go index 48b9aa39b..9ba14b8c9 100644 --- a/search_test.go +++ b/search_test.go @@ -125,6 +125,13 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() { Expect(res2.Docs[1].ID).To(BeEquivalentTo("doc2")) Expect(res2.Docs[0].ID).To(BeEquivalentTo("doc3")) + res3, err := client.FTSearchWithArgs(ctx, "num", "foo", &redis.FTSearchOptions{NoContent: true, SortBy: []redis.FTSearchSortBy{sortBy2}, SortByWithCount: true}).Result() + Expect(err).NotTo(HaveOccurred()) + Expect(res3.Total).To(BeEquivalentTo(int64(3))) + Expect(res3.Docs[2].ID).To(BeEquivalentTo("doc1")) + Expect(res3.Docs[1].ID).To(BeEquivalentTo("doc2")) + Expect(res3.Docs[0].ID).To(BeEquivalentTo("doc3")) + }) It("should FTCreate and FTSearch example", Label("search", "ftcreate", "ftsearch"), func() { From f6fbfc1713b466cfd49cdd3b2fe8dd60842af06a Mon Sep 17 00:00:00 2001 From: Christopher Golling Date: Tue, 3 Dec 2024 14:45:06 -0700 Subject: [PATCH 2/4] FTSearch test fix --- search_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/search_test.go b/search_test.go index 9ba14b8c9..ac8b06d7b 100644 --- a/search_test.go +++ b/search_test.go @@ -120,7 +120,7 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() { res2, err := client.FTSearchWithArgs(ctx, "num", "foo", &redis.FTSearchOptions{NoContent: true, SortBy: []redis.FTSearchSortBy{sortBy2}}).Result() Expect(err).NotTo(HaveOccurred()) - Expect(res2.Total).To(BeEquivalentTo(int64(3))) + Expect(res2.Total).To(BeEquivalentTo(int64(0))) Expect(res2.Docs[2].ID).To(BeEquivalentTo("doc1")) Expect(res2.Docs[1].ID).To(BeEquivalentTo("doc2")) Expect(res2.Docs[0].ID).To(BeEquivalentTo("doc3")) From d5c2272e4909b90dffd6192c3f80a99cf2cd4d4c Mon Sep 17 00:00:00 2001 From: Christopher Golling Date: Tue, 3 Dec 2024 14:47:55 -0700 Subject: [PATCH 3/4] Another FTSearch test fix --- search_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/search_test.go b/search_test.go index ac8b06d7b..bb9770f42 100644 --- a/search_test.go +++ b/search_test.go @@ -120,14 +120,14 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() { res2, err := client.FTSearchWithArgs(ctx, "num", "foo", &redis.FTSearchOptions{NoContent: true, SortBy: []redis.FTSearchSortBy{sortBy2}}).Result() Expect(err).NotTo(HaveOccurred()) - Expect(res2.Total).To(BeEquivalentTo(int64(0))) + Expect(res2.Total).To(BeEquivalentTo(int64(3))) Expect(res2.Docs[2].ID).To(BeEquivalentTo("doc1")) Expect(res2.Docs[1].ID).To(BeEquivalentTo("doc2")) Expect(res2.Docs[0].ID).To(BeEquivalentTo("doc3")) res3, err := client.FTSearchWithArgs(ctx, "num", "foo", &redis.FTSearchOptions{NoContent: true, SortBy: []redis.FTSearchSortBy{sortBy2}, SortByWithCount: true}).Result() Expect(err).NotTo(HaveOccurred()) - Expect(res3.Total).To(BeEquivalentTo(int64(3))) + Expect(res3.Total).To(BeEquivalentTo(int64(0))) Expect(res3.Docs[2].ID).To(BeEquivalentTo("doc1")) Expect(res3.Docs[1].ID).To(BeEquivalentTo("doc2")) Expect(res3.Docs[0].ID).To(BeEquivalentTo("doc3")) From 01f954d7b17362e3d3e1cebb78c4496182f1ccbd Mon Sep 17 00:00:00 2001 From: Christopher Golling Date: Tue, 3 Dec 2024 14:57:13 -0700 Subject: [PATCH 4/4] Another FTSearch test fix --- search_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/search_test.go b/search_test.go index bb9770f42..e267c8ae8 100644 --- a/search_test.go +++ b/search_test.go @@ -128,9 +128,6 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() { res3, err := client.FTSearchWithArgs(ctx, "num", "foo", &redis.FTSearchOptions{NoContent: true, SortBy: []redis.FTSearchSortBy{sortBy2}, SortByWithCount: true}).Result() Expect(err).NotTo(HaveOccurred()) Expect(res3.Total).To(BeEquivalentTo(int64(0))) - Expect(res3.Docs[2].ID).To(BeEquivalentTo("doc1")) - Expect(res3.Docs[1].ID).To(BeEquivalentTo("doc2")) - Expect(res3.Docs[0].ID).To(BeEquivalentTo("doc3")) })