diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go index 4ba2021bb..5aad595a5 100644 --- a/encoding/proto/proto.go +++ b/encoding/proto/proto.go @@ -1016,8 +1016,8 @@ func decodeGroupCounts(a []*internal.GroupCount) []pilosa.GroupCount { other := make([]pilosa.GroupCount, len(a)) for i := range a { other[i] = pilosa.GroupCount{ - decodeFieldRows(a[i].Group), - a[i].Count, + Group: decodeFieldRows(a[i].Group), + Count: a[i].Count, } } return other diff --git a/executor.go b/executor.go index 3eb887b4e..89892e5c5 100644 --- a/executor.go +++ b/executor.go @@ -879,7 +879,7 @@ func mergeGroupCounts(gc, other []GroupCount) []GroupCount { return gc } -func (e *executor) executeGroupByShard(ctx context.Context, index string, c *pql.Call, shard uint64, childRows []RowIDs) ([]GroupCount, error) { +func (e *executor) executeGroupByShard(_ context.Context, index string, c *pql.Call, shard uint64, childRows []RowIDs) ([]GroupCount, error) { // Fetch index. idx := e.Holder.Index(index) if idx == nil { @@ -988,7 +988,7 @@ func (e *executor) executeRows(ctx context.Context, index string, c *pql.Call, s return results, nil } -func (e *executor) executeRowsShard(ctx context.Context, index string, c *pql.Call, shard uint64) (RowIDs, error) { +func (e *executor) executeRowsShard(_ context.Context, index string, c *pql.Call, shard uint64) (RowIDs, error) { // Fetch index. idx := e.Holder.Index(index) if idx == nil { diff --git a/fragment.go b/fragment.go index a738b0829..9fdcb849a 100644 --- a/fragment.go +++ b/fragment.go @@ -1795,8 +1795,9 @@ func (f *fragment) rows(start uint64, filters ...rowFilter) []uint64 { } // apply filters - addRow, done := true, false + addRow := true for _, filter := range filters { + var done bool addRow, done = filter(vRow, key, c) if done { return rows