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

Optimized last fix so that the BooleanQuery is only cloned when one of its clauses has rewritten. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@149934 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug Cutting 2003-01-20 19:01:31 +00:00
parent 637b10da6c
commit d1fec6e830
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/java/org/apache/lucene/search/BooleanQuery.java
View File

@ -202,26 +202,29 @@ public class BooleanQuery extends Query {
if (clauses.size() == 1) { // optimize 1-clause queries
BooleanClause c = (BooleanClause)clauses.elementAt(0);
if (!c.prohibited) { // just return clause
Query clone = (Query)c.query.clone(); // have to clone to boost
clone.setBoost(getBoost() * clone.getBoost());
return clone;
Query query = c.query;
if (getBoost() != 1.0f) { // have to clone to boost
query = (Query)query.clone();
query.setBoost(getBoost() * query.getBoost());
}
return query;
}
}
BooleanQuery clone = (BooleanQuery)this.clone(); // recursively clone
boolean changed = false;
BooleanQuery clone = null; // recursively rewrite
for (int i = 0 ; i < clauses.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i);
Query q = c.query.rewrite(reader);
if (q != c.query) { // rewrote
changed = true; // replace in clone
Query query = c.query.rewrite(reader);
if (query != c.query) { // clause rewrote: must clone
if (clone == null)
clone = (BooleanQuery)this.clone();
clone.clauses.setElementAt
(new BooleanClause(q, c.required, c.prohibited), i);
(new BooleanClause(query, c.required, c.prohibited), i);
}
}
if (changed)
return clone; // clauses rewrote
else
if (clone != null) {
return clone; // some clauses rewrote
} else
return this; // no clauses rewrote
}