refactor(tsdb): changed tsdb time series model to use null.Float instead of pointers

pkg/tsdb/graphite/graphite.go

@@ -80,6 +80,7 @@ func (e *GraphiteExecutor) Execute(queries tsdb.QuerySlice, context *tsdb.QueryC
 
 	result.QueryResults = make(map[string]*tsdb.QueryResult)
 	queryRes := &tsdb.QueryResult{}
+
 	for _, series := range data {
 		queryRes.Series = append(queryRes.Series, &tsdb.TimeSeries{
 			Name:   series.Target,

pkg/tsdb/graphite/types.go

@@ -1,6 +1,8 @@
 package graphite
 
+import "github.com/grafana/grafana/pkg/tsdb"
+
 type TargetResponseDTO struct {
-	Target     string        `json:"target"`
-	DataPoints [][2]*float64 `json:"datapoints"`
+	Target     string                `json:"target"`
+	DataPoints tsdb.TimeSeriesPoints `json:"datapoints"`
 }

pkg/tsdb/models.go

@@ -1,6 +1,9 @@
 package tsdb
 
-import "github.com/grafana/grafana/pkg/components/simplejson"
+import (
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"gopkg.in/guregu/null.v3"
+)
 
 type Query struct {
 	RefId         string
@@ -55,13 +58,29 @@ type QueryResult struct {
 }
 
 type TimeSeries struct {
-	Name   string        `json:"name"`
-	Points [][2]*float64 `json:"points"`
+	Name   string           `json:"name"`
+	Points TimeSeriesPoints `json:"points"`
 }
 
+type TimePoint [2]null.Float
+type TimeSeriesPoints []TimePoint
 type TimeSeriesSlice []*TimeSeries
 
-func NewTimeSeries(name string, points [][2]*float64) *TimeSeries {
+func NewTimePoint(value float64, timestamp float64) TimePoint {
+	return TimePoint{null.FloatFrom(value), null.FloatFrom(timestamp)}
+}
+
+func NewTimeSeriesPointsFromArgs(values ...float64) TimeSeriesPoints {
+	points := make(TimeSeriesPoints, 0)
+
+	for i := 0; i < len(values); i += 2 {
+		points = append(points, NewTimePoint(values[i], values[i+1]))
+	}
+
+	return points
+}
+
+func NewTimeSeries(name string, points TimeSeriesPoints) *TimeSeries {
 	return &TimeSeries{
 		Name:   name,
 		Points: points,

pkg/tsdb/prometheus/prometheus.go

@@ -140,17 +140,15 @@ func parseResponse(value pmodel.Value, query *PrometheusQuery) (map[string]*tsdb
 	}
 
 	for _, v := range data {
-		var points [][2]*float64
-		for _, k := range v.Values {
-			timestamp := float64(k.Timestamp)
-			val := float64(k.Value)
-			points = append(points, [2]*float64{&val, &timestamp})
+		series := tsdb.TimeSeries{
+			Name: formatLegend(v.Metric, query),
 		}
 
-		queryRes.Series = append(queryRes.Series, &tsdb.TimeSeries{
-			Name:   formatLegend(v.Metric, query),
-			Points: points,
-		})
+		for _, k := range v.Values {
+			series.Points = append(series.Points, tsdb.NewTimePoint(float64(k.Value), float64(k.Timestamp.Unix()*1000)))
+		}
+
+		queryRes.Series = append(queryRes.Series, &series)
 	}
 
 	queryResults["A"] = queryRes

pkg/tsdb/testdata/scenarios.go

@@ -4,7 +4,6 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/tsdb"
 )
 
@@ -21,7 +20,7 @@ var ScenarioRegistry map[string]*Scenario
 
 func init() {
 	ScenarioRegistry = make(map[string]*Scenario)
-	logger := log.New("tsdb.testdata")
+	//logger := log.New("tsdb.testdata")
 
 	registerScenario(&Scenario{
 		Id:   "random_walk",
@@ -33,13 +32,11 @@ func init() {
 
 			series := newSeriesForQuery(query)
 
-			points := make([][2]*float64, 0)
+			points := make(tsdb.TimeSeriesPoints, 0)
 			walker := rand.Float64() * 100
 
 			for i := int64(0); i < 10000 && timeWalkerMs < to; i++ {
-				timestamp := float64(timeWalkerMs)
-				val := float64(walker)
-				points = append(points, [2]*float64{&val, &timestamp})
+				points = append(points, tsdb.NewTimePoint(walker, float64(timeWalkerMs)))
 
 				walker += rand.Float64() - 0.5
 				timeWalkerMs += query.IntervalMs
@@ -72,12 +69,9 @@ func init() {
 			series := newSeriesForQuery(query)
 			outsideTime := context.TimeRange.MustGetFrom().Add(-1*time.Hour).Unix() * 1000
 
-			timestamp := float64(outsideTime)
-			logger.Info("time", "from", timestamp)
-			val := float64(10)
-
-			series.Points = append(series.Points, [2]*float64{&val, &timestamp})
+			series.Points = append(series.Points, tsdb.NewTimePoint(10, float64(outsideTime)))
 			queryRes.Series = append(queryRes.Series, series)
+
 			return queryRes
 		},
 	})