Speedup and clean up operation optimization.

storage/metric/operation.go

@@ -15,10 +15,11 @@ package metric
 
 import (
 	"fmt"
-	"github.com/prometheus/prometheus/model"
 	"math"
 	"sort"
 	"time"
+
+	"github.com/prometheus/prometheus/model"
 )
 
 // Encapsulates a primitive query operation.
@@ -65,11 +66,11 @@ type getValuesAtTimeOp struct {
 	consumed bool
 }
 
-func (o getValuesAtTimeOp) String() string {
+func (g *getValuesAtTimeOp) String() string {
-	return fmt.Sprintf("getValuesAtTimeOp at %s", o.time)
+	return fmt.Sprintf("getValuesAtTimeOp at %s", g.time)
 }
 
-func (g getValuesAtTimeOp) StartsAt() time.Time {
+func (g *getValuesAtTimeOp) StartsAt() time.Time {
 	return g.time
 }
 
@@ -82,7 +83,7 @@ func (g *getValuesAtTimeOp) ExtractSamples(in model.Values) (out model.Values) {
 	return
 }
 
-func (g getValuesAtTimeOp) GreedierThan(op op) (superior bool) {
+func (g *getValuesAtTimeOp) GreedierThan(op op) (superior bool) {
 	switch op.(type) {
 	case *getValuesAtTimeOp:
 		superior = true
@@ -139,15 +140,15 @@ type getValuesAtIntervalOp struct {
 	interval time.Duration
 }
 
-func (o getValuesAtIntervalOp) String() string {
+func (o *getValuesAtIntervalOp) String() string {
 	return fmt.Sprintf("getValuesAtIntervalOp from %s each %s through %s", o.from, o.interval, o.through)
 }
 
-func (g getValuesAtIntervalOp) StartsAt() time.Time {
+func (g *getValuesAtIntervalOp) StartsAt() time.Time {
 	return g.from
 }
 
-func (g getValuesAtIntervalOp) Through() time.Time {
+func (g *getValuesAtIntervalOp) Through() time.Time {
 	return g.through
 }
 
@@ -174,14 +175,14 @@ func (g *getValuesAtIntervalOp) ExtractSamples(in model.Values) (out model.Value
 	return
 }
 
-func (g getValuesAtIntervalOp) CurrentTime() (currentTime *time.Time) {
+func (g *getValuesAtIntervalOp) CurrentTime() (currentTime *time.Time) {
 	if g.from.After(g.through) {
 		return
 	}
 	return &g.from
 }
 
-func (g getValuesAtIntervalOp) GreedierThan(op op) (superior bool) {
+func (g *getValuesAtIntervalOp) GreedierThan(op op) (superior bool) {
 	switch o := op.(type) {
 	case *getValuesAtTimeOp:
 		superior = true
@@ -199,15 +200,15 @@ type getValuesAlongRangeOp struct {
 	through time.Time
 }
 
-func (o getValuesAlongRangeOp) String() string {
+func (o *getValuesAlongRangeOp) String() string {
 	return fmt.Sprintf("getValuesAlongRangeOp from %s through %s", o.from, o.through)
 }
 
-func (g getValuesAlongRangeOp) StartsAt() time.Time {
+func (g *getValuesAlongRangeOp) StartsAt() time.Time {
 	return g.from
 }
 
-func (g getValuesAlongRangeOp) Through() time.Time {
+func (g *getValuesAlongRangeOp) Through() time.Time {
 	return g.through
 }
 
@@ -244,14 +245,14 @@ func (g *getValuesAlongRangeOp) ExtractSamples(in model.Values) (out model.Value
 	return in[firstIdx:lastIdx]
 }
 
-func (g getValuesAlongRangeOp) CurrentTime() (currentTime *time.Time) {
+func (g *getValuesAlongRangeOp) CurrentTime() (currentTime *time.Time) {
 	if g.from.After(g.through) {
 		return
 	}
 	return &g.from
 }
 
-func (g getValuesAlongRangeOp) GreedierThan(op op) (superior bool) {
+func (g *getValuesAlongRangeOp) GreedierThan(op op) (superior bool) {
 	switch o := op.(type) {
 	case *getValuesAtTimeOp:
 		superior = true
@@ -376,109 +377,106 @@ func collectRanges(ops ops) (ranges ops) {
 // simplification.  For instance, if a range query happens to overlap a get-a-
 // value-at-a-certain-point-request, the range query should flatten and subsume
 // the other.
-func optimizeForward(pending ops) (out ops) {
+func optimizeForward(unoptimized ops) ops {
-	if len(pending) == 0 {
+	if len(unoptimized) <= 1 {
-		return
+		return unoptimized
 	}
 
-	var (
+	head := unoptimized[0]
-		head op = pending[0]
+	unoptimized = unoptimized[1:]
-		tail ops
+	optimized := ops{}
-	)
 
-	pending = pending[1:]
+	switch headOp := head.(type) {
-
-	switch t := head.(type) {
 	case *getValuesAtTimeOp:
-		out = ops{head}
+		optimized = ops{head}
 	case *getValuesAtIntervalOp:
+		optimized, unoptimized = optimizeForwardGetValuesAtInterval(headOp, unoptimized)
+	case *getValuesAlongRangeOp:
+		optimized, unoptimized = optimizeForwardGetValuesAlongRange(headOp, unoptimized)
+	default:
+		panic("unknown operation type")
+	}
+
+	tail := optimizeForward(unoptimized)
+
+	return append(optimized, tail...)
+}
+
+func optimizeForwardGetValuesAtInterval(headOp *getValuesAtIntervalOp, unoptimized ops) (ops, ops) {
 	// If the last value was a scan at a given frequency along an interval,
 	// several optimizations may exist.
-		for _, peekOperation := range pending {
+	for _, peekOperation := range unoptimized {
-			if peekOperation.StartsAt().After(t.Through()) {
+		if peekOperation.StartsAt().After(headOp.Through()) {
 			break
 		}
 
 		// If the type is not a range request, we can't do anything.
 		switch next := peekOperation.(type) {
 		case *getValuesAlongRangeOp:
-				if !next.GreedierThan(t) {
+			if !next.GreedierThan(headOp) {
-					var (
+				after := getValuesAtIntervalOp(*headOp)
-						before = getValuesAtIntervalOp(*t)
-						after  = getValuesAtIntervalOp(*t)
-					)
 
-					before.through = next.from
+				headOp.through = next.from
 
 				// Truncate the get value at interval request if a range request cuts
 				// it off somewhere.
-					var (
+				from := next.from
-						from = next.from
-					)
 
 				for !from.After(next.through) {
-						from = from.Add(t.interval)
+					from = from.Add(headOp.interval)
 				}
 
 				after.from = from
 
-					pending = append(ops{&before, &after}, pending...)
+				unoptimized = append(ops{&after}, unoptimized...)
-					sort.Sort(startsAtSort{pending})
+				sort.Sort(startsAtSort{unoptimized})
-
+				return ops{headOp}, unoptimized
-					return optimizeForward(pending)
 			}
 		}
 	}
+	return ops{headOp}, unoptimized
+}
 
-	case *getValuesAlongRangeOp:
+func optimizeForwardGetValuesAlongRange(headOp *getValuesAlongRangeOp, unoptimized ops) (ops, ops) {
-		for _, peekOperation := range pending {
+	optimized := ops{}
-			if peekOperation.StartsAt().After(t.Through()) {
+	for _, peekOperation := range unoptimized {
+		if peekOperation.StartsAt().After(headOp.Through()) {
+			optimized = ops{headOp}
 			break
 		}
 
 		switch next := peekOperation.(type) {
 		// All values at a specific time may be elided into the range query.
 		case *getValuesAtTimeOp:
-				pending = pending[1:]
+			optimized = ops{headOp}
-				continue
+			unoptimized = unoptimized[1:]
 		case *getValuesAlongRangeOp:
 			// Range queries should be concatenated if they overlap.
-				if next.GreedierThan(t) {
+			if next.GreedierThan(headOp) {
-					next.from = t.from
+				next.from = headOp.from
-
+				return optimized, unoptimized
-					return optimizeForward(pending)
-				} else {
-					pending = pending[1:]
 			}
+			optimized = ops{headOp}
+			unoptimized = unoptimized[1:]
 		case *getValuesAtIntervalOp:
-				pending = pending[1:]
+			optimized = ops{headOp}
+			unoptimized = unoptimized[1:]
 
-				if next.GreedierThan(t) {
+			if next.GreedierThan(headOp) {
-					var (
+				nextStart := next.from
-						nextStart = next.from
-					)
 
-					for !nextStart.After(next.through) {
+				for !nextStart.After(headOp.through) {
 					nextStart = nextStart.Add(next.interval)
 				}
 
 				next.from = nextStart
-					tail = append(ops{next}, pending...)
+				unoptimized = append(ops{next}, unoptimized...)
 			}
 		default:
 			panic("unknown operation type")
 		}
 	}
-	default:
+	return optimized, unoptimized
-		panic("unknown operation type")
-	}
-
-	// Strictly needed?
-	sort.Sort(startsAtSort{pending})
-
-	tail = optimizeForward(pending)
-
-	return append(ops{head}, tail...)
 }
 
 // selectQueriesForTime chooses all subsequent operations from the slice that

storage/metric/operation_test.go

@@ -14,11 +14,12 @@
 package metric
 
 import (
-	"github.com/prometheus/prometheus/model"
-	"github.com/prometheus/prometheus/utility/test"
 	"sort"
 	"testing"
 	"time"
+
+	"github.com/prometheus/prometheus/model"
+	"github.com/prometheus/prometheus/utility/test"
 )
 
 func testOptimizeTimeGroups(t test.Tester) {
@@ -586,6 +587,31 @@ func testOptimizeForward(t test.Tester) {
 					},
 				},
 			},
+			// Range with subsequent overlapping interval.
+			{
+				in: ops{
+					&getValuesAlongRangeOp{
+						from:    testInstant,
+						through: testInstant.Add(3 * time.Minute),
+					},
+					&getValuesAtIntervalOp{
+						from:     testInstant.Add(1 * time.Minute),
+						through:  testInstant.Add(4 * time.Minute),
+						interval: time.Second * 10,
+					},
+				},
+				out: ops{
+					&getValuesAlongRangeOp{
+						from:    testInstant,
+						through: testInstant.Add(3 * time.Minute),
+					},
+					&getValuesAtIntervalOp{
+						from:     testInstant.Add(3*time.Minute + 10*time.Second),
+						through:  testInstant.Add(4 * time.Minute),
+						interval: time.Second * 10,
+					},
+				},
+			},
 		}
 	)
 

storage/metric/view.go

@@ -14,9 +14,10 @@
 package metric
 
 import (
-	"github.com/prometheus/prometheus/model"
 	"sort"
 	"time"
+
+	"github.com/prometheus/prometheus/model"
 )
 
 var (