Skip to content

Optimize UnsignedLong range queries to convert to MatchNoDocsQuery when lower > upper bounds #14416

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jun 20, 2024
+10 −3
Merged

Optimize UnsignedLong range queries to convert to MatchNoDocsQuery when lower > upper bounds #14416

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4fedeed
Added check for lower > upper at end of function
Skyring100 Jun 17, 2024
844b267
Fixed mistake of using < operator on BigInteger, now using compareTo
Skyring100 Jun 17, 2024
7d1adfd
Fixed simple mistake of flipping > operator
Skyring100 Jun 17, 2024
b9513ad
Fixed space formatting
Skyring100 Jun 18, 2024
a9fb34f
Updated CHANGELOG.md
Skyring100 Jun 18, 2024
7601c9e
Issue number linked in CHANGELOG.md
Skyring100 Jun 18, 2024
d0bb0f9
doTestDocValueRangeQueries now accepts MatchNoDocsQuery alongside Ind…
Skyring100 Jun 18, 2024
f39e389
dotestdoTestDocValueRangeQueries only checks indexQuery and randomAcc…
Skyring100 Jun 18, 2024
3251bfa
Ran gradlew spotlessApply to fix import formatting issues
Skyring100 Jun 18, 2024
f23212c
Imported Matchers.either method instead of entire Matchers class
Skyring100 Jun 19, 2024
a187f9e
Merge branch 'main' into MatchNoDocsIssue14404
reta Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `com.gradle.develocity` from 3.17.4 to 3.17.5 ([#14397](https://github.com/opensearch-project/OpenSearch/pull/14397))

### Changed
- unsignedLongRangeQuery now returns MatchNoDocsQuery if the lower bounds are greater than the upper bounds ([#14416](https://github.com/opensearch-project/OpenSearch/pull/14416))

### Deprecated

Expand Down
3 changes: 3 additions & 0 deletions server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,9 @@ public static Query unsignedLongRangeQuery(
u = u.subtract(BigInteger.ONE);
}
}
if (l.compareTo(u) > 0) {
return new MatchNoDocsQuery();
}
return builder.apply(l, u);
}
}
Expand Down
9 changes: 6 additions & 3 deletions server/src/test/java/org/opensearch/index/mapper/NumberFieldTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
import org.opensearch.index.mapper.NumberFieldMapper.NumberType;
import org.opensearch.index.query.QueryShardContext;
import org.opensearch.search.MultiValueMode;
import org.hamcrest.Matchers;
import org.junit.Before;

import java.io.ByteArrayInputStream;
Expand Down Expand Up @@ -673,9 +674,11 @@ public void doTestDocValueRangeQueries(NumberType type, Supplier<Number> valueSu
true,
MOCK_QSC
);
assertThat(query, instanceOf(IndexOrDocValuesQuery.class));
IndexOrDocValuesQuery indexOrDvQuery = (IndexOrDocValuesQuery) query;
assertEquals(searcher.count(indexOrDvQuery.getIndexQuery()), searcher.count(indexOrDvQuery.getRandomAccessQuery()));
assertThat(query, Matchers.either(instanceOf(IndexOrDocValuesQuery.class)).or(instanceOf(MatchNoDocsQuery.class)));
if (query instanceof IndexOrDocValuesQuery) {
IndexOrDocValuesQuery indexOrDvQuery = (IndexOrDocValuesQuery) query;
assertEquals(searcher.count(indexOrDvQuery.getIndexQuery()), searcher.count(indexOrDvQuery.getRandomAccessQuery()));
}
}
reader.close();
dir.close();
Expand Down