warn on rollup/base query coverage mismatch

Author: pjain1

proto/gen/rill/runtime/v1/queries.pb.go

@@ -6296,6 +6296,11 @@ definitions:
         items:
           type: object
         title: Not optional, not null
+      servingTable:
+        type: string
+        description: |-
+          Rollup table the query was routed to. Empty when the query was served from the metrics view's base table.
+          Matches the keys of rollup_time_ranges in MetricsViewTimeRangeResponse and MetricsViewTimeRangesResponse.
       trace:
         $ref: '#/definitions/v1Trace'
         description: Traces of spans captured during request execution. Only populated if trace was set to true in the request.
@@ -6459,6 +6464,11 @@ definitions:
           type: object
           $ref: '#/definitions/v1MetricsViewComparisonRow'
         title: Not optional, not null
+      servingTable:
+        type: string
+        description: |-
+          Rollup table the query was routed to. Empty when the query was served from the metrics view's base table.
+          Matches the keys of rollup_time_ranges in MetricsViewTimeRangeResponse and MetricsViewTimeRangesResponse.
       trace:
         $ref: '#/definitions/v1Trace'
         description: Traces of spans captured during request execution. Only populated if trace was set to true in the request.
@@ -6801,6 +6811,13 @@ definitions:
       timeRangeSummary:
         $ref: '#/definitions/v1TimeRangeSummary'
         title: Not optional, not null
+      rollupTimeRanges:
+        type: object
+        additionalProperties:
+          $ref: '#/definitions/v1TimeRangeSummary'
+        description: |-
+          Time range summaries for the metrics view's rollups, keyed by rollup table name.
+          Only populated when the metrics view has rollups.
       maxQueryTimeRangeMillis:
         type: string
         format: int64
@@ -6816,6 +6833,13 @@ definitions:
       fullTimeRange:
         $ref: '#/definitions/v1TimeRangeSummary'
         description: The full time range summary for the requested time dimension.
+      rollupTimeRanges:
+        type: object
+        additionalProperties:
+          $ref: '#/definitions/v1TimeRangeSummary'
+        description: |-
+          Time range summaries for the metrics view's rollups, keyed by rollup table name.
+          Only populated when the metrics view has rollups.
       resolvedTimeRanges:
         type: array
         items:
@@ -6903,6 +6927,11 @@ definitions:
           type: object
           $ref: '#/definitions/v1TimeSeriesValue'
         title: Not optional, not null
+      servingTable:
+        type: string
+        description: |-
+          Rollup table the query was routed to. Empty when the query was served from the metrics view's base table.
+          Matches the keys of rollup_time_ranges in MetricsViewTimeRangeResponse and MetricsViewTimeRangesResponse.
       trace:
         $ref: '#/definitions/v1Trace'
         description: Traces of spans captured during request execution. Only populated if trace was set to true in the request.

proto/gen/rill/runtime/v1/queries.pb.validate.go

@@ -485,6 +485,9 @@ message MetricsViewAggregationResponse {
   StructType schema = 1;
   // Not optional, not null
   repeated google.protobuf.Struct data = 2;
+  // Rollup table the query was routed to. Empty when the query was served from the metrics view's base table.
+  // Matches the keys of rollup_time_ranges in MetricsViewTimeRangeResponse and MetricsViewTimeRangesResponse.
+  string serving_table = 4;
   // Traces of spans captured during request execution. Only populated if trace was set to true in the request.
   Trace trace = 3;
 }
