From 97f67ddcb87581f579359ea62f8f510fce9c917a Mon Sep 17 00:00:00 2001
From: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Date: Tue, 10 Apr 2018 16:36:00 +0200
Subject: [PATCH] tsdb: improved floating point support when converting sql
 time column to epoch (ms)

---
 pkg/tsdb/sql_engine_test.go | 15 +++++++++------
 pkg/tsdb/time_range.go      | 12 ++++++------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkg/tsdb/sql_engine_test.go b/pkg/tsdb/sql_engine_test.go
index f8856489230..4c6951a0196 100644
--- a/pkg/tsdb/sql_engine_test.go
+++ b/pkg/tsdb/sql_engine_test.go
@@ -1,6 +1,7 @@
 package tsdb
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
@@ -9,7 +10,7 @@ import (
 
 func TestSqlEngine(t *testing.T) {
 	Convey("SqlEngine", t, func() {
-		dt := time.Date(2018, 3, 14, 21, 20, 6, 527e6, time.UTC)
+		dt := time.Date(2018, 3, 14, 21, 20, 6, int(527345*time.Microsecond), time.UTC)
 
 		Convey("Given row values with time.Time as time columns", func() {
 			var nilPointer *time.Time
@@ -24,7 +25,7 @@ func TestSqlEngine(t *testing.T) {
 			}
 
 			Convey("When converting them should return epoch time with millisecond precision ", func() {
-				expected := float64(dt.UnixNano() / 1e6)
+				expected := float64(dt.UnixNano()) / float64(time.Millisecond)
 				So(fixtures[0].(float64), ShouldEqual, expected)
 				So(fixtures[1].(float64), ShouldEqual, expected)
 				So(fixtures[2], ShouldBeNil)
@@ -132,8 +133,8 @@ func TestSqlEngine(t *testing.T) {
 		})
 
 		Convey("Given row values with float64 as time columns", func() {
-			tSeconds := float64(dt.Unix())
-			tMilliseconds := float64(dt.UnixNano() / 1e6)
+			tSeconds := float64(dt.UnixNano()) / float64(time.Second)
+			tMilliseconds := float64(dt.UnixNano()) / float64(time.Millisecond)
 			tNanoSeconds := float64(dt.UnixNano())
 			var nilPointer *float64
 
@@ -151,10 +152,12 @@ func TestSqlEngine(t *testing.T) {
 			}
 
 			Convey("When converting them should return epoch time with millisecond precision ", func() {
-				So(fixtures[0].(float64), ShouldEqual, tSeconds*1e3)
-				So(fixtures[1].(float64), ShouldEqual, tSeconds*1e3)
+				So(fixtures[0].(float64), ShouldEqual, tMilliseconds)
+				So(fixtures[1].(float64), ShouldEqual, tMilliseconds)
 				So(fixtures[2].(float64), ShouldEqual, tMilliseconds)
 				So(fixtures[3].(float64), ShouldEqual, tMilliseconds)
+				fmt.Println(fixtures[4].(float64))
+				fmt.Println(tMilliseconds)
 				So(fixtures[4].(float64), ShouldEqual, tMilliseconds)
 				So(fixtures[5].(float64), ShouldEqual, tMilliseconds)
 				So(fixtures[6], ShouldBeNil)
diff --git a/pkg/tsdb/time_range.go b/pkg/tsdb/time_range.go
index 47076eb3c6b..ed5b77d61de 100644
--- a/pkg/tsdb/time_range.go
+++ b/pkg/tsdb/time_range.go
@@ -92,14 +92,14 @@ func (tr *TimeRange) ParseTo() (time.Time, error) {
 // EpochPrecisionToMs converts epoch precision to millisecond, if needed.
 // Only seconds to milliseconds supported right now
 func EpochPrecisionToMs(value float64) float64 {
-	if int64(value)/1e10 == 0 {
-		return float64(value * 1e3)
+	s := strconv.FormatFloat(value, 'e', -1, 64)
+	if strings.HasSuffix(s, "e+09") {
+		return value * float64(1e3)
 	}
 
-	s := strconv.FormatFloat(value, 'f', -1, 64)
-	if len(s) == 19 {
-		return float64(value / 1e6)
+	if strings.HasSuffix(s, "e+18") {
+		return value / float64(time.Millisecond)
 	}
 
-	return float64(value)
+	return value
 }