Update at-modifier to apply after truncate

rilldata · Jan 20, 2025 · 503fb1b · 503fb1b
1 parent f480b54
commit 503fb1b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/runtime/pkg/rilltime/rilltime.go b/runtime/pkg/rilltime/rilltime.go
@@ -105,8 +105,8 @@ type Grain struct {
 }
 
 type AtModifiers struct {
-	Offset   *TimeAnchor `parser:"@@?"`
-	TimeZone *string     `parser:"@TimeZone?"`
+	Offset   *Grain  `parser:"@@?"`
+	TimeZone *string `parser:"@TimeZone?"`
 }
 
 // ParseOptions allows for additional options that could probably not be added to the time range itself
@@ -208,18 +208,18 @@ func (e *Expression) Eval(evalOpts EvalOptions) (time.Time, time.Time, error) {
 	}
 
 	if e.Start != nil {
-		start = e.Modify(evalOpts, e.Start, start, true)
+		start = e.modify(evalOpts, e.Start, start)
 	}
 
 	end := evalOpts.Watermark
 	if e.End != nil {
-		end = e.Modify(evalOpts, e.End, end, true)
+		end = e.modify(evalOpts, e.End, end)
 	}
 
 	return start, end, nil
 }
 
-func (e *Expression) Modify(evalOpts EvalOptions, ta *TimeAnchor, tm time.Time, addOffset bool) time.Time {
+func (e *Expression) modify(evalOpts EvalOptions, ta *TimeAnchor, tm time.Time) time.Time {
 	isTruncate := true
 	truncateGrain := e.truncateGrain
 	isBoundary := false
@@ -265,9 +265,6 @@ func (e *Expression) Modify(evalOpts EvalOptions, ta *TimeAnchor, tm time.Time,
 	if ta.Offset != nil {
 		tm = ta.Offset.offset(tm)
 	}
-	if addOffset && e.AtModifiers != nil && e.AtModifiers.Offset != nil {
-		tm = e.Modify(evalOpts, e.AtModifiers.Offset, tm, false)
-	}
 
 	if ta.Trunc != nil {
 		truncateGrain = grainMap[*ta.Trunc]
@@ -281,6 +278,11 @@ func (e *Expression) Modify(evalOpts EvalOptions, ta *TimeAnchor, tm time.Time,
 		modifiedTime = timeutil.CeilTime(tm, truncateGrain, e.timeZone, evalOpts.FirstDay, evalOpts.FirstMonth)
 	}
 
+	// Add offset after truncate
+	if e.AtModifiers != nil && e.AtModifiers.Offset != nil {
+		modifiedTime = e.AtModifiers.Offset.offset(modifiedTime)
+	}
+
 	if isBoundary && modifiedTime.Equal(timeBeforeOffset) && (e.Modifiers == nil || e.Modifiers.CompleteGrain == nil) {
 		// edge case where the end time falls on a boundary. add +1grain to make sure the last data point is included
 		n := 1

diff --git a/runtime/pkg/rilltime/rilltime_test.go b/runtime/pkg/rilltime/rilltime_test.go
@@ -27,6 +27,9 @@ func Test_Resolve(t *testing.T) {
 		{`-6d, now : |h|`, "2024-08-03T00:00:00Z", "2024-08-09T10:00:00Z"},
 		{`-6d, now : h`, "2024-08-03T00:00:00Z", "2024-08-09T11:00:00Z"},
 
+		{`0d : h`, "2024-08-05T00:00:00Z", "2024-08-05T07:00:00Z"},
+		{`0d : h @ -1d`, "2024-08-04T00:00:00Z", "2024-08-04T07:00:00Z"},
+
 		{`-7d, -5d : h`, "2024-07-29T00:00:00Z", "2024-07-31T00:00:00Z"},
 		{`-2d, now/d : h @ -5d`, "2024-08-02T00:00:00Z", "2024-08-04T00:00:00Z"},
 		{`-2d, now/d @ -5d`, "2024-08-02T00:00:00Z", "2024-08-04T00:00:00Z"},