fix: fix parsing timestamp

taosdata · May 9, 2024 · 76174b8 · 76174b8
1 parent 24a49a9
commit 76174b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controller/rest/restful.go b/controller/rest/restful.go
@@ -119,9 +119,9 @@ func (ctl *Restful) sql(c *gin.Context) {
 		timeBuffer = timeBuffer[:0]
 		switch precision {
 		case common.PrecisionMilliSecond: // milli-second
-			timeBuffer = time.Unix(0, ts*1e6).In(location).AppendFormat(timeBuffer, layout.LayoutMillSecond)
+			timeBuffer = time.Unix(ts/1e3, (ts%1e3)*1e6).In(location).AppendFormat(timeBuffer, layout.LayoutMillSecond)
 		case common.PrecisionMicroSecond: // micro-second
-			timeBuffer = time.Unix(0, ts*1e3).In(location).AppendFormat(timeBuffer, layout.LayoutMicroSecond)
+			timeBuffer = time.Unix(ts/1e6, (ts%1e6)*1e3).In(location).AppendFormat(timeBuffer, layout.LayoutMicroSecond)
 		case common.PrecisionNanoSecond: // nano-second
 			timeBuffer = time.Unix(0, ts).In(location).AppendFormat(timeBuffer, layout.LayoutNanoSecond)
 		default:

diff --git a/plugin/prometheus/process.go b/plugin/prometheus/process.go
@@ -123,7 +123,7 @@ func generateWriteSql(timeseries []prompbWrite.TimeSeries, sql *bytes.Buffer, tt
 		for _, sample := range timeseries[i].Samples {
 			sql.WriteString("('")
 			timeBuffer.Reset()
-			timeBuffer.B = time.Unix(0, sample.Timestamp*1e6).UTC().AppendFormat(timeBuffer.B, time.RFC3339Nano)
+			timeBuffer.B = time.Unix(sample.Timestamp/1e3, (sample.Timestamp%1e3)*1e6).UTC().AppendFormat(timeBuffer.B, time.RFC3339Nano)
 			sql.WriteString(bytesutil.ToUnsafeString(timeBuffer.B))
 			sql.WriteString("',")
 			if math.IsNaN(sample.Value) {
@@ -262,7 +262,7 @@ func generateReadSql(query *prompb.Query) (string, error) {
 }
 
 func ms2Time(ts int64) string {
-	return time.Unix(0, ts*1e6).UTC().Format(time.RFC3339Nano)
+	return time.Unix(ts/1e3, (ts%1e3)*1e6).UTC().Format(time.RFC3339Nano)
 }
 
 func escapeString(s string) string {