opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-27 02:54:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

sql: seconds epochs are now correctly converted to ms.

Browse Source 
Closes #12061
This commit is contained in:
Leonard Gram
2018-05-28 16:57:51 +02:00
parent 83b7bbd60b
commit e6f2811b21
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/sql_engine.go
View File

@ -144,10 +144,10 @@ func ConvertSqlTimeColumnToEpochMs(values RowValues, timeIndex int) {
if timeIndex >= 0 { if timeIndex >= 0 {
switch value := values[timeIndex].(type) { switch value := values[timeIndex].(type) {
case time.Time: case time.Time:
values[timeIndex] = EpochPrecisionToMs(float64(value.UnixNano())) values[timeIndex] = float64(value.UnixNano()) / float64(time.Millisecond)
case *time.Time: case *time.Time:
if value != nil { if value != nil {
values[timeIndex] = EpochPrecisionToMs(float64((*value).UnixNano())) values[timeIndex] = float64((*value).UnixNano()) / float64(time.Millisecond)
} }
case int64: case int64:
values[timeIndex] = int64(EpochPrecisionToMs(float64(value))) values[timeIndex] = int64(EpochPrecisionToMs(float64(value)))

13
pkg/tsdb/sql_engine_test.go
View File

@ -12,14 +12,17 @@ import (
func TestSqlEngine(t *testing.T) { func TestSqlEngine(t *testing.T) {
Convey("SqlEngine", t, func() { Convey("SqlEngine", t, func() {
dt := time.Date(2018, 3, 14, 21, 20, 6, int(527345*time.Microsecond), time.UTC) dt := time.Date(2018, 3, 14, 21, 20, 6, int(527345*time.Microsecond), time.UTC)
earlyDt := time.Date(1970, 3, 14, 21, 20, 6, int(527345*time.Microsecond), time.UTC)
Convey("Given row values with time.Time as time columns", func() { Convey("Given row values with time.Time as time columns", func() {
var nilPointer *time.Time var nilPointer *time.Time
fixtures := make([]interface{}, 3) fixtures := make([]interface{}, 5)
fixtures[0] = dt fixtures[0] = dt
fixtures[1] = &dt fixtures[1] = &dt
fixtures[2] = nilPointer fixtures[2] = earlyDt
fixtures[3] = &earlyDt
fixtures[4] = nilPointer
for i := range fixtures { for i := range fixtures {
ConvertSqlTimeColumnToEpochMs(fixtures, i) ConvertSqlTimeColumnToEpochMs(fixtures, i)
@ -27,9 +30,13 @@ func TestSqlEngine(t *testing.T) {
Convey("When converting them should return epoch time with millisecond precision ", func() { Convey("When converting them should return epoch time with millisecond precision ", func() {
expected := float64(dt.UnixNano()) / float64(time.Millisecond) expected := float64(dt.UnixNano()) / float64(time.Millisecond)
expectedEarly := float64(earlyDt.UnixNano()) / float64(time.Millisecond)
So(fixtures[0].(float64), ShouldEqual, expected) So(fixtures[0].(float64), ShouldEqual, expected)
So(fixtures[1].(float64), ShouldEqual, expected) So(fixtures[1].(float64), ShouldEqual, expected)
So(fixtures[2], ShouldBeNil) So(fixtures[2].(float64), ShouldEqual, expectedEarly)
So(fixtures[3].(float64), ShouldEqual, expectedEarly)
So(fixtures[4], ShouldBeNil)
}) })
}) })