IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pdoan017/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-08-28 13:28:13 +02:00
commit 407f1ad475
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package mysql package mysql
import ( import (
"container/list"
"context" "context"
"database/sql" "database/sql"
"fmt" "fmt"
@ -245,6 +246,7 @@ func (e MysqlExecutor) getTypedRowData(types []*sql.ColumnType, rows *core.Rows)
func (e MysqlExecutor) TransformToTimeSeries(query *tsdb.Query, rows *core.Rows, result *tsdb.QueryResult) error { func (e MysqlExecutor) TransformToTimeSeries(query *tsdb.Query, rows *core.Rows, result *tsdb.QueryResult) error {
pointsBySeries := make(map[string]*tsdb.TimeSeries) pointsBySeries := make(map[string]*tsdb.TimeSeries)
seriesByQueryOrder := list.New()
columnNames, err := rows.Columns() columnNames, err := rows.Columns()
if err != nil { if err != nil {
@ -282,11 +284,13 @@ func (e MysqlExecutor) TransformToTimeSeries(query *tsdb.Query, rows *core.Rows,
series := &tsdb.TimeSeries{Name: rowData.metric} series := &tsdb.TimeSeries{Name: rowData.metric}
series.Points = append(series.Points, tsdb.TimePoint{rowData.value, rowData.time}) series.Points = append(series.Points, tsdb.TimePoint{rowData.value, rowData.time})
pointsBySeries[rowData.metric] = series pointsBySeries[rowData.metric] = series
seriesByQueryOrder.PushBack(rowData.metric)
} }
} }
for _, value := range pointsBySeries { for elem := seriesByQueryOrder.Front(); elem != nil; elem = elem.Next() {
result.Series = append(result.Series, value) key := elem.Value.(string)
result.Series = append(result.Series, pointsBySeries[key])
} }
result.Meta.Set("rowCount", rowCount) result.Meta.Set("rowCount", rowCount)