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

replace Vector with ArrayList, add clauses() to return that List of clauses: LUCENE-745 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@487931 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2006-12-17 02:40:37 +00:00
parent 487fd6657c
commit f1467191f1
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -310,6 +310,10 @@ Optimizations
of norms of segments with no deleted docs. of norms of segments with no deleted docs.
(Michael Busch via Yonik Seeley) (Michael Busch via Yonik Seeley)
15. LUCENE-745: Add BooleanQuery.clauses(), allowing direct access
to the List of clauses and replaced the internal synchronized Vector
with an unsynchronized List. (Yonik Seeley)
Test Cases Test Cases
1. Added TestTermScorer.java (Grant Ingersoll) 1. Added TestTermScorer.java (Grant Ingersoll)
2. Added TestWindowsMMap.java (Benson Margulies via Mike McCandless) 2. Added TestWindowsMMap.java (Benson Margulies via Mike McCandless)

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

@ -22,9 +22,7 @@ import org.apache.lucene.util.ToStringUtils;
import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanClause.Occur;
import java.io.IOException; import java.io.IOException;
import java.util.Iterator; import java.util.*;
import java.util.Set;
import java.util.Vector;
/** A Query that matches documents matching boolean combinations of other /** A Query that matches documents matching boolean combinations of other
* queries, e.g. {@link TermQuery}s, {@link PhraseQuery}s or other * queries, e.g. {@link TermQuery}s, {@link PhraseQuery}s or other
@ -75,7 +73,7 @@ public class BooleanQuery extends Query {
BooleanQuery.maxClauseCount = maxClauseCount; BooleanQuery.maxClauseCount = maxClauseCount;
} }
private Vector clauses = new Vector(); private ArrayList clauses = new ArrayList();
private boolean disableCoord; private boolean disableCoord;
/** Constructs an empty boolean query. */ /** Constructs an empty boolean query. */
@ -166,14 +164,17 @@ public class BooleanQuery extends Query {
if (clauses.size() >= maxClauseCount) if (clauses.size() >= maxClauseCount)
throw new TooManyClauses(); throw new TooManyClauses();
clauses.addElement(clause); clauses.add(clause);
} }
/** Returns the set of clauses in this query. */ /** Returns the set of clauses in this query. */
public BooleanClause[] getClauses() { public BooleanClause[] getClauses() {
return (BooleanClause[])clauses.toArray(new BooleanClause[0]); return (BooleanClause[])clauses.toArray(new BooleanClause[clauses.size()]);
} }
/** Returns the list of clauses in this query. */
public List clauses() { return clauses; }
private class BooleanWeight implements Weight { private class BooleanWeight implements Weight {
protected Similarity similarity; protected Similarity similarity;
protected Vector weights = new Vector(); protected Vector weights = new Vector();
@ -182,7 +183,7 @@ public class BooleanQuery extends Query {
throws IOException { throws IOException {
this.similarity = getSimilarity(searcher); this.similarity = getSimilarity(searcher);
for (int i = 0 ; i < clauses.size(); i++) { for (int i = 0 ; i < clauses.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
weights.add(c.getQuery().createWeight(searcher)); weights.add(c.getQuery().createWeight(searcher));
} }
} }
@ -193,7 +194,7 @@ public class BooleanQuery extends Query {
public float sumOfSquaredWeights() throws IOException { public float sumOfSquaredWeights() throws IOException {
float sum = 0.0f; float sum = 0.0f;
for (int i = 0 ; i < weights.size(); i++) { for (int i = 0 ; i < weights.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
Weight w = (Weight)weights.elementAt(i); Weight w = (Weight)weights.elementAt(i);
// call sumOfSquaredWeights for all clauses in case of side effects // call sumOfSquaredWeights for all clauses in case of side effects
float s = w.sumOfSquaredWeights(); // sum sub weights float s = w.sumOfSquaredWeights(); // sum sub weights
@ -211,7 +212,7 @@ public class BooleanQuery extends Query {
public void normalize(float norm) { public void normalize(float norm) {
norm *= getBoost(); // incorporate boost norm *= getBoost(); // incorporate boost
for (int i = 0 ; i < weights.size(); i++) { for (int i = 0 ; i < weights.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
Weight w = (Weight)weights.elementAt(i); Weight w = (Weight)weights.elementAt(i);
// normalize all clauses, (even if prohibited in case of side affects) // normalize all clauses, (even if prohibited in case of side affects)
w.normalize(norm); w.normalize(norm);
@ -229,7 +230,7 @@ public class BooleanQuery extends Query {
boolean allRequired = true; boolean allRequired = true;
boolean noneBoolean = true; boolean noneBoolean = true;
for (int i = 0 ; i < weights.size(); i++) { for (int i = 0 ; i < weights.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
if (!c.isRequired()) if (!c.isRequired())
allRequired = false; allRequired = false;
if (c.getQuery() instanceof BooleanQuery) if (c.getQuery() instanceof BooleanQuery)
@ -253,7 +254,7 @@ public class BooleanQuery extends Query {
BooleanScorer result = new BooleanScorer(similarity); BooleanScorer result = new BooleanScorer(similarity);
for (int i = 0 ; i < weights.size(); i++) { for (int i = 0 ; i < weights.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
Weight w = (Weight)weights.elementAt(i); Weight w = (Weight)weights.elementAt(i);
Scorer subScorer = w.scorer(reader); Scorer subScorer = w.scorer(reader);
if (subScorer != null) if (subScorer != null)
@ -277,7 +278,7 @@ public class BooleanQuery extends Query {
boolean fail = false; boolean fail = false;
int shouldMatchCount = 0; int shouldMatchCount = 0;
for (int i = 0 ; i < weights.size(); i++) { for (int i = 0 ; i < weights.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
Weight w = (Weight)weights.elementAt(i); Weight w = (Weight)weights.elementAt(i);
Explanation e = w.explain(reader, doc); Explanation e = w.explain(reader, doc);
if (!c.isProhibited()) maxCoord++; if (!c.isProhibited()) maxCoord++;
@ -349,7 +350,7 @@ public class BooleanQuery extends Query {
minNrShouldMatch); minNrShouldMatch);
for (int i = 0 ; i < weights.size(); i++) { for (int i = 0 ; i < weights.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
Weight w = (Weight)weights.elementAt(i); Weight w = (Weight)weights.elementAt(i);
Scorer subScorer = w.scorer(reader); Scorer subScorer = w.scorer(reader);
if (subScorer != null) if (subScorer != null)
@ -386,7 +387,7 @@ public class BooleanQuery extends Query {
public Query rewrite(IndexReader reader) throws IOException { public Query rewrite(IndexReader reader) throws IOException {
if (clauses.size() == 1) { // optimize 1-clause queries if (clauses.size() == 1) { // optimize 1-clause queries
BooleanClause c = (BooleanClause)clauses.elementAt(0); BooleanClause c = (BooleanClause)clauses.get(0);
if (!c.isProhibited()) { // just return clause if (!c.isProhibited()) { // just return clause
Query query = c.getQuery().rewrite(reader); // rewrite first Query query = c.getQuery().rewrite(reader); // rewrite first
@ -403,13 +404,12 @@ public class BooleanQuery extends Query {
BooleanQuery clone = null; // recursively rewrite BooleanQuery clone = null; // recursively rewrite
for (int i = 0 ; i < clauses.size(); i++) { for (int i = 0 ; i < clauses.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
Query query = c.getQuery().rewrite(reader); Query query = c.getQuery().rewrite(reader);
if (query != c.getQuery()) { // clause rewrote: must clone if (query != c.getQuery()) { // clause rewrote: must clone
if (clone == null) if (clone == null)
clone = (BooleanQuery)this.clone(); clone = (BooleanQuery)this.clone();
clone.clauses.setElementAt clone.clauses.set(i, new BooleanClause(query, c.getOccur()));
(new BooleanClause(query, c.getOccur()), i);
} }
} }
if (clone != null) { if (clone != null) {
@ -428,7 +428,7 @@ public class BooleanQuery extends Query {
public Object clone() { public Object clone() {
BooleanQuery clone = (BooleanQuery)super.clone(); BooleanQuery clone = (BooleanQuery)super.clone();
clone.clauses = (Vector)this.clauses.clone(); clone.clauses = (ArrayList)this.clauses.clone();
return clone; return clone;
} }
@ -441,7 +441,7 @@ public class BooleanQuery extends Query {
} }
for (int i = 0 ; i < clauses.size(); i++) { for (int i = 0 ; i < clauses.size(); i++) {
BooleanClause c = (BooleanClause)clauses.elementAt(i); BooleanClause c = (BooleanClause)clauses.get(i);
if (c.isProhibited()) if (c.isProhibited())
buffer.append("-"); buffer.append("-");
else if (c.isRequired()) else if (c.isRequired())