Kiu/VictoriaMetrics
Kiu/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-12-14 16:12:15 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

app/vmselect/promql: properly detect aggregate topk* and bottomk* aggregate functions in order to disable duplicate sorting

Browse Source 
Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1189
This commit is contained in:
Aliaksandr Valialkin 2021-04-08 00:09:34 +03:00
parent 9ce3b7e1dd
commit f90bf265f4
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/vmselect/promql/aggr.go
View File

@ -618,7 +618,9 @@ func newAggrFuncTopK(isReverse bool) aggrFunc {
}) })
fillNaNsAtIdx(n, ks[n], tss) fillNaNsAtIdx(n, ks[n], tss)
} }
return removeNaNs(tss) tss = removeNaNs(tss)
reverseSeries(tss)
return tss
} }
return aggrFuncExt(afe, args[1], &afa.ae.Modifier, afa.ae.Limit, true) return aggrFuncExt(afe, args[1], &afa.ae.Modifier, afa.ae.Limit, true)
} }
@ -683,7 +685,17 @@ func getRangeTopKTimeseries(tss []*timeseries, modifier *metricsql.ModifierExpr,
if remainingSumTS != nil { if remainingSumTS != nil {
tss = append(tss, remainingSumTS) tss = append(tss, remainingSumTS)
} }
return removeNaNs(tss) tss = removeNaNs(tss)
reverseSeries(tss)
return tss
}
func reverseSeries(tss []*timeseries) {
j := len(tss)
for i := 0; i < len(tss)/2; i++ {
j--
tss[i], tss[j] = tss[j], tss[i]
}
} }
func getRemainingSumTimeseries(tss []*timeseries, modifier *metricsql.ModifierExpr, ks []float64, remainingSumTagName string) *timeseries { func getRemainingSumTimeseries(tss []*timeseries, modifier *metricsql.ModifierExpr, ks []float64, remainingSumTagName string) *timeseries {

29
app/vmselect/promql/exec.go
View File

@ -86,21 +86,22 @@ func Exec(ec *EvalConfig, q string, isFirstPointOnly bool) ([]netstorage.Result,
} }
func maySortResults(e metricsql.Expr, tss []*timeseries) bool { func maySortResults(e metricsql.Expr, tss []*timeseries) bool {
fe, ok := e.(*metricsql.FuncExpr) switch v := e.(type) {
if !ok { case *metricsql.FuncExpr:
return true switch strings.ToLower(v.Name) {
} case "sort", "sort_desc",
switch fe.Name { "sort_by_label", "sort_by_label_desc":
case "sort", "sort_desc", return false
"sort_by_label", "sort_by_label_desc", }
"topk", "bottomk", case *metricsql.AggrFuncExpr:
"topk_max", "topk_min", "topk_avg", "topk_median", switch strings.ToLower(v.Name) {
"bottomk_max", "bottomk_min", "bottomk_avg", "bottomk_median", case "topk", "bottomk", "outliersk",
"outliersk": "topk_max", "topk_min", "topk_avg", "topk_median",
return false "bottomk_max", "bottomk_min", "bottomk_avg", "bottomk_median":
default: return false
return true }
} }
return true
} }
func timeseriesToResult(tss []*timeseries, maySort bool) ([]netstorage.Result, error) { func timeseriesToResult(tss []*timeseries, maySort bool) ([]netstorage.Result, error) {