summaryrefslogtreecommitdiff
path: root/internal/mapr/groupset.go
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2021-10-09 21:10:29 +0300
committerPaul Buetow <paul@buetow.org>2021-10-10 13:36:41 +0300
commit97747ea0f3178f7f5890512d483fdccaa82846b0 (patch)
tree9ff1335ca26afc90e55fd6de416457e252d75a35 /internal/mapr/groupset.go
parent7a7169791a64190e1002e38bc9c04ad0d5c1ce1f (diff)
vetting and linting and some code restyling
Diffstat (limited to 'internal/mapr/groupset.go')
-rw-r--r--internal/mapr/groupset.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go
index ce7630d..6ffc8b9 100644
--- a/internal/mapr/groupset.go
+++ b/internal/mapr/groupset.go
@@ -73,7 +73,6 @@ func (g *GroupSet) Result(query *Query, rowsLimit int) (string, int, error) {
if err != nil {
return "", 0, err
}
-
if query.Limit != -1 {
rowsLimit = query.Limit
}
@@ -91,12 +90,14 @@ func (g *GroupSet) Result(query *Query, rowsLimit int) (string, int, error) {
if sc.FieldStorage == query.OrderBy {
attrs = append(attrs, config.Client.TermColors.MaprTable.HeaderSortKeyAttr)
}
+
for _, groupBy := range query.GroupBy {
if sc.FieldStorage == groupBy {
attrs = append(attrs, config.Client.TermColors.MaprTable.HeaderGroupKeyAttr)
break
}
}
+
color.PaintWithAttrs(sb, str,
config.Client.TermColors.MaprTable.HeaderFg,
config.Client.TermColors.MaprTable.HeaderBg,
@@ -191,7 +192,6 @@ func (*GroupSet) writeQueryFile(query *Query) error {
fd.WriteString(query.RawQuery)
os.Rename(tmpQueryFile, queryFile)
-
return nil
}
@@ -256,7 +256,6 @@ func (g *GroupSet) WriteResult(query *Query) error {
func (g *GroupSet) result(query *Query, gatherWidths bool) ([]result, []int, error) {
var rows []result
widths := make([]int, len(query.Select))
-
var valueStr string
var value float64
@@ -284,7 +283,8 @@ func (g *GroupSet) result(query *Query, gatherWidths bool) ([]result, []int, err
value = set.FValues[sc.FieldStorage] / float64(set.Samples)
valueStr = fmt.Sprintf("%f", value)
default:
- return rows, widths, fmt.Errorf("Unknown aggregation method '%v'", sc.Operation)
+ return rows, widths, fmt.Errorf("Unknown aggregation method '%v'",
+ sc.Operation)
}
if sc.FieldStorage == query.OrderBy {
@@ -302,7 +302,6 @@ func (g *GroupSet) result(query *Query, gatherWidths bool) ([]result, []int, err
widths[i] = len(valueStr)
}
}
-
rows = append(rows, r)
}