opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 06:02:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

mysql: worked on mysql data soruce

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-04-20 17:10:09 +02:00
parent 1bbc149089
commit c78c460f79
10 changed files with 114 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/tsdb/mysql/mysql.go
View File

@ -112,14 +112,18 @@ func (e *MysqlExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, co
defer rows.Close()
res, err := e.TransformToTimeSeries(query, rows)
if err != nil {
queryResult.Error = err
return result
}
format := query.Model.Get("format").MustString("time_series")
queryResult.Series = res
queryResult.Meta.Set("rowCount", countPointsInAllSeries(res))
if format == "time_series" {
res, err := e.TransformToTimeSeries(query, rows)
if err != nil {
queryResult.Error = err
return result
}
queryResult.Series = res
queryResult.Meta.Set("rowCount", countPointsInAllSeries(res))
}
}
return result