app/vmselect/promql: follow-up after 57b3320478

app/vmselect/netstorage/netstorage.go

@@ -49,17 +49,12 @@ type Result struct {
 	// Values are sorted by Timestamps.
 	Values     []float64
 	Timestamps []int64
-
-	// Marshaled MetricName. Used only for results sorting
-	// in app/vmselect/promql
-	MetricNameMarshaled []byte
 }
 
 func (r *Result) reset() {
 	r.MetricName.Reset()
 	r.Values = r.Values[:0]
 	r.Timestamps = r.Timestamps[:0]
-	r.MetricNameMarshaled = r.MetricNameMarshaled[:0]
 }
 
 // Results holds results returned from ProcessSearchQuery.

app/vmselect/promql/exec.go

@@ -13,6 +13,7 @@ import (
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/netstorage"
 	"github.com/VictoriaMetrics/VictoriaMetrics/app/vmselect/querystats"
 	"github.com/VictoriaMetrics/VictoriaMetrics/lib/decimal"
+	"github.com/VictoriaMetrics/VictoriaMetrics/lib/storage"
 	"github.com/VictoriaMetrics/metrics"
 	"github.com/VictoriaMetrics/metricsql"
 )
@@ -95,14 +96,13 @@ func timeseriesToResult(tss []*timeseries, maySort bool) ([]netstorage.Result, e
 	m := make(map[string]struct{}, len(tss))
 	bb := bbPool.Get()
 	for i, ts := range tss {
-		bb.B = metricNameToBytes(bb.B[:0], &ts.MetricName)
+		bb.B = marshalMetricNameSorted(bb.B[:0], &ts.MetricName)
 		if _, ok := m[string(bb.B)]; ok {
 			return nil, fmt.Errorf(`duplicate output timeseries: %s`, stringMetricName(&ts.MetricName))
 		}
 		m[string(bb.B)] = struct{}{}
 
 		rs := &result[i]
-		rs.MetricNameMarshaled = append(rs.MetricNameMarshaled[:0], bb.B...)
 		rs.MetricName.CopyFrom(&ts.MetricName)
 		rs.Values = append(rs.Values[:0], ts.Values...)
 		rs.Timestamps = append(rs.Timestamps[:0], ts.Timestamps...)
@@ -111,13 +111,39 @@ func timeseriesToResult(tss []*timeseries, maySort bool) ([]netstorage.Result, e
 
 	if maySort {
 		sort.Slice(result, func(i, j int) bool {
-			return string(result[i].MetricNameMarshaled) < string(result[j].MetricNameMarshaled)
+			return metricNameLess(&result[i].MetricName, &result[j].MetricName)
 		})
 	}
 
 	return result, nil
 }
 
+func metricNameLess(a, b *storage.MetricName) bool {
+	if string(a.MetricGroup) != string(b.MetricGroup) {
+		return string(a.MetricGroup) < string(b.MetricGroup)
+	}
+	// Metric names for a and b match. Compare tags.
+	// Tags must be already sorted by the caller, so just compare them.
+	ats := a.Tags
+	bts := b.Tags
+	for i := range ats {
+		if i >= len(bts) {
+			// a contains more tags than b and all the previous tags were identical,
+			// so a is considered bigger than b.
+			return false
+		}
+		at := &ats[i]
+		bt := &bts[i]
+		if string(at.Key) != string(bt.Key) {
+			return string(at.Key) < string(bt.Key)
+		}
+		if string(at.Value) != string(bt.Value) {
+			return string(at.Value) < string(bt.Value)
+		}
+	}
+	return len(ats) < len(bts)
+}
+
 func removeNaNs(tss []*timeseries) []*timeseries {
 	rvs := tss[:0]
 	for _, ts := range tss {

app/vmselect/promql/exec_test.go

@@ -1,7 +1,6 @@
 package promql
 
 import (
-	"fmt"
 	"testing"
 	"time"
 

app/vmselect/promql/timeseries.go

@@ -318,18 +318,6 @@ func marshalMetricTagsFast(dst []byte, tags []storage.Tag) []byte {
 	return dst
 }
 
-func metricNameToBytes(dst []byte, mn *storage.MetricName) []byte {
-	dst = marshalBytesFast(dst, mn.MetricGroup)
-	sortMetricTags(mn.Tags)
-	for i := range mn.Tags {
-		tag := &mn.Tags[i]
-		dst = append(dst, tag.Key...)
-		dst = append(dst, tag.Value...)
-		dst = append(dst, ","...)
-	}
-	return dst
-}
-
 func marshalMetricNameSorted(dst []byte, mn *storage.MetricName) []byte {
 	// Do not marshal AccountID and ProjectID, since they are unused.
 	dst = marshalBytesFast(dst, mn.MetricGroup)