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 [5/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/search/function/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java Sun Jan 30 16:08:25 2011
@@ -43,35 +43,43 @@ public class DoubleFieldSource extends F
this.parser = parser;
}
+ @Override
public String description() {
return "double(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final double[] arr = (parser == null) ?
cache.getDoubles(reader, field) :
cache.getDoubles(reader, field, parser);
return new DocValues() {
+ @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 arr[doc];
}
+ @Override
public String strVal(int doc) {
return Double.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + doubleVal(doc);
}
@@ -139,6 +147,7 @@ public class DoubleFieldSource extends F
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != DoubleFieldSource.class) return false;
DoubleFieldSource other = (DoubleFieldSource) o;
@@ -147,6 +156,7 @@ public class DoubleFieldSource extends F
this.parser.getClass() == other.parser.getClass();
}
+ @Override
public int hashCode() {
int h = parser == null ? Double.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -39,29 +39,37 @@ public abstract class DualFloatFunction
protected abstract String name();
protected abstract float func(int doc, DocValues aVals, DocValues bVals);
+ @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 func(doc, aVals, bVals);
}
+ @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 floatVal(doc);
}
+ @Override
public String strVal(int doc) {
return Float.toString(floatVal(doc));
}
+ @Override
public String toString(int doc) {
return name() + '(' + aVals.toString(doc) + ',' + bVals.toString(doc) + ')';
}
@@ -74,6 +82,7 @@ public abstract class DualFloatFunction
b.createWeight(context,searcher);
}
+ @Override
public int hashCode() {
int h = a.hashCode();
h ^= (h << 13) | (h >>> 20);
@@ -83,6 +92,7 @@ public abstract class DualFloatFunction
return h;
}
+ @Override
public boolean equals(Object o) {
if (this.getClass() != o.getClass()) return false;
DualFloatFunction other = (DualFloatFunction)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java Sun Jan 30 16:08:25 2011
@@ -37,10 +37,12 @@ public abstract class FieldCacheSource e
return cache;
}
+ @Override
public String description() {
return field;
}
+ @Override
public boolean equals(Object o) {
if (!(o instanceof FieldCacheSource)) return false;
FieldCacheSource other = (FieldCacheSource)o;
@@ -48,6 +50,7 @@ public abstract class FieldCacheSource e
&& this.cache == other.cache;
}
+ @Override
public int hashCode() {
return cache.hashCode() + field.hashCode();
};
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java Sun Jan 30 16:08:25 2011
@@ -50,10 +50,12 @@ public class FileFloatSource extends Val
this.dataDir = parser.getReq().getCore().getDataDir();
}
+ @Override
public String description() {
return "float(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
int offset = 0;
if (reader instanceof SolrIndexReader) {
@@ -68,32 +70,39 @@ public class FileFloatSource extends Val
final float[] arr = getCachedFloats(reader);
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return arr[doc + off];
}
+ @Override
public int intVal(int doc) {
return (int)arr[doc + off];
}
+ @Override
public long longVal(int doc) {
return (long)arr[doc + off];
}
+ @Override
public double doubleVal(int doc) {
return (double)arr[doc + off];
}
+ @Override
public String strVal(int doc) {
return Float.toString(arr[doc + off]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + floatVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != FileFloatSource.class) return false;
FileFloatSource other = (FileFloatSource)o;
@@ -103,10 +112,12 @@ public class FileFloatSource extends Val
&& this.dataDir.equals(other.dataDir);
}
+ @Override
public int hashCode() {
return FileFloatSource.class.hashCode() + field.getName().hashCode();
};
+ @Override
public String toString() {
return "FileFloatSource(field="+field.getName()+",keyField="+keyField.getName()
+ ",defVal="+defVal+",dataDir="+dataDir+")";
@@ -118,6 +129,7 @@ public class FileFloatSource extends Val
}
static Cache floatCache = new Cache() {
+ @Override
protected Object createValue(IndexReader reader, Object key) {
return getFloats(((Entry)key).ffs, reader);
}
@@ -177,12 +189,14 @@ public class FileFloatSource extends Val
this.ffs = ffs;
}
+ @Override
public boolean equals(Object o) {
if (!(o instanceof Entry)) return false;
Entry other = (Entry)o;
return ffs.equals(other.ffs);
}
+ @Override
public int hashCode() {
return ffs.hashCode();
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java Sun Jan 30 16:08:25 2011
@@ -44,41 +44,50 @@ public class FloatFieldSource extends Fi
this.parser = parser;
}
+ @Override
public String description() {
return "float(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final float[] arr = (parser==null) ?
cache.getFloats(reader, field) :
cache.getFloats(reader, field, parser);
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return 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 Float.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + floatVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != FloatFieldSource.class) return false;
FloatFieldSource other = (FloatFieldSource)o;
@@ -87,6 +96,7 @@ public class FloatFieldSource extends Fi
this.parser.getClass() == other.parser.getClass();
}
+ @Override
public int hashCode() {
int h = parser==null ? Float.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FunctionQuery.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FunctionQuery.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FunctionQuery.java Sun Jan 30 16:08:25 2011
@@ -49,10 +49,12 @@ public class FunctionQuery extends Query
return func;
}
+ @Override
public Query rewrite(IndexReader reader) throws IOException {
return this;
}
+ @Override
public void extractTerms(Set terms) {}
protected class FunctionWeight extends Weight {
@@ -67,10 +69,12 @@ public class FunctionQuery extends Query
func.createWeight(context, searcher);
}
+ @Override
public Query getQuery() {
return FunctionQuery.this;
}
+ @Override
public float getValue() {
return queryWeight;
}
@@ -173,6 +177,7 @@ public class FunctionQuery extends Query
return doc;
}
+ @Override
public float score() throws IOException {
float score = qWeight * vals.floatVal(doc);
@@ -201,12 +206,14 @@ public class FunctionQuery extends Query
}
+ @Override
public Weight createWeight(Searcher searcher) throws IOException {
return new FunctionQuery.FunctionWeight(searcher);
}
/** Prints a user-readable version of this query. */
+ @Override
public String toString(String field)
{
float boost = getBoost();
@@ -216,6 +223,7 @@ public class FunctionQuery extends Query
/** Returns true if <code>o</code> is equal to this. */
+ @Override
public boolean equals(Object o) {
if (FunctionQuery.class != o.getClass()) return false;
FunctionQuery other = (FunctionQuery)o;
@@ -224,6 +232,7 @@ public class FunctionQuery extends Query
}
/** Returns a hash code value for this object. */
+ @Override
public int hashCode() {
return func.hashCode()*31 + Float.floatToIntBits(getBoost());
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/IntFieldSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/IntFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/IntFieldSource.java Sun Jan 30 16:08:25 2011
@@ -43,36 +43,44 @@ public class IntFieldSource extends Fiel
this.parser = parser;
}
+ @Override
public String description() {
return "int(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final int[] arr = (parser==null) ?
cache.getInts(reader, field) :
cache.getInts(reader, field, parser);
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return (float)arr[doc];
}
+ @Override
public int intVal(int doc) {
return 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 Float.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
@@ -113,6 +121,7 @@ public class IntFieldSource extends Fiel
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != IntFieldSource.class) return false;
IntFieldSource other = (IntFieldSource)o;
@@ -121,6 +130,7 @@ public class IntFieldSource extends Fiel
this.parser.getClass() == other.parser.getClass();
}
+ @Override
public int hashCode() {
int h = parser==null ? Integer.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -42,28 +42,36 @@ public class LinearFloatFunction extends
this.intercept = intercept;
}
+ @Override
public String description() {
return slope + "*float(" + source.description() + ")+" + intercept;
}
+ @Override
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 vals.floatVal(doc) * slope + intercept;
}
+ @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 slope + "*float(" + vals.toString(doc) + ")+" + intercept;
}
@@ -75,6 +83,7 @@ public class LinearFloatFunction extends
source.createWeight(context, searcher);
}
+ @Override
public int hashCode() {
int h = Float.floatToIntBits(slope);
h = (h >>> 2) | (h << 30);
@@ -83,6 +92,7 @@ public class LinearFloatFunction extends
return h + source.hashCode();
}
+ @Override
public boolean equals(Object o) {
if (LinearFloatFunction.class != o.getClass()) return false;
LinearFloatFunction other = (LinearFloatFunction)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LongFieldSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LongFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/LongFieldSource.java Sun Jan 30 16:08:25 2011
@@ -44,6 +44,7 @@ public class LongFieldSource extends Fie
this.parser = parser;
}
+ @Override
public String description() {
return "long(" + field + ')';
}
@@ -53,31 +54,38 @@ public class LongFieldSource extends Fie
return Long.parseLong(extVal);
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final long[] arr = (parser == null) ?
cache.getLongs(reader, field) :
cache.getLongs(reader, field, parser);
return new DocValues() {
+ @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 arr[doc];
}
+ @Override
public double doubleVal(int doc) {
return arr[doc];
}
+ @Override
public String strVal(int doc) {
return Long.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + longVal(doc);
}
@@ -120,6 +128,7 @@ public class LongFieldSource extends Fie
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != this.getClass()) return false;
LongFieldSource other = (LongFieldSource) o;
@@ -128,6 +137,7 @@ public class LongFieldSource extends Fie
this.parser.getClass() == other.parser.getClass();
}
+ @Override
public int hashCode() {
int h = parser == null ? this.getClass().hashCode() : parser.getClass().hashCode();
h += super.hashCode();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -41,29 +41,37 @@ public class MaxFloatFunction extends Va
this.fval = fval;
}
+ @Override
public String description() {
return "max(" + source.description() + "," + fval + ")";
}
+ @Override
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) {
float v = vals.floatVal(doc);
return v < fval ? fval : v;
}
+ @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 "max(" + vals.toString(doc) + "," + fval + ")";
}
@@ -75,12 +83,14 @@ public class MaxFloatFunction extends Va
source.createWeight(context, searcher);
}
+ @Override
public int hashCode() {
int h = Float.floatToIntBits(fval);
h = (h >>> 2) | (h << 30);
return h + source.hashCode();
}
+ @Override
public boolean equals(Object o) {
if (MaxFloatFunction.class != o.getClass()) return false;
MaxFloatFunction other = (MaxFloatFunction)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -38,6 +38,7 @@ public abstract class MultiFloatFunction
abstract protected String name();
abstract protected float func(int doc, DocValues[] valsArr);
+ @Override
public String description() {
StringBuilder sb = new StringBuilder();
sb.append(name()).append('(');
@@ -54,6 +55,7 @@ public abstract class MultiFloatFunction
return sb.toString();
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final DocValues[] valsArr = new DocValues[sources.length];
for (int i=0; i<sources.length; i++) {
@@ -61,21 +63,27 @@ public abstract class MultiFloatFunction
}
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return func(doc, valsArr);
}
+ @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) {
StringBuilder sb = new StringBuilder();
sb.append(name()).append('(');
@@ -100,10 +108,12 @@ public abstract class MultiFloatFunction
source.createWeight(context, searcher);
}
+ @Override
public int hashCode() {
return Arrays.hashCode(sources) + name().hashCode();
}
+ @Override
public boolean equals(Object o) {
if (this.getClass() != o.getClass()) return false;
MultiFloatFunction other = (MultiFloatFunction)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java Sun Jan 30 16:08:25 2011
@@ -49,49 +49,60 @@ public class OrdFieldSource extends Valu
this.field = field;
}
+ @Override
public String description() {
return "ord(" + 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)order[doc];
}
+ @Override
public int intVal(int doc) {
return order[doc];
}
+ @Override
public long longVal(int doc) {
return (long)order[doc];
}
+ @Override
public double doubleVal(int doc) {
return (double)order[doc];
}
+ @Override
public String strVal(int doc) {
// the string value of the ordinal, not the string itself
return Integer.toString(order[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
return o.getClass() == OrdFieldSource.class && this.field.equals(((OrdFieldSource)o).field);
}
private static final int hcode = OrdFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + field.hashCode();
};
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -28,10 +28,12 @@ public class PowFloatFunction extends Du
super(a,b);
}
+ @Override
protected String name() {
return "pow";
}
+ @Override
protected float func(int doc, DocValues aVals, DocValues bVals) {
return (float)Math.pow(aVals.floatVal(doc), bVals.floatVal(doc));
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -25,10 +25,12 @@ public class ProductFloatFunction extend
super(sources);
}
+ @Override
protected String name() {
return "product";
}
+ @Override
protected float func(int doc, DocValues[] valsArr) {
float val = 1.0f;
for (DocValues vals : valsArr) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/QueryValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/QueryValueSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/QueryValueSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/QueryValueSource.java Sun Jan 30 16:08:25 2011
@@ -39,6 +39,7 @@ public class QueryValueSource extends Va
public Query getQuery() { return q; }
public float getDefaultValue() { return defVal; }
+ @Override
public String description() {
return "query(" + q + ",def=" + defVal + ")";
}
@@ -48,10 +49,12 @@ public class QueryValueSource extends Va
return new QueryDocValues(reader, q, defVal, context==null ? null : (Weight)context.get(this));
}
+ @Override
public int hashCode() {
return q.hashCode() * 29;
}
+ @Override
public boolean equals(Object o) {
if (QueryValueSource.class != o.getClass()) return false;
QueryValueSource other = (QueryValueSource)o;
@@ -86,6 +89,7 @@ class QueryDocValues extends DocValues {
weight = w!=null ? w : q.weight(new IndexSearcher(reader));
}
+ @Override
public float floatVal(int doc) {
try {
if (doc < lastDocRequested) {
@@ -113,18 +117,23 @@ class QueryDocValues extends DocValues {
}
}
+ @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 "query(" + q + ",def=" + defVal + ")=" + floatVal(doc);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -46,29 +46,37 @@ public class RangeMapFloatFunction exten
this.defaultVal = def;
}
+ @Override
public String description() {
return "map(" + source.description() + "," + min + "," + max + "," + target + ")";
}
+ @Override
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) {
float val = vals.floatVal(doc);
return (val>=min && val<=max) ? target : (defaultVal == null ? val : defaultVal);
}
+ @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 "map(" + vals.toString(doc) + ",min=" + min + ",max=" + max + ",target=" + target + ")";
}
@@ -80,6 +88,7 @@ public class RangeMapFloatFunction exten
source.createWeight(context, searcher);
}
+ @Override
public int hashCode() {
int h = source.hashCode();
h ^= (h << 10) | (h >>> 23);
@@ -93,6 +102,7 @@ public class RangeMapFloatFunction exten
return h;
}
+ @Override
public boolean equals(Object o) {
if (RangeMapFloatFunction.class != o.getClass()) return false;
RangeMapFloatFunction other = (RangeMapFloatFunction)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -57,24 +57,31 @@ public class ReciprocalFloatFunction ext
this.b=b;
}
+ @Override
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 a/(m*vals.floatVal(doc) + b);
}
+ @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 Float.toString(a) + "/("
+ m + "*float(" + vals.toString(doc) + ')'
@@ -88,18 +95,21 @@ public class ReciprocalFloatFunction ext
source.createWeight(context, searcher);
}
+ @Override
public String description() {
return Float.toString(a) + "/("
+ m + "*float(" + source.description() + ")"
+ "+" + b + ')';
}
+ @Override
public int hashCode() {
int h = Float.floatToIntBits(a) + Float.floatToIntBits(m);
h ^= (h << 13) | (h >>> 20);
return h + (Float.floatToIntBits(b)) + source.hashCode();
}
+ @Override
public boolean equals(Object o) {
if (ReciprocalFloatFunction.class != o.getClass()) return false;
ReciprocalFloatFunction other = (ReciprocalFloatFunction)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java Sun Jan 30 16:08:25 2011
@@ -53,10 +53,12 @@ public class ReverseOrdFieldSource exten
this.field = field;
}
+ @Override
public String description() {
return "rord("+field+')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final FieldCache.StringIndex sindex = FieldCache.DEFAULT.getStringIndex(reader, field);
@@ -64,33 +66,40 @@ public class ReverseOrdFieldSource exten
final int end = sindex.lookup.length;
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return (float)(end - arr[doc]);
}
+ @Override
public int intVal(int doc) {
return (end - arr[doc]);
}
+ @Override
public long longVal(int doc) {
return (long)(end - arr[doc]);
}
+ @Override
public double doubleVal(int doc) {
return (double)(end - arr[doc]);
}
+ @Override
public String strVal(int doc) {
// the string value of the ordinal, not the string itself
return Integer.toString((end - arr[doc]));
}
+ @Override
public String toString(int doc) {
return description() + '=' + strVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != ReverseOrdFieldSource.class) return false;
ReverseOrdFieldSource other = (ReverseOrdFieldSource)o;
@@ -98,6 +107,7 @@ public class ReverseOrdFieldSource exten
}
private static final int hcode = ReverseOrdFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + field.hashCode();
};
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -45,10 +45,12 @@ public class ScaleFloatFunction extends
this.max = max;
}
+ @Override
public String description() {
return "scale(" + source.description() + "," + min + "," + max + ")";
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final DocValues vals = source.getValues(context, reader);
int maxDoc = reader.maxDoc();
@@ -85,21 +87,27 @@ public class ScaleFloatFunction extends
final float maxSource = maxVal;
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return (vals.floatVal(doc) - minSource) * scale + min;
}
+ @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 "scale(" + vals.toString(doc) + ",toMin=" + min + ",toMax=" + max
+ ",fromMin=" + minSource
@@ -114,6 +122,7 @@ public class ScaleFloatFunction extends
source.createWeight(context, searcher);
}
+ @Override
public int hashCode() {
int h = Float.floatToIntBits(min);
h = h*29;
@@ -123,6 +132,7 @@ public class ScaleFloatFunction extends
return h;
}
+ @Override
public boolean equals(Object o) {
if (ScaleFloatFunction.class != o.getClass()) return false;
ScaleFloatFunction other = (ScaleFloatFunction)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java Sun Jan 30 16:08:25 2011
@@ -39,10 +39,12 @@ public class ShortFieldSource extends Fi
this.parser = parser;
}
+ @Override
public String description() {
return "short(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
final short[] arr = (parser == null) ?
cache.getShorts(reader, field) :
@@ -58,26 +60,32 @@ public class ShortFieldSource extends Fi
return 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 Short.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + shortVal(doc);
}
@@ -85,6 +93,7 @@ public class ShortFieldSource extends Fi
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != ShortFieldSource.class) return false;
ShortFieldSource
@@ -94,6 +103,7 @@ public class ShortFieldSource extends Fi
this.parser.getClass() == other.parser.getClass();
}
+ @Override
public int hashCode() {
int h = parser == null ? Short.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -35,21 +35,27 @@ import java.util.Map;
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 func(doc, vals);
}
+ @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 name() + '(' + vals.toString(doc) + ')';
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SingleFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SingleFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SingleFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SingleFunction.java Sun Jan 30 16:08:25 2011
@@ -33,14 +33,17 @@ import java.util.Map;
protected abstract String name();
+ @Override
public String description() {
return name() + '(' + source.description() + ')';
}
+ @Override
public int hashCode() {
return source.hashCode() + name().hashCode();
}
+ @Override
public boolean equals(Object o) {
if (this.getClass() != o.getClass()) return false;
SingleFunction other = (SingleFunction)o;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java Sun Jan 30 16:08:25 2011
@@ -82,6 +82,7 @@ public abstract class StringIndexDocValu
};
}
+ @Override
public String toString(int doc) {
return vs.description() + '=' + strVal(doc);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java Sun Jan 30 16:08:25 2011
@@ -30,6 +30,7 @@ public class SumFloatFunction extends Mu
return "sum";
}
+ @Override
protected float func(int doc, DocValues[] valsArr) {
float val = 0.0f;
for (DocValues vals : valsArr) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/TopValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/TopValueSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/TopValueSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/TopValueSource.java Sun Jan 30 16:08:25 2011
@@ -38,10 +38,12 @@ public class TopValueSource extends Valu
return vs;
}
+ @Override
public String description() {
return "top(" + vs.description() + ')';
}
+ @Override
public DocValues getValues(Map context, IndexReader reader) throws IOException {
int offset = 0;
IndexReader topReader = reader;
@@ -58,43 +60,52 @@ public class TopValueSource extends Valu
if (topReader == reader) return vals;
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return vals.floatVal(doc + off);
}
+ @Override
public int intVal(int doc) {
return vals.intVal(doc + off);
}
+ @Override
public long longVal(int doc) {
return vals.longVal(doc + off);
}
+ @Override
public double doubleVal(int doc) {
return vals.doubleVal(doc + off);
}
+ @Override
public String strVal(int doc) {
return vals.strVal(doc + off);
}
+ @Override
public String toString(int doc) {
return vals.strVal(doc + off);
}
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != TopValueSource.class) return false;
TopValueSource other = (TopValueSource)o;
return vs.equals(other.vs);
}
+ @Override
public int hashCode() {
int h = vs.hashCode();
return (h<<1) | (h>>>31);
}
+ @Override
public String toString() {
return "top("+vs.toString()+')';
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ValueSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ValueSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ValueSource.java Sun Jan 30 16:08:25 2011
@@ -50,8 +50,10 @@ public abstract class ValueSource implem
return getValues(reader);
}
+ @Override
public abstract boolean equals(Object o);
+ @Override
public abstract int hashCode();
/**
@@ -59,6 +61,7 @@ public abstract class ValueSource implem
*/
public abstract String description();
+ @Override
public String toString() {
return description();
}
@@ -123,6 +126,7 @@ public abstract class ValueSource implem
this.context = context;
}
+ @Override
public FieldComparator newComparator(String fieldname, int numHits,
int sortPos, boolean reversed) throws IOException {
return new ValueSourceComparator(context, numHits);
@@ -145,6 +149,7 @@ public abstract class ValueSource implem
values = new double[numHits];
}
+ @Override
public int compare(int slot1, int slot2) {
final double v1 = values[slot1];
final double v2 = values[slot2];
@@ -158,6 +163,7 @@ public abstract class ValueSource implem
}
+ @Override
public int compareBottom(int doc) {
final double v2 = docVals.doubleVal(doc);
if (bottom > v2) {
@@ -169,6 +175,7 @@ public abstract class ValueSource implem
}
}
+ @Override
public void copy(int slot, int doc) {
values[slot] = docVals.doubleVal(doc);
}
@@ -178,10 +185,12 @@ public abstract class ValueSource implem
docVals = getValues(fcontext, reader);
}
+ @Override
public void setBottom(final int bottom) {
this.bottom = values[bottom];
}
+ @Override
public Comparable value(int slot) {
return values[slot];
}
@@ -259,6 +268,7 @@ class ValueSourceScorer extends Scorer {
}
+ @Override
public float score() throws IOException {
return values.floatVal(doc);
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java Sun Jan 30 16:08:25 2011
@@ -49,9 +49,11 @@ public class ValueSourceRangeFilter exte
this.includeUpper = upperVal != null && includeUpper;
}
+ @Override
public DocIdSet getDocIdSet(final Map context, final IndexReader reader) throws IOException {
return new DocIdSet() {
- public DocIdSetIterator iterator() throws IOException {
+ @Override
+ public DocIdSetIterator iterator() throws IOException {
return valueSource.getValues(context, reader).getRangeScorer(reader, lowerVal, upperVal, includeLower, includeUpper);
}
};
@@ -62,6 +64,7 @@ public class ValueSourceRangeFilter exte
valueSource.createWeight(context, searcher);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("frange(");
@@ -75,6 +78,7 @@ public class ValueSourceRangeFilter exte
return sb.toString();
}
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof ValueSourceRangeFilter)) return false;
@@ -89,6 +93,7 @@ public class ValueSourceRangeFilter exte
return true;
}
+ @Override
public int hashCode() {
int h = valueSource.hashCode();
h += lowerVal != null ? lowerVal.hashCode() : 0x572353db;
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/VectorValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/VectorValueSource.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/VectorValueSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/VectorValueSource.java Sun Jan 30 16:08:25 2011
@@ -44,6 +44,7 @@ public class VectorValueSource extends M
return sources;
}
+ @Override
public int dimension() {
return sources.size();
}
@@ -97,6 +98,7 @@ public class VectorValueSource extends M
vals[0] = x.strVal(doc);
vals[1] = y.strVal(doc);
}
+ @Override
public String toString(int doc) {
return name() + "(" + x.toString(doc) + "," + y.toString(doc) + ")";
}
@@ -178,12 +180,14 @@ public class VectorValueSource extends M
};
}
+ @Override
public void createWeight(Map context, Searcher searcher) throws IOException {
for (ValueSource source : sources)
source.createWeight(context, searcher);
}
+ @Override
public String description() {
StringBuilder sb = new StringBuilder();
sb.append(name()).append('(');
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java Sun Jan 30 16:08:25 2011
@@ -59,22 +59,27 @@ public class GeohashHaversineFunction ex
final DocValues gh2DV = geoHash2.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 distance(doc, gh1DV, gh2DV);
}
+ @Override
public String strVal(int doc) {
return Double.toString(doubleVal(doc));
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java Sun Jan 30 16:08:25 2011
@@ -39,6 +39,7 @@ import java.util.Map;
public class HaversineConstFunction extends ValueSource {
public static ValueSourceParser parser = new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException
{
// TODO: dispatch through SpatialQueriable in the future?
@@ -198,18 +199,22 @@ public class HaversineConstFunction exte
final double latCenterRad_cos = this.latCenterRad_cos;
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) {
double latRad = latVals.doubleVal(doc) * DistanceUtils.DEGREES_TO_RADIANS;
double lonRad = lonVals.doubleVal(doc) * DistanceUtils.DEGREES_TO_RADIANS;
@@ -222,6 +227,7 @@ public class HaversineConstFunction exte
return (EARTH_MEAN_DIAMETER * Math.atan2(Math.sqrt(h), Math.sqrt(1 - h)));
}
+ @Override
public String strVal(int doc) {
return Double.toString(doubleVal(doc));
}
@@ -260,6 +266,7 @@ public class HaversineConstFunction exte
return result;
}
+ @Override
public String description() {
return name() + '(' + p2 + ',' + latCenter + ',' + lonCenter + ')';
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java Sun Jan 30 16:08:25 2011
@@ -100,22 +100,27 @@ public class HaversineFunction extends V
final DocValues vals2 = p2.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 distance(doc, vals1, vals2);
}
+ @Override
public String strVal(int doc) {
return Double.toString(doubleVal(doc));
}
@@ -159,6 +164,7 @@ public class HaversineFunction extends V
return result;
}
+ @Override
public String description() {
StringBuilder sb = new StringBuilder();
sb.append(name()).append('(');
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java Sun Jan 30 16:08:25 2011
@@ -33,6 +33,7 @@ public class SquaredEuclideanFunction ex
}
+ @Override
protected String name() {
return name;
@@ -41,6 +42,7 @@ public class SquaredEuclideanFunction ex
/**
* @param doc The doc to score
*/
+ @Override
protected double distance(int doc, DocValues dv1, DocValues dv2) {
double[] vals1 = new double[source1.dimension()];
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java Sun Jan 30 16:08:25 2011
@@ -53,18 +53,22 @@ public class StringDistanceFunction exte
final DocValues str2DV = str2.getValues(context, reader);
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return dist.getDistance(str1DV.strVal(doc), str2DV.strVal(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 (double) floatVal(doc);
}
@@ -81,6 +85,7 @@ public class StringDistanceFunction exte
};
}
+ @Override
public String description() {
StringBuilder sb = new StringBuilder();
sb.append("strdist").append('(');
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java Sun Jan 30 16:08:25 2011
@@ -96,22 +96,27 @@ public class VectorDistanceFunction exte
return (short) doubleVal(doc);
}
+ @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 distance(doc, vals1, vals2);
}
+ @Override
public String strVal(int doc) {
return Double.toString(doubleVal(doc));
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java Sun Jan 30 16:08:25 2011
@@ -92,6 +92,7 @@ public abstract class AbstractLuceneSpel
protected StringDistance sd;
+ @Override
public String init(NamedList config, SolrCore core) {
super.init(config, core);
indexDir = (String) config.get(INDEX_DIR);
@@ -229,6 +230,7 @@ public abstract class AbstractLuceneSpel
return reader;
}
+ @Override
public void reload(SolrCore core, SolrIndexSearcher searcher) throws IOException {
spellChecker.setSpellIndex(index);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java Sun Jan 30 16:08:25 2011
@@ -50,12 +50,14 @@ public class FileBasedSpellChecker exten
private String characterEncoding;
public static final String WORD_FIELD_NAME = "word";
+ @Override
public String init(NamedList config, SolrCore core) {
super.init(config, core);
characterEncoding = (String) config.get(SOURCE_FILE_CHAR_ENCODING);
return name;
}
+ @Override
public void build(SolrCore core, SolrIndexSearcher searcher) {
try {
loadExternalFileDictionary(core);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java Sun Jan 30 16:08:25 2011
@@ -49,6 +49,7 @@ public class IndexBasedSpellChecker exte
protected float threshold;
protected IndexReader reader;
+ @Override
public String init(NamedList config, SolrCore core) {
super.init(config, core);
threshold = config.get(THRESHOLD_TOKEN_FREQUENCY) == null ? 0.0f
@@ -68,6 +69,7 @@ public class IndexBasedSpellChecker exte
}
}
+ @Override
public void build(SolrCore core, SolrIndexSearcher searcher) {
IndexReader reader = null;
try {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/SpellingQueryConverter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/SpellingQueryConverter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/SpellingQueryConverter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/SpellingQueryConverter.java Sun Jan 30 16:08:25 2011
@@ -91,6 +91,7 @@ public class SpellingQueryConverter exte
* @param original the original query string
* @return a Collection of Lucene Tokens
*/
+ @Override
public Collection<Token> convert(String original) {
if (original == null) { // this can happen with q.alt = and no query
return Collections.emptyList();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Lookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Lookup.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Lookup.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/spelling/suggest/Lookup.java Sun Jan 30 16:08:25 2011
@@ -42,6 +42,7 @@ public abstract class Lookup {
this.value = value;
}
+ @Override
public String toString() {
return key + "/" + value;
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java Sun Jan 30 16:08:25 2011
@@ -36,6 +36,7 @@ public class CommitUpdateCommand extends
super("commit");
this.optimize=optimize;
}
+ @Override
public String toString() {
return "commit(optimize="+optimize
+",waitFlush="+waitFlush
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java Sun Jan 30 16:08:25 2011
@@ -29,6 +29,7 @@ public class DeleteUpdateCommand extends
super("delete");
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder(commandName);
sb.append(':');
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler.java Sun Jan 30 16:08:25 2011
@@ -170,6 +170,7 @@ public class DirectUpdateHandler extends
****************************************************************/
// could return the number of docs deleted, but is that always possible to know???
+ @Override
public void delete(DeleteUpdateCommand cmd) throws IOException {
if (!cmd.fromPending && !cmd.fromCommitted)
throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,"meaningless command: " + cmd);
@@ -184,6 +185,7 @@ public class DirectUpdateHandler extends
// TODO - return number of docs deleted?
// Depending on implementation, we may not be able to immediately determine num...
+ @Override
public void deleteByQuery(DeleteUpdateCommand cmd) throws IOException {
if (!cmd.fromPending && !cmd.fromCommitted)
throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,"meaningless command: " + cmd);
@@ -226,12 +228,14 @@ public class DirectUpdateHandler extends
}
***************************/
+ @Override
public int mergeIndexes(MergeIndexesCommand cmd) throws IOException {
throw new SolrException(
SolrException.ErrorCode.BAD_REQUEST,
"DirectUpdateHandler doesn't support mergeIndexes. Use DirectUpdateHandler2 instead.");
}
+ @Override
public void commit(CommitUpdateCommand cmd) throws IOException {
Future[] waitSearcher = null;
if (cmd.waitSearcher) {
@@ -272,6 +276,7 @@ public class DirectUpdateHandler extends
/**
* @since Solr 1.4
*/
+ @Override
public void rollback(RollbackUpdateCommand cmd) throws IOException {
throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,
"DirectUpdateHandler doesn't support rollback. Use DirectUpdateHandler2 instead.");
@@ -322,6 +327,7 @@ public class DirectUpdateHandler extends
}
+ @Override
public int addDoc(AddUpdateCommand cmd) throws IOException {
// if there is no ID field, use allowDups
@@ -354,6 +360,7 @@ public class DirectUpdateHandler extends
throw new SolrException( SolrException.ErrorCode.BAD_REQUEST,"unsupported param combo:" + cmd);
}
+ @Override
public void close() throws IOException {
synchronized(this) {
closeSearcher();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java Sun Jan 30 16:08:25 2011
@@ -195,6 +195,7 @@ public class DirectUpdateHandler2 extend
}
}
+ @Override
public int addDoc(AddUpdateCommand cmd) throws IOException {
addCommands.incrementAndGet();
addCommandsCumulative.incrementAndGet();
@@ -265,6 +266,7 @@ public class DirectUpdateHandler2 extend
// could return the number of docs deleted, but is that always possible to know???
+ @Override
public void delete(DeleteUpdateCommand cmd) throws IOException {
deleteByIdCommands.incrementAndGet();
deleteByIdCommandsCumulative.incrementAndGet();
@@ -295,7 +297,8 @@ public class DirectUpdateHandler2 extend
// why not return number of docs deleted?
// Depending on implementation, we may not be able to immediately determine the num...
- public void deleteByQuery(DeleteUpdateCommand cmd) throws IOException {
+ @Override
+ public void deleteByQuery(DeleteUpdateCommand cmd) throws IOException {
deleteByQueryCommands.incrementAndGet();
deleteByQueryCommandsCumulative.incrementAndGet();
@@ -341,6 +344,7 @@ public class DirectUpdateHandler2 extend
}
}
+ @Override
public int mergeIndexes(MergeIndexesCommand cmd) throws IOException {
mergeIndexesCommands.incrementAndGet();
int rc = -1;
@@ -378,6 +382,7 @@ public class DirectUpdateHandler2 extend
}
}
+ @Override
public void commit(CommitUpdateCommand cmd) throws IOException {
if (cmd.optimize) {
@@ -447,6 +452,7 @@ public class DirectUpdateHandler2 extend
/**
* @since Solr 1.4
*/
+ @Override
public void rollback(RollbackUpdateCommand cmd) throws IOException {
rollbackCommands.incrementAndGet();
@@ -480,6 +486,7 @@ public class DirectUpdateHandler2 extend
}
+ @Override
public void close() throws IOException {
log.info("closing " + this);
iwCommit.lock();
@@ -623,6 +630,7 @@ public class DirectUpdateHandler2 extend
// to facilitate testing: blocks if called during commit
public synchronized int getCommitCount() { return autoCommitCount; }
+ @Override
public String toString() {
if(timeUpperBound > 0 || docsUpperBound > 0) {
return
@@ -695,6 +703,7 @@ public class DirectUpdateHandler2 extend
return lst;
}
+ @Override
public String toString() {
return "DirectUpdateHandler2" + getStatistics();
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/SolrIndexWriter.java Sun Jan 30 16:08:25 2011
@@ -136,6 +136,7 @@ public class SolrIndexWriter extends Ind
* ****
*/
private volatile boolean isClosed = false;
+ @Override
public void close() throws IOException {
log.debug("Closing Writer " + name);
try {
@@ -182,6 +183,7 @@ public class SolrIndexWriter extends Ind
// We might ideally want to override print(String) as well, but
// looking through the code that writes to infoStream, it appears
// that all the classes except CheckIndex just use println.
+ @Override
public void println(String x) {
print(dateFormat.format(new Date()) + " ");
super.println(x);
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/UpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/UpdateCommand.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/UpdateCommand.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/UpdateCommand.java Sun Jan 30 16:08:25 2011
@@ -29,6 +29,7 @@ package org.apache.solr.update;
this.commandName = commandName;
}
+ @Override
public String toString() {
return commandName;
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java Sun Jan 30 16:08:25 2011
@@ -25,10 +25,12 @@ public class Lookup3Signature extends Si
public Lookup3Signature() {
}
+ @Override
public void add(String content) {
hash = Hash.lookup3ycs64(content,0,content.length(),hash);
}
+ @Override
public byte[] getSignature() {
return new byte[]{(byte)(hash>>56),(byte)(hash>>48),(byte)(hash>>40),(byte)(hash>>32),(byte)(hash>>24),(byte)(hash>>16),(byte)(hash>>8),(byte)(hash>>0)};
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/MD5Signature.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/MD5Signature.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/MD5Signature.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/MD5Signature.java Sun Jan 30 16:08:25 2011
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
public class MD5Signature extends Signature {
protected final static Logger log = LoggerFactory.getLogger(MD5Signature.class);
private static ThreadLocal<MessageDigest> DIGESTER_FACTORY = new ThreadLocal<MessageDigest>() {
+ @Override
protected MessageDigest initialValue() {
try {
return MessageDigest.getInstance("MD5");
@@ -41,6 +42,7 @@ public class MD5Signature extends Signat
digester.reset();
}
+ @Override
public void add(String content) {
try {
digester.update(content.getBytes("UTF-8"));
@@ -51,6 +53,7 @@ public class MD5Signature extends Signat
}
}
+ @Override
public byte[] getSignature() {
return digester.digest();
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/TextProfileSignature.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/TextProfileSignature.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/TextProfileSignature.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/update/processor/TextProfileSignature.java Sun Jan 30 16:08:25 2011
@@ -51,12 +51,14 @@ public class TextProfileSignature extend
private float quantRate;
private float minTokenLen;
+ @Override
public void init(SolrParams params) {
quantRate = params.getFloat("quantRate", 0.01f);
minTokenLen = params.getInt("minTokenLen", 2);
}
+ @Override
public byte[] getSignature() {
return super.getSignature();
}
@@ -144,6 +146,7 @@ public class TextProfileSignature extend
this.val = val;
}
+ @Override
public String toString() {
return val + " " + cnt;
}
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BoundedTreeSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BoundedTreeSet.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BoundedTreeSet.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/BoundedTreeSet.java Sun Jan 30 16:08:25 2011
@@ -55,11 +55,13 @@ public class BoundedTreeSet<E> extends T
remove(last());
}
}
+ @Override
public boolean add(E item) {
boolean out = super.add(item);
adjust();
return out;
}
+ @Override
public boolean addAll(Collection<? extends E> c) {
boolean out = super.addAll(c);
adjust();
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/DisMaxParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/DisMaxParams.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/DisMaxParams.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/DisMaxParams.java Sun Jan 30 16:08:25 2011
@@ -103,6 +103,7 @@ public class DisMaxParams extends Common
* </p>
* @deprecated use SolrParams.toSolrParams
*/
+ @Override
@Deprecated
public void setValues(NamedList args) {
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/util/SolrPluginUtils.java Sun Jan 30 16:08:25 2011
@@ -784,6 +784,7 @@ public class SolrPluginUtils {
* DisjunctionMaxQuery. (so yes: aliases which point at other
* aliases should work)
*/
+ @Override
protected Query getFieldQuery(String field, String queryText, boolean quoted)
throws ParseException {
Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java Sun Jan 30 16:08:25 2011
@@ -36,6 +36,7 @@ import java.util.List;
*/
public class BinaryRequestWriter extends RequestWriter {
+ @Override
public Collection<ContentStream> getContentStreams(SolrRequest req) throws IOException {
if (req instanceof UpdateRequest) {
UpdateRequest updateRequest = (UpdateRequest) req;
@@ -55,10 +56,12 @@ public class BinaryRequestWriter extends
}
+ @Override
public String getUpdateContentType() {
return "application/octet-stream";
}
+ @Override
public ContentStream getContentStream(final UpdateRequest request) throws IOException {
final BAOS baos = new BAOS();
new JavaBinUpdateRequestCodec().marshal(request, baos);
@@ -91,6 +94,7 @@ public class BinaryRequestWriter extends
}
+ @Override
public void write(SolrRequest request, OutputStream os) throws IOException {
if (request instanceof UpdateRequest) {
UpdateRequest updateRequest = (UpdateRequest) request;
@@ -106,6 +110,7 @@ public class BinaryRequestWriter extends
}
}
+ @Override
public String getPath(SolrRequest req) {
if (req instanceof UpdateRequest) {
return "/update/javabin";
Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java Sun Jan 30 16:08:25 2011
@@ -30,10 +30,12 @@ import java.io.Reader;
* @since solr 1.3
*/
public class BinaryResponseParser extends ResponseParser {
+ @Override
public String getWriterType() {
return "javabin";
}
+ @Override
public NamedList<Object> processResponse(InputStream body, String encoding) {
try {
return (NamedList<Object>) new JavaBinCodec().unmarshal(body);
@@ -44,10 +46,12 @@ public class BinaryResponseParser extend
}
+ @Override
public String getVersion() {
return "2";
}
+ @Override
public NamedList<Object> processResponse(Reader reader) {
throw new RuntimeException("Cannot handle character stream");
}
Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java Sun Jan 30 16:08:25 2011
@@ -90,6 +90,7 @@ public class LBHttpSolrServer extends So
this.solrServer = solrServer;
}
+ @Override
public String toString() {
return solrServer.getBaseURL();
}
@@ -184,6 +185,7 @@ public class LBHttpSolrServer extends So
* @throws SolrServerException
* @throws IOException
*/
+ @Override
public NamedList<Object> request(final SolrRequest request)
throws SolrServerException, IOException {
int count = counter.incrementAndGet();
@@ -308,6 +310,7 @@ public class LBHttpSolrServer extends So
return httpClient;
}
+ @Override
protected void finalize() throws Throwable {
try {
if(this.aliveCheckExecutor!=null)
Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java Sun Jan 30 16:08:25 2011
@@ -67,6 +67,7 @@ public class JavaBinUpdateRequestCodec {
nl.add("delByQ", updateRequest.getDeleteQuery());
nl.add("docs", docIter);
new JavaBinCodec(){
+ @Override
public void writeMap(Map val) throws IOException {
if (val instanceof SolrInputDocument) {
writeVal(solrInputDocumentToList((SolrInputDocument) val));
@@ -101,6 +102,7 @@ public class JavaBinUpdateRequestCodec {
// is ever refactored, this will not work.
private boolean seenOuterMostDocIterator = false;
+ @Override
public NamedList readNamedList(FastInputStream dis) throws IOException {
int sz = readSize(dis);
NamedList nl = new NamedList();
@@ -115,6 +117,7 @@ public class JavaBinUpdateRequestCodec {
return nl;
}
+ @Override
public List readIterator(FastInputStream fis) throws IOException {
// default behavior for reading any regular Iterator in the stream
Modified: lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java?rev=1065312&r1=1065311&r2=1065312&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java Sun Jan 30 16:08:25 2011
@@ -92,6 +92,7 @@ public class FieldStatsInfo implements S
}
}
+ @Override
public String toString()
{
StringBuilder sb = new StringBuilder();