Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: lots of corner cases in PromQL #1345

Merged
merged 8 commits into from
Apr 10, 2023

Conversation

waynexia
Copy link
Member

@waynexia waynexia commented Apr 7, 2023

I hereby agree to the terms of the GreptimeDB CLA

What's changed and what's your intention?

Changes 😇

  • don't generate filter plan if there is no filter
  • don't include timestamp filter in filter plan
  • fix how the offset is handled
  • consider the stale NaN case
  • don't filter NaN for instant selector
  • ignore nonexistent time series in range selector

Checklist

  • I have written the necessary rustdoc comments.
  • I have added the necessary unit tests and integration tests.

Refer to a related PR or issue link (optional)

#1042

waynexia added 5 commits April 7, 2023 10:43
fix offset logic
ignore empty range vector

Signed-off-by: Ruihang Xia <[email protected]>
Signed-off-by: Ruihang Xia <[email protected]>
Signed-off-by: Ruihang Xia <[email protected]>
@codecov
Copy link

codecov bot commented Apr 7, 2023

Codecov Report

Merging #1345 (4127cc1) into develop (da66138) will decrease coverage by 0.78%.
The diff coverage is 90.83%.

❗ Current head 4127cc1 differs from pull request most recent head 0d4e03a. Consider uploading reports for the commit 0d4e03a to get more accurate results

@@             Coverage Diff             @@
##           develop    #1345      +/-   ##
===========================================
- Coverage    85.84%   85.06%   -0.78%     
===========================================
  Files          506      514       +8     
  Lines        76861    77471     +610     
===========================================
- Hits         65980    65901      -79     
- Misses       10881    11570     +689     

Copy link
Collaborator

@fengjiachun fengjiachun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Signed-off-by: Ruihang Xia <[email protected]>
Signed-off-by: Ruihang Xia <[email protected]>
@waynexia waynexia requested a review from killme2008 April 10, 2023 08:53
@killme2008 killme2008 enabled auto-merge (squash) April 10, 2023 08:55
@killme2008 killme2008 merged commit 09f003d into GreptimeTeam:develop Apr 10, 2023
paomian pushed a commit to paomian/greptimedb that referenced this pull request Oct 19, 2023
* adjust plan ordering
fix offset logic
ignore empty range vector

Signed-off-by: Ruihang Xia <[email protected]>

* fix: different NaN logic between instant and range selector

Signed-off-by: Ruihang Xia <[email protected]>

* fix: enlarge selector time window

Signed-off-by: Ruihang Xia <[email protected]>

* revert change about stale NaN

Signed-off-by: Ruihang Xia <[email protected]>

* fix tests

Signed-off-by: Ruihang Xia <[email protected]>

* clean up

Signed-off-by: Ruihang Xia <[email protected]>

* rename variables

Signed-off-by: Ruihang Xia <[email protected]>

* one more rename

Signed-off-by: Ruihang Xia <[email protected]>

---------

Signed-off-by: Ruihang Xia <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants