github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-03-11 15:34:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

app/vmselect: do not return empty time series in /api/v1/query result

Browse source
This commit is contained in:
Aliaksandr Valialkin 2019-07-01 17:14:49 +03:00
parent 6682a35731
commit a3abed80ff
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/vmselect/prometheus/prometheus.go
View file

@ -501,7 +501,7 @@ func QueryHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) error
DenyPartialResponse: getDenyPartialResponse(r),
}
result, err := promql.Exec(&ec, query)
result, err := promql.Exec(&ec, query, true)
if err != nil {
return fmt.Errorf("cannot execute %q: %s", query, err)
}
@ -562,7 +562,7 @@ func QueryRangeHandler(at *auth.Token, w http.ResponseWriter, r *http.Request) e
DenyPartialResponse: getDenyPartialResponse(r),
}
result, err := promql.Exec(&ec, query)
result, err := promql.Exec(&ec, query, false)
if err != nil {
return fmt.Errorf("cannot execute %q: %s", query, err)
}

12
app/vmselect/promql/exec.go
View file

@ -27,8 +27,8 @@ func ExpandWithExprs(q string) (string, error) {
return string(buf), nil
}
// Exec executes q for the given ec until the deadline.
func Exec(ec *EvalConfig, q string) ([]netstorage.Result, error) {
// Exec executes q for the given ec.
func Exec(ec *EvalConfig, q string, isFirstPointOnly bool) ([]netstorage.Result, error) {
if *logSlowQueryDuration > 0 {
startTime := time.Now()
defer func() {
@ -66,6 +66,14 @@ func Exec(ec *EvalConfig, q string) ([]netstorage.Result, error) {
}
ec.End -= ec.Step
if isFirstPointOnly {
// Remove all the points except the first one from every time series.
for _, ts := range rv {
ts.Values = ts.Values[:1]
ts.Timestamps = ts.Timestamps[:1]
}
}
maySort := maySortResults(e, rv)
result, err := timeseriesToResult(rv, maySort)
if err != nil {

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

@ -72,7 +72,7 @@ func TestExecSuccess(t *testing.T) {
Deadline: netstorage.NewDeadline(time.Minute),
}
for i := 0; i < 5; i++ {
result, err := Exec(ec, q)
result, err := Exec(ec, q, false)
if err != nil {
t.Fatalf(`unexpected error when executing %q: %s`, q, err)
}
@ -3679,7 +3679,14 @@ func TestExecError(t *testing.T) {
Deadline: netstorage.NewDeadline(time.Minute),
}
for i := 0; i < 4; i++ {
rv, err := Exec(ec, q)
rv, err := Exec(ec, q, false)
if err == nil {
t.Fatalf(`expecting non-nil error on %q`, q)
}
if rv != nil {
t.Fatalf(`expecting nil rv`)
}
rv, err = Exec(ec, q, true)
if err == nil {
t.Fatalf(`expecting non-nil error on %q`, q)
}