github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-02-19 15:30:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

app/vmselect/promql: take into account the previous point when calculating max_over_time and min_over_time

Browse source 
This lines up with `first_over_time` function used in `rollup_candlestick`, so `rollup=low` always returns
the minimum value.

Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/204
This commit is contained in:
Aliaksandr Valialkin 2019-10-08 12:28:06 +03:00
parent 95d0f1bfd1
commit a5302a6651
3 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/vmselect/promql/exec_test.go
View file

@ -3566,7 +3566,7 @@ func TestExecSuccess(t *testing.T) {
}} }}
r4 := netstorage.Result{ r4 := netstorage.Result{
MetricName: metricNameExpected, MetricName: metricNameExpected,
Values: []float64{0.85, 0.94, 0.97, 0.93, 0.98, 0.92}, Values: []float64{0.9, 0.94, 0.97, 0.93, 0.98, 0.92},
Timestamps: timestampsExpected, Timestamps: timestampsExpected,
} }
r4.MetricName.Tags = []storage.Tag{{ r4.MetricName.Tags = []storage.Tag{{
@ -3614,7 +3614,7 @@ func TestExecSuccess(t *testing.T) {
q := `sort(rollup(time()[:50s]))` q := `sort(rollup(time()[:50s]))`
r1 := netstorage.Result{ r1 := netstorage.Result{
MetricName: metricNameExpected, MetricName: metricNameExpected,
Values: []float64{850, 1050, 1250, 1450, 1650, 1850}, Values: []float64{800, 1000, 1200, 1400, 1600, 1800},
Timestamps: timestampsExpected, Timestamps: timestampsExpected,
} }
r1.MetricName.Tags = []storage.Tag{{ r1.MetricName.Tags = []storage.Tag{{

19
app/vmselect/promql/rollup.go
View file

@ -533,11 +533,14 @@ func rollupAvg(rfa *rollupFuncArg) float64 {
func rollupMin(rfa *rollupFuncArg) float64 { func rollupMin(rfa *rollupFuncArg) float64 {
// There is no need in handling NaNs here, since they must be cleaned up // There is no need in handling NaNs here, since they must be cleaned up
// before calling rollup funcs. // before calling rollup funcs.
minValue := rfa.prevValue
values := rfa.values values := rfa.values
if math.IsNaN(minValue) {
if len(values) == 0 { if len(values) == 0 {
return rfa.prevValue return nan
}
minValue = values[0]
} }
minValue := values[0]
for _, v := range values { for _, v := range values {
if v < minValue { if v < minValue {
minValue = v minValue = v
@ -549,11 +552,14 @@ func rollupMin(rfa *rollupFuncArg) float64 {
func rollupMax(rfa *rollupFuncArg) float64 { func rollupMax(rfa *rollupFuncArg) float64 {
// There is no need in handling NaNs here, since they must be cleaned up // There is no need in handling NaNs here, since they must be cleaned up
// before calling rollup funcs. // before calling rollup funcs.
maxValue := rfa.prevValue
values := rfa.values values := rfa.values
if math.IsNaN(maxValue) {
if len(values) == 0 { if len(values) == 0 {
return rfa.prevValue return nan
}
maxValue = values[0]
} }
maxValue := values[0]
for _, v := range values { for _, v := range values {
if v > maxValue { if v > maxValue {
maxValue = v maxValue = v
@ -567,7 +573,10 @@ func rollupSum(rfa *rollupFuncArg) float64 {
// before calling rollup funcs. // before calling rollup funcs.
values := rfa.values values := rfa.values
if len(values) == 0 { if len(values) == 0 {
return rfa.prevValue if math.IsNaN(rfa.prevValue) {
return nan
}
return 0
} }
var sum float64 var sum float64
for _, v := range values { for _, v := range values {

2
app/vmselect/promql/rollup_test.go
View file

@ -527,7 +527,7 @@ func TestRollupFuncsNoWindow(t *testing.T) {
} }
rc.Timestamps = getTimestamps(rc.Start, rc.End, rc.Step) rc.Timestamps = getTimestamps(rc.Start, rc.End, rc.Step)
values := rc.Do(nil, testValues, testTimestamps) values := rc.Do(nil, testValues, testTimestamps)
valuesExpected := []float64{nan, 21, 12, 32, 34} valuesExpected := []float64{nan, 21, 12, 12, 34}
timestampsExpected := []int64{0, 40, 80, 120, 160} timestampsExpected := []int64{0, 40, 80, 120, 160}
testRowsEqual(t, values, rc.Timestamps, valuesExpected, timestampsExpected) testRowsEqual(t, values, rc.Timestamps, valuesExpected, timestampsExpected)
}) })