have DocSet implement Bits interface

kimchy · kimchy · commit 66d93e451256 · 2011-11-29T23:52:58.000+02:00
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AllDocSet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AllDocSet.java
@@ -41,7 +41,11 @@ public AllDocSet(int maxDoc) {
         return true;
     }
 
-    @Override public boolean get(int doc) throws IOException {
+    @Override public int length() {
+        return maxDoc;
+    }
+
+    @Override public boolean get(int doc) {
         return doc < maxDoc;
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AndDocSet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AndDocSet.java
@@ -36,13 +36,20 @@ public AndDocSet(List<DocSet> sets) {
         this.sets = sets;
     }
 
-    @Override public boolean get(int doc) throws IOException {
+    @Override public boolean get(int doc) {
         for (DocSet s : sets) {
             if (!s.get(doc)) return false;
         }
         return true;
     }
 
+    @Override public int length() {
+        if (sets.isEmpty()) {
+            return 0;
+        }
+        return sets.get(0).length();
+    }
+
     @Override public boolean isCacheable() {
         // not cacheable, the reason is that by default, when constructing the filter, it is not cacheable,
         // so if someone wants it to be cacheable, we might as well construct a cached version of the result
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocSet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocSet.java
@@ -21,16 +21,17 @@
 
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.DocIdSetIterator;
+import org.apache.lucene.util.Bits;
 
 import java.io.IOException;
 
 /**
  * @author kimchy (shay.banon)
  */
-public abstract class DocSet extends DocIdSet {
+public abstract class DocSet extends DocIdSet implements Bits {
 
     public static final DocSet EMPTY_DOC_SET = new DocSet() {
-        @Override public boolean get(int doc) throws IOException {
+        @Override public boolean get(int doc) {
             return false;
         }
 
@@ -45,9 +46,13 @@ public abstract class DocSet extends DocIdSet {
         @Override public long sizeInBytes() {
             return 0;
         }
+
+        @Override public int length() {
+            return 0;
+        }
     };
 
-    public abstract boolean get(int doc) throws IOException;
+    public abstract boolean get(int doc);
 
     public abstract long sizeInBytes();
 }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/FixedBitDocSet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/FixedBitDocSet.java
@@ -44,11 +44,15 @@ public FixedBitDocSet(int numBits) {
         return true;
     }
 
+    @Override public int length() {
+        return set.length();
+    }
+
     public FixedBitSet set() {
         return set;
     }
 
-    @Override public boolean get(int doc) throws IOException {
+    @Override public boolean get(int doc) {
         return set.get(doc);
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/GetDocSet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/GetDocSet.java
@@ -38,6 +38,10 @@ protected GetDocSet(int maxDoc) {
         return 0;
     }
 
+    @Override public int length() {
+        return maxDoc;
+    }
+
     @Override public DocIdSetIterator iterator() throws IOException {
         return new DocIdSetIterator() {
             private int doc = -1;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/NotDocSet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/NotDocSet.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.common.lucene.docset;
 
-import java.io.IOException;
-
 /**
  * @author kimchy (shay.banon)
  */
@@ -40,7 +38,7 @@ public NotDocSet(DocSet set, int max) {
 //        return set.isCacheable();
     }
 
-    @Override public boolean get(int doc) throws IOException {
+    @Override public boolean get(int doc) {
         return !set.get(doc);
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OpenBitDocSet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OpenBitDocSet.java
@@ -45,6 +45,10 @@ public OpenBitDocSet(DocIdSetIterator disi, int numBits) throws IOException {
         this.set = new OpenBitSetDISI(disi, numBits);
     }
 
+    @Override public int length() {
+        return set.length();
+    }
+
     @Override public boolean isCacheable() {
         return true;
     }
@@ -53,7 +57,7 @@ public OpenBitSet set() {
         return set;
     }
 
-    @Override public boolean get(int doc) throws IOException {
+    @Override public boolean get(int doc) {
         return set.fastGet(doc);
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OrDocSet.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OrDocSet.java
@@ -36,13 +36,20 @@ public OrDocSet(List<DocSet> sets) {
         this.sets = sets;
     }
 
-    @Override public boolean get(int doc) throws IOException {
+    @Override public boolean get(int doc) {
         for (DocSet s : sets) {
             if (s.get(doc)) return true;
         }
         return false;
     }
 
+    @Override public int length() {
+        if (sets.isEmpty()) {
+            return 0;
+        }
+        return sets.get(0).length();
+    }
+
     @Override public boolean isCacheable() {
         // not cacheable, the reason is that by default, when constructing the filter, it is not cacheable,
         // so if someone wants it to be cacheable, we might as well construct a cached version of the result
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java
@@ -54,7 +54,7 @@ public LimitDocSet(int maxDoc, int limit) {
             this.limit = limit;
         }
 
-        @Override public boolean get(int doc) throws IOException {
+        @Override public boolean get(int doc) {
             if (++counter > limit) {
                 return false;
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java
@@ -22,6 +22,7 @@
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.DocIdSet;
 import org.apache.lucene.search.Filter;
+import org.elasticsearch.ElasticSearchIllegalArgumentException;
 import org.elasticsearch.ElasticSearchIllegalStateException;
 import org.elasticsearch.common.collect.Maps;
 import org.elasticsearch.common.inject.Inject;
@@ -174,7 +175,7 @@ public ScriptDocSet(IndexReader reader, SearchScript searchScript) {
                 return false;
             }
 
-            @Override public boolean get(int doc) throws IOException {
+            @Override public boolean get(int doc) {
                 searchScript.setNextDocId(doc);
                 Object val = searchScript.run();
                 if (val == null) {
@@ -186,7 +187,7 @@ public ScriptDocSet(IndexReader reader, SearchScript searchScript) {
                 if (val instanceof Number) {
                     return ((Number) val).longValue() != 0;
                 }
-                throw new IOException("Can't handle type [" + val + "] in script filter");
+                throw new ElasticSearchIllegalArgumentException("Can't handle type [" + val + "] in script filter");
             }
         }
     }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java
@@ -152,7 +152,7 @@ public static NumericRangeFieldDataFilter<Byte> newByteRange(FieldDataCache fiel
                         return false;
                     }
 
-                    @Override public boolean get(int doc) throws IOException {
+                    @Override public boolean get(int doc) {
                         if (!fieldData.hasValue(doc)) {
                             return false;
                         }
@@ -209,7 +209,7 @@ public static NumericRangeFieldDataFilter<Short> newShortRange(FieldDataCache fi
                         return false;
                     }
 
-                    @Override public boolean get(int doc) throws IOException {
+                    @Override public boolean get(int doc) {
                         if (!fieldData.hasValue(doc)) {
                             return false;
                         }
@@ -265,7 +265,7 @@ public static NumericRangeFieldDataFilter<Integer> newIntRange(FieldDataCache fi
                         return false;
                     }
 
-                    @Override public boolean get(int doc) throws IOException {
+                    @Override public boolean get(int doc) {
                         if (!fieldData.hasValue(doc)) {
                             return false;
                         }
@@ -321,7 +321,7 @@ public static NumericRangeFieldDataFilter<Long> newLongRange(FieldDataCache fiel
                         return false;
                     }
 
-                    @Override public boolean get(int doc) throws IOException {
+                    @Override public boolean get(int doc) {
                         if (!fieldData.hasValue(doc)) {
                             return false;
                         }
@@ -381,7 +381,7 @@ public static NumericRangeFieldDataFilter<Float> newFloatRange(FieldDataCache fi
                         return false;
                     }
 
-                    @Override public boolean get(int doc) throws IOException {
+                    @Override public boolean get(int doc) {
                         if (!fieldData.hasValue(doc)) {
                             return false;
                         }
@@ -441,7 +441,7 @@ public static NumericRangeFieldDataFilter<Double> newDoubleRange(FieldDataCache
                         return false;
                     }
 
-                    @Override public boolean get(int doc) throws IOException {
+                    @Override public boolean get(int doc) {
                         if (!fieldData.hasValue(doc)) {
                             return false;
                         }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java
@@ -173,7 +173,7 @@ public GeoDistanceDocSet(int maxDoc, GeoPointFieldData fieldData, GeoDistance.Fi
             return false;
         }
 
-        @Override public boolean get(int doc) throws IOException {
+        @Override public boolean get(int doc) {
             if (!fieldData.hasValue(doc)) {
                 return false;
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java
@@ -192,7 +192,7 @@ public GeoDistanceRangeDocSet(int maxDoc, GeoPointFieldData fieldData, GeoDistan
             return false;
         }
 
-        @Override public boolean get(int doc) throws IOException {
+        @Override public boolean get(int doc) {
             if (!fieldData.hasValue(doc)) {
                 return false;
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java
@@ -76,7 +76,7 @@ public GeoPolygonDocSet(int maxDoc, GeoPointFieldData fieldData, Point[] points)
             return false;
         }
 
-        @Override public boolean get(int doc) throws IOException {
+        @Override public boolean get(int doc) {
             if (!fieldData.hasValue(doc)) {
                 return false;
             }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java
@@ -91,7 +91,7 @@ public Meridian180GeoBoundingBoxDocSet(int maxDoc, GeoPointFieldData fieldData,
             return false;
         }
 
-        @Override public boolean get(int doc) throws IOException {
+        @Override public boolean get(int doc) {
             if (!fieldData.hasValue(doc)) {
                 return false;
             }
@@ -139,7 +139,7 @@ public GeoBoundingBoxDocSet(int maxDoc, GeoPointFieldData fieldData, Point topLe
             return false;
         }
 
-        @Override public boolean get(int doc) throws IOException {
+        @Override public boolean get(int doc) {
             if (!fieldData.hasValue(doc)) {
                 return false;
             }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,11 @@ public AllDocSet(int maxDoc) {`
`41`	`41`	`return true;`
`42`	`42`	`}`
`43`	`43`
`44`		`- @Override public boolean get(int doc) throws IOException {`
	`44`	`+ @Override public int length() {`
	`45`	`+ return maxDoc;`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ @Override public boolean get(int doc) {`
`45`	`49`	`return doc < maxDoc;`
`46`	`50`	`}`
`47`	`51`
Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,15 @@ public FixedBitDocSet(int numBits) {`
`44`	`44`	`return true;`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ @Override public int length() {`
	`48`	`+ return set.length();`
	`49`	`+ }`
	`50`	`+`
`47`	`51`	`public FixedBitSet set() {`
`48`	`52`	`return set;`
`49`	`53`	`}`
`50`	`54`
`51`		`- @Override public boolean get(int doc) throws IOException {`
	`55`	`+ @Override public boolean get(int doc) {`
`52`	`56`	`return set.get(doc);`
`53`	`57`	`}`
`54`	`58`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@`
`19`	`19`
`20`	`20`	`package org.elasticsearch.common.lucene.docset;`
`21`	`21`
`22`		`-import java.io.IOException;`
`23`		`-`
`24`	`22`	`/**`
`25`	`23`	`* @author kimchy (shay.banon)`
`26`	`24`	`*/`
`@@ -40,7 +38,7 @@ public NotDocSet(DocSet set, int max) {`
`40`	`38`	`// return set.isCacheable();`
`41`	`39`	`}`
`42`	`40`
`43`		`- @Override public boolean get(int doc) throws IOException {`
	`41`	`+ @Override public boolean get(int doc) {`
`44`	`42`	`return !set.get(doc);`
`45`	`43`	`}`
`46`	`44`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ public OpenBitDocSet(DocIdSetIterator disi, int numBits) throws IOException {`
`45`	`45`	`this.set = new OpenBitSetDISI(disi, numBits);`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ @Override public int length() {`
	`49`	`+ return set.length();`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`@Override public boolean isCacheable() {`
`49`	`53`	`return true;`
`50`	`54`	`}`
`@@ -53,7 +57,7 @@ public OpenBitSet set() {`
`53`	`57`	`return set;`
`54`	`58`	`}`
`55`	`59`
`56`		`- @Override public boolean get(int doc) throws IOException {`
	`60`	`+ @Override public boolean get(int doc) {`
`57`	`61`	`return set.fastGet(doc);`
`58`	`62`	`}`
`59`	`63`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public LimitDocSet(int maxDoc, int limit) {`
`54`	`54`	`this.limit = limit;`
`55`	`55`	`}`
`56`	`56`
`57`		`- @Override public boolean get(int doc) throws IOException {`
	`57`	`+ @Override public boolean get(int doc) {`
`58`	`58`	`if (++counter > limit) {`
`59`	`59`	`return false;`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import org.apache.lucene.index.IndexReader;`
`23`	`23`	`import org.apache.lucene.search.DocIdSet;`
`24`	`24`	`import org.apache.lucene.search.Filter;`
	`25`	`+import org.elasticsearch.ElasticSearchIllegalArgumentException;`
`25`	`26`	`import org.elasticsearch.ElasticSearchIllegalStateException;`
`26`	`27`	`import org.elasticsearch.common.collect.Maps;`
`27`	`28`	`import org.elasticsearch.common.inject.Inject;`
`@@ -174,7 +175,7 @@ public ScriptDocSet(IndexReader reader, SearchScript searchScript) {`
`174`	`175`	`return false;`
`175`	`176`	`}`
`176`	`177`
`177`		`- @Override public boolean get(int doc) throws IOException {`
	`178`	`+ @Override public boolean get(int doc) {`
`178`	`179`	`searchScript.setNextDocId(doc);`
`179`	`180`	`Object val = searchScript.run();`
`180`	`181`	`if (val == null) {`
`@@ -186,7 +187,7 @@ public ScriptDocSet(IndexReader reader, SearchScript searchScript) {`
`186`	`187`	`if (val instanceof Number) {`
`187`	`188`	`return ((Number) val).longValue() != 0;`
`188`	`189`	`}`
`189`		`- throw new IOException("Can't handle type [" + val + "] in script filter");`
	`190`	`+ throw new ElasticSearchIllegalArgumentException("Can't handle type [" + val + "] in script filter");`
`190`	`191`	`}`
`191`	`192`	`}`
`192`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public static NumericRangeFieldDataFilter<Byte> newByteRange(FieldDataCache fiel`
`152`	`152`	`return false;`
`153`	`153`	`}`
`154`	`154`
`155`		`- @Override public boolean get(int doc) throws IOException {`
	`155`	`+ @Override public boolean get(int doc) {`
`156`	`156`	`if (!fieldData.hasValue(doc)) {`
`157`	`157`	`return false;`
`158`	`158`	`}`
`@@ -209,7 +209,7 @@ public static NumericRangeFieldDataFilter<Short> newShortRange(FieldDataCache fi`
`209`	`209`	`return false;`
`210`	`210`	`}`
`211`	`211`
`212`		`- @Override public boolean get(int doc) throws IOException {`
	`212`	`+ @Override public boolean get(int doc) {`
`213`	`213`	`if (!fieldData.hasValue(doc)) {`
`214`	`214`	`return false;`
`215`	`215`	`}`
`@@ -265,7 +265,7 @@ public static NumericRangeFieldDataFilter<Integer> newIntRange(FieldDataCache fi`
`265`	`265`	`return false;`
`266`	`266`	`}`
`267`	`267`
`268`		`- @Override public boolean get(int doc) throws IOException {`
	`268`	`+ @Override public boolean get(int doc) {`
`269`	`269`	`if (!fieldData.hasValue(doc)) {`
`270`	`270`	`return false;`
`271`	`271`	`}`
`@@ -321,7 +321,7 @@ public static NumericRangeFieldDataFilter<Long> newLongRange(FieldDataCache fiel`
`321`	`321`	`return false;`
`322`	`322`	`}`
`323`	`323`
`324`		`- @Override public boolean get(int doc) throws IOException {`
	`324`	`+ @Override public boolean get(int doc) {`
`325`	`325`	`if (!fieldData.hasValue(doc)) {`
`326`	`326`	`return false;`
`327`	`327`	`}`
`@@ -381,7 +381,7 @@ public static NumericRangeFieldDataFilter<Float> newFloatRange(FieldDataCache fi`
`381`	`381`	`return false;`
`382`	`382`	`}`
`383`	`383`
`384`		`- @Override public boolean get(int doc) throws IOException {`
	`384`	`+ @Override public boolean get(int doc) {`
`385`	`385`	`if (!fieldData.hasValue(doc)) {`
`386`	`386`	`return false;`
`387`	`387`	`}`
`@@ -441,7 +441,7 @@ public static NumericRangeFieldDataFilter<Double> newDoubleRange(FieldDataCache`
`441`	`441`	`return false;`
`442`	`442`	`}`
`443`	`443`
`444`		`- @Override public boolean get(int doc) throws IOException {`
	`444`	`+ @Override public boolean get(int doc) {`
`445`	`445`	`if (!fieldData.hasValue(doc)) {`
`446`	`446`	`return false;`
`447`	`447`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public GeoDistanceDocSet(int maxDoc, GeoPointFieldData fieldData, GeoDistance.Fi`
`173`	`173`	`return false;`
`174`	`174`	`}`
`175`	`175`
`176`		`- @Override public boolean get(int doc) throws IOException {`
	`176`	`+ @Override public boolean get(int doc) {`
`177`	`177`	`if (!fieldData.hasValue(doc)) {`
`178`	`178`	`return false;`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public GeoDistanceRangeDocSet(int maxDoc, GeoPointFieldData fieldData, GeoDistan`
`192`	`192`	`return false;`
`193`	`193`	`}`
`194`	`194`
`195`		`- @Override public boolean get(int doc) throws IOException {`
	`195`	`+ @Override public boolean get(int doc) {`
`196`	`196`	`if (!fieldData.hasValue(doc)) {`
`197`	`197`	`return false;`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public GeoPolygonDocSet(int maxDoc, GeoPointFieldData fieldData, Point[] points)`
`76`	`76`	`return false;`
`77`	`77`	`}`
`78`	`78`
`79`		`- @Override public boolean get(int doc) throws IOException {`
	`79`	`+ @Override public boolean get(int doc) {`
`80`	`80`	`if (!fieldData.hasValue(doc)) {`
`81`	`81`	`return false;`
`82`	`82`	`}`