@@ -638,6 +641,9 @@ message MetricsViewComparisonRequest {
 message MetricsViewComparisonResponse {
   // Not optional, not null
   repeated MetricsViewComparisonRow rows = 1;
+  // Rollup table the query was routed to. Empty when the query was served from the metrics view's base table.
+  // Matches the keys of rollup_time_ranges in MetricsViewTimeRangeResponse and MetricsViewTimeRangesResponse.
+  string serving_table = 3;
   // Traces of spans captured during request execution. Only populated if trace was set to true in the request.
   Trace trace = 2;
 }
@@ -747,6 +753,9 @@ message MetricsViewTimeSeriesResponse {
   repeated MetricsViewColumn meta = 1;
   // Not optional, not null
   repeated TimeSeriesValue data = 2;
+  // Rollup table the query was routed to. Empty when the query was served from the metrics view's base table.
+  // Matches the keys of rollup_time_ranges in MetricsViewTimeRangeResponse and MetricsViewTimeRangesResponse.
+  string serving_table = 4;
   // Traces of spans captured during request execution. Only populated if trace was set to true in the request.
   Trace trace = 3;
 }
@@ -861,6 +870,9 @@ message MetricsViewTimeRangeRequest {
 message MetricsViewTimeRangeResponse {
   // Not optional, not null
   TimeRangeSummary time_range_summary = 1;
+  // Time range summaries for the metrics view's rollups, keyed by rollup table name.
+  // Only populated when the metrics view has rollups.
+  map<string, TimeRangeSummary> rollup_time_ranges = 4;
   // The metrics view's max_query_time_range property resolved into milliseconds against the current time.
   // Zero if the metrics view does not configure max_query_time_range.
   int64 max_query_time_range_millis = 3;
@@ -931,6 +943,9 @@ message MetricsViewTimeRangesRequest {
 message MetricsViewTimeRangesResponse {
   // The full time range summary for the requested time dimension.
   TimeRangeSummary full_time_range = 1;
+  // Time range summaries for the metrics view's rollups, keyed by rollup table name.
+  // Only populated when the metrics view has rollups.
+  map<string, TimeRangeSummary> rollup_time_ranges = 6;
   // The resolved time ranges for the requested rilltime expressions.
   repeated ResolvedTimeRange resolved_time_ranges = 3;
   // The same values as resolved_time_ranges for backwards compatibility.

proto/gen/rill/runtime/v1/runtime.swagger.yaml

@@ -127,8 +127,9 @@ func (q *MetricsViewAggregation) Resolve(ctx context.Context, rt *runtime.Runtim
 	}
 
 	q.Result = &runtimev1.MetricsViewAggregationResponse{
-		Schema: res.Schema,
-		Data:   data,
+		Schema:       res.Schema,
+		Data:         data,
+		ServingTable: rollupServingTable(e, mv.ValidSpec),
 	}
 	return nil
 }
@@ -287,6 +288,15 @@ func ResolveTimestampResult(ctx context.Context, rt *runtime.Runtime, instanceID
 	return tsRes, nil
 }
 
+// rollupServingTable returns the rollup table the executor's last query was routed to.
+// Returns an empty string when the query was served from the metrics view's base table.
+func rollupServingTable(e *executor.Executor, mv *runtimev1.MetricsViewSpec) string {
+	if t := e.LatestQueryTable(); t != "" && t != mv.Table {
+		return t
+	}
+	return ""
+}
+
 func (q *MetricsViewAggregation) rewriteToMetricsViewQuery(export bool) (*metricsview.Query, error) {
 	qry := &metricsview.Query{MetricsView: q.MetricsViewName}
 

proto/rill/runtime/v1/queries.proto

@@ -172,7 +172,8 @@ func (q *MetricsViewComparison) Resolve(ctx context.Context, rt *runtime.Runtime
 	}
 
 	q.Result = &runtimev1.MetricsViewComparisonResponse{
-		Rows: rows,
+		Rows:         rows,
+		ServingTable: rollupServingTable(e, mv.ValidSpec),
 	}
 
 	return nil

runtime/queries/metricsview_aggregation.go

@@ -143,7 +143,11 @@ func (q *MetricsViewTimeSeries) Resolve(ctx context.Context, rt *runtime.Runtime
 	}
 	defer res.Close()
 
-	return q.populateResult(res, timeDim, mv.ValidSpec, nullImpl)
+	if err := q.populateResult(res, timeDim, mv.ValidSpec, nullImpl); err != nil {
+		return err
+	}
+	q.Result.ServingTable = rollupServingTable(e, mv.ValidSpec)
+	return nil
 }
 
 func (q *MetricsViewTimeSeries) Export(ctx context.Context, rt *runtime.Runtime, instanceID string, w io.Writer, opts *runtime.ExportOptions) error {

runtime/queries/metricsview_comparison_toplist.go

@@ -419,6 +419,7 @@ func (s *Server) MetricsViewTimeRange(ctx context.Context, req *runtimev1.Metric
 			Max:       valOrNullTime(ts.Max),
 			Watermark: valOrNullTime(ts.Watermark),
 		},
+		RollupTimeRanges:        rollupTimeRangeSummaries(ts),
 		MaxQueryTimeRangeMillis: metricsview.ResolveMaxQueryTimeRange(maxQueryTimeRange, time.Now()).Milliseconds(),
 	}, nil
 }
@@ -528,11 +529,13 @@ func (s *Server) MetricsViewTimeRanges(ctx context.Context, req *runtimev1.Metri
 		return nil, err
 	}
 	if req.ExecutionTime != nil {
-		// If override is set, we use it for every ref except `min`
+		// If override is set, we use it for every ref except `min`.
+		// Rollup timestamps are preserved as-is since they report actual data coverage.
 		ts = metricsview.TimestampsResult{
 			Min:       ts.Min,
 			Max:       req.ExecutionTime.AsTime(),
 			Watermark: req.ExecutionTime.AsTime(),
+			Rollups:   ts.Rollups,
 		}
 		now = req.ExecutionTime.AsTime()
 	}
@@ -603,6 +606,7 @@ func (s *Server) MetricsViewTimeRanges(ctx context.Context, req *runtimev1.Metri
 			Max:       valOrNullTime(ts.Max),
 			Watermark: valOrNullTime(ts.Watermark),
 		},
+		RollupTimeRanges:        rollupTimeRangeSummaries(ts),
 		ResolvedTimeRanges:      timeRanges,
 		TimeRanges:              backwardsCompatibleRanges,
 		MaxQueryTimeRangeMillis: metricsview.ResolveMaxQueryTimeRange(maxQueryTimeRange, now).Milliseconds(),
@@ -810,3 +814,19 @@ func valOrNullTime(v time.Time) *timestamppb.Timestamp {
 	}
 	return timestamppb.New(v)
 }
+
+// rollupTimeRangeSummaries converts the rollup timestamps in a TimestampsResult
+// to time range summaries keyed by rollup table name. Returns nil when the metrics view has no rollups.
+func rollupTimeRangeSummaries(ts metricsview.TimestampsResult) map[string]*runtimev1.TimeRangeSummary {
+	if len(ts.Rollups) == 0 {
+		return nil
+	}
+	res := make(map[string]*runtimev1.TimeRangeSummary, len(ts.Rollups))
+	for table, rts := range ts.Rollups {
+		res[table] = &runtimev1.TimeRangeSummary{
+			Min: valOrNullTime(rts.Min),
+			Max: valOrNullTime(rts.Max),
+		}
+	}
+	return res
+}