diff --git a/src/promql/src/planner.rs b/src/promql/src/planner.rs index 3af4197bbd..27b0ed5402 100644 --- a/src/promql/src/planner.rs +++ b/src/promql/src/planner.rs @@ -141,9 +141,6 @@ impl PromPlanner { // convert op and value columns to aggregate exprs let aggr_exprs = self.create_aggregate_exprs(*op, &input)?; - // remove time index column from context - self.ctx.time_index_column = None; - // create plan let group_sort_expr = group_exprs .clone() diff --git a/tests-integration/src/tests/promql_test.rs b/tests-integration/src/tests/promql_test.rs index 61b1f177f0..8cb798d067 100644 --- a/tests-integration/src/tests/promql_test.rs +++ b/tests-integration/src/tests/promql_test.rs @@ -414,12 +414,12 @@ async fn aggregators_complex_combined_aggrs(instance: Arc) { unix_epoch_plus_100s(), Duration::from_secs(60), Duration::from_secs(0), - "+------------+-----------------------------------------------------------------------------------------------------------+\ - \n| job | SUM(http_requests.value) + MIN(http_requests.value) + MAX(http_requests.value) + AVG(http_requests.value) |\ - \n+------------+-----------------------------------------------------------------------------------------------------------+\ - \n| api-server | 1750.0 |\ - \n| app-server | 4550.0 |\ - \n+------------+-----------------------------------------------------------------------------------------------------------+", + "+------------+---------------------+-----------------------------------------------------------------------------------------------------------+\ + \n| job | ts | SUM(http_requests.value) + MIN(http_requests.value) + MAX(http_requests.value) + AVG(http_requests.value) |\ + \n+------------+---------------------+-----------------------------------------------------------------------------------------------------------+\ + \n| api-server | 1970-01-01T00:00:00 | 1750.0 |\ + \n| app-server | 1970-01-01T00:00:00 | 4550.0 |\ + \n+------------+---------------------+-----------------------------------------------------------------------------------------------------------+", ) .await; } @@ -439,12 +439,12 @@ async fn two_aggregators_combined_aggrs(instance: Arc) { unix_epoch_plus_100s(), Duration::from_secs(60), Duration::from_secs(0), - "+------------+-----------------------------------------------------+\ - \n| job | SUM(http_requests.value) + MIN(http_requests.value) |\ - \n+------------+-----------------------------------------------------+\ - \n| api-server | 1100.0 |\ - \n| app-server | 3100.0 |\ - \n+------------+-----------------------------------------------------+", + "+------------+---------------------+-----------------------------------------------------+\ + \n| job | ts | SUM(http_requests.value) + MIN(http_requests.value) |\ + \n+------------+---------------------+-----------------------------------------------------+\ + \n| api-server | 1970-01-01T00:00:00 | 1100.0 |\ + \n| app-server | 1970-01-01T00:00:00 | 3100.0 |\ + \n+------------+---------------------+-----------------------------------------------------+", ) .await; }