HSEARCH-1191 EMPTY_DOCIDSET was removed, implement our own

hibernate · Feb 3, 2014 · 0371148 · 0371148
1 parent 211d0a0
commit 0371148
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/engine/src/main/java/org/hibernate/search/filter/impl/AndDocIdSet.java b/engine/src/main/java/org/hibernate/search/filter/impl/AndDocIdSet.java
@@ -29,6 +29,7 @@
 
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.OpenBitSet;
 
 import static java.lang.Math.max;
@@ -78,7 +79,7 @@ private synchronized DocIdSet buildBitSet() throws IOException {
 			DocIdSetIterator docIdSetIterator = andedDocIdSets.get( i ).iterator();
 			if ( docIdSetIterator == null ) {
 				// the Lucene API permits to return null on any iterator for empty matches
-				return DocIdSet.EMPTY_DOCIDSET;
+				return EMPTY_DOCIDSET;
 			}
 			iterators[i] = docIdSetIterator;
 		}
@@ -94,7 +95,7 @@ private DocIdSet makeDocIdSetOnAgreedBits(final DocIdSetIterator[] iterators) th
 		int targetPosition = findFirstTargetPosition( iterators, result );
 
 		if ( targetPosition == DocIdSetIterator.NO_MORE_DOCS ) {
-			return DocIdSet.EMPTY_DOCIDSET;
+			return EMPTY_DOCIDSET;
 		}
 
 		// Each iterator can vote "ok" for the current target to
@@ -165,4 +166,23 @@ private int findFirstTargetPosition(final DocIdSetIterator[] iterators, OpenBitS
 
 		return targetPosition;
 	}
+
+	private static final DocIdSet EMPTY_DOCIDSET = new DocIdSet() {
+
+		@Override
+		public DocIdSetIterator iterator() {
+			return DocIdSetIterator.empty();
+		}
+
+		@Override
+		public boolean isCacheable() {
+			return true;
+		}
+
+		@Override
+		public Bits bits() {
+			return null;
+		}
+	};
+
 }