Merge pull request #1774 from grafana/groupbynode-respect-order

groupByNode[s]: implement ordering like graphite does

expr/func_groupbynodes.go

@@ -56,12 +56,21 @@ func (s *FuncGroupByNodes) Exec(dataMap DataMap) ([]models.Series, error) {
 		s []models.Series
 		m models.SeriesMeta
 	}
+
 	groups := make(map[string]Group)
+
+	// list of aggregation keys in order they were seen.
+	// we need to return series in this order
+	var keyList []string
+
 	// Group series by nodes, this is mostly similar to GroupByTags,
 	// except that the group keys are different.
 	for _, serie := range series {
 		key := aggKey(serie, s.nodes)
-		group := groups[key]
+		group, ok := groups[key]
+		if !ok {
+			keyList = append(keyList, key)
+		}
 		group.s = append(group.s, serie)
 		group.m = group.m.Merge(serie.Meta)
 		groups[key] = group
@@ -70,7 +79,8 @@ func (s *FuncGroupByNodes) Exec(dataMap DataMap) ([]models.Series, error) {
 	output := make([]models.Series, 0, len(groups))
 	aggFunc := getCrossSeriesAggFunc(s.aggregator)
 
-	for key, group := range groups {
+	for _, key := range keyList {
+		group := groups[key]
 		consolidator, queryConsolidator := summarizeCons(group.s)
 		outSeries := models.Series{
 			Target:       key,

expr/func_groupbynodes_test.go

@@ -2,7 +2,6 @@ package expr
 
 import (
 	"math"
-	"sort"
 	"strconv"
 	"testing"
 
@@ -241,13 +240,6 @@ func testGroupByNodes(name string, in []models.Series, expected []models.Series,
 		t.Fatalf("case %q: output length expected to be %d but got %d", name, len(expected), len(got))
 	}
 
-	sort.Slice(got, func(i, j int) bool {
-		return got[i].Target < got[j].Target
-	})
-	sort.Slice(expected, func(i, j int) bool {
-		return expected[i].Target < expected[j].Target
-	})
-
 	for i, g := range got {
 		o := expected[i]
 		if g.Target != o.Target {