Support > and != on the same field #3454
Merged
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
| public @Nullable List<Value> getNotInValues(FieldIndex fieldIndex) { | ||
| List<Value> values = new ArrayList<>(); | ||
|
|
||
| public @Nullable Collection<Value> getNotInValues(FieldIndex fieldIndex) { |
There was a problem hiding this comment.
This method now supports a == 1 && a != 2, which now correctly just returns a != 2 instead of the concatenation of both.
| Value.newBuilder() | ||
| .setArrayValue(ArrayValue.newBuilder().addValues(MIN_VALUE)) | ||
| .build(); | ||
| filterValue = Values.MIN_VALUE; |
There was a problem hiding this comment.
Not In and Not Equal use the same bound, which makes the comparison logic at the end of this method work as we do not want to compare to an array but to an actual minimum.
| @@ -740,8 +740,10 @@ private boolean isInFilter(Target target, FieldPath fieldPath) { | |||
| for (Filter filter : target.getFilters()) { | |||
| if ((filter instanceof FieldFilter) && ((FieldFilter) filter).getField().equals(fieldPath)) { | |||
| FieldFilter.Operator operator = ((FieldFilter) filter).getOperator(); | |||
| return operator.equals(FieldFilter.Operator.IN) | |||
| || operator.equals(FieldFilter.Operator.NOT_IN); | |||
| if (operator.equals(FieldFilter.Operator.IN) | |||
There was a problem hiding this comment.
A not-in filter does not have to appear on the first filter for a field. If there are multiple filters for the field path, not in can appear later.
| @@ -41,16 +41,15 @@ | |||
| public static final Value NULL_VALUE = | |||
| Value.newBuilder().setNullValue(NullValue.NULL_VALUE).build(); | |||
| public static final Value MIN_VALUE = NULL_VALUE; | |||
| private static final Value MAX_VALUE_TYPE = Value.newBuilder().setStringValue("__max__").build(); | |||
There was a problem hiding this comment.
All changes in this file are to support correct ordering for MAX_VALUE.
Size Report 1Affected Products
Test Logs
Notes |
Coverage Report 1Affected Products
Test Logs
Notes |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 adds the ability to use inequality and equality filters on the same field.