From f9dbacf3322b6ca282525456e0fa71344ab5c225 Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Thu, 18 Oct 2018 14:36:44 -0500 Subject: [PATCH] fix compile errors --- executor.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/executor.go b/executor.go index 32f914f1b..c57f80618 100644 --- a/executor.go +++ b/executor.go @@ -966,7 +966,7 @@ func (g GroupCount) Compare(o GroupCount) int { func (e *executor) executeGroupByShard(_ context.Context, index string, c *pql.Call, shard uint64, childRows []RowIDs) ([]GroupCount, error) { iter, err := newGroupByIterator(childRows, c.Children, index, shard, e.Holder) if err != nil { - return errors.Wrapf(err, "getting group by iterator for shard %d", shard) + return nil, errors.Wrapf(err, "getting group by iterator for shard %d", shard) } if iter == nil { return []GroupCount{}, nil @@ -2603,7 +2603,7 @@ func newGroupByIterator(rowIDs []RowIDs, children []*pql.Call, index string, sha gbi.rows[i].row = gbi.rows[i].row.Intersect(gbi.rows[i-1].row) } - return gbi + return gbi, nil } // nextAtIdx is a recursive helper method for getting the next row for the field