MQE: fix or where both sides have series with the same labels
#9874
Conversation
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
# Conflicts: # CHANGELOG.md
5615fa0 to
aff7b54
Compare
…rBinaryOperation` to make test stronger
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9874-to-r313 origin/r313
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b873372adbf0996bff70de55934f3dd4a10c7b89
# Push it to GitHub
git push --set-upstream origin backport-9874-to-r313
git switch main
# Remove the local backport branch
git branch -D backport-9874-to-r313Then, create a pull request where the |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9874-to-r314 origin/r314
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b873372adbf0996bff70de55934f3dd4a10c7b89
# Push it to GitHub
git push --set-upstream origin backport-9874-to-r314
git switch main
# Remove the local backport branch
git branch -D backport-9874-to-r314Then, create a pull request where the |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9874-to-r315 origin/r315
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b873372adbf0996bff70de55934f3dd4a10c7b89
# Push it to GitHub
git push --set-upstream origin backport-9874-to-r315
git switch main
# Remove the local backport branch
git branch -D backport-9874-to-r315Then, create a pull request where the |
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-9874-to-r316 origin/r316
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b873372adbf0996bff70de55934f3dd4a10c7b89
# Push it to GitHub
git push --set-upstream origin backport-9874-to-r316
git switch main
# Remove the local backport branch
git branch -D backport-9874-to-r316Then, create a pull request where the |
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
* MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
Merged
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
* MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
Merged
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
* MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
Merged
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
* MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
Merged
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
* MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
… (#9876) * MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
… (#9877) * MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
… (#9878) * MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
charleskorn
added a commit
that referenced
this pull request
Nov 12, 2024
… (#9875) * MQE: fix `or` where both sides have series with the same labels * Add changelog entry # Conflicts: # CHANGELOG.md * Address PR feedback: move `operators.NewDeduplicateAndMerge` to `NewOrBinaryOperation` to make test stronger (cherry picked from commit b873372) # Conflicts: # CHANGELOG.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does
This PR fixes a bug in MQE's implementation of
orwhere it could return incorrect results if both sides contained series with the same labels, and the series on the left side did not have a value for all time steps.For example, in the expression
min(series_1) or min(series_2), both sides have a single series with no labels. Previously,orwould have returned two series with the labels{}, rather than correctly returning a single{}series.I've opted to use
DeduplicateAndMergehere, as it's the simplest solution that is already well-tested. A more sophisticated option would be to modifyOrBinaryOperationto handle this case itself, but this would come at the cost of increased complexity, and it would largely replicate the behaviour and logic ofDeduplicateAndMerge.The same issue does not affect
andorunless, as these operations always return only the left series.Which issue(s) this PR fixes or relates to
(none)
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.