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

LUCENE_7747: QueryBuilder now iterates lazily over the possible paths when building a graph query

This commit is contained in:
Jim Ferenczi 2017-03-17 15:53:21 +01:00 committed by Shalin Shekhar Mangar
parent acd6a68704
commit 2d32832bcb
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -229,6 +229,8 @@ Improvements
* LUCENE-7695: ComplexPhraseQueryParser to support query time synonyms (Markus Jelsma
via Mikhail Khludnev)
* LUCENE_7747: QueryBuilder now iterates lazily over the possible paths when building a graph query
Optimizations
* LUCENE-7641: Optimized point range queries to compute documents that do not

46
lucene/core/src/java/org/apache/lucene/util/QueryBuilder.java
View File

@ -19,7 +19,6 @@ package org.apache.lucene.util;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@ -512,21 +511,20 @@ public class QueryBuilder {
lastState = end;
final Query queryPos;
if (graph.hasSidePath(start)) {
List<Query> queries = new ArrayList<> ();
Iterator<TokenStream> it = graph.getFiniteStrings(start, end);
while (it.hasNext()) {
TokenStream ts = it.next();
// This is a synonym path so all terms are mandatory (MUST).
Query q = createFieldQuery(ts, BooleanClause.Occur.MUST, field, getAutoGenerateMultiTermSynonymsPhraseQuery(), 0);
if (q != null) {
queries.add(q);
final Iterator<TokenStream> it = graph.getFiniteStrings(start, end);
Iterator<Query> queries = new Iterator<Query>() {
@Override
public boolean hasNext() {
return it.hasNext();
}
}
if (queries.size() > 0) {
queryPos = newGraphSynonymQuery(queries.toArray(new Query[queries.size()]));
} else {
queryPos = null;
}
@Override
public Query next() {
TokenStream ts = it.next();
return createFieldQuery(ts, BooleanClause.Occur.MUST, field, getAutoGenerateMultiTermSynonymsPhraseQuery(), 0);
}
};
queryPos = newGraphSynonymQuery(queries);
} else {
Term[] terms = graph.getTerms(field, start);
assert terms.length > 0;
@ -636,16 +634,16 @@ public class QueryBuilder {
* This is intended for subclasses that wish to customize the generated queries.
* @return new Query instance
*/
protected Query newGraphSynonymQuery(Query queries[]) {
if (queries == null) {
return new BooleanQuery.Builder().build();
} else if (queries.length == 1) {
return queries[0];
} else {
BooleanQuery.Builder builder = new BooleanQuery.Builder();
Arrays.stream(queries).forEachOrdered(qry -> builder.add(qry, BooleanClause.Occur.SHOULD));
return builder.build();
protected Query newGraphSynonymQuery(Iterator<Query> queries) {
BooleanQuery.Builder builder = new BooleanQuery.Builder();
while (queries.hasNext()) {
builder.add(queries.next(), BooleanClause.Occur.SHOULD);
}
BooleanQuery bq = builder.build();
if (bq.clauses().size() == 1) {
return bq.clauses().get(0).getQuery();
}
return bq;
}
/**