honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

have DocSet implement Bits interface

This commit is contained in:
Shay Banon 2011-11-29 23:52:58 +02:00
parent a21c0829c7
commit 6c552b4187
15 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AllDocSet.java
View File

@ -41,7 +41,11 @@ public class AllDocSet extends DocSet {
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;
}

9
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/AndDocSet.java
View File

@ -36,13 +36,20 @@ public class AndDocSet extends DocSet {
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

11
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/DocSet.java
View File

@ -21,16 +21,17 @@ package org.elasticsearch.common.lucene.docset;
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();
}

6
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/FixedBitDocSet.java
View File

@ -44,11 +44,15 @@ public class FixedBitDocSet extends DocSet {
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);
}

4
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/GetDocSet.java
View File

@ -38,6 +38,10 @@ public abstract class GetDocSet extends DocSet {
return 0;
}
@Override public int length() {
return maxDoc;
}
@Override public DocIdSetIterator iterator() throws IOException {
return new DocIdSetIterator() {
private int doc = -1;

4
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/NotDocSet.java
View File

@ -19,8 +19,6 @@
package org.elasticsearch.common.lucene.docset;
import java.io.IOException;
/**
* @author kimchy (shay.banon)
*/
@ -40,7 +38,7 @@ public class NotDocSet extends GetDocSet {
// return set.isCacheable();
}
@Override public boolean get(int doc) throws IOException {
@Override public boolean get(int doc) {
return !set.get(doc);
}

6
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OpenBitDocSet.java
View File

@ -45,6 +45,10 @@ public class OpenBitDocSet extends DocSet {
this.set = new OpenBitSetDISI(disi, numBits);
}
@Override public int length() {
return set.length();
}
@Override public boolean isCacheable() {
return true;
}
@ -53,7 +57,7 @@ public class OpenBitDocSet extends DocSet {
return set;
}
@Override public boolean get(int doc) throws IOException {
@Override public boolean get(int doc) {
return set.fastGet(doc);
}

9
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/docset/OrDocSet.java
View File

@ -36,13 +36,20 @@ public class OrDocSet extends DocSet {
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

2
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/search/LimitFilter.java
View File

@ -54,7 +54,7 @@ public class LimitFilter extends NoCacheFilter {
this.limit = limit;
}
@Override public boolean get(int doc) throws IOException {
@Override public boolean get(int doc) {
if (++counter > limit) {
return false;
}

5
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/ScriptFilterParser.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.index.query;
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 class ScriptFilterParser implements FilterParser {
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 class ScriptFilterParser implements FilterParser {
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");
}
}
}

12
modules/elasticsearch/src/main/java/org/elasticsearch/index/search/NumericRangeFieldDataFilter.java
View File

@ -152,7 +152,7 @@ public abstract class NumericRangeFieldDataFilter<T> extends Filter {
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 abstract class NumericRangeFieldDataFilter<T> extends Filter {
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 abstract class NumericRangeFieldDataFilter<T> extends Filter {
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 abstract class NumericRangeFieldDataFilter<T> extends Filter {
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 abstract class NumericRangeFieldDataFilter<T> extends Filter {
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 abstract class NumericRangeFieldDataFilter<T> extends Filter {
return false;
}
@Override public boolean get(int doc) throws IOException {
@Override public boolean get(int doc) {
if (!fieldData.hasValue(doc)) {
return false;
}

2
modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceFilter.java
View File

@ -173,7 +173,7 @@ public class GeoDistanceFilter extends Filter {
return false;
}
@Override public boolean get(int doc) throws IOException {
@Override public boolean get(int doc) {
if (!fieldData.hasValue(doc)) {
return false;
}

2
modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoDistanceRangeFilter.java
View File

@ -192,7 +192,7 @@ public class GeoDistanceRangeFilter extends Filter {
return false;
}
@Override public boolean get(int doc) throws IOException {
@Override public boolean get(int doc) {
if (!fieldData.hasValue(doc)) {
return false;
}

2
modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/GeoPolygonFilter.java
View File

@ -76,7 +76,7 @@ public class GeoPolygonFilter extends Filter {
return false;
}
@Override public boolean get(int doc) throws IOException {
@Override public boolean get(int doc) {
if (!fieldData.hasValue(doc)) {
return false;
}

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/search/geo/InMemoryGeoBoundingBoxFilter.java
View File

@ -91,7 +91,7 @@ public class InMemoryGeoBoundingBoxFilter extends Filter {
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 class InMemoryGeoBoundingBoxFilter extends Filter {
return false;
}
@Override public boolean get(int doc) throws IOException {
@Override public boolean get(int doc) {
if (!fieldData.hasValue(doc)) {
return false;
}