refactor(query-engine): dedup controller-pattern matching loop in promql.rs#515
Merged
milindsrivastava1997 merged 1 commit intoJul 7, 2026
Conversation
milindsrivastava1997
deleted the
506-promqlrs-duplicated-controller-pattern-matching-loop
branch
zaoxing
added a commit
that referenced
this pull request
Jul 11, 2026
…t-correction Resolve conflicts from main's promql.rs dedup + QueryPatternType removal (#511/#515/#517/#518) against the rate()/increase() counter-reset correction + extrapolation work: - promql.rs: keep main's refactored build_query_kwargs_promql signature (&Statistic, match_result); thread `timestamps` through it and retain the Rate|Increase range-boundary arm; drop now-unused imports (QueryPatternType, get_is_collapsable, AggregationOperator, PromQLFunction, get_spatial_aggregation_output_labels, get_statistics_to_compute). - simple_engine/mod.rs: keep RANGE_*_MS_KWARG imports (per-step range boundaries), drop removed QueryPatternType. - tests: keep the single-pop Increase extrapolation test (arroyo serde now makes it deserializable) over main's obsolete not_implemented assertion; keep all new rate/increase test modules alongside main's range_query_arithmetic_tests. Verified: workspace builds; 560 lib tests pass (0 failures); fmt clean. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.