You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/02/09 02:04:13 UTC
svn commit: r1068718 [16/21] - in /lucene/dev/branches/bulkpostings: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/ant/
dev-tools/maven/lucene/contrib/db/bdb-j...
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ValueSourceParser.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ValueSourceParser.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/ValueSourceParser.java Wed Feb 9 01:03:49 2011
@@ -81,23 +81,27 @@ public abstract class ValueSourceParser
static {
addParser("ord", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
String field = fp.parseId();
return 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 ReverseOrdFieldSource(field);
}
});
addParser("top", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
// top(vs) is now a no-op
ValueSource source = fp.parseValueSource();
@@ -105,6 +109,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();
@@ -113,6 +118,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();
@@ -120,6 +126,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();
@@ -129,6 +136,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();
@@ -137,6 +145,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();
@@ -144,6 +153,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();
@@ -155,13 +165,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));
}
@@ -169,6 +182,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()]));
@@ -177,6 +191,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()]));
@@ -185,14 +200,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);
}
@@ -200,12 +218,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;
@@ -216,6 +236,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();
@@ -224,6 +245,7 @@ public abstract class ValueSourceParser
}
});
addParser("joindf", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
String f0 = fp.parseArg();
String qf = fp.parseArg();
@@ -234,6 +256,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();
@@ -274,6 +297,7 @@ public abstract class ValueSourceParser
});
addParser("ghhsin", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
double radius = fp.parseDouble();
@@ -285,6 +309,7 @@ public abstract class ValueSourceParser
});
addParser("geohash", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource lat = fp.parseValueSource();
@@ -294,6 +319,7 @@ public abstract class ValueSourceParser
}
});
addParser("strdist", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource str1 = fp.parseValueSource();
@@ -319,117 +345,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);
@@ -439,6 +488,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();
@@ -450,11 +500,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);
}
@@ -462,6 +514,7 @@ public abstract class ValueSourceParser
addParser("docfreq", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
TInfo tinfo = parseTerm(fp);
return new DocFreqValueSource(tinfo.field, tinfo.val, tinfo.indexedField, tinfo.indexedBytes);
@@ -469,6 +522,7 @@ public abstract class ValueSourceParser
});
addParser("idf", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
TInfo tinfo = parseTerm(fp);
return new IDFValueSource(tinfo.field, tinfo.val, tinfo.indexedField, tinfo.indexedBytes);
@@ -476,6 +530,7 @@ public abstract class ValueSourceParser
});
addParser("termfreq", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
TInfo tinfo = parseTerm(fp);
return new TermFreqValueSource(tinfo.field, tinfo.val, tinfo.indexedField, tinfo.indexedBytes);
@@ -483,6 +538,7 @@ public abstract class ValueSourceParser
});
addParser("tf", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
TInfo tinfo = parseTerm(fp);
return new TFValueSource(tinfo.field, tinfo.val, tinfo.indexedField, tinfo.indexedBytes);
@@ -490,6 +546,7 @@ public abstract class ValueSourceParser
});
addParser("norm", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
String field = fp.parseArg();
return new NormValueSource(field);
@@ -497,12 +554,14 @@ public abstract class ValueSourceParser
});
addParser("maxdoc", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
return new MaxDocValueSource();
}
});
addParser("numdocs", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
return new NumDocsValueSource();
}
@@ -599,6 +658,7 @@ public abstract class ValueSourceParser
class DateValueSourceParser extends ValueSourceParser {
DateField df = new TrieDateField();
+ @Override
public void init(NamedList args) {
}
@@ -619,6 +679,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();
@@ -655,10 +716,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);
}
@@ -667,10 +730,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;
}
@@ -679,10 +744,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);
}
@@ -706,42 +773,52 @@ class LongConstValueSource extends Const
this.fv = constant;
}
+ @Override
public String description() {
return "const(" + constant + ")";
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) 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;
@@ -793,6 +870,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());
}
@@ -802,6 +880,7 @@ abstract class DoubleParser extends Name
super(source);
}
+ @Override
public String name() {
return DoubleParser.this.name();
}
@@ -810,21 +889,27 @@ abstract class DoubleParser extends Name
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final DocValues vals = source.getValues(context, readerContext);
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) + ')';
}
@@ -841,6 +926,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());
}
@@ -858,29 +944,37 @@ abstract class Double2Parser extends Nam
this.b = b;
}
+ @Override
public String description() {
return name() + "(" + a.description() + "," + b.description() + ")";
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final DocValues aVals = a.getValues(context, readerContext);
final DocValues bVals = b.getValues(context, readerContext);
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) + ')';
}
@@ -891,6 +985,7 @@ abstract class Double2Parser extends Nam
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
}
+ @Override
public int hashCode() {
int h = a.hashCode();
h ^= (h << 13) | (h >>> 20);
@@ -900,6 +995,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/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/BoostedQuery.java Wed Feb 9 01:03:49 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(IndexSearcher searcher) throws IOException {
return new BoostedQuery.BoostedWeight(searcher);
}
@@ -69,10 +72,12 @@ public class BoostedQuery extends Query
boostVal.createWeight(fcontext,searcher);
}
+ @Override
public Query getQuery() {
return BoostedQuery.this;
}
+ @Override
public float getValue() {
return getBoost();
}
@@ -173,6 +178,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(')');
@@ -180,6 +186,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;
@@ -188,6 +195,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/bulkpostings/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java Wed Feb 9 01:03:49 2011
@@ -37,10 +37,12 @@ public class ByteFieldSource extends Num
super(creator);
}
+ @Override
public String description() {
return "byte(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final ByteValues vals = cache.getBytes(readerContext.reader, field, creator);
final byte[] arr = vals.values;
@@ -56,26 +58,32 @@ public class ByteFieldSource extends Num
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);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ConstValueSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ConstValueSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ConstValueSource.java Wed Feb 9 01:03:49 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, AtomicReaderContext readerContext) 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/bulkpostings/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java Wed Feb 9 01:03:49 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/bulkpostings/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java Wed Feb 9 01:03:49 2011
@@ -45,21 +45,27 @@ class ConstIntDocValues extends DocValue
this.parent = parent;
}
+ @Override
public float floatVal(int doc) {
return fval;
}
+ @Override
public int intVal(int doc) {
return ival;
}
+ @Override
public long longVal(int doc) {
return lval;
}
+ @Override
public double doubleVal(int doc) {
return dval;
}
+ @Override
public String strVal(int doc) {
return sval;
}
+ @Override
public String toString(int doc) {
return parent.description() + '=' + sval;
}
@@ -82,21 +88,27 @@ class ConstDoubleDocValues extends DocVa
this.parent = parent;
}
+ @Override
public float floatVal(int doc) {
return fval;
}
+ @Override
public int intVal(int doc) {
return ival;
}
+ @Override
public long longVal(int doc) {
return lval;
}
+ @Override
public double doubleVal(int doc) {
return dval;
}
+ @Override
public String strVal(int doc) {
return sval;
}
+ @Override
public String toString(int doc) {
return parent.description() + '=' + sval;
}
@@ -250,10 +262,12 @@ public class DocFreqValueSource extends
context.put("searcher",searcher);
}
+ @Override
public int hashCode() {
return getClass().hashCode() + indexedField.hashCode()*29 + indexedBytes.hashCode();
}
+ @Override
public boolean equals(Object o) {
if (this.getClass() != o.getClass()) return false;
DocFreqValueSource other = (DocFreqValueSource)o;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java Wed Feb 9 01:03:49 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, AtomicReaderContext readerContext) 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;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java Wed Feb 9 01:03:49 2011
@@ -42,36 +42,44 @@ public class DoubleFieldSource extends N
super(creator);
}
+ @Override
public String description() {
return "double(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final DoubleValues vals = cache.getDoubles(readerContext.reader, field, creator);
final double[] arr = vals.values;
final Bits valid = vals.valid;
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);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java Wed Feb 9 01:03:49 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, AtomicReaderContext readerContext) throws IOException {
final DocValues aVals = a.getValues(context, readerContext);
final DocValues bVals = b.getValues(context, readerContext);
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/bulkpostings/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java Wed Feb 9 01:03:49 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/bulkpostings/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FileFloatSource.java Wed Feb 9 01:03:49 2011
@@ -53,10 +53,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, AtomicReaderContext readerContext) throws IOException {
int offset = 0;
ReaderContext topLevelContext = ReaderUtil.getTopLevelContext(readerContext);
@@ -64,32 +66,39 @@ public class FileFloatSource extends Val
final float[] arr = getCachedFloats(topLevelContext.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;
@@ -99,10 +108,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+")";
@@ -114,6 +125,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);
}
@@ -173,12 +185,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/bulkpostings/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java Wed Feb 9 01:03:49 2011
@@ -41,36 +41,44 @@ public class FloatFieldSource extends Nu
super(creator);
}
+ @Override
public String description() {
return "float(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final FloatValues vals = cache.getFloats(readerContext.reader, field, creator);
final float[] arr = vals.values;
final Bits valid = vals.valid;
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);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/IntFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/IntFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/IntFieldSource.java Wed Feb 9 01:03:49 2011
@@ -41,11 +41,13 @@ public class IntFieldSource extends Nume
super(creator);
}
+ @Override
public String description() {
return "int(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final IntValues vals = cache.getInts(readerContext.reader, field, creator);
final int[] arr = vals.values;
@@ -54,26 +56,32 @@ public class IntFieldSource extends Nume
return new DocValues() {
final MutableValueInt val = new MutableValueInt();
+ @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);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java Wed Feb 9 01:03:49 2011
@@ -43,10 +43,12 @@ public class JoinDocFreqValueSource exte
this.qfield = qfield;
}
+ @Override
public String description() {
return NAME + "(" + field +":("+qfield+"))";
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException
{
final DocTerms terms = cache.getTerms(readerContext.reader, field, true );
@@ -55,6 +57,7 @@ public class JoinDocFreqValueSource exte
return new DocValues() {
BytesRef ref = new BytesRef();
+ @Override
public int intVal(int doc)
{
try {
@@ -68,28 +71,34 @@ public class JoinDocFreqValueSource exte
}
}
+ @Override
public float floatVal(int doc) {
return (float)intVal(doc);
}
+ @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 intVal(doc) + "";
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != JoinDocFreqValueSource.class) return false;
JoinDocFreqValueSource other = (JoinDocFreqValueSource)o;
@@ -97,6 +106,7 @@ public class JoinDocFreqValueSource exte
return super.equals(other);
}
+ @Override
public int hashCode() {
return qfield.hashCode() + super.hashCode();
};
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/LinearFloatFunction.java Wed Feb 9 01:03:49 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, AtomicReaderContext readerContext) throws IOException {
final DocValues vals = source.getValues(context, readerContext);
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/bulkpostings/solr/src/java/org/apache/solr/search/function/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/LongFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/LongFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/LongFieldSource.java Wed Feb 9 01:03:49 2011
@@ -43,6 +43,7 @@ public class LongFieldSource extends Num
super(creator);
}
+ @Override
public String description() {
return "long(" + field + ')';
}
@@ -51,32 +52,39 @@ public class LongFieldSource extends Num
return Long.parseLong(extVal);
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final LongValues vals = cache.getLongs(readerContext.reader, field, creator);
final long[] arr = vals.values;
final Bits valid = vals.valid;
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);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/MaxFloatFunction.java Wed Feb 9 01:03:49 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, AtomicReaderContext readerContext) throws IOException {
final DocValues vals = source.getValues(context, readerContext);
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/bulkpostings/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/MultiFloatFunction.java Wed Feb 9 01:03:49 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, AtomicReaderContext readerContext) 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/bulkpostings/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/NumericFieldCacheSource.java Wed Feb 9 01:03:49 2011
@@ -32,6 +32,7 @@ public abstract class NumericFieldCacheS
this.creator = creator;
}
+ @Override
public final boolean equals(Object o) {
if (o.getClass() != this.getClass()) return false;
NumericFieldCacheSource other = (NumericFieldCacheSource) o;
@@ -40,6 +41,7 @@ public abstract class NumericFieldCacheS
this.creator.getClass() == other.creator.getClass();
}
+ @Override
public final int hashCode() {
int h = creator == null ? this.getClass().hashCode() : creator.getClass().hashCode();
h += super.hashCode();
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/OrdFieldSource.java Wed Feb 9 01:03:49 2011
@@ -52,11 +52,13 @@ public class OrdFieldSource extends Valu
this.field = field;
}
+ @Override
public String description() {
return "ord(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final int off = readerContext.docBase;
final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader;
@@ -66,35 +68,43 @@ public class OrdFieldSource extends Valu
return readableValue;
}
+ @Override
public float floatVal(int doc) {
return (float)sindex.getOrd(doc+off);
}
+ @Override
public int intVal(int doc) {
return sindex.getOrd(doc+off);
}
+ @Override
public long longVal(int doc) {
return (long)sindex.getOrd(doc+off);
}
+ @Override
public double doubleVal(int doc) {
return (double)sindex.getOrd(doc+off);
}
+ @Override
public int ordVal(int doc) {
return sindex.getOrd(doc+off);
}
+ @Override
public int numOrd() {
return sindex.numOrd();
}
+ @Override
public String strVal(int doc) {
// the string value of the ordinal, not the string itself
return Integer.toString(sindex.getOrd(doc+off));
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
@@ -119,11 +129,13 @@ public class OrdFieldSource extends Valu
};
}
+ @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/bulkpostings/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/PowFloatFunction.java Wed Feb 9 01:03:49 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/bulkpostings/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ProductFloatFunction.java Wed Feb 9 01:03:49 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/bulkpostings/solr/src/java/org/apache/solr/search/function/QueryValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/QueryValueSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/QueryValueSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/QueryValueSource.java Wed Feb 9 01:03:49 2011
@@ -42,6 +42,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 + ")";
}
@@ -51,10 +52,12 @@ public class QueryValueSource extends Va
return new QueryDocValues(readerContext, q, defVal, fcontext);
}
+ @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;
@@ -97,11 +100,11 @@ class QueryDocValues extends DocValues {
if (w == null) {
IndexSearcher weightSearcher;
if(fcontext == null) {
- weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext), readerContext);
+ weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext));
} else {
weightSearcher = (IndexSearcher)fcontext.get("searcher");
if (weightSearcher == null) {
- weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext), readerContext);
+ weightSearcher = new IndexSearcher(ReaderUtil.getTopLevelContext(readerContext));
}
}
w = q.weight(weightSearcher);
@@ -109,6 +112,7 @@ class QueryDocValues extends DocValues {
weight = w;
}
+ @Override
public float floatVal(int doc) {
try {
if (doc < lastDocRequested) {
@@ -135,18 +139,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/bulkpostings/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java Wed Feb 9 01:03:49 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, AtomicReaderContext readerContext) throws IOException {
final DocValues vals = source.getValues(context, readerContext);
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/bulkpostings/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java Wed Feb 9 01:03:49 2011
@@ -57,24 +57,31 @@ public class ReciprocalFloatFunction ext
this.b=b;
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final DocValues vals = source.getValues(context, readerContext);
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/bulkpostings/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java Wed Feb 9 01:03:49 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, AtomicReaderContext readerContext) throws IOException {
final IndexReader topReader = ReaderUtil.getTopLevelContext(readerContext).reader;
final int off = readerContext.docBase;
@@ -65,41 +67,50 @@ public class ReverseOrdFieldSource exten
final int end = sindex.numOrd();
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return (float)(end - sindex.getOrd(doc+off));
}
+ @Override
public int intVal(int doc) {
return (end - sindex.getOrd(doc+off));
}
+ @Override
public long longVal(int doc) {
return (long)(end - sindex.getOrd(doc+off));
}
+ @Override
public int ordVal(int doc) {
return (end - sindex.getOrd(doc+off));
}
+ @Override
public int numOrd() {
return end;
}
+ @Override
public double doubleVal(int doc) {
return (double)(end - sindex.getOrd(doc+off));
}
+ @Override
public String strVal(int doc) {
// the string value of the ordinal, not the string itself
return Integer.toString((end - sindex.getOrd(doc+off)));
}
+ @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;
@@ -107,6 +118,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/bulkpostings/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ScaleFloatFunction.java Wed Feb 9 01:03:49 2011
@@ -46,6 +46,7 @@ public class ScaleFloatFunction extends
this.max = max;
}
+ @Override
public String description() {
return "scale(" + source.description() + "," + min + "," + max + ")";
}
@@ -93,6 +94,7 @@ public class ScaleFloatFunction extends
return scaleInfo;
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
ScaleInfo scaleInfo = (ScaleInfo)context.get(source);
@@ -107,21 +109,27 @@ public class ScaleFloatFunction extends
final DocValues vals = source.getValues(context, readerContext);
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
@@ -136,6 +144,7 @@ public class ScaleFloatFunction extends
source.createWeight(context, searcher);
}
+ @Override
public int hashCode() {
int h = Float.floatToIntBits(min);
h = h*29;
@@ -145,6 +154,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/bulkpostings/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ShortFieldSource.java Wed Feb 9 01:03:49 2011
@@ -35,10 +35,12 @@ public class ShortFieldSource extends Nu
}
+ @Override
public String description() {
return "short(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final ShortValues vals = cache.getShorts(readerContext.reader, field, creator);
final short[] arr = vals.values;
@@ -54,26 +56,32 @@ public class ShortFieldSource extends Nu
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);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SimpleFloatFunction.java Wed Feb 9 01:03:49 2011
@@ -35,21 +35,27 @@ import java.util.Map;
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
final DocValues vals = source.getValues(context, readerContext);
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/bulkpostings/solr/src/java/org/apache/solr/search/function/SingleFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SingleFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SingleFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SingleFunction.java Wed Feb 9 01:03:49 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/bulkpostings/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/StringIndexDocValues.java Wed Feb 9 01:03:49 2011
@@ -89,6 +89,7 @@ public abstract class StringIndexDocValu
};
}
+ @Override
public String toString(int doc) {
return vs.description() + '=' + strVal(doc);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/SumFloatFunction.java Wed Feb 9 01:03:49 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/bulkpostings/solr/src/java/org/apache/solr/search/function/TFValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/TFValueSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/TFValueSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/TFValueSource.java Wed Feb 9 01:03:49 2011
@@ -1,5 +1,22 @@
package org.apache.solr.search.function;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.search.DocIdSetIterator;
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ValueSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ValueSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ValueSource.java Wed Feb 9 01:03:49 2011
@@ -49,8 +49,10 @@ public abstract class ValueSource implem
*/
public abstract DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException;
+ @Override
public abstract boolean equals(Object o);
+ @Override
public abstract int hashCode();
/**
@@ -58,6 +60,7 @@ public abstract class ValueSource implem
*/
public abstract String description();
+ @Override
public String toString() {
return description();
}
@@ -89,7 +92,7 @@ public abstract class ValueSource implem
* EXPERIMENTAL: This method is subject to change.
* <br>WARNING: Sorted function queries are not currently weighted.
* <p>
- * Get the SortField for this ValueSource. Uses the {@link #getValues(java.util.Map, AtomicReaderContext)}
+ * Get the SortField for this ValueSource. Uses the {@link #getValues(java.util.Map, IndexReader.AtomicReaderContext)}
* to populate the SortField.
*
* @param reverse true if this is a reverse sort.
@@ -127,6 +130,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);
@@ -149,6 +153,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];
@@ -162,6 +167,7 @@ public abstract class ValueSource implem
}
+ @Override
public int compareBottom(int doc) {
final double v2 = docVals.doubleVal(doc);
if (bottom > v2) {
@@ -173,19 +179,23 @@ public abstract class ValueSource implem
}
}
+ @Override
public void copy(int slot, int doc) {
values[slot] = docVals.doubleVal(doc);
}
+ @Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
docVals = getValues(fcontext, context);
return this;
}
+ @Override
public void setBottom(final int bottom) {
this.bottom = values[bottom];
}
+ @Override
public Comparable value(int slot) {
return values[slot];
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java Wed Feb 9 01:03:49 2011
@@ -49,9 +49,11 @@ public class ValueSourceRangeFilter exte
this.includeUpper = upperVal != null && includeUpper;
}
+ @Override
public DocIdSet getDocIdSet(final Map context, final AtomicReaderContext readerContext) throws IOException {
return new DocIdSet() {
- public DocIdSetIterator iterator() throws IOException {
+ @Override
+ public DocIdSetIterator iterator() throws IOException {
return valueSource.getValues(context, readerContext).getRangeScorer(readerContext.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/bulkpostings/solr/src/java/org/apache/solr/search/function/VectorValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/VectorValueSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/VectorValueSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/VectorValueSource.java Wed Feb 9 01:03:49 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, IndexSearcher 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/bulkpostings/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java Wed Feb 9 01:03:49 2011
@@ -59,22 +59,27 @@ public class GeohashHaversineFunction ex
final DocValues gh2DV = geoHash2.getValues(context, readerContext);
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));
}