Skip to content

fix(aggregate, search): ft.aggregate bugfixes #3263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 7, 2025
Merged

fix(aggregate, search): ft.aggregate bugfixes #3263

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28e79aa
fix: rearange args for ft.aggregate
ndyakov Feb 6, 2025
064c83f
improve test
ndyakov Feb 6, 2025
25ae60d
wip: add scorer and addscores
ndyakov Feb 6, 2025
3bb8051
enable all tests
ndyakov Feb 6, 2025
3bc9a57
fix ftsearch with count test
ndyakov Feb 6, 2025
35101a5
make linter happy
ndyakov Feb 6, 2025
46f97c7
Addscores is available in later redisearch releases.
ndyakov Feb 6, 2025
f4e7c76
load an apply seem to break scorer and addscores
ndyakov Feb 6, 2025
cf190be
Merge branch 'master' into ndyakov/ft-aggregate-bugfixes
ndyakov Feb 7, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
improve test
  • Loading branch information
@ndyakov
ndyakov committed Feb 6, 2025
commit 064c83f8877ae692dd703be2247f53f812dda3df
18 changes: 15 additions & 3 deletions search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,14 +655,26 @@ var _ = Describe("RediSearch commands Resp 2", Label("search"), func() {
client.HSet(ctx, "doc2", "PrimaryKey", "9::362329", "CreatedDateTimeUTC", "1739342399")
client.HSet(ctx, "doc3", "PrimaryKey", "9::362329", "CreatedDateTimeUTC", "1739353199")

reducer := redis.FTAggregateReducer{Reducer: redis.SearchCount}
reducer := redis.FTAggregateReducer{Reducer: redis.SearchCount, As: "perDay"}

options := &redis.FTAggregateOptions{
Apply: []redis.FTAggregateApply{{Field: "@CreatedDateTimeUTC /(60*60*24)", As: "TimestampAsDay"}},
GroupBy: []redis.FTAggregateGroupBy{{Fields: []interface{}{"@TimestampAsDay"}, Reduce: []redis.FTAggregateReducer{reducer}}},
Apply: []redis.FTAggregateApply{{Field: "floor(@CreatedDateTimeUTC /(60*60*24))", As: "TimestampAsDay"}},
GroupBy: []redis.FTAggregateGroupBy{{
Fields: []interface{}{"@TimestampAsDay"},
Reduce: []redis.FTAggregateReducer{reducer},
}},
SortBy: []redis.FTAggregateSortBy{{
FieldName: "@perDay",
Desc: true,
}},
}

res, err := client.FTAggregateWithArgs(ctx, "idx1", "*", options).Result()
Expect(err).NotTo(HaveOccurred())
Expect(res).ToNot(BeNil())
Expect(len(res.Rows)).To(BeEquivalentTo(2))
Expect(res.Rows[0].Fields["perDay"]).To(BeEquivalentTo("2"))
Expect(res.Rows[1].Fields["perDay"]).To(BeEquivalentTo("1"))
})

It("should FTAggregate apply", Label("search", "ftaggregate"), func() {
Expand Down
Loading