You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/02/09 02:04:13 UTC
svn commit: r1068718 [15/21] - in /lucene/dev/branches/bulkpostings: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/ant/
dev-tools/maven/lucene/contrib/db/bdb-j...
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DateField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DateField.java Wed Feb 9 01:03:49 2011
@@ -125,12 +125,14 @@ public class DateField extends FieldType
// The easiest fix is to simply remove the 'Z' for the internal
// format.
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
}
protected static String NOW = "NOW";
protected static char Z = 'Z';
+ @Override
public String toInternal(String val) {
return toInternal(parseMath(null, val));
}
@@ -183,6 +185,7 @@ public class DateField extends FieldType
return formatDate(val);
}
+ @Override
public String indexedToReadable(String indexedForm) {
return indexedForm + Z;
}
@@ -193,6 +196,7 @@ public class DateField extends FieldType
out.write(Z);
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
@@ -211,6 +215,7 @@ public class DateField extends FieldType
}
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
@@ -219,6 +224,7 @@ public class DateField extends FieldType
return new OrdFieldSource(field.name);
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeDate(name, toExternal(f));
}
@@ -336,6 +342,7 @@ public class DateField extends FieldType
this.setTimeZone(CANONICAL_TZ);
}
+ @Override
public Date parse(String i, ParsePosition p) {
/* delegate to SimpleDateFormat for easy stuff */
Date d = super.parse(i, p);
@@ -357,6 +364,7 @@ public class DateField extends FieldType
return d;
}
+ @Override
public StringBuffer format(Date d, StringBuffer toAppendTo,
FieldPosition pos) {
/* delegate to SimpleDateFormat for easy stuff */
@@ -375,6 +383,7 @@ public class DateField extends FieldType
return toAppendTo;
}
+ @Override
public Object clone() {
ISO8601CanonicalDateFormat c
= (ISO8601CanonicalDateFormat) super.clone();
@@ -391,6 +400,7 @@ public class DateField extends FieldType
super();
proto = d;
}
+ @Override
protected DateFormat initialValue() {
return (DateFormat) proto.clone();
}
@@ -423,34 +433,42 @@ class DateFieldSource extends FieldCache
this.ft = ft;
}
+ @Override
public String description() {
return "date(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
return new StringIndexDocValues(this, readerContext, field) {
+ @Override
protected String toTerm(String readableValue) {
// needed for frange queries to work properly
return ft.toInternal(readableValue);
}
+ @Override
public float floatVal(int doc) {
return (float)intVal(doc);
}
+ @Override
public int intVal(int doc) {
int ord=termsIndex.getOrd(doc);
return ord;
}
+ @Override
public long longVal(int doc) {
return (long)intVal(doc);
}
+ @Override
public double doubleVal(int doc) {
return (double)intVal(doc);
}
+ @Override
public String strVal(int doc) {
int ord=termsIndex.getOrd(doc);
if (ord == 0) {
@@ -463,18 +481,21 @@ class DateFieldSource extends FieldCache
}
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof DateFieldSource
&& super.equals(o);
}
private static int hcode = DateFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + super.hashCode();
};
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DoubleField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DoubleField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/DoubleField.java Wed Feb 9 01:03:49 2011
@@ -33,12 +33,15 @@ import java.util.Map;
* @version $Id$
*/
public class DoubleField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String, String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
/////////////////////////////////////////////////////////////
+ @Override
public SortField getSortField(SchemaField field, boolean reverse) {
+ field.checkSortability();
return new SortField(field.name, SortField.DOUBLE, reverse);
}
@@ -48,6 +51,7 @@ public class DoubleField extends FieldTy
return new DoubleFieldSource( new DoubleValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String s = f.stringValue();
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/ExternalFileField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/ExternalFileField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/ExternalFileField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/ExternalFileField.java Wed Feb 9 01:03:49 2011
@@ -59,6 +59,7 @@ public class ExternalFileField extends F
private IndexSchema schema;
private float defVal;
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
String ftypeS = getArg("valType", args);
@@ -74,14 +75,17 @@ public class ExternalFileField extends F
this.schema = schema;
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
throw new UnsupportedOperationException();
}
+ @Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
// default key field to unique key
SchemaField keyField = keyFieldName==null ? schema.getUniqueKeyField() : schema.getField(keyFieldName);
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FieldType.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FieldType.java Wed Feb 9 01:03:49 2011
@@ -185,6 +185,7 @@ public abstract class FieldType extends
this.typeName = typeName;
}
+ @Override
public String toString() {
return typeName + "{class=" + this.getClass().getName()
// + propertiesToString(properties)
@@ -390,6 +391,7 @@ public abstract class FieldType extends
this.maxChars=maxChars;
}
+ @Override
public TokenStreamInfo getStream(String fieldName, Reader reader) {
Tokenizer ts = new Tokenizer(reader) {
final char[] cbuf = new char[maxChars];
@@ -476,13 +478,17 @@ public abstract class FieldType extends
/**
* Returns the SortField instance that should be used to sort fields
* of this type.
+ * @see SchemaField#checkSortability
*/
public abstract SortField getSortField(SchemaField field, boolean top);
/**
- * Utility usable by subclasses when they want to get basic String sorting.
+ * Utility usable by subclasses when they want to get basic String sorting
+ * using common checks.
+ * @see SchemaField#checkSortability
*/
protected SortField getStringSort(SchemaField field, boolean reverse) {
+ field.checkSortability();
return Sorting.getStringSortField(field.name, reverse, field.sortMissingLast(),field.sortMissingFirst());
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FloatField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FloatField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/FloatField.java Wed Feb 9 01:03:49 2011
@@ -32,11 +32,14 @@ import java.io.IOException;
* @version $Id$
*/
public class FloatField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
+ field.checkSortability();
return new SortField(field.name,SortField.FLOAT, reverse);
}
@@ -45,6 +48,7 @@ public class FloatField extends FieldTyp
return new FloatFieldSource( new FloatValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String s = f.stringValue();
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IndexSchema.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IndexSchema.java Wed Feb 9 01:03:49 2011
@@ -99,7 +99,7 @@ public final class IndexSchema {
* If the is stream is null, the resource loader will load the schema resource by name.
* @see SolrResourceLoader#openSchema
* By default, this follows the normal config path directory searching rules.
- * @see Config#openResource
+ * @see SolrResourceLoader#openResource
*/
public IndexSchema(SolrConfig solrConfig, String name, InputStream is) {
this.solrConfig = solrConfig;
@@ -316,6 +316,7 @@ public final class IndexSchema {
return analyzer!=null ? analyzer : getDynamicFieldType(fieldName).getAnalyzer();
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader)
{
return getAnalyzer(fieldName).tokenStream(fieldName,reader);
@@ -497,6 +498,7 @@ public final class IndexSchema {
Node node = (Node) xpath.evaluate("/schema/similarity", document, XPathConstants.NODE);
if (node==null) {
similarityFactory = new SimilarityFactory() {
+ @Override
public SimilarityProvider getSimilarityProvider() {
return IndexSearcher.getDefaultSimilarityProvider();
}
@@ -512,6 +514,7 @@ public final class IndexSchema {
} else {
// just like always, assume it's a SimilarityProvider and get a ClassCastException - reasonable error handling
similarityFactory = new SimilarityFactory() {
+ @Override
public SimilarityProvider getSimilarityProvider() {
return (SimilarityProvider) obj;
}
@@ -946,6 +949,7 @@ public final class IndexSchema {
return new SchemaField(prototype, name);
}
+ @Override
public String toString() {
return prototype.toString();
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IntField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IntField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/IntField.java Wed Feb 9 01:03:49 2011
@@ -32,11 +32,14 @@ import java.io.IOException;
* @version $Id$
*/
public class IntField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
+ field.checkSortability();
return new SortField(field.name,SortField.INT, reverse);
}
@@ -45,6 +48,7 @@ public class IntField extends FieldType
return new IntFieldSource(new IntValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String s = f.stringValue();
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LongField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LongField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/LongField.java Wed Feb 9 01:03:49 2011
@@ -32,14 +32,16 @@ import java.util.Map;
* @version $Id$
*/
public class LongField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
/////////////////////////////////////////////////////////////
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
-
+ field.checkSortability();
return new SortField(field.name,SortField.LONG, reverse);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/RandomSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/RandomSortField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/RandomSortField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/RandomSortField.java Wed Feb 9 01:03:49 2011
@@ -100,33 +100,40 @@ public class RandomSortField extends Fie
private static FieldComparatorSource randomComparatorSource = new FieldComparatorSource() {
+ @Override
public FieldComparator newComparator(final String fieldname, final int numHits, int sortPos, boolean reversed) throws IOException {
return new FieldComparator() {
int seed;
private final int[] values = new int[numHits];
int bottomVal;
+ @Override
public int compare(int slot1, int slot2) {
return values[slot1] - values[slot2]; // values will be positive... no overflow possible.
}
+ @Override
public void setBottom(int slot) {
bottomVal = values[slot];
}
+ @Override
public int compareBottom(int doc) throws IOException {
return bottomVal - hash(doc+seed);
}
+ @Override
public void copy(int slot, int doc) throws IOException {
values[slot] = hash(doc+seed);
}
+ @Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
seed = getSeed(fieldname, context);
return this;
}
+ @Override
public Comparable value(int slot) {
return values[slot];
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SchemaField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SchemaField.java Wed Feb 9 01:03:49 2011
@@ -17,9 +17,12 @@
package org.apache.solr.schema;
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.search.SortField;
+
import org.apache.solr.response.TextResponseWriter;
import java.util.Map;
@@ -120,10 +123,35 @@ public final class SchemaField extends F
type.write(writer,name,val);
}
+ /**
+ * Delegates to the FieldType for this field
+ * @see FieldType#getSortField
+ */
public SortField getSortField(boolean top) {
return type.getSortField(this, top);
}
+ /**
+ * Sanity checks that the properties of this field type are plausible
+ * for a field that may be used in sorting, throwing an appropraite
+ * exception (including hte field name) if it is not. FieldType subclasses
+ * can choose to call this method in their getSortField implementation
+ * @see FieldType#getSortField
+ */
+ public void checkSortability() throws SolrException {
+ if (! indexed() ) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
+ "can not sort on unindexed field: "
+ + getName());
+ }
+ if ( multiValued() ) {
+ throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
+ "can not sort on multivalued field: "
+ + getName());
+ }
+
+ }
+
static SchemaField create(String name, FieldType ft, Map<String,String> props) {
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/ShortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/ShortField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/ShortField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/ShortField.java Wed Feb 9 01:03:49 2011
@@ -35,14 +35,16 @@ import java.util.Map;
*
**/
public class ShortField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String, String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
/////////////////////////////////////////////////////////////
+ @Override
public SortField getSortField(SchemaField field, boolean reverse) {
-
+ field.checkSortability();
return new SortField(field.name, SortField.SHORT, reverse);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableDoubleField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableDoubleField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableDoubleField.java Wed Feb 9 01:03:49 2011
@@ -37,11 +37,16 @@ import java.util.Map;
import java.io.IOException;
/**
* @version $Id$
+ *
+ * @deprecated use {@link DoubleField} or {@link TrieDoubleField} - will be removed in 5.x
*/
+@Deprecated
public class SortableDoubleField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
@@ -51,10 +56,12 @@ public class SortableDoubleField extends
return new SortableDoubleFieldSource(field.name);
}
+ @Override
public String toInternal(String val) {
return NumberUtils.double2sortableStr(val);
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
@@ -64,6 +71,7 @@ public class SortableDoubleField extends
return NumberUtils.SortableStr2double(f.stringValue());
}
+ @Override
public String indexedToReadable(String indexedForm) {
return NumberUtils.SortableStr2doubleStr(indexedForm);
}
@@ -74,6 +82,7 @@ public class SortableDoubleField extends
out.write( indexedToReadable(ByteUtils.UTF8toUTF16(input)) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
writer.writeDouble(name, NumberUtils.SortableStr2double(sval));
@@ -95,41 +104,50 @@ class SortableDoubleFieldSource extends
this.defVal = defVal;
}
+ @Override
public String description() {
return "sdouble(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final double def = defVal;
return new StringIndexDocValues(this, readerContext, field) {
private final BytesRef spare = new BytesRef();
+ @Override
protected String toTerm(String readableValue) {
return NumberUtils.double2sortableStr(readableValue);
}
+ @Override
public float floatVal(int doc) {
return (float)doubleVal(doc);
}
+ @Override
public int intVal(int doc) {
return (int)doubleVal(doc);
}
+ @Override
public long longVal(int doc) {
return (long)doubleVal(doc);
}
+ @Override
public double doubleVal(int doc) {
int ord=termsIndex.getOrd(doc);
return ord==0 ? def : NumberUtils.SortableStr2double(termsIndex.lookup(ord, spare));
}
+ @Override
public String strVal(int doc) {
return Double.toString(doubleVal(doc));
}
+ @Override
public String toString(int doc) {
return description() + '=' + doubleVal(doc);
}
@@ -160,6 +178,7 @@ class SortableDoubleFieldSource extends
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof SortableDoubleFieldSource
&& super.equals(o)
@@ -167,6 +186,7 @@ class SortableDoubleFieldSource extends
}
private static int hcode = SortableDoubleFieldSource.class.hashCode();
+ @Override
public int hashCode() {
long bits = Double.doubleToLongBits(defVal);
int ibits = (int)(bits ^ (bits>>>32)); // mix upper bits into lower.
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableFloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableFloatField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableFloatField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableFloatField.java Wed Feb 9 01:03:49 2011
@@ -37,11 +37,16 @@ import java.util.Map;
import java.io.IOException;
/**
* @version $Id$
+ *
+ * @deprecated use {@link FloatField} or {@link TrieFloatField} - will be removed in 5.x
*/
+@Deprecated
public class SortableFloatField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
@@ -51,10 +56,12 @@ public class SortableFloatField extends
return new SortableFloatFieldSource(field.name);
}
+ @Override
public String toInternal(String val) {
return NumberUtils.float2sortableStr(val);
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
@@ -64,6 +71,7 @@ public class SortableFloatField extends
return NumberUtils.SortableStr2float(f.stringValue());
}
+ @Override
public String indexedToReadable(String indexedForm) {
return NumberUtils.SortableStr2floatStr(indexedForm);
}
@@ -74,6 +82,7 @@ public class SortableFloatField extends
out.write( indexedToReadable(ByteUtils.UTF8toUTF16(input)) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
writer.writeFloat(name, NumberUtils.SortableStr2float(sval));
@@ -95,41 +104,50 @@ class SortableFloatFieldSource extends F
this.defVal = defVal;
}
+ @Override
public String description() {
return "sfloat(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final float def = defVal;
return new StringIndexDocValues(this, readerContext, field) {
private final BytesRef spare = new BytesRef();
+ @Override
protected String toTerm(String readableValue) {
return NumberUtils.float2sortableStr(readableValue);
}
+ @Override
public float floatVal(int doc) {
int ord=termsIndex.getOrd(doc);
return ord==0 ? def : NumberUtils.SortableStr2float(termsIndex.lookup(ord, spare));
}
+ @Override
public int intVal(int doc) {
return (int)floatVal(doc);
}
+ @Override
public long longVal(int doc) {
return (long)floatVal(doc);
}
+ @Override
public double doubleVal(int doc) {
return (double)floatVal(doc);
}
+ @Override
public String strVal(int doc) {
return Float.toString(floatVal(doc));
}
+ @Override
public String toString(int doc) {
return description() + '=' + floatVal(doc);
}
@@ -160,6 +178,7 @@ class SortableFloatFieldSource extends F
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof SortableFloatFieldSource
&& super.equals(o)
@@ -167,6 +186,7 @@ class SortableFloatFieldSource extends F
}
private static int hcode = SortableFloatFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + super.hashCode() + Float.floatToIntBits(defVal);
};
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableIntField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableIntField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableIntField.java Wed Feb 9 01:03:49 2011
@@ -37,11 +37,16 @@ import java.util.Map;
import java.io.IOException;
/**
* @version $Id$
+ *
+ * @deprecated use {@link IntField} or {@link TrieIntField} - will be removed in 5.x
*/
+@Deprecated
public class SortableIntField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
@@ -51,6 +56,7 @@ public class SortableIntField extends Fi
return new SortableIntFieldSource(field.name);
}
+ @Override
public String toInternal(String val) {
// special case single digits? years?, etc
// stringCache? general stringCache on a
@@ -58,10 +64,12 @@ public class SortableIntField extends Fi
return NumberUtils.int2sortableStr(val);
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
+ @Override
public String indexedToReadable(String indexedForm) {
return NumberUtils.SortableStr2int(indexedForm);
}
@@ -77,6 +85,7 @@ public class SortableIntField extends Fi
return NumberUtils.SortableStr2int(f.stringValue(), 0, 3);
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
writer.writeInt(name, NumberUtils.SortableStr2int(sval,0,sval.length()));
@@ -97,41 +106,50 @@ class SortableIntFieldSource extends Fie
this.defVal = defVal;
}
+ @Override
public String description() {
return "sint(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final int def = defVal;
return new StringIndexDocValues(this, readerContext, field) {
private final BytesRef spare = new BytesRef();
+ @Override
protected String toTerm(String readableValue) {
return NumberUtils.int2sortableStr(readableValue);
}
+ @Override
public float floatVal(int doc) {
return (float)intVal(doc);
}
+ @Override
public int intVal(int doc) {
int ord=termsIndex.getOrd(doc);
return ord==0 ? def : NumberUtils.SortableStr2int(termsIndex.lookup(ord, spare),0,3);
}
+ @Override
public long longVal(int doc) {
return (long)intVal(doc);
}
+ @Override
public double doubleVal(int doc) {
return (double)intVal(doc);
}
+ @Override
public String strVal(int doc) {
return Integer.toString(intVal(doc));
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
@@ -163,6 +181,7 @@ class SortableIntFieldSource extends Fie
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof SortableIntFieldSource
&& super.equals(o)
@@ -170,6 +189,7 @@ class SortableIntFieldSource extends Fie
}
private static int hcode = SortableIntFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + super.hashCode() + defVal;
};
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableLongField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableLongField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/SortableLongField.java Wed Feb 9 01:03:49 2011
@@ -37,11 +37,16 @@ import java.util.Map;
import java.io.IOException;
/**
* @version $Id$
+ *
+ * @deprecated use {@link LongField} or {@link TrieLongField} - will be removed in 5.x
*/
+@Deprecated
public class SortableLongField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
@@ -51,10 +56,12 @@ public class SortableLongField extends F
return new SortableLongFieldSource(field.name);
}
+ @Override
public String toInternal(String val) {
return NumberUtils.long2sortableStr(val);
}
+ @Override
public String indexedToReadable(String indexedForm) {
return NumberUtils.SortableStr2long(indexedForm);
}
@@ -65,6 +72,7 @@ public class SortableLongField extends F
out.write( indexedToReadable(ByteUtils.UTF8toUTF16(input)) );
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
@@ -74,6 +82,7 @@ public class SortableLongField extends F
return NumberUtils.SortableStr2long(f.stringValue(),0,5);
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
writer.writeLong(name, NumberUtils.SortableStr2long(sval,0,sval.length()));
@@ -96,41 +105,50 @@ class SortableLongFieldSource extends Fi
this.defVal = defVal;
}
+ @Override
public String description() {
return "slong(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final long def = defVal;
return new StringIndexDocValues(this, readerContext, field) {
private final BytesRef spare = new BytesRef();
+ @Override
protected String toTerm(String readableValue) {
return NumberUtils.long2sortableStr(readableValue);
}
+ @Override
public float floatVal(int doc) {
return (float)longVal(doc);
}
+ @Override
public int intVal(int doc) {
return (int)longVal(doc);
}
+ @Override
public long longVal(int doc) {
int ord=termsIndex.getOrd(doc);
return ord==0 ? def : NumberUtils.SortableStr2long(termsIndex.lookup(ord, spare),0,5);
}
+ @Override
public double doubleVal(int doc) {
return (double)longVal(doc);
}
+ @Override
public String strVal(int doc) {
return Long.toString(longVal(doc));
}
+ @Override
public String toString(int doc) {
return description() + '=' + longVal(doc);
}
@@ -161,6 +179,7 @@ class SortableLongFieldSource extends Fi
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof SortableLongFieldSource
&& super.equals(o)
@@ -168,6 +187,7 @@ class SortableLongFieldSource extends Fi
}
private static int hcode = SortableLongFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + super.hashCode() + (int)defVal;
};
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/StrField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/StrField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/StrField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/StrField.java Wed Feb 9 01:03:49 2011
@@ -31,18 +31,22 @@ import java.io.IOException;
* @version $Id$
*/
public class StrField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
super.init(schema, args);
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeStr(name, f.stringValue(), true);
}
+ @Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
return new StrFieldSource(field.getName());
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/StrFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/StrFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/StrFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/StrFieldSource.java Wed Feb 9 01:03:49 2011
@@ -32,41 +32,51 @@ public class StrFieldSource extends Fiel
super(field);
}
+ @Override
public String description() {
return "str(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
return new StringIndexDocValues(this, readerContext, field) {
+ @Override
protected String toTerm(String readableValue) {
return readableValue;
}
+ @Override
public float floatVal(int doc) {
return (float)intVal(doc);
}
+ @Override
public int intVal(int doc) {
int ord=termsIndex.getOrd(doc);
return ord;
}
+ @Override
public long longVal(int doc) {
return (long)intVal(doc);
}
+ @Override
public double doubleVal(int doc) {
return (double)intVal(doc);
}
+ @Override
public int ordVal(int doc) {
return termsIndex.getOrd(doc);
}
+ @Override
public int numOrd() {
return termsIndex.numOrd();
}
+ @Override
public String strVal(int doc) {
int ord=termsIndex.getOrd(doc);
if (ord == 0) {
@@ -76,18 +86,21 @@ public class StrFieldSource extends Fiel
}
}
+ @Override
public String toString(int doc) {
return description() + '=' + strVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof StrFieldSource
&& super.equals(o);
}
private static int hcode = SortableFloatFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + super.hashCode();
};
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TextField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TextField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TextField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TextField.java Wed Feb 9 01:03:49 2011
@@ -49,6 +49,7 @@ import java.io.StringReader;
public class TextField extends FieldType {
protected boolean autoGeneratePhraseQueries = true;
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
properties |= TOKENIZED;
if (schema.getVersion()> 1.1f) properties &= ~OMIT_TF_POSITIONS;
@@ -62,10 +63,13 @@ public class TextField extends FieldType
return autoGeneratePhraseQueries;
}
+ @Override
public SortField getSortField(SchemaField field, boolean reverse) {
+ /* :TODO: maybe warn if isTokenized(), but doesn't use LimitTokenCountFilter in it's chain? */
return getStringSort(field, reverse);
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeStr(name, f.stringValue(), true);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieDateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieDateField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieDateField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieDateField.java Wed Feb 9 01:03:49 2011
@@ -78,6 +78,7 @@ public class TrieDateField extends DateF
@Override
public SortField getSortField(SchemaField field, boolean top) {
+ field.checkSortability();
return new SortField(new LongValuesCreator( field.getName(), FieldCache.NUMERIC_UTILS_LONG_PARSER, CachedArrayCreator.CACHE_VALUES_AND_BITS ), top);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieField.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/schema/TrieField.java Wed Feb 9 01:03:49 2011
@@ -121,7 +121,10 @@ public class TrieField extends FieldType
}
}
+ @Override
public SortField getSortField(SchemaField field, boolean top) {
+ field.checkSortability();
+
int flags = CachedArrayCreator.CACHE_VALUES_AND_BITS;
Object missingValue = null;
boolean sortMissingLast = on( SORT_MISSING_LAST, properties );
@@ -194,6 +197,7 @@ public class TrieField extends FieldType
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
byte[] arr = f.getBinaryValue();
if (arr==null) {
@@ -586,6 +590,7 @@ class TrieDateFieldSource extends LongFi
super(creator);
}
+ @Override
public String description() {
return "date(" + field + ')';
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/BitDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/BitDocSet.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/BitDocSet.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/BitDocSet.java Wed Feb 9 01:03:49 2011
@@ -113,15 +113,18 @@ public class BitDocSet extends DocSetBas
*
* @return the <b>internal</b> OpenBitSet that should <b>not</b> be modified.
*/
+ @Override
public OpenBitSet getBits() {
return bits;
}
+ @Override
public void add(int doc) {
bits.set(doc);
size=-1; // invalidate size
}
+ @Override
public void addUnique(int doc) {
bits.set(doc);
size=-1; // invalidate size
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -43,12 +43,14 @@ public class BoostQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
QParser baseParser;
ValueSource vs;
String b;
+ @Override
public Query parse() throws ParseException {
b = localParams.get(BOOSTFUNC);
baseParser = subQuery(localParams.get(QueryParsing.V), null);
@@ -65,14 +67,17 @@ public class BoostQParserPlugin extends
}
+ @Override
public String[] getDefaultHighlightFields() {
return baseParser.getDefaultHighlightFields();
}
+ @Override
public Query getHighlightQuery() throws ParseException {
return baseParser.getHighlightQuery();
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
// encapsulate base debug info in a sub-list?
baseParser.addDebugInfo(debugInfo);
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DisMaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DisMaxQParser.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DisMaxQParser.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DisMaxQParser.java Wed Feb 9 01:03:49 2011
@@ -79,6 +79,7 @@ public class DisMaxQParser extends QPars
protected QParser altQParser;
+ @Override
public Query parse() throws ParseException {
SolrParams solrParams = localParams == null ? params : new DefaultSolrParams(localParams, params);
queryFields = SolrPluginUtils.parseFieldBoosts(solrParams.getParams(DisMaxParams.QF));
@@ -244,6 +245,7 @@ public class DisMaxQParser extends QPars
return parsedUserQuery == null ? altUserQuery : parsedUserQuery;
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
super.addDebugInfo(debugInfo);
debugInfo.add("altquerystring", altUserQuery);
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -115,6 +115,7 @@ public class DisMaxQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new DisMaxQParser(qstr, localParams, params, req);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DocSet.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DocSet.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DocSet.java Wed Feb 9 01:03:49 2011
@@ -154,6 +154,7 @@ public interface DocSet /* extends Colle
abstract class DocSetBase implements DocSet {
// Not implemented efficiently... for testing purposes only
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof DocSet)) return false;
DocSet other = (DocSet)obj;
@@ -249,9 +250,8 @@ abstract class DocSetBase implements Doc
return new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext ctx) throws IOException {
- IndexReader.AtomicReaderContext context = (IndexReader.AtomicReaderContext)ctx; // TODO: remove after lucene migration
- IndexReader reader = ctx.reader;
+ public DocIdSet getDocIdSet(AtomicReaderContext context) throws IOException {
+ IndexReader reader = context.reader;
if (context.isTopLevel) {
return bs;
@@ -262,6 +262,7 @@ abstract class DocSetBase implements Doc
final int max = base + maxDoc; // one past the max doc in this segment.
return new DocIdSet() {
+ @Override
public DocIdSetIterator iterator() throws IOException {
return new DocIdSetIterator() {
int pos=base-1;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DocSetHitCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DocSetHitCollector.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DocSetHitCollector.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/DocSetHitCollector.java Wed Feb 9 01:03:49 2011
@@ -45,6 +45,7 @@ class DocSetCollector extends Collector
this.maxDoc = maxDoc;
this.scratch = new int[smallSetSize];
}
+ @Override
public void collect(int doc) throws IOException {
doc += base;
// optimistically collect the first docs in an array
@@ -77,13 +78,16 @@ class DocSetCollector extends Collector
}
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
this.base = context.docBase;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return false;
}
@@ -97,6 +101,7 @@ class DocSetDelegateCollector extends Do
this.collector = collector;
}
+ @Override
public void collect(int doc) throws IOException {
collector.collect(doc);
@@ -120,6 +125,7 @@ class DocSetDelegateCollector extends Do
pos++;
}
+ @Override
public DocSet getDocSet() {
if (pos<=scratch.length) {
// assumes docs were collected in sorted order!
@@ -131,10 +137,12 @@ class DocSetDelegateCollector extends Do
}
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
collector.setScorer(scorer);
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
collector.setNextReader(context);
this.base = context.docBase;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -55,6 +55,7 @@ public class ExtendedDismaxQParserPlugin
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new ExtendedDismaxQParser(qstr, localParams, params, req);
}
@@ -96,6 +97,7 @@ class ExtendedDismaxQParser extends QPar
private QParser altQParser;
+ @Override
public Query parse() throws ParseException {
SolrParams localParams = getLocalParams();
SolrParams params = getParams();
@@ -483,6 +485,7 @@ class ExtendedDismaxQParser extends QPar
return parsedUserQuery == null ? altUserQuery : parsedUserQuery;
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
super.addDebugInfo(debugInfo);
debugInfo.add("altquerystring", altUserQuery);
@@ -820,6 +823,7 @@ class ExtendedDismaxQParser extends QPar
analyzer.removeStopFilter = remove;
}
+ @Override
protected Query getBooleanQuery(List clauses, boolean disableCoord) throws ParseException {
Query q = super.getBooleanQuery(clauses, disableCoord);
if (q != null) {
@@ -834,6 +838,7 @@ class ExtendedDismaxQParser extends QPar
////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
+ @Override
protected void addClause(List clauses, int conj, int mods, Query q) {
//System.out.println("addClause:clauses="+clauses+" conj="+conj+" mods="+mods+" q="+q);
super.addClause(clauses, conj, mods, q);
@@ -1075,6 +1080,7 @@ final class ExtendedAnalyzer extends Ana
this.queryAnalyzer = parser.getReq().getSchema().getQueryAnalyzer();
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
if (!removeStopFilter) {
return queryAnalyzer.tokenStream(fieldName, reader);
@@ -1138,10 +1144,12 @@ final class ExtendedAnalyzer extends Ana
return newa.tokenStream(fieldName, reader);
}
+ @Override
public int getPositionIncrementGap(String fieldName) {
return queryAnalyzer.getPositionIncrementGap(fieldName);
}
+ @Override
public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException {
if (!removeStopFilter) {
return queryAnalyzer.reusableTokenStream(fieldName, reader);
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FastLRUCache.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FastLRUCache.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FastLRUCache.java Wed Feb 9 01:03:49 2011
@@ -274,6 +274,7 @@ public class FastLRUCache<K,V> extends S
return lst;
}
+ @Override
public String toString() {
return name + getStatistics().toString();
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -38,8 +38,10 @@ public class FieldQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
+ @Override
public Query parse() throws ParseException {
String field = localParams.get(QueryParsing.F);
String queryText = localParams.get(QueryParsing.V);
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionQParser.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionQParser.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionQParser.java Wed Feb 9 01:03:49 2011
@@ -56,6 +56,7 @@ public class FunctionQParser extends QPa
return parseMultipleSources;
}
+ @Override
public Query parse() throws ParseException {
sp = new QueryParsing.StrParser(getString());
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -31,6 +31,7 @@ public class FunctionQParserPlugin exten
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new FunctionQParser(qstr, localParams, params, req);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -39,11 +39,13 @@ public class FunctionRangeQParserPlugin
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
ValueSource vs;
String funcStr;
+ @Override
public Query parse() throws ParseException {
funcStr = localParams.get(QueryParsing.V, null);
Query funcQ = subQuery(funcStr, FunctionQParserPlugin.NAME).parse();
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/Grouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/Grouping.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/Grouping.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/Grouping.java Wed Feb 9 01:03:49 2011
@@ -77,10 +77,11 @@ public class Grouping {
int docsToCollect = getMax(off, len, max);
// TODO: implement a DocList impl that doesn't need to start at offset=0
- TopDocs topDocs = collector.topDocs(0, docsToCollect);
+ TopDocs topDocs = collector.topDocs(0, Math.max(docsToCollect,1)); // 0 isn't supported as a valid value
+ int docsCollected = Math.min(docsToCollect, topDocs.scoreDocs.length);
- int ids[] = new int[topDocs.scoreDocs.length];
- float[] scores = needScores ? new float[topDocs.scoreDocs.length] : null;
+ int ids[] = new int[docsCollected];
+ float[] scores = needScores ? new float[docsCollected] : null;
for (int i=0; i<ids.length; i++) {
ids[i] = topDocs.scoreDocs[i].doc;
if (scores != null)
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LRUCache.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LRUCache.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LRUCache.java Wed Feb 9 01:03:49 2011
@@ -77,6 +77,7 @@ public class LRUCache<K,V> extends SolrC
description += ')';
map = new LinkedHashMap<K,V>(initialSize, 0.75f, true) {
+ @Override
protected boolean removeEldestEntry(Map.Entry eldest) {
if (size() > limit) {
// increment evictions regardless of state.
@@ -277,6 +278,7 @@ public class LRUCache<K,V> extends SolrC
return lst;
}
+ @Override
public String toString() {
return name + getStatistics().toString();
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -41,6 +41,7 @@ public class LuceneQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new LuceneQParser(qstr, localParams, params, req);
}
@@ -55,6 +56,7 @@ class LuceneQParser extends QParser {
}
+ @Override
public Query parse() throws ParseException {
String qstr = getString();
if (qstr == null) return null;
@@ -73,6 +75,7 @@ class LuceneQParser extends QParser {
}
+ @Override
public String[] getDefaultHighlightFields() {
return lparser == null ? new String[]{} : new String[]{lparser.getField()};
}
@@ -87,6 +90,7 @@ class OldLuceneQParser extends LuceneQPa
super(qstr, localParams, params, req);
}
+ @Override
public Query parse() throws ParseException {
// handle legacy "query;sort" syntax
if (getLocalParams() == null) {
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java Wed Feb 9 01:03:49 2011
@@ -46,6 +46,7 @@ class LuceneQueryOptimizer {
*/
public LuceneQueryOptimizer(final int cacheSize, float threshold) {
this.cache = new LinkedHashMap(cacheSize, 0.75f, true) {
+ @Override
protected boolean removeEldestEntry(Map.Entry eldest) {
return size() > cacheSize; // limit size of cache
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java Wed Feb 9 01:03:49 2011
@@ -47,6 +47,7 @@ public class MissingStringLastComparator
this.missingValueProxy=missingValueProxy;
}
+ @Override
public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException {
return new TermOrdValComparator_SML(numHits, fieldname, sortPos, reversed, missingValueProxy);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/MutableValue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/MutableValue.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/MutableValue.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/MutableValue.java Wed Feb 9 01:03:49 2011
@@ -50,6 +50,7 @@ public abstract class MutableValue imple
return (c1 == c2) && this.equalsSameType(other);
}
+ @Override
public abstract int hashCode();
@Override
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -38,25 +38,30 @@ public class NestedQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
QParser baseParser;
ValueSource vs;
String b;
+ @Override
public Query parse() throws ParseException {
baseParser = subQuery(localParams.get(QueryParsing.V), null);
return baseParser.getQuery();
}
+ @Override
public String[] getDefaultHighlightFields() {
return baseParser.getDefaultHighlightFields();
}
+ @Override
public Query getHighlightQuery() throws ParseException {
return baseParser.getHighlightQuery();
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
// encapsulate base debug info in a sub-list?
baseParser.addDebugInfo(debugInfo);
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -31,6 +31,7 @@ public class OldLuceneQParserPlugin exte
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new OldLuceneQParser(qstr, localParams, params, req);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -36,8 +36,10 @@ public class PrefixQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
+ @Override
public Query parse() throws ParseException {
return new PrefixQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryParsing.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryParsing.java Wed Feb 9 01:03:49 2011
@@ -330,16 +330,9 @@ public class QueryParsing {
}
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
- "sort param fiedl can't be found: " + field);
+ "sort param field can't be found: " + field);
}
-
- // TODO: remove this - it should be up to the FieldType
- if (!sf.indexed()) {
- throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
- "can not sort on unindexed field: "
- + field);
- }
- lst.add(sf.getType().getSortField(sf, top));
+ lst.add(sf.getSortField(top));
}
}
@@ -828,6 +821,7 @@ public class QueryParsing {
return pos < end ? val.charAt(pos) : 0;
}
+ @Override
public String toString() {
return "'" + val + "'" + ", pos=" + pos;
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryResultKey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryResultKey.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryResultKey.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/QueryResultKey.java Wed Feb 9 01:03:49 2011
@@ -56,10 +56,12 @@ public final class QueryResultKey {
hc = h;
}
+ @Override
public int hashCode() {
return hc;
}
+ @Override
public boolean equals(Object o) {
if (o==this) return true;
if (!(o instanceof QueryResultKey)) return false;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/RawQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/RawQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/RawQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/RawQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -40,8 +40,10 @@ public class RawQParserPlugin extends QP
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
+ @Override
public Query parse() throws ParseException {
return new TermQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrCacheBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrCacheBase.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrCacheBase.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrCacheBase.java Wed Feb 9 01:03:49 2011
@@ -55,6 +55,7 @@ public abstract class SolrCacheBase {
throw new RuntimeException("Can't parse autoWarm value: " + configValue, e);
}
}
+ @Override
public String toString() {
return strVal;
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java Wed Feb 9 01:03:49 2011
@@ -41,14 +41,17 @@ public class SolrConstantScoreQuery exte
}
/** Returns the encapsulated filter */
+ @Override
public Filter getFilter() {
return filter;
}
+ @Override
public Query rewrite(IndexReader reader) throws IOException {
return this;
}
+ @Override
public void extractTerms(Set terms) {
// OK to not add any terms when used for MultiSearcher,
// but may not be OK for highlighting
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java Wed Feb 9 01:03:49 2011
@@ -205,6 +205,7 @@ public class SolrIndexSearcher extends I
}
+ @Override
public String toString() {
return name;
}
@@ -228,6 +229,7 @@ public class SolrIndexSearcher extends I
*
* In particular, the underlying reader and any cache's in use are closed.
*/
+ @Override
public void close() throws IOException {
if (cachingEnabled) {
StringBuilder sb = new StringBuilder();
@@ -376,7 +378,7 @@ public class SolrIndexSearcher extends I
/**
* @return the indexDir on which this searcher is opened
- * @see org.apache.solr.search.SolrIndexSearcher#SolrIndexSearcher(org.apache.solr.core.SolrCore, org.apache.solr.schema.IndexSchema, String, String, boolean)
+ * @see #SolrIndexSearcher(SolrCore, IndexSchema, String, Directory, boolean)
*/
public String getIndexDir() {
return indexDir;
@@ -411,6 +413,7 @@ public class SolrIndexSearcher extends I
/**
* Retrieve the {@link Document} instance corresponding to the document id.
*/
+ @Override
public Document doc(int i) throws IOException {
return doc(i, (Set<String>)null);
}
@@ -419,6 +422,7 @@ public class SolrIndexSearcher extends I
* This method does not currently use the Solr document cache.
*
* @see IndexReader#document(int, FieldSelector) */
+ @Override
public Document doc(int n, FieldSelector fieldSelector) throws IOException {
return getIndexReader().document(n, fieldSelector);
}
@@ -1139,13 +1143,17 @@ public class SolrIndexSearcher extends I
if (!needScores) {
collector = new Collector () {
+ @Override
public void setScorer(Scorer scorer) throws IOException {
}
+ @Override
public void collect(int doc) throws IOException {
numHits[0]++;
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -1153,16 +1161,20 @@ public class SolrIndexSearcher extends I
} else {
collector = new Collector() {
Scorer scorer;
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public void collect(int doc) throws IOException {
numHits[0]++;
float score = scorer.score();
if (score > topscore[0]) topscore[0]=score;
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -1260,16 +1272,20 @@ public class SolrIndexSearcher extends I
} else {
collector = setCollector = new DocSetDelegateCollector(smallSetSize, maxDoc, new Collector() {
Scorer scorer;
- public void setScorer(Scorer scorer) throws IOException {
+ @Override
+ public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
- public void collect(int doc) throws IOException {
+ @Override
+ public void collect(int doc) throws IOException {
float score = scorer.score();
if (score > topscore[0]) topscore[0]=score;
}
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ @Override
+ public void setNextReader(AtomicReaderContext context) throws IOException {
}
- public boolean acceptsDocsOutOfOrder() {
+ @Override
+ public boolean acceptsDocsOutOfOrder() {
return false;
}
});
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SortedIntDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SortedIntDocSet.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SortedIntDocSet.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SortedIntDocSet.java Wed Feb 9 01:03:49 2011
@@ -552,8 +552,7 @@ public class SortedIntDocSet extends Doc
int lastEndIdx = 0;
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext contextX) throws IOException {
- AtomicReaderContext context = (AtomicReaderContext)contextX; // TODO: remove after lucene migration
+ public DocIdSet getDocIdSet(AtomicReaderContext context) throws IOException {
IndexReader reader = context.reader;
final int base = context.docBase;
@@ -587,6 +586,7 @@ public class SortedIntDocSet extends Doc
return new DocIdSet() {
+ @Override
public DocIdSetIterator iterator() throws IOException {
return new DocIdSetIterator() {
int idx = startIdx;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -31,6 +31,7 @@ public class SpatialBoxQParserPlugin ext
return new SpatialFilterQParser(qstr, localParams, params, req, true);
}
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/TermQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/TermQParserPlugin.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/TermQParserPlugin.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/TermQParserPlugin.java Wed Feb 9 01:03:49 2011
@@ -47,8 +47,10 @@ public class TermQParserPlugin extends Q
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
+ @Override
public Query parse() throws ParseException {
String fname = localParams.get(QueryParsing.F);
FieldType ft = req.getSchema().getFieldTypeNoEx(fname);