Fix tag NEQ #2105
Merged
Fix tag NEQ #2105
Conversation
This file contains 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
| @@ -1188,7 +1193,6 @@ func TestSingleServer(t *testing.T) { | |||
| nodes := createCombinedNodeCluster(t, testName, dir, 1, 8090, nil) | |||
|
|
|||
| runTestsData(t, testName, nodes, "mydb", "myrp") | |||
| runTest_rawDataReturnsInOrder(t, testName, nodes, "mydb", "myrp") | |||
There was a problem hiding this comment.
Obviously this will not be part of the final commit, just to speed up my testing.
|
Fix issue #2097. |
otoolep
force-pushed
the
fix_tag_neq
branch
2 times, most recently
from
b154b0a to
53d17a6
Compare
|
lgtm |
otoolep
force-pushed
the
fix_tag_neq
branch
2 times, most recently
from
76e0a85 to
47025e9
Compare
| expected: `{"results":[{}]}`, | ||
| }, | ||
| { | ||
| reset: true, |
There was a problem hiding this comment.
I added an explicit reset-and-write here, since this test is subtle. I thought it was worth making it explicit.
|
@otoolep I made the same mistake in the |
otoolep
force-pushed
the
fix_tag_neq
branch
5 times, most recently
from
524dfab to
aef724a
Compare
If so, then return all series IDs which do not match. Fix for issue #2097
Series that do not have any tags are considered matching in the NEQREGEX case so the must be explicitly added.
|
+1 from @dgnorton |
| if n.Op == influxql.NEQREGEX { | ||
| ids = m.seriesIDs | ||
| } | ||
|
|
||
| for k := range tagVals { | ||
| match := re.Val.MatchString(k) | ||
|
|
||
| if (match && n.Op == influxql.EQREGEX) || (!match && n.Op == influxql.NEQREGEX) { |
There was a problem hiding this comment.
I think the || (!match && n.Op == influxql.NEQREGEX) can be removed.
There was a problem hiding this comment.
OK, I will update the code, and if the tests pass, I will merge.
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.
No description provided.