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

mysql: progress

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-04-19 17:26:29 +02:00
parent 1e29d4fcfa
commit 11806dfa78
4 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import (
"github.com/go-xorm/core"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/components/null"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/tsdb"
@ -81,6 +82,7 @@ func (e *MysqlExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, co
QueryResults: make(map[string]*tsdb.QueryResult),
}
macroEngine := NewMysqlMacroEngine(context.TimeRange)
session := e.engine.NewSession()
defer session.Close()
db := session.DB()
@ -91,9 +93,20 @@ func (e *MysqlExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, co
continue
}
queryResult := &tsdb.QueryResult{Meta: simplejson.New(), RefId: query.RefId}
result.QueryResults[query.RefId] = queryResult
rawSql, err := macroEngine.Interpolate(rawSql)
if err != nil {
queryResult.Error = err
continue
}
queryResult.Meta.Set("sql", rawSql)
rows, err := db.Query(rawSql)
if err != nil {
result.QueryResults[query.RefId] = &tsdb.QueryResult{Error: err}
queryResult.Error = err
continue
}
@ -101,16 +114,24 @@ func (e *MysqlExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice, co
res, err := e.TransformToTimeSeries(query, rows)
if err != nil {
result.Error = err
queryResult.Error = err
return result
}
result.QueryResults[query.RefId] = &tsdb.QueryResult{RefId: query.RefId, Series: res}
queryResult.Series = res
queryResult.Meta.Set("rowCount", countPointsInAllSeries(res))
}
return result
}
func countPointsInAllSeries(seriesList tsdb.TimeSeriesSlice) (count int) {
for _, series := range seriesList {
count += len(series.Points)
}
return count
}
func (e MysqlExecutor) TransformToTimeSeries(query *tsdb.Query, rows *core.Rows) (tsdb.TimeSeriesSlice, error) {
pointsBySeries := make(map[string]*tsdb.TimeSeries)
columnNames, err := rows.Columns()