You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by mi...@apache.org on 2009/07/27 13:12:37 UTC
svn commit: r798102 - in /lucene/java/trunk:
contrib/miscellaneous/src/java/org/apache/lucene/misc/
src/java/org/apache/lucene/search/
Author: mikemccand
Date: Mon Jul 27 11:12:36 2009
New Revision: 798102
URL: http://svn.apache.org/viewvc?rev=798102&view=rev
Log:
LUCENE-1754: just use EMPTY_DOCIDSET.iterator() instead of new EmptyDocIdSetIterator
Removed:
lucene/java/trunk/src/java/org/apache/lucene/search/EmptyDocIdSetIterator.java
Modified:
lucene/java/trunk/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java
lucene/java/trunk/src/java/org/apache/lucene/search/ConstantScoreQuery.java
lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java
lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java
Modified: lucene/java/trunk/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java?rev=798102&r1=798101&r2=798102&view=diff
==============================================================================
--- lucene/java/trunk/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java (original)
+++ lucene/java/trunk/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java Mon Jul 27 11:12:36 2009
@@ -54,13 +54,12 @@
* <http://www.apache.org/>.
*/
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.search.Filter;
-
import java.io.IOException;
+
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.EmptyDocIdSetIterator;
+import org.apache.lucene.search.Filter;
import org.apache.lucene.util.OpenBitSet;
import org.apache.lucene.util.OpenBitSetDISI;
import org.apache.lucene.util.SortedVIntList;
@@ -150,11 +149,11 @@
throws IOException {
DocIdSet docIdSet = filter.getDocIdSet(reader);
if (docIdSet == null) {
- return EmptyDocIdSetIterator.getInstance();
+ return DocIdSet.EMPTY_DOCIDSET.iterator();
} else {
DocIdSetIterator iter = docIdSet.iterator();
if (iter == null) {
- return EmptyDocIdSetIterator.getInstance();
+ return DocIdSet.EMPTY_DOCIDSET.iterator();
} else {
return iter;
}
@@ -275,11 +274,11 @@
} else {
DocIdSetIterator disi;
if (dis == null) {
- disi = EmptyDocIdSetIterator.getInstance();
+ disi = DocIdSet.EMPTY_DOCIDSET.iterator();
} else {
disi = dis.iterator();
if (disi == null) {
- disi = EmptyDocIdSetIterator.getInstance();
+ disi = DocIdSet.EMPTY_DOCIDSET.iterator();
}
}
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/ConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/ConstantScoreQuery.java?rev=798102&r1=798101&r2=798102&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/ConstantScoreQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/ConstantScoreQuery.java Mon Jul 27 11:12:36 2009
@@ -115,11 +115,11 @@
theScore = w.getValue();
DocIdSet docIdSet = filter.getDocIdSet(reader);
if (docIdSet == null) {
- docIdSetIterator = EmptyDocIdSetIterator.getInstance();
+ docIdSetIterator = DocIdSet.EMPTY_DOCIDSET.iterator();
} else {
DocIdSetIterator iter = docIdSet.iterator();
if (iter == null) {
- docIdSetIterator = EmptyDocIdSetIterator.getInstance();
+ docIdSetIterator = DocIdSet.EMPTY_DOCIDSET.iterator();
} else {
docIdSetIterator = iter;
}
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java?rev=798102&r1=798101&r2=798102&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/DocIdSet.java Mon Jul 27 11:12:36 2009
@@ -28,7 +28,18 @@
/** An empty {@code DocIdSet} instance for easy use (this is currently
* implemented using a {@link SortedVIntList}). */
- public static final DocIdSet EMPTY_DOCIDSET = new SortedVIntList(new int[0]);
+ public static final DocIdSet EMPTY_DOCIDSET = new SortedVIntList(new int[0]) {
+
+ private final DocIdSetIterator iterator = new DocIdSetIterator() {
+ public int advance(int target) throws IOException { return NO_MORE_DOCS; }
+ public int docID() { return NO_MORE_DOCS; }
+ public int nextDoc() throws IOException { return NO_MORE_DOCS; }
+ };
+
+ public DocIdSetIterator iterator() {
+ return iterator;
+ }
+ };
/** Provides a {@link DocIdSetIterator} to access the set.
* This may (but is not required to) return null if there
Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java?rev=798102&r1=798101&r2=798102&view=diff
==============================================================================
--- lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/java/trunk/src/java/org/apache/lucene/search/FilteredQuery.java Mon Jul 27 11:12:36 2009
@@ -83,9 +83,9 @@
}
Filter f = FilteredQuery.this.filter;
DocIdSet docIdSet = f.getDocIdSet(ir);
- DocIdSetIterator docIdSetIterator = docIdSet == null ? EmptyDocIdSetIterator.getInstance() : docIdSet.iterator();
+ DocIdSetIterator docIdSetIterator = docIdSet == null ? DocIdSet.EMPTY_DOCIDSET.iterator() : docIdSet.iterator();
if (docIdSetIterator == null) {
- docIdSetIterator = EmptyDocIdSetIterator.getInstance();
+ docIdSetIterator = DocIdSet.EMPTY_DOCIDSET.iterator();
}
if (docIdSetIterator.advance(i) == i) {
return inner;