utc timezone (#4954)

rilldata · May 27, 2024 · 99b2fc3 · 99b2fc3 · github-actions · May 27, 2024
1 parent 13991c3
commit 99b2fc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/runtime/pkg/pbutil/pbutil.go b/runtime/pkg/pbutil/pbutil.go
@@ -50,10 +50,10 @@ func ToValue(v any, t *runtimev1.Type) (*structpb.Value, error) {
 		return structpb.NewNumberValue(float64(v)), nil
 	case time.Time:
 		if t != nil && t.Code == runtimev1.Type_CODE_DATE {
-			s := v.Format(time.DateOnly)
+			s := v.In(time.UTC).Format(time.DateOnly)
 			return structpb.NewStringValue(s), nil
 		}
-		s := v.Format(time.RFC3339Nano)
+		s := v.In(time.UTC).Format(time.RFC3339Nano)
 		return structpb.NewStringValue(s), nil
 	case float32:
 		// Turning NaNs and Infs into nulls until frontend can deal with them as strings
@@ -147,10 +147,10 @@ func ToValue(v any, t *runtimev1.Type) (*structpb.Value, error) {
 		return structpb.NewNumberValue(float64(*v)), nil
 	case *time.Time:
 		if t != nil && t.Code == runtimev1.Type_CODE_DATE {
-			s := v.Format(time.DateOnly)
+			s := v.In(time.UTC).Format(time.DateOnly)
 			return structpb.NewStringValue(s), nil
 		}
-		s := v.Format(time.RFC3339Nano)
+		s := v.In(time.UTC).Format(time.RFC3339Nano)
 		return structpb.NewStringValue(s), nil
 	case *float32:
 		// Turning NaNs and Infs into nulls until frontend can deal with them as strings

diff --git a/runtime/queries/metricsview_aggregation.go b/runtime/queries/metricsview_aggregation.go
@@ -878,7 +878,8 @@ func (q *MetricsViewAggregation) buildTimestampExpr(mv *runtimev1.MetricsViewSpe
 		if dim.TimeZone == "" || dim.TimeZone == "UTC" || dim.TimeZone == "Etc/UTC" {
 			return fmt.Sprintf("date_trunc('%s', %s)", dialect.ConvertToDateTruncSpecifier(dim.TimeGrain), col), nil, nil
 		}
-		return fmt.Sprintf("toTimezone(date_trunc('%s', toTimezone(%s::TIMESTAMP, ?)), ?)", dialect.ConvertToDateTruncSpecifier(dim.TimeGrain), col), []any{dim.TimeZone, dim.TimeZone}, nil
+		// The return type of date_trunc('month', ...) is Date so need another TIMESTAMP cast
+		return fmt.Sprintf("toTimezone(date_trunc('%s', toTimezone(%s::TIMESTAMP, ?))::TIMESTAMP, ?)", dialect.ConvertToDateTruncSpecifier(dim.TimeGrain), col), []any{dim.TimeZone, dim.TimeZone}, nil
 	case drivers.DialectPinot:
 		// ToDateTime format truncates millis to secs because we don't support that, for example timeseries api does timestamppb.New(ts) which truncates to seconds
 		return fmt.Sprintf("ToDateTime(date_trunc('%s', %s, 'MILLISECONDS', ?), 'yyyy-MM-dd''T''HH:mm:ss''Z''')", dialect.ConvertToDateTruncSpecifier(dim.TimeGrain), col), []any{dim.TimeZone}, nil