You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lucene.apache.org by ot...@apache.org on 2004/05/11 19:18:04 UTC
cvs commit: jakarta-lucene/src/java/org/apache/lucene/search BooleanQuery.java BooleanScorer.java ConjunctionScorer.java ExactPhraseScorer.java IndexSearcher.java ParallelMultiSearcher.java PhraseScorer.java QueryTermVector.java
otis 2004/05/11 10:18:04
Modified: src/java/org/apache/lucene/search BooleanQuery.java
BooleanScorer.java ConjunctionScorer.java
ExactPhraseScorer.java IndexSearcher.java
ParallelMultiSearcher.java PhraseScorer.java
QueryTermVector.java
Log:
- Bugzilla case 28856 - http://issues.apache.org/bugzilla/show_bug.cgi?id=28856
Revision Changes Path
1.23 +0 -2 jakarta-lucene/src/java/org/apache/lucene/search/BooleanQuery.java
Index: BooleanQuery.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/BooleanQuery.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- BooleanQuery.java 29 Mar 2004 22:48:03 -0000 1.22
+++ BooleanQuery.java 11 May 2004 17:18:03 -0000 1.23
@@ -87,7 +87,6 @@
private class BooleanWeight implements Weight {
private Searcher searcher;
- private float norm;
private Vector weights = new Vector();
public BooleanWeight(Searcher searcher) {
@@ -147,7 +146,6 @@
ConjunctionScorer result =
new ConjunctionScorer(getSimilarity(searcher));
for (int i = 0 ; i < weights.size(); i++) {
- BooleanClause c = (BooleanClause)clauses.elementAt(i);
Weight w = (Weight)weights.elementAt(i);
Scorer subScorer = w.scorer(reader);
if (subScorer == null)
1.8 +0 -3 jakarta-lucene/src/java/org/apache/lucene/search/BooleanScorer.java
Index: BooleanScorer.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/BooleanScorer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BooleanScorer.java 29 Mar 2004 22:48:03 -0000 1.7
+++ BooleanScorer.java 11 May 2004 17:18:03 -0000 1.8
@@ -17,11 +17,8 @@
*/
import java.io.IOException;
-import org.apache.lucene.index.*;
final class BooleanScorer extends Scorer {
- private int currentDoc;
-
private SubScorer scorers = null;
private BucketTable bucketTable = new BucketTable(this);
1.4 +0 -1 jakarta-lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java
Index: ConjunctionScorer.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/ConjunctionScorer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConjunctionScorer.java 21 Apr 2004 15:23:29 -0000 1.3
+++ ConjunctionScorer.java 11 May 2004 17:18:03 -0000 1.4
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.util.*;
-import org.apache.lucene.index.*;
/** Scorer for conjunctions, sets of queries, all of which are required. */
final class ConjunctionScorer extends Scorer {
1.6 +0 -1 jakarta-lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java
Index: ExactPhraseScorer.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ExactPhraseScorer.java 29 Mar 2004 22:48:03 -0000 1.5
+++ ExactPhraseScorer.java 11 May 2004 17:18:03 -0000 1.6
@@ -17,7 +17,6 @@
*/
import java.io.IOException;
-import org.apache.lucene.util.*;
import org.apache.lucene.index.*;
final class ExactPhraseScorer extends PhraseScorer {
1.18 +0 -1 jakarta-lucene/src/java/org/apache/lucene/search/IndexSearcher.java
Index: IndexSearcher.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/IndexSearcher.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- IndexSearcher.java 21 Apr 2004 17:26:28 -0000 1.17
+++ IndexSearcher.java 11 May 2004 17:18:04 -0000 1.18
@@ -23,7 +23,6 @@
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.util.PriorityQueue;
/** Implements search over a single IndexReader.
*
1.5 +0 -1 jakarta-lucene/src/java/org/apache/lucene/search/ParallelMultiSearcher.java
Index: ParallelMultiSearcher.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/ParallelMultiSearcher.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParallelMultiSearcher.java 29 Mar 2004 22:48:03 -0000 1.4
+++ ParallelMultiSearcher.java 11 May 2004 17:18:04 -0000 1.5
@@ -199,7 +199,6 @@
private Query query;
private Filter filter;
private int nDocs;
- private int hits;
private TopDocs docs;
private int i;
private PriorityQueue hq;
1.14 +0 -1 jakarta-lucene/src/java/org/apache/lucene/search/PhraseScorer.java
Index: PhraseScorer.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/PhraseScorer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PhraseScorer.java 21 Apr 2004 15:23:29 -0000 1.13
+++ PhraseScorer.java 11 May 2004 17:18:04 -0000 1.14
@@ -18,7 +18,6 @@
import java.io.IOException;
-import org.apache.lucene.util.*;
import org.apache.lucene.index.*;
abstract class PhraseScorer extends Scorer {
1.5 +0 -1 jakarta-lucene/src/java/org/apache/lucene/search/QueryTermVector.java
Index: QueryTermVector.java
===================================================================
RCS file: /home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/QueryTermVector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- QueryTermVector.java 29 Mar 2004 22:48:03 -0000 1.4
+++ QueryTermVector.java 11 May 2004 17:18:04 -0000 1.5
@@ -19,7 +19,6 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermFreqVector;
import java.io.IOException;
---------------------------------------------------------------------
To unsubscribe, e-mail: lucene-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: lucene-dev-help@jakarta.apache.org