Also include NEQ in filters #2104
Merged
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
| @@ -588,6 +588,21 @@ func runTestsData(t *testing.T, testName string, nodes Cluster, database, retent | |||
| expected: `{"results":[{"series":[{"name":"cpu","tags":{"region":"us-east"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",15]]},{"name":"cpu","tags":{"region":"us-west"},"columns":["time","mean"],"values":[["1970-01-01T00:00:00Z",30]]}]}]}`, | |||
| }, | |||
|
|
|||
| // WHERE tag queries | |||
| { | |||
| reset: true, | |||
There was a problem hiding this comment.
Added some = unit tests for tags. These always worked, but I wanted some tests.
| if n.Op == influxql.EQ || n.Op == influxql.LT || n.Op == influxql.LTE || n.Op == influxql.GT || | ||
| n.Op == influxql.GTE || n.Op == influxql.EQREGEX || n.Op == influxql.NEQREGEX { | ||
| switch n.Op { | ||
| case influxql.EQ, influxql.LT, influxql.LTE, influxql.GT, influxql.GTE, influxql.EQREGEX, influxql.NEQREGEX, influxql.NEQ: |
There was a problem hiding this comment.
The fix is here -- add influxql.NEQ. I also changed to the code to use switch -- I think it's easier to read now.
| @@ -475,6 +475,8 @@ func (m *Measurement) walkWhereForSeriesIds(expr influxql.Expr, filters map[uint | |||
|
|
|||
| // finally return the ids and say that we should include them | |||
| return ids, true, nil | |||
| default: | |||
There was a problem hiding this comment.
This may not be the right thing to do, but it would have flagged the bug immediately.
otoolep
force-pushed
the
various_fixes
branch
2 times, most recently
from
74c0175
to
0757bf3
Compare
This fixes != for field value comparisons.
|
LGTM, 🚢. Since you were adding test cases for queries against tags, it wouldn't hurt to add some that test against multiple tags using |
|
Let me get back to that -- I'm working on tags in #2105, and will add more tests there. |
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.
This fixes != for field value comparisons.