Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-10442: When indexQuery or/and dvQuery be a MatchAllDocsQuery then IndexOrDocValuesQuery should be rewrite to MatchAllDocsQuery (#715)

This commit is contained in:
Lu Xugang 2022-03-01 01:46:32 +08:00 committed by GitHub
parent 466278e149
commit 6224d0b157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -234,6 +234,9 @@ Optimizations
* LUCENE-10084, LUCENE-10435: Rewrite DocValuesFieldExistsQuery to MatchAllDocsQuery whenever * LUCENE-10084, LUCENE-10435: Rewrite DocValuesFieldExistsQuery to MatchAllDocsQuery whenever
terms or points have a docCount that is equal to maxDoc. (Vigya Sharma, Lu Xugang) terms or points have a docCount that is equal to maxDoc. (Vigya Sharma, Lu Xugang)
* LUCENE-10442: When indexQuery or/and dvQuery be a MatchAllDocsQuery
then IndexOrDocValuesQuery should be rewrite to MatchAllDocsQuery. (Lu Xugang)
Changes in runtime behavior Changes in runtime behavior
--------------------- ---------------------

4
lucene/core/src/java/org/apache/lucene/search/IndexOrDocValuesQuery.java
View File

@ -104,6 +104,10 @@ public final class IndexOrDocValuesQuery extends Query {
public Query rewrite(IndexReader reader) throws IOException { public Query rewrite(IndexReader reader) throws IOException {
Query indexRewrite = indexQuery.rewrite(reader); Query indexRewrite = indexQuery.rewrite(reader);
Query dvRewrite = dvQuery.rewrite(reader); Query dvRewrite = dvQuery.rewrite(reader);
if (indexRewrite.getClass() == MatchAllDocsQuery.class
|| dvRewrite.getClass() == MatchAllDocsQuery.class) {
return new MatchAllDocsQuery();
}
if (indexQuery != indexRewrite || dvQuery != dvRewrite) { if (indexQuery != indexRewrite || dvQuery != dvRewrite) {
return new IndexOrDocValuesQuery(indexRewrite, dvRewrite); return new IndexOrDocValuesQuery(indexRewrite, dvRewrite);
} }