Skip to content

Extend coverage #48

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 5 commits into from
Apr 2, 2020
Merged

Extend coverage #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0369d52
[add] extended tests for Paging serialize()
filipecosta90 Mar 30, 2020
5e45a0a
[add] extended coverage for document.go
filipecosta90 Mar 30, 2020
7c3434d
[add] added spellcheck test file
filipecosta90 Mar 30, 2020
2ad24bb
Merge branch 'master' of https://github.com/RediSearch/redisearch-go …
filipecosta90 Apr 1, 2020
5cfa76b
[add] added test for FT.AGGREGATE reply parsing. (quick refactoring i…
filipecosta90 Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions redisearch/aggregate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ type AggregateQuery struct {
Max int
WithSchema bool
Verbatim bool
WithCursor bool
Cursor *Cursor
WithCursor bool
Cursor *Cursor
// TODO: add load fields

}
Expand Down Expand Up @@ -187,12 +187,12 @@ func (a *AggregateQuery) Limit(offset int, num int) *AggregateQuery {
}

//Load document fields from the document HASH objects (if they are not in the sortables)
func (a *AggregateQuery) Load( Properties []string) *AggregateQuery {
func (a *AggregateQuery) Load(Properties []string) *AggregateQuery {
nproperties := len(Properties)
if nproperties > 0 {
a.AggregatePlan = a.AggregatePlan.Add("LOAD", nproperties)
for _, property := range Properties {
a.AggregatePlan = a.AggregatePlan.Add(fmt.Sprintf( "@%s", property ))
a.AggregatePlan = a.AggregatePlan.Add(fmt.Sprintf("@%s", property))
}
}
return a
Expand Down Expand Up @@ -260,6 +260,7 @@ func (q AggregateQuery) Serialize() redis.Args {
return args
}

// Deprecated: Please use processAggReply() instead
func ProcessAggResponse(res []interface{}) [][]string {
aggregateReply := make([][]string, len(res), len(res))
for i := 0; i < len(res); i++ {
Expand All @@ -273,6 +274,25 @@ func ProcessAggResponse(res []interface{}) [][]string {
return aggregateReply
}

func processAggReply(res []interface{}) (total int, aggregateReply [][]string, err error) {
aggregateReply = [][]string{}
total = 0
aggregate_results := len(res) - 1
if aggregate_results > 0 {
total = aggregate_results
aggregateReply = make([][]string, aggregate_results, aggregate_results)
for i := 0; i < aggregate_results; i++ {
if d, e := redis.Strings(res[i+1], nil); e == nil {
aggregateReply[i] = d
} else {
err = fmt.Errorf("Error parsing Aggregate Reply: %v on reply position %d", e, i)
aggregateReply[i] = nil
}
}
}
return
}

func ProcessAggResponseSS(res []interface{}) [][]string {
var lout = len(res)
aggregateReply := make([][]string, lout, lout)
Expand Down
Loading