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/01/30 17:08:35 UTC
svn commit: r1065312 [4/6] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/contrib/analyzers/common/src/java/org/apache/lucene/analysis/fa/
lucene/contrib/misc/src/java/org/apache/lucene/index/
lucene/contrib/misc/src/java/org/apache/lucene/stor...
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableDoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableDoubleField.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableDoubleField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableDoubleField.java Sun Jan 30 16:08:25 2011
@@ -34,21 +34,26 @@ import java.io.IOException;
* @version $Id$
*/
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);
}
+ @Override
public ValueSource getValueSource(SchemaField field) {
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());
}
@@ -58,15 +63,18 @@ public class SortableDoubleField extends
return NumberUtils.SortableStr2double(f.stringValue());
}
+ @Override
public String indexedToReadable(String indexedForm) {
return NumberUtils.SortableStr2doubleStr(indexedForm);
}
+ @Override
public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
xmlWriter.writeDouble(name, NumberUtils.SortableStr2double(sval));
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
writer.writeDouble(name, NumberUtils.SortableStr2double(sval));
@@ -88,45 +96,55 @@ class SortableDoubleFieldSource extends
this.defVal = defVal;
}
+ @Override
public String description() {
return "sdouble(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final double def = defVal;
return new StringIndexDocValues(this, reader, field) {
+ @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=order[doc];
return ord==0 ? def : NumberUtils.SortableStr2double(lookup[ord]);
}
+ @Override
public String strVal(int doc) {
return Double.toString(doubleVal(doc));
}
+ @Override
public String toString(int doc) {
return description() + '=' + doubleVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof SortableDoubleFieldSource
&& super.equals(o)
@@ -134,6 +152,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/branch_3x/solr/src/java/org/apache/solr/schema/SortableFloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableFloatField.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableFloatField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableFloatField.java Sun Jan 30 16:08:25 2011
@@ -34,21 +34,26 @@ import java.io.IOException;
* @version $Id$
*/
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);
}
+ @Override
public ValueSource getValueSource(SchemaField field) {
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());
}
@@ -58,15 +63,18 @@ public class SortableFloatField extends
return NumberUtils.SortableStr2float(f.stringValue());
}
+ @Override
public String indexedToReadable(String indexedForm) {
return NumberUtils.SortableStr2floatStr(indexedForm);
}
+ @Override
public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
xmlWriter.writeFloat(name, NumberUtils.SortableStr2float(sval));
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
writer.writeFloat(name, NumberUtils.SortableStr2float(sval));
@@ -88,45 +96,55 @@ class SortableFloatFieldSource extends F
this.defVal = defVal;
}
+ @Override
public String description() {
return "sfloat(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final float def = defVal;
return new StringIndexDocValues(this, reader, field) {
+ @Override
protected String toTerm(String readableValue) {
return NumberUtils.float2sortableStr(readableValue);
}
+ @Override
public float floatVal(int doc) {
int ord=order[doc];
return ord==0 ? def : NumberUtils.SortableStr2float(lookup[ord]);
}
+ @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);
}
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof SortableFloatFieldSource
&& super.equals(o)
@@ -134,6 +152,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/branch_3x/solr/src/java/org/apache/solr/schema/SortableIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableIntField.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableIntField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableIntField.java Sun Jan 30 16:08:25 2011
@@ -34,17 +34,21 @@ import java.io.IOException;
* @version $Id$
*/
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);
}
+ @Override
public ValueSource getValueSource(SchemaField field) {
return new SortableIntFieldSource(field.name);
}
+ @Override
public String toInternal(String val) {
// special case single digits? years?, etc
// stringCache? general stringCache on a
@@ -52,10 +56,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);
}
@@ -65,6 +71,7 @@ public class SortableIntField extends Fi
return NumberUtils.SortableStr2int(f.stringValue(), 0, 3);
}
+ @Override
public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
// since writeInt an int instead of a String since that may be more efficient
@@ -72,6 +79,7 @@ public class SortableIntField extends Fi
xmlWriter.writeInt(name, NumberUtils.SortableStr2int(sval,0,sval.length()));
}
+ @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()));
@@ -92,45 +100,55 @@ class SortableIntFieldSource extends Fie
this.defVal = defVal;
}
+ @Override
public String description() {
return "sint(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final int def = defVal;
return new StringIndexDocValues(this, reader, field) {
+ @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=order[doc];
return ord==0 ? def : NumberUtils.SortableStr2int(lookup[ord],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);
}
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof SortableIntFieldSource
&& super.equals(o)
@@ -138,6 +156,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/branch_3x/solr/src/java/org/apache/solr/schema/SortableLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableLongField.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableLongField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/SortableLongField.java Sun Jan 30 16:08:25 2011
@@ -34,25 +34,31 @@ import java.io.IOException;
* @version $Id$
*/
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);
}
+ @Override
public ValueSource getValueSource(SchemaField field) {
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);
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
@@ -62,11 +68,13 @@ public class SortableLongField extends F
return NumberUtils.SortableStr2long(f.stringValue(),0,5);
}
+ @Override
public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
String sval = f.stringValue();
xmlWriter.writeLong(name, NumberUtils.SortableStr2long(sval,0,sval.length()));
}
+ @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()));
@@ -89,45 +97,55 @@ class SortableLongFieldSource extends Fi
this.defVal = defVal;
}
+ @Override
public String description() {
return "slong(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final long def = defVal;
return new StringIndexDocValues(this, reader, field) {
+ @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=order[doc];
return ord==0 ? def : NumberUtils.SortableStr2long(lookup[ord],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);
}
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof SortableLongFieldSource
&& super.equals(o)
@@ -135,6 +153,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/branch_3x/solr/src/java/org/apache/solr/schema/StrField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/StrField.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/StrField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/StrField.java Sun Jan 30 16:08:25 2011
@@ -34,22 +34,27 @@ 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(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
xmlWriter.writeStr(name, f.stringValue());
}
+ @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());
}
@@ -62,50 +67,61 @@ class StrFieldSource extends FieldCacheS
super(field);
}
+ @Override
public String description() {
return "str(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
return new StringIndexDocValues(this, reader, 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=order[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=order[doc];
return lookup[ord];
}
+ @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/branch_3x/solr/src/java/org/apache/solr/schema/TextField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/TextField.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/TextField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/TextField.java Sun Jan 30 16:08:25 2011
@@ -48,6 +48,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;
@@ -61,14 +62,17 @@ public class TextField extends FieldType
return autoGeneratePhraseQueries;
}
+ @Override
public SortField getSortField(SchemaField field, boolean reverse) {
return getStringSort(field, reverse);
}
+ @Override
public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
xmlWriter.writeStr(name, f.stringValue());
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeStr(name, f.stringValue(), true);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/TrieField.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/schema/TrieField.java Sun Jan 30 16:08:25 2011
@@ -112,6 +112,7 @@ public class TrieField extends FieldType
}
}
+ @Override
public SortField getSortField(SchemaField field, boolean top) {
switch (type) {
case INTEGER:
@@ -128,6 +129,7 @@ public class TrieField extends FieldType
}
}
+ @Override
public ValueSource getValueSource(SchemaField field) {
switch (type) {
case INTEGER:
@@ -145,6 +147,7 @@ public class TrieField extends FieldType
}
}
+ @Override
public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
byte[] arr = f.getBinaryValue();
if (arr==null) {
@@ -173,6 +176,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) {
@@ -509,6 +513,7 @@ class TrieDateFieldSource extends LongFi
super(field);
}
+ @Override
public String description() {
return "date(" + field + ')';
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/BitDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/BitDocSet.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/BitDocSet.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/BitDocSet.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java Sun Jan 30 16:08:25 2011
@@ -37,6 +37,7 @@ public class ConstantScorePrefixQuery ex
/** Returns the prefix for this query */
public Term getPrefix() { return prefix; }
+ @Override
public Query rewrite(IndexReader reader) throws IOException {
// TODO: if number of terms are low enough, rewrite to a BooleanQuery
// for potentially faster execution.
@@ -47,6 +48,7 @@ public class ConstantScorePrefixQuery ex
}
/** Prints a user-readable version of this query. */
+ @Override
public String toString(String field)
{
StringBuilder buffer = new StringBuilder();
@@ -64,6 +66,7 @@ public class ConstantScorePrefixQuery ex
}
/** Returns true if <code>o</code> is equal to this. */
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof ConstantScorePrefixQuery)) return false;
@@ -72,6 +75,7 @@ public class ConstantScorePrefixQuery ex
}
/** Returns a hash code value for this object.*/
+ @Override
public int hashCode() {
int h = prefix.hashCode() ^ Float.floatToIntBits(getBoost());
h ^= (h << 14) | (h >>> 19); // reversible (1 to 1) transformation unique to ConstantScorePrefixQuery
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParser.java Sun Jan 30 16:08:25 2011
@@ -62,6 +62,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));
@@ -227,6 +228,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/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java Sun Jan 30 16:08:25 2011
@@ -33,6 +33,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/branch_3x/solr/src/java/org/apache/solr/search/DocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DocSet.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DocSet.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DocSet.java Sun Jan 30 16:08:25 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;
@@ -264,6 +265,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/branch_3x/solr/src/java/org/apache/solr/search/DocSetHitCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DocSetHitCollector.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DocSetHitCollector.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/DocSetHitCollector.java Sun Jan 30 16:08:25 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(IndexReader reader, int docBase) throws IOException {
this.base = 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(IndexReader reader, int docBase) throws IOException {
collector.setNextReader(reader, docBase);
this.base = docBase;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java Sun Jan 30 16:08:25 2011
@@ -56,6 +56,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);
}
@@ -97,6 +98,7 @@ class ExtendedDismaxQParser extends QPar
private QParser altQParser;
+ @Override
public Query parse() throws ParseException {
SolrParams localParams = getLocalParams();
SolrParams params = getParams();
@@ -484,6 +486,7 @@ class ExtendedDismaxQParser extends QPar
return parsedUserQuery;
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
super.addDebugInfo(debugInfo);
debugInfo.add("altquerystring", altUserQuery);
@@ -821,6 +824,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) {
@@ -835,6 +839,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);
@@ -1074,6 +1079,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);
@@ -1137,10 +1143,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/branch_3x/solr/src/java/org/apache/solr/search/FastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FastLRUCache.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FastLRUCache.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FastLRUCache.java Sun Jan 30 16:08:25 2011
@@ -276,6 +276,7 @@ public class FastLRUCache<K,V> implement
return lst;
}
+ @Override
public String toString() {
return name + getStatistics().toString();
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParser.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/LRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LRUCache.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LRUCache.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LRUCache.java Sun Jan 30 16:08:25 2011
@@ -80,6 +80,7 @@ public class LRUCache<K,V> implements So
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.
@@ -279,6 +280,7 @@ public class LRUCache<K,V> implements So
return lst;
}
+ @Override
public String toString() {
return name + getStatistics().toString();
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java Sun Jan 30 16:08:25 2011
@@ -42,6 +42,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);
}
@@ -56,6 +57,7 @@ class LuceneQParser extends QParser {
}
+ @Override
public Query parse() throws ParseException {
String qstr = getString();
@@ -79,6 +81,7 @@ class LuceneQParser extends QParser {
}
+ @Override
public String[] getDefaultHighlightFields() {
return new String[]{lparser.getField()};
}
@@ -93,6 +96,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/branch_3x/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java Sun Jan 30 16:08:25 2011
@@ -42,6 +42,7 @@ public class MissingStringLastComparator
this.missingValueProxy=missingValueProxy;
}
+ @Override
public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException {
return new MissingLastOrdComparator(numHits, fieldname, sortPos, reversed, missingValueProxy);
}
@@ -80,6 +81,7 @@ public class MissingStringLastComparator
this.nullVal = nullVal;
}
+ @Override
public int compare(int slot1, int slot2) {
if (readerGen[slot1] == readerGen[slot2]) {
int cmp = ords[slot1] - ords[slot2];
@@ -102,6 +104,7 @@ public class MissingStringLastComparator
return val1.compareTo(val2);
}
+ @Override
public int compareBottom(int doc) {
assert bottomSlot != -1;
int order = this.order[doc];
@@ -149,6 +152,7 @@ public class MissingStringLastComparator
ords[slot] = index;
}
+ @Override
public void copy(int slot, int doc) {
final int ord = order[doc];
ords[slot] = ord == 0 ? NULL_ORD : ord;
@@ -157,6 +161,7 @@ public class MissingStringLastComparator
readerGen[slot] = currentReaderGen;
}
+ @Override
public void setNextReader(IndexReader reader, int docBase) throws IOException {
FieldCache.StringIndex currentReaderValues = FieldCache.DEFAULT.getStringIndex(reader, field);
currentReaderGen++;
@@ -169,6 +174,7 @@ public class MissingStringLastComparator
}
}
+ @Override
public void setBottom(final int bottom) {
bottomSlot = bottom;
if (readerGen[bottom] != currentReaderGen) {
@@ -180,6 +186,7 @@ public class MissingStringLastComparator
bottomValue = values[bottom];
}
+ @Override
public Comparable value(int slot) {
Comparable v = values[slot];
return v==null ? nullVal : v;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryParsing.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryParsing.java Sun Jan 30 16:08:25 2011
@@ -881,6 +881,7 @@ public class QueryParsing {
return pos < end ? val.charAt(pos) : 0;
}
+ @Override
public String toString() {
return "'" + val + "'" + ", pos=" + pos;
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryResultKey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryResultKey.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryResultKey.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/QueryResultKey.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/RawQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/RawQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/RawQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/RawQParserPlugin.java Sun Jan 30 16:08:25 2011
@@ -35,8 +35,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/branch_3x/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java Sun Jan 30 16:08:25 2011
@@ -40,14 +40,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
@@ -66,28 +69,34 @@ public class SolrConstantScoreQuery exte
((SolrFilter)filter).createWeight(context, searcher);
}
+ @Override
public Query getQuery() {
return SolrConstantScoreQuery.this;
}
+ @Override
public float getValue() {
return queryWeight;
}
+ @Override
public float sumOfSquaredWeights() throws IOException {
queryWeight = getBoost();
return queryWeight * queryWeight;
}
+ @Override
public void normalize(float norm) {
this.queryNorm = norm;
queryWeight *= this.queryNorm;
}
+ @Override
public Scorer scorer(IndexReader reader, boolean scoreDocsInOrder, boolean topScorer) throws IOException {
return new ConstantScorer(similarity, reader, this);
}
+ @Override
public Explanation explain(IndexReader reader, int doc) throws IOException {
ConstantScorer cs = new ConstantScorer(similarity, reader, this);
@@ -133,18 +142,22 @@ public class SolrConstantScoreQuery exte
}
}
+ @Override
public int nextDoc() throws IOException {
return docIdSetIterator.nextDoc();
}
+ @Override
public int docID() {
return docIdSetIterator.docID();
}
+ @Override
public float score() throws IOException {
return theScore;
}
+ @Override
public int advance(int target) throws IOException {
return docIdSetIterator.advance(target);
}
@@ -154,6 +167,7 @@ public class SolrConstantScoreQuery exte
}
}
+ @Override
public Weight createWeight(Searcher searcher) {
try {
return new SolrConstantScoreQuery.ConstantWeight(searcher);
@@ -164,12 +178,14 @@ public class SolrConstantScoreQuery exte
}
/** Prints a user-readable version of this query. */
+ @Override
public String toString(String field) {
return "ConstantScore(" + filter.toString()
+ (getBoost()==1.0 ? ")" : "^" + getBoost());
}
/** Returns true if <code>o</code> is equal to this. */
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof SolrConstantScoreQuery)) return false;
@@ -178,6 +194,7 @@ public class SolrConstantScoreQuery exte
}
/** Returns a hash code value for this object. */
+ @Override
public int hashCode() {
// Simple add is OK since no existing filter hashcode has a float component.
return filter.hashCode() + Float.floatToIntBits(getBoost());
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexReader.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexReader.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexReader.java Sun Jan 30 16:08:25 2011
@@ -150,6 +150,7 @@ public class SolrIndexReader extends Fil
return o.getClass().getSimpleName()+ "@" + Integer.toHexString(o.hashCode());
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("SolrIndexReader{this=").append(Integer.toHexString(this.hashCode()));
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java Sun Jan 30 16:08:25 2011
@@ -203,6 +203,7 @@ public class SolrIndexSearcher extends I
}
+ @Override
public String toString() {
return name;
}
@@ -226,6 +227,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();
@@ -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);
}
@@ -1104,13 +1108,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(IndexReader reader, int docBase) throws IOException {
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -1118,16 +1126,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(IndexReader reader, int docBase) throws IOException {
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -1225,16 +1237,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(IndexReader reader, int docBase) throws IOException {
+ @Override
+ public void setNextReader(IndexReader reader, int docBase) throws IOException {
}
- public boolean acceptsDocsOutOfOrder() {
+ @Override
+ public boolean acceptsDocsOutOfOrder() {
return false;
}
});
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrQueryParser.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrQueryParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SolrQueryParser.java Sun Jan 30 16:08:25 2011
@@ -126,6 +126,7 @@ public class SolrQueryParser extends Que
}
}
+ @Override
protected Query getFieldQuery(String field, String queryText, boolean quoted) throws ParseException {
checkNullField(field);
// intercept magic field name of "_" to use as a hook for our
@@ -157,6 +158,7 @@ public class SolrQueryParser extends Que
return super.getFieldQuery(field, queryText, quoted);
}
+ @Override
protected Query getRangeQuery(String field, String part1, String part2, boolean inclusive) throws ParseException {
checkNullField(field);
SchemaField sf = schema.getField(field);
@@ -166,6 +168,7 @@ public class SolrQueryParser extends Que
inclusive, inclusive);
}
+ @Override
protected Query getPrefixQuery(String field, String termStr) throws ParseException {
checkNullField(field);
if (getLowercaseExpandedTerms()) {
@@ -187,6 +190,7 @@ public class SolrQueryParser extends Que
return prefixQuery;
}
+ @Override
protected Query getWildcardQuery(String field, String termStr) throws ParseException {
// *:* -> MatchAllDocsQuery
if ("*".equals(field) && "*".equals(termStr)) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SortedIntDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SortedIntDocSet.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SortedIntDocSet.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SortedIntDocSet.java Sun Jan 30 16:08:25 2011
@@ -165,6 +165,7 @@ public class SortedIntDocSet extends Doc
return icount;
}
+ @Override
public int intersectionSize(DocSet other) {
if (!(other instanceof SortedIntDocSet)) {
// assume other implementations are better at random access than we are,
@@ -589,6 +590,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/branch_3x/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java Sun Jan 30 16:08:25 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/branch_3x/solr/src/java/org/apache/solr/search/ValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ValueSourceParser.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ValueSourceParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/ValueSourceParser.java Sun Jan 30 16:08:25 2011
@@ -115,23 +115,27 @@ public abstract class ValueSourceParser
static {
addParser("ord", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
String field = fp.parseId();
return new TopValueSource(new OrdFieldSource(field));
}
});
addParser("literal", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
return new LiteralValueSource(fp.getString());
}
});
addParser("rord", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
String field = fp.parseId();
return new TopValueSource(new ReverseOrdFieldSource(field));
}
});
addParser("top", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
// nested top is redundant, and ord and rord get automatically wrapped
@@ -140,6 +144,7 @@ public abstract class ValueSourceParser
}
});
addParser("linear", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float slope = fp.parseFloat();
@@ -148,6 +153,7 @@ public abstract class ValueSourceParser
}
});
addParser("max", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float val = fp.parseFloat();
@@ -155,6 +161,7 @@ public abstract class ValueSourceParser
}
});
addParser("recip", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float m = fp.parseFloat();
@@ -164,6 +171,7 @@ public abstract class ValueSourceParser
}
});
addParser("scale", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float min = fp.parseFloat();
@@ -172,6 +180,7 @@ public abstract class ValueSourceParser
}
});
addParser("div", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource a = fp.parseValueSource();
ValueSource b = fp.parseValueSource();
@@ -179,6 +188,7 @@ public abstract class ValueSourceParser
}
});
addParser("map", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float min = fp.parseFloat();
@@ -190,13 +200,16 @@ public abstract class ValueSourceParser
});
addParser("abs", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
return new SimpleFloatFunction(source) {
+ @Override
protected String name() {
return "abs";
}
+ @Override
protected float func(int doc, DocValues vals) {
return Math.abs(vals.floatVal(doc));
}
@@ -204,6 +217,7 @@ public abstract class ValueSourceParser
}
});
addParser("sum", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
List<ValueSource> sources = fp.parseValueSourceList();
return new SumFloatFunction(sources.toArray(new ValueSource[sources.size()]));
@@ -212,6 +226,7 @@ public abstract class ValueSourceParser
alias("sum", "add");
addParser("product", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
List<ValueSource> sources = fp.parseValueSourceList();
return new ProductFloatFunction(sources.toArray(new ValueSource[sources.size()]));
@@ -220,14 +235,17 @@ public abstract class ValueSourceParser
alias("product", "mul");
addParser("sub", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource a = fp.parseValueSource();
ValueSource b = fp.parseValueSource();
return new DualFloatFunction(a, b) {
+ @Override
protected String name() {
return "sub";
}
+ @Override
protected float func(int doc, DocValues aVals, DocValues bVals) {
return aVals.floatVal(doc) - bVals.floatVal(doc);
}
@@ -235,12 +253,14 @@ public abstract class ValueSourceParser
}
});
addParser("vector", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
return new VectorValueSource(fp.parseValueSourceList());
}
});
addParser("query", new ValueSourceParser() {
// boost(query($q),rating)
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
Query q = fp.parseNestedQuery();
float defVal = 0.0f;
@@ -251,6 +271,7 @@ public abstract class ValueSourceParser
}
});
addParser("boost", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
Query q = fp.parseNestedQuery();
ValueSource vs = fp.parseValueSource();
@@ -262,6 +283,7 @@ public abstract class ValueSourceParser
addParser("geodist", HaversineConstFunction.parser);
addParser("hsin", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
double radius = fp.parseDouble();
@@ -302,6 +324,7 @@ public abstract class ValueSourceParser
});
addParser("ghhsin", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
double radius = fp.parseDouble();
@@ -313,6 +336,7 @@ public abstract class ValueSourceParser
});
addParser("geohash", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource lat = fp.parseValueSource();
@@ -322,6 +346,7 @@ public abstract class ValueSourceParser
}
});
addParser("strdist", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource str1 = fp.parseValueSource();
@@ -347,117 +372,140 @@ public abstract class ValueSourceParser
});
addParser(new DoubleParser("rad") {
+ @Override
public double func(int doc, DocValues vals) {
return vals.doubleVal(doc) * DistanceUtils.DEGREES_TO_RADIANS;
}
});
addParser(new DoubleParser("deg") {
+ @Override
public double func(int doc, DocValues vals) {
return vals.doubleVal(doc) * DistanceUtils.RADIANS_TO_DEGREES;
}
});
addParser(new DoubleParser("sqrt") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.sqrt(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("cbrt") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.cbrt(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("log") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.log10(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("ln") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.log(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("exp") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.exp(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("sin") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.sin(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("cos") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.cos(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("tan") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.tan(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("asin") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.asin(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("acos") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.acos(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("atan") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.atan(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("sinh") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.sinh(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("cosh") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.cosh(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("tanh") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.tanh(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("ceil") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.ceil(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("floor") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.floor(vals.doubleVal(doc));
}
});
addParser(new DoubleParser("rint") {
+ @Override
public double func(int doc, DocValues vals) {
return Math.rint(vals.doubleVal(doc));
}
});
addParser(new Double2Parser("pow") {
+ @Override
public double func(int doc, DocValues a, DocValues b) {
return Math.pow(a.doubleVal(doc), b.doubleVal(doc));
}
});
addParser(new Double2Parser("hypot") {
+ @Override
public double func(int doc, DocValues a, DocValues b) {
return Math.hypot(a.doubleVal(doc), b.doubleVal(doc));
}
});
addParser(new Double2Parser("atan2") {
+ @Override
public double func(int doc, DocValues a, DocValues b) {
return Math.atan2(a.doubleVal(doc), b.doubleVal(doc));
}
});
addParser("sqedist", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
List<ValueSource> sources = fp.parseValueSourceList();
MVResult mvr = getMultiValueSources(sources);
@@ -467,6 +515,7 @@ public abstract class ValueSourceParser
});
addParser("dist", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
float power = fp.parseFloat();
List<ValueSource> sources = fp.parseValueSourceList();
@@ -478,11 +527,13 @@ public abstract class ValueSourceParser
addParser("pi", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
return new DoubleConstValueSource(Math.PI);
}
});
addParser("e", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
return new DoubleConstValueSource(Math.E);
}
@@ -544,6 +595,7 @@ public abstract class ValueSourceParser
class DateValueSourceParser extends ValueSourceParser {
DateField df = new TrieDateField();
+ @Override
public void init(NamedList args) {
}
@@ -564,6 +616,7 @@ class DateValueSourceParser extends Valu
return f.getType().getValueSource(f, fp);
}
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
String first = fp.parseArg();
String second = fp.parseArg();
@@ -600,10 +653,12 @@ class DateValueSourceParser extends Valu
// "dv"
if (d1 != null && v2 != null)
return new DualFloatFunction(new LongConstValueSource(ms1), v2) {
+ @Override
protected String name() {
return "ms";
}
+ @Override
protected float func(int doc, DocValues aVals, DocValues bVals) {
return ms1 - bVals.longVal(doc);
}
@@ -612,10 +667,12 @@ class DateValueSourceParser extends Valu
// "vd"
if (v1 != null && d2 != null)
return new DualFloatFunction(v1, new LongConstValueSource(ms2)) {
+ @Override
protected String name() {
return "ms";
}
+ @Override
protected float func(int doc, DocValues aVals, DocValues bVals) {
return aVals.longVal(doc) - ms2;
}
@@ -624,10 +681,12 @@ class DateValueSourceParser extends Valu
// "vv"
if (v1 != null && v2 != null)
return new DualFloatFunction(v1, v2) {
+ @Override
protected String name() {
return "ms";
}
+ @Override
protected float func(int doc, DocValues aVals, DocValues bVals) {
return aVals.longVal(doc) - bVals.longVal(doc);
}
@@ -652,42 +711,52 @@ class LongConstValueSource extends Const
this.fv = constant;
}
+ @Override
public String description() {
return "const(" + constant + ")";
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return fv;
}
+ @Override
public int intVal(int doc) {
return (int) constant;
}
+ @Override
public long longVal(int doc) {
return constant;
}
+ @Override
public double doubleVal(int doc) {
return dv;
}
+ @Override
public String strVal(int doc) {
return Long.toString(constant);
}
+ @Override
public String toString(int doc) {
return description();
}
};
}
+ @Override
public int hashCode() {
return (int) constant + (int) (constant >>> 32);
}
+ @Override
public boolean equals(Object o) {
if (LongConstValueSource.class != o.getClass()) return false;
LongConstValueSource other = (LongConstValueSource) o;
@@ -741,6 +810,7 @@ abstract class DoubleParser extends Name
public abstract double func(int doc, DocValues vals);
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
return new Function(fp.parseValueSource());
}
@@ -750,6 +820,7 @@ abstract class DoubleParser extends Name
super(source);
}
+ @Override
public String name() {
return DoubleParser.this.name();
}
@@ -758,26 +829,32 @@ abstract class DoubleParser extends Name
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final DocValues vals = source.getValues(context, reader);
return new DocValues() {
+ @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) {
return func(doc, vals);
}
+ @Override
public String strVal(int doc) {
return Double.toString(doubleVal(doc));
}
+ @Override
public String toString(int doc) {
return name() + '(' + vals.toString(doc) + ')';
}
@@ -794,6 +871,7 @@ abstract class Double2Parser extends Nam
public abstract double func(int doc, DocValues a, DocValues b);
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
return new Function(fp.parseValueSource(), fp.parseValueSource());
}
@@ -811,34 +889,42 @@ abstract class Double2Parser extends Nam
this.b = b;
}
+ @Override
public String description() {
return name() + "(" + a.description() + "," + b.description() + ")";
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final DocValues aVals = a.getValues(context, reader);
final DocValues bVals = b.getValues(context, reader);
return new DocValues() {
+ @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) {
return func(doc, aVals, bVals);
}
+ @Override
public String strVal(int doc) {
return Double.toString(doubleVal(doc));
}
+ @Override
public String toString(int doc) {
return name() + '(' + aVals.toString(doc) + ',' + bVals.toString(doc) + ')';
}
@@ -851,6 +937,7 @@ abstract class Double2Parser extends Nam
b.createWeight(context, searcher);
}
+ @Override
public int hashCode() {
int h = a.hashCode();
h ^= (h << 13) | (h >>> 20);
@@ -860,6 +947,7 @@ abstract class Double2Parser extends Nam
return h;
}
+ @Override
public boolean equals(Object o) {
if (this.getClass() != o.getClass()) return false;
Function other = (Function) o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/BoostedQuery.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/BoostedQuery.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/BoostedQuery.java Sun Jan 30 16:08:25 2011
@@ -41,6 +41,7 @@ public class BoostedQuery extends Query
public Query getQuery() { return q; }
public ValueSource getValueSource() { return boostVal; }
+ @Override
public Query rewrite(IndexReader reader) throws IOException {
Query newQ = q.rewrite(reader);
if (newQ == q) return this;
@@ -49,10 +50,12 @@ public class BoostedQuery extends Query
return bq;
}
+ @Override
public void extractTerms(Set terms) {
q.extractTerms(terms);
}
+ @Override
public Weight createWeight(Searcher searcher) throws IOException {
return new BoostedQuery.BoostedWeight(searcher);
}
@@ -69,10 +72,12 @@ public class BoostedQuery extends Query
boostVal.createWeight(context,searcher);
}
+ @Override
public Query getQuery() {
return BoostedQuery.this;
}
+ @Override
public float getValue() {
return getBoost();
}
@@ -182,6 +187,7 @@ public class BoostedQuery extends Query
}
+ @Override
public String toString(String field) {
StringBuilder sb = new StringBuilder();
sb.append("boost(").append(q.toString(field)).append(',').append(boostVal).append(')');
@@ -189,6 +195,7 @@ public class BoostedQuery extends Query
return sb.toString();
}
+ @Override
public boolean equals(Object o) {
if (getClass() != o.getClass()) return false;
BoostedQuery other = (BoostedQuery)o;
@@ -197,6 +204,7 @@ public class BoostedQuery extends Query
&& this.boostVal.equals(other.boostVal);
}
+ @Override
public int hashCode() {
int h = q.hashCode();
h ^= (h << 17) | (h >>> 16);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java Sun Jan 30 16:08:25 2011
@@ -42,10 +42,12 @@ public class ByteFieldSource extends Fie
this.parser = parser;
}
+ @Override
public String description() {
return "byte(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final byte[] arr = (parser == null) ?
cache.getBytes(reader, field) :
@@ -61,26 +63,32 @@ public class ByteFieldSource extends Fie
return (short) arr[doc];
}
+ @Override
public float floatVal(int doc) {
return (float) arr[doc];
}
+ @Override
public int intVal(int doc) {
return (int) arr[doc];
}
+ @Override
public long longVal(int doc) {
return (long) arr[doc];
}
+ @Override
public double doubleVal(int doc) {
return (double) arr[doc];
}
+ @Override
public String strVal(int doc) {
return Byte.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + byteVal(doc);
}
@@ -88,6 +96,7 @@ public class ByteFieldSource extends Fie
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != ByteFieldSource.class) return false;
ByteFieldSource
@@ -97,6 +106,7 @@ public class ByteFieldSource extends Fie
this.parser.getClass() == other.parser.getClass();
}
+ @Override
public int hashCode() {
int h = parser == null ? Byte.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ConstValueSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ConstValueSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ConstValueSource.java Sun Jan 30 16:08:25 2011
@@ -34,37 +34,47 @@ public class ConstValueSource extends Co
this.dv = constant;
}
+ @Override
public String description() {
return "const(" + constant + ")";
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return constant;
}
+ @Override
public int intVal(int doc) {
return (int)constant;
}
+ @Override
public long longVal(int doc) {
return (long)constant;
}
+ @Override
public double doubleVal(int doc) {
return dv;
}
+ @Override
public String strVal(int doc) {
return Float.toString(constant);
}
+ @Override
public String toString(int doc) {
return description();
}
};
}
+ @Override
public int hashCode() {
return Float.floatToIntBits(constant) * 31;
}
+ @Override
public boolean equals(Object o) {
if (!(o instanceof ConstValueSource)) return false;
ConstValueSource other = (ConstValueSource)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -28,10 +28,12 @@ public class DivFloatFunction extends Du
super(a,b);
}
+ @Override
protected String name() {
return "div";
}
+ @Override
protected float func(int doc, DocValues aVals, DocValues bVals) {
return aVals.floatVal(doc) / bVals.floatVal(doc);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java Sun Jan 30 16:08:25 2011
@@ -33,43 +33,53 @@ public class DoubleConstValueSource exte
this.lv = (long)constant;
}
+ @Override
public String description() {
return "const(" + constant + ")";
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return fv;
}
+ @Override
public int intVal(int doc) {
return (int) lv;
}
+ @Override
public long longVal(int doc) {
return lv;
}
+ @Override
public double doubleVal(int doc) {
return constant;
}
+ @Override
public String strVal(int doc) {
return Double.toString(constant);
}
+ @Override
public String toString(int doc) {
return description();
}
};
}
+ @Override
public int hashCode() {
long bits = Double.doubleToRawLongBits(constant);
return (int)(bits ^ (bits >>> 32));
}
+ @Override
public boolean equals(Object o) {
if (!(o instanceof DoubleConstValueSource)) return false;
DoubleConstValueSource other = (DoubleConstValueSource) o;