diff options
Diffstat (limited to 'internal/mapr/globalgroupset.go')
| -rw-r--r-- | internal/mapr/globalgroupset.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/internal/mapr/globalgroupset.go b/internal/mapr/globalgroupset.go index 2b12898..cbee303 100644 --- a/internal/mapr/globalgroupset.go +++ b/internal/mapr/globalgroupset.go @@ -33,12 +33,13 @@ func (g *GlobalGroupSet) Merge(query *Query, group *GroupSet) error { } // MergeNoblock merges (non-blocking) a group set into the global group set. +// The semaphore is released via defer so it is always returned even if +// g.merge panics, mirroring the guarantee provided by the blocking Merge. func (g *GlobalGroupSet) MergeNoblock(query *Query, group *GroupSet) (bool, error) { select { case g.semaphore <- struct{}{}: - err := g.merge(query, group) - <-g.semaphore - return true, err + defer func() { <-g.semaphore }() + return true, g.merge(query, group) default: return false, nil } @@ -86,8 +87,8 @@ func (g *GlobalGroupSet) WriteResult(query *Query, finalResult bool) error { } // Result returns the result of the mapreduce aggregation as a string. -func (g *GlobalGroupSet) Result(query *Query, rowsLimit int) (string, int, error) { +func (g *GlobalGroupSet) Result(query *Query, rowsLimit int, renderer ResultRenderer) (string, int, error) { g.semaphore <- struct{}{} defer func() { <-g.semaphore }() - return g.GroupSet.Result(query, rowsLimit) + return g.GroupSet.Result(query, rowsLimit, renderer) } |