RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor some greediness computations.

This commit is contained in:
Matt T. Proud 2013-03-15 14:36:04 -07:00
parent 978acd4e96
commit b00ca7e422
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/metric/operation.go
View File

@ -334,10 +334,6 @@ func collectIntervals(o ops) (intervals map[time.Duration]ops) {
} }
} }
for _, operations := range intervals {
sort.Sort(greedinessSort{operations})
}
return return
} }
@ -387,7 +383,7 @@ func optimizeForward(pending ops) (out ops) {
// If the type is not a range request, we can't do anything. // If the type is not a range request, we can't do anything.
switch next := peekOperation.(type) { switch next := peekOperation.(type) {
case *getValuesAlongRangeOp: case *getValuesAlongRangeOp:
if !next.Through().After(t.Through()) { if !next.GreedierThan(t) {
var ( var (
before = getValuesAtIntervalOp(*t) before = getValuesAtIntervalOp(*t)
after = getValuesAtIntervalOp(*t) after = getValuesAtIntervalOp(*t)
@ -433,7 +429,7 @@ func optimizeForward(pending ops) (out ops) {
// Range queries should be concatenated if they overlap. // Range queries should be concatenated if they overlap.
pending = pending[1:len(pending)] pending = pending[1:len(pending)]
if next.Through().After(t.Through()) { if next.GreedierThan(t) {
t.through = next.through t.through = next.through
var ( var (
@ -448,7 +444,7 @@ func optimizeForward(pending ops) (out ops) {
case *getValuesAtIntervalOp: case *getValuesAtIntervalOp:
pending = pending[1:len(pending)] pending = pending[1:len(pending)]
if next.through.After(t.Through()) { if next.GreedierThan(t) {
var ( var (
t = next.from t = next.from
) )