You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2008/10/03 23:26:57 UTC
svn commit: r701539 [4/6] - in /lucene/solr/branches/sandbox/ryan:
client/java/solrj/src/org/apache/solr/client/solrj/embedded/
client/java/solrj/src/org/apache/solr/client/solrj/impl/
client/java/solrj/src/org/apache/solr/client/solrj/response/ client...
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/ValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/ValueSourceParser.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/ValueSourceParser.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/ValueSourceParser.java Fri Oct 3 14:26:50 2008
@@ -65,26 +65,31 @@
public static Map<String, ValueSourceParser> standardValueSourceParsers = new HashMap<String, ValueSourceParser>();
static {
standardValueSourceParsers.put("ord", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
String field = fp.parseId();
return new OrdFieldSource(field);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("rord", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
String field = fp.parseId();
return new ReverseOrdFieldSource(field);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("linear", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float slope = fp.parseFloat();
@@ -92,22 +97,26 @@
return new LinearFloatFunction(source,slope,intercept);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("max", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float val = fp.parseFloat();
return new MaxFloatFunction(source,val);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("recip", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float m = fp.parseFloat();
@@ -116,11 +125,13 @@
return new ReciprocalFloatFunction(source,m,a,b);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("scale", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float min = fp.parseFloat();
@@ -128,33 +139,39 @@
return new ScaleFloatFunction(source,min,max);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("pow", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource a = fp.parseValueSource();
ValueSource b = fp.parseValueSource();
return new PowFloatFunction(a,b);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("div", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource a = fp.parseValueSource();
ValueSource b = fp.parseValueSource();
return new DivFloatFunction(a,b);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("map", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float min = fp.parseFloat();
@@ -163,81 +180,99 @@
return new RangeMapFloatFunction(source,min,max,target);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("sqrt", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
return new SimpleFloatFunction(source) {
+ @Override
protected String name() {
return "sqrt";
}
+ @Override
protected float func(int doc, DocValues vals) {
return (float)Math.sqrt(vals.floatVal(doc));
}
};
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("log", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
return new SimpleFloatFunction(source) {
+ @Override
protected String name() {
return "log";
}
+ @Override
protected float func(int doc, DocValues vals) {
return (float)Math.log10(vals.floatVal(doc));
}
};
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("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 (float)Math.abs(vals.floatVal(doc));
+ return Math.abs(vals.floatVal(doc));
}
};
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("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()]));
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("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()]));
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("query", new ValueSourceParser() {
// boost(query($q),rating)
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
Query q = fp.parseNestedQuery();
float defVal = 0.0f;
@@ -247,11 +282,13 @@
return new QueryValueSource(q, defVal);
}
+ @Override
public void init(NamedList args) {
}
});
standardValueSourceParsers.put("boost", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
Query q = fp.parseNestedQuery();
ValueSource vs = fp.parseValueSource();
@@ -259,6 +296,7 @@
return new QueryValueSource(bq, 0.0f);
}
+ @Override
public void init(NamedList args) {
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/WildcardFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/WildcardFilter.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/WildcardFilter.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/WildcardFilter.java Fri Oct 3 14:26:50 2008
@@ -26,7 +26,6 @@
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.util.OpenBitSet;
-import java.util.BitSet;
import java.io.IOException;
@@ -43,20 +42,6 @@
public Term getTerm() { return term; }
- /**
- * @deprecated Use {@link #getDocIdSet(IndexReader)} instead.
- */
- @Override
- public BitSet bits(IndexReader reader) throws IOException {
- final BitSet bitSet = new BitSet(reader.maxDoc());
- new WildcardGenerator(term) {
- public void handleDoc(int doc) {
- bitSet.set(doc);
- }
- }.generate(reader);
- return bitSet;
- }
-
@Override
public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
final OpenBitSet bitSet = new OpenBitSet(reader.maxDoc());
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/BoostedQuery.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/BoostedQuery.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/BoostedQuery.java Fri Oct 3 14:26:50 2008
@@ -39,6 +39,7 @@
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;
@@ -47,10 +48,12 @@
return bq;
}
+ @Override
public void extractTerms(Set terms) {
q.extractTerms(terms);
}
+ @Override
protected Weight createWeight(Searcher searcher) throws IOException {
return new BoostedQuery.BoostedWeight(searcher);
}
@@ -111,22 +114,27 @@
this.vals = vs.getValues(reader);
}
+ @Override
public boolean next() throws IOException {
return scorer.next();
}
+ @Override
public int doc() {
return scorer.doc();
}
+ @Override
public float score() throws IOException {
return qWeight * scorer.score() * vals.floatVal(scorer.doc());
}
+ @Override
public boolean skipTo(int target) throws IOException {
return scorer.skipTo(target);
}
+ @Override
public Explanation explain(int doc) throws IOException {
Explanation subQueryExpl = weight.qWeight.explain(reader,doc);
if (!subQueryExpl.isMatch()) {
@@ -142,6 +150,7 @@
}
+ @Override
public String toString(String field) {
StringBuilder sb = new StringBuilder();
sb.append("boost(").append(q.toString(field)).append(',').append(boostVal).append(')');
@@ -149,6 +158,7 @@
return sb.toString();
}
+ @Override
public boolean equals(Object o) {
if (getClass() != o.getClass()) return false;
BoostedQuery other = (BoostedQuery)o;
@@ -157,6 +167,7 @@
&& this.boostVal.equals(other.boostVal);
}
+ @Override
public int hashCode() {
int h = q.hashCode();
h ^= (h << 17) | (h >>> 16);
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ByteFieldSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ByteFieldSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ByteFieldSource.java Fri Oct 3 14:26:50 2008
@@ -41,10 +41,12 @@
this.parser = parser;
}
+ @Override
public String description() {
return "byte(" + field + ')';
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final byte[] arr = (parser == null) ?
cache.getBytes(reader, field) :
@@ -52,34 +54,40 @@
return new DocValues() {
@Override
public byte byteVal(int doc) {
- return (byte) arr[doc];
+ return arr[doc];
}
@Override
public short shortVal(int doc) {
- return (short) arr[doc];
+ return arr[doc];
}
+ @Override
public float floatVal(int doc) {
- return (float) arr[doc];
+ return arr[doc];
}
+ @Override
public int intVal(int doc) {
- return (int) arr[doc];
+ return arr[doc];
}
+ @Override
public long longVal(int doc) {
- return (long) arr[doc];
+ return arr[doc];
}
+ @Override
public double doubleVal(int doc) {
- return (double) arr[doc];
+ return arr[doc];
}
+ @Override
public String strVal(int doc) {
return Byte.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + byteVal(doc);
}
@@ -87,6 +95,7 @@
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != ByteFieldSource.class) return false;
ByteFieldSource
@@ -96,6 +105,7 @@
this.parser.getClass() == other.parser.getClass();
}
+ @Override
public int hashCode() {
int h = parser == null ? Byte.class.hashCode() : parser.getClass().hashCode();
h += super.hashCode();
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ConstValueSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ConstValueSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ConstValueSource.java Fri Oct 3 14:26:50 2008
@@ -31,37 +31,47 @@
this.constant = constant;
}
+ @Override
public String description() {
return "const(" + constant + ")";
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
return new DocValues() {
+ @Override
public float floatVal(int doc) {
return constant;
}
+ @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);
+ return floatVal(doc);
}
+ @Override
public String strVal(int doc) {
return Float.toString(floatVal(doc));
}
+ @Override
public String toString(int doc) {
return description();
}
};
}
+ @Override
public int hashCode() {
return Float.floatToIntBits(constant) * 31;
}
+ @Override
public boolean equals(Object o) {
if (ConstValueSource.class != o.getClass()) return false;
ConstValueSource other = (ConstValueSource)o;
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/DivFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/DivFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/DivFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/DivFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -28,10 +28,12 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/DoubleFieldSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/DoubleFieldSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/DoubleFieldSource.java Fri Oct 3 14:26:50 2008
@@ -42,41 +42,50 @@
this.parser = parser;
}
+ @Override
public String description() {
return "double(" + field + ')';
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final double[] arr = (parser == null) ?
((ExtendedFieldCache) cache).getDoubles(reader, field) :
((ExtendedFieldCache) 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() + '=' + floatVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != DoubleFieldSource.class) return false;
DoubleFieldSource other = (DoubleFieldSource) o;
@@ -85,6 +94,7 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FieldCacheSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FieldCacheSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FieldCacheSource.java Fri Oct 3 14:26:50 2008
@@ -49,10 +49,12 @@
return cache;
}
+ @Override
public String description() {
return field;
}
+ @Override
public boolean equals(Object o) {
if (!(o instanceof FieldCacheSource)) return false;
FieldCacheSource other = (FieldCacheSource)o;
@@ -60,6 +62,7 @@
&& this.cache == other.cache;
}
+ @Override
public int hashCode() {
return cache.hashCode() + field.hashCode();
};
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FileFloatSource.java Fri Oct 3 14:26:50 2008
@@ -48,39 +48,48 @@
this.dataDir = parser.getReq().getCore().getDataDir();
}
+ @Override
public String description() {
return "float(" + field + ')';
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final float[] arr = getCachedFloats(reader);
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];
+ return 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() != FileFloatSource.class) return false;
FileFloatSource other = (FileFloatSource)o;
@@ -90,10 +99,12 @@
&& 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+")";
@@ -105,6 +116,7 @@
}
static Cache floatCache = new Cache() {
+ @Override
protected Object createValue(IndexReader reader, Object key) {
return getFloats(((Entry)key).ffs, reader);
}
@@ -164,12 +176,14 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FloatFieldSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FloatFieldSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FloatFieldSource.java Fri Oct 3 14:26:50 2008
@@ -43,41 +43,50 @@
this.parser = parser;
}
+ @Override
public String description() {
return "float(" + field + ')';
}
+ @Override
public DocValues getValues(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];
+ return 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;
@@ -86,6 +95,7 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FunctionQuery.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FunctionQuery.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/FunctionQuery.java Fri Oct 3 14:26:50 2008
@@ -44,10 +44,12 @@
return func;
}
+ @Override
public Query rewrite(IndexReader reader) throws IOException {
return this;
}
+ @Override
public void extractTerms(Set terms) {}
protected class FunctionWeight implements Weight {
@@ -109,6 +111,7 @@
// the score could either ignore the subscore, or boost it.
// Containment: floatline(foo:myTerm, "myFloatField", 1.0, 0.0f)
// Boost: foo:myTerm^floatline("myFloatField",1.0,0.0f)
+ @Override
public boolean next() throws IOException {
for(;;) {
++doc;
@@ -124,19 +127,23 @@
}
}
+ @Override
public int doc() {
return doc;
}
+ @Override
public float score() throws IOException {
return qWeight * vals.floatVal(doc);
}
+ @Override
public boolean skipTo(int target) throws IOException {
doc=target-1;
return next();
}
+ @Override
public Explanation explain(int doc) throws IOException {
float sc = qWeight * vals.floatVal(doc);
@@ -151,12 +158,14 @@
}
+ @Override
protected Weight createWeight(Searcher searcher) {
return new FunctionQuery.FunctionWeight(searcher);
}
/** Prints a user-readable version of this query. */
+ @Override
public String toString(String field)
{
float boost = getBoost();
@@ -166,6 +175,7 @@
/** 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;
@@ -174,6 +184,7 @@
}
/** Returns a hash code value for this object. */
+ @Override
public int hashCode() {
return func.hashCode()*31 + Float.floatToIntBits(getBoost());
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/IntFieldSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/IntFieldSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/IntFieldSource.java Fri Oct 3 14:26:50 2008
@@ -42,35 +42,43 @@
this.parser = parser;
}
+ @Override
public String description() {
return "int(" + field + ')';
}
+ @Override
public DocValues getValues(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];
+ return arr[doc];
}
+ @Override
public int intVal(int doc) {
- return (int)arr[doc];
+ return arr[doc];
}
+ @Override
public long longVal(int doc) {
- return (long)arr[doc];
+ return arr[doc];
}
+ @Override
public double doubleVal(int doc) {
- return (double)arr[doc];
+ return arr[doc];
}
+ @Override
public String strVal(int doc) {
return Float.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
@@ -78,6 +86,7 @@
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != IntFieldSource.class) return false;
IntFieldSource other = (IntFieldSource)o;
@@ -86,6 +95,7 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/LinearFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/LinearFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/LinearFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/LinearFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -40,34 +40,43 @@
this.intercept = intercept;
}
+ @Override
public String description() {
return slope + "*float(" + source.description() + ")+" + intercept;
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final DocValues vals = source.getValues(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);
+ return 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;
}
};
}
+ @Override
public int hashCode() {
int h = Float.floatToIntBits(slope);
h = (h >>> 2) | (h << 30);
@@ -76,6 +85,7 @@
return h + source.hashCode();
}
+ @Override
public boolean equals(Object o) {
if (LinearFloatFunction.class != o.getClass()) return false;
LinearFloatFunction other = (LinearFloatFunction)o;
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/LongFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/LongFieldSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/LongFieldSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/LongFieldSource.java Fri Oct 3 14:26:50 2008
@@ -43,41 +43,50 @@
this.parser = parser;
}
+ @Override
public String description() {
return "long(" + field + ')';
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final long[] arr = (parser == null) ?
((ExtendedFieldCache) cache).getLongs(reader, field) :
((ExtendedFieldCache) cache).getLongs(reader, field, parser);
return new DocValues() {
+ @Override
public float floatVal(int doc) {
- return (float) arr[doc];
+ return arr[doc];
}
+ @Override
public int intVal(int doc) {
return (int) arr[doc];
}
+ @Override
public long longVal(int doc) {
- return (long) arr[doc];
+ return 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() + '=' + floatVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != LongFieldSource.class) return false;
LongFieldSource other = (LongFieldSource) o;
@@ -86,6 +95,7 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/MaxFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/MaxFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/MaxFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/MaxFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -39,41 +39,51 @@
this.fval = fval;
}
+ @Override
public String description() {
return "max(" + source.description() + "," + fval + ")";
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final DocValues vals = source.getValues(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);
+ return 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 + ")";
}
};
}
+ @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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/OrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/OrdFieldSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/OrdFieldSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/OrdFieldSource.java Fri Oct 3 14:26:50 2008
@@ -46,40 +46,49 @@
this.field = field;
}
+ @Override
public String description() {
return "ord(" + field + ')';
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final int[] arr = FieldCache.DEFAULT.getStringIndex(reader, field).order;
return new DocValues() {
+ @Override
public float floatVal(int doc) {
- return (float)arr[doc];
+ return arr[doc];
}
+ @Override
public int intVal(int doc) {
- return (int)arr[doc];
+ return arr[doc];
}
+ @Override
public long longVal(int doc) {
- return (long)arr[doc];
+ return arr[doc];
}
+ @Override
public double doubleVal(int doc) {
- return (double)arr[doc];
+ return arr[doc];
}
+ @Override
public String strVal(int doc) {
// the string value of the ordinal, not the string itself
return Integer.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != OrdFieldSource.class) return false;
OrdFieldSource other = (OrdFieldSource)o;
@@ -87,6 +96,7 @@
}
private static final int hcode = OrdFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + field.hashCode();
};
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/PowFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/PowFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/PowFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/PowFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -32,10 +32,12 @@
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));
}
@@ -58,35 +60,44 @@
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(IndexReader reader) throws IOException {
final DocValues aVals = a.getValues(reader);
final DocValues bVals = b.getValues(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) + ')';
}
};
}
+ @Override
public int hashCode() {
int h = a.hashCode();
h ^= (h << 13) | (h >>> 20);
@@ -96,6 +107,7 @@
return h;
}
+ @Override
public boolean equals(Object o) {
if (this.getClass() != o.getClass()) return false;
DualFloatFunction other = (DualFloatFunction)o;
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ProductFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ProductFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ProductFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ProductFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -25,10 +25,12 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/QueryValueSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/QueryValueSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/QueryValueSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/QueryValueSource.java Fri Oct 3 14:26:50 2008
@@ -41,18 +41,22 @@
public Query getQuery() { return q; }
public float getDefaultValue() { return defVal; }
+ @Override
public String description() {
return "query(" + q + ",def=" + defVal + ")";
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
return new QueryDocValues(reader, q, defVal);
}
+ @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;
@@ -83,6 +87,7 @@
weight = q.weight(searcher);
}
+ @Override
public float floatVal(int doc) {
try {
if (doc < lastDocRequested) {
@@ -121,18 +126,23 @@
}
}
+ @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);
+ return 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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/RangeMapFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -42,35 +42,44 @@
this.target = target;
}
+ @Override
public String description() {
return "map(" + source.description() + "," + min + "," + max + "," + target + ")";
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final DocValues vals = source.getValues(reader);
return new DocValues() {
+ @Override
public float floatVal(int doc) {
float val = vals.floatVal(doc);
return (val>=min && val<=max) ? target : val;
}
+ @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);
+ return 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 + ")";
}
};
}
+ @Override
public int hashCode() {
int h = source.hashCode();
h ^= (h << 10) | (h >>> 23);
@@ -82,6 +91,7 @@
return h;
}
+ @Override
public boolean equals(Object o) {
if (RangeMapFloatFunction.class != o.getClass()) return false;
RangeMapFloatFunction other = (RangeMapFloatFunction)o;
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ReciprocalFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -52,24 +52,31 @@
this.b=b;
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final DocValues vals = source.getValues(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);
+ return 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) + ')'
@@ -78,18 +85,21 @@
};
}
+ @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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java Fri Oct 3 14:26:50 2008
@@ -47,10 +47,12 @@
this.field = field;
}
+ @Override
public String description() {
return "rord("+field+')';
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final FieldCache.StringIndex sindex = FieldCache.DEFAULT.getStringIndex(reader, field);
@@ -58,33 +60,40 @@
final int end = sindex.lookup.length;
return new DocValues() {
+ @Override
public float floatVal(int doc) {
- return (float)(end - arr[doc]);
+ return (end - arr[doc]);
}
+ @Override
public int intVal(int doc) {
- return (int)(end - arr[doc]);
+ return (end - arr[doc]);
}
+ @Override
public long longVal(int doc) {
- return (long)(end - arr[doc]);
+ return (end - arr[doc]);
}
+ @Override
public double doubleVal(int doc) {
- return (double)(end - arr[doc]);
+ return (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;
@@ -92,6 +101,7 @@
}
private static final int hcode = ReverseOrdFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + field.hashCode();
};
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ScaleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ScaleFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ScaleFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ScaleFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -43,10 +43,12 @@
this.max = max;
}
+ @Override
public String description() {
return "scale(" + source.description() + "," + min + "," + max + ")";
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final DocValues vals = source.getValues(reader);
int maxDoc = reader.maxDoc();
@@ -83,21 +85,27 @@
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);
+ return 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
@@ -107,6 +115,7 @@
};
}
+ @Override
public int hashCode() {
int h = Float.floatToIntBits(min);
h = h*29;
@@ -116,6 +125,7 @@
return h;
}
+ @Override
public boolean equals(Object o) {
if (ScaleFloatFunction.class != o.getClass()) return false;
ScaleFloatFunction other = (ScaleFloatFunction)o;
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ShortFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ShortFieldSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ShortFieldSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ShortFieldSource.java Fri Oct 3 14:26:50 2008
@@ -38,10 +38,12 @@
this.parser = parser;
}
+ @Override
public String description() {
return "short(" + field + ')';
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final short[] arr = (parser == null) ?
cache.getShorts(reader, field) :
@@ -54,29 +56,35 @@
@Override
public short shortVal(int doc) {
- return (short) arr[doc];
+ return arr[doc];
}
+ @Override
public float floatVal(int doc) {
- return (float) arr[doc];
+ return arr[doc];
}
+ @Override
public int intVal(int doc) {
- return (int) arr[doc];
+ return arr[doc];
}
+ @Override
public long longVal(int doc) {
- return (long) arr[doc];
+ return arr[doc];
}
+ @Override
public double doubleVal(int doc) {
- return (double) arr[doc];
+ return arr[doc];
}
+ @Override
public String strVal(int doc) {
return Short.toString(arr[doc]);
}
+ @Override
public String toString(int doc) {
return description() + '=' + shortVal(doc);
}
@@ -84,6 +92,7 @@
};
}
+ @Override
public boolean equals(Object o) {
if (o.getClass() != ShortFieldSource.class) return false;
ShortFieldSource
@@ -93,6 +102,7 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/SimpleFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/SimpleFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/SimpleFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/SimpleFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -33,38 +33,48 @@
protected abstract String name();
protected abstract float func(int doc, DocValues vals);
+ @Override
public String description() {
return name() + '(' + source.description() + ')';
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final DocValues vals = source.getValues(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);
+ return floatVal(doc);
}
+ @Override
public String strVal(int doc) {
return Float.toString(floatVal(doc));
}
+ @Override
public String toString(int doc) {
return name() + '(' + vals.toString(doc) + ')';
}
};
}
+ @Override
public int hashCode() {
return source.hashCode() + name().hashCode();
}
+ @Override
public boolean equals(Object o) {
if (this.getClass() != o.getClass()) return false;
SimpleFloatFunction other = (SimpleFloatFunction)o;
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/SumFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/SumFloatFunction.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/SumFloatFunction.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/SumFloatFunction.java Fri Oct 3 14:26:50 2008
@@ -35,6 +35,7 @@
return "sum";
}
+ @Override
protected float func(int doc, DocValues[] valsArr) {
float val = 0.0f;
for (DocValues vals : valsArr) {
@@ -55,6 +56,7 @@
abstract protected String name();
abstract protected float func(int doc, DocValues[] valsArr);
+ @Override
public String description() {
StringBuilder sb = new StringBuilder();
sb.append(name()+'(');
@@ -71,6 +73,7 @@
return sb.toString();
}
+ @Override
public DocValues getValues(IndexReader reader) throws IOException {
final DocValues[] valsArr = new DocValues[sources.length];
for (int i=0; i<sources.length; i++) {
@@ -78,21 +81,27 @@
}
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);
+ return 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()+'(');
@@ -111,10 +120,12 @@
};
}
+ @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/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ValueSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ValueSource.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ValueSource.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/function/ValueSource.java Fri Oct 3 14:26:50 2008
@@ -34,13 +34,16 @@
public abstract DocValues getValues(IndexReader reader) throws IOException;
+ @Override
public abstract boolean equals(Object o);
+ @Override
public abstract int hashCode();
/** description of field, used in explain() */
public abstract String description();
+ @Override
public String toString() {
return description();
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java Fri Oct 3 14:26:50 2008
@@ -33,7 +33,6 @@
import org.apache.lucene.search.spell.Dictionary;
import org.apache.lucene.search.spell.LevensteinDistance;
import org.apache.lucene.search.spell.SpellChecker;
-import org.apache.lucene.search.spell.StringDistance;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.RAMDirectory;
@@ -77,6 +76,7 @@
protected float accuracy = 0.5f;
public static final String FIELD = "field";
+ @Override
public String init(NamedList config, SolrCore core) {
super.init(config, core);
indexDir = (String) config.get(INDEX_DIR);
@@ -127,6 +127,7 @@
return name;
}
+ @Override
@SuppressWarnings("unchecked")
public SpellingResult getSuggestions(Collection<Token> tokens,
IndexReader reader, int count, boolean onlyMorePopular,
@@ -137,7 +138,7 @@
Term term = field != null ? new Term(field, "") : null;
for (Token token : tokens) {
String tokenText = new String(token.termBuffer(), 0, token.termLength());
- String[] suggestions = spellChecker.suggestSimilar(tokenText, (int) Math.max(count, AbstractLuceneSpellChecker.DEFAULT_SUGGESTION_COUNT),
+ String[] suggestions = spellChecker.suggestSimilar(tokenText, Math.max(count, AbstractLuceneSpellChecker.DEFAULT_SUGGESTION_COUNT),
field != null ? reader : null, //workaround LUCENE-1295
field,
onlyMorePopular);
@@ -171,6 +172,7 @@
return reader;
}
+ @Override
public void reload() throws IOException {
spellChecker.setSpellIndex(index);
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java Fri Oct 3 14:26:50 2008
@@ -22,7 +22,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
@@ -54,12 +53,14 @@
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.getSchema(), core.getResourceLoader());
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java Fri Oct 3 14:26:50 2008
@@ -16,14 +16,10 @@
* limitations under the License.
*/
-import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.store.FSDirectory;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.core.SolrResourceLoader;
-import org.apache.solr.schema.FieldType;
-import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.util.HighFrequencyDictionary;
@@ -52,6 +48,7 @@
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
@@ -71,6 +68,7 @@
}
}
+ @Override
public void build(SolrCore core, SolrIndexSearcher searcher) {
IndexReader reader = null;
try {
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/SpellingQueryConverter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/SpellingQueryConverter.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/SpellingQueryConverter.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/spelling/SpellingQueryConverter.java Fri Oct 3 14:26:50 2008
@@ -44,6 +44,7 @@
* @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/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/AddUpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/AddUpdateCommand.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/AddUpdateCommand.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/AddUpdateCommand.java Fri Oct 3 14:26:50 2008
@@ -40,8 +40,6 @@
public SolrInputDocument solrDoc;
public boolean allowDups;
- public boolean overwritePending;
- public boolean overwriteCommitted;
/** Reset state to reuse this object with a different document in the same request */
public void clear() {
@@ -110,8 +108,6 @@
sb.append(':');
if (indexedId !=null) sb.append("id=").append(indexedId);
sb.append(",allowDups=").append(allowDups);
- sb.append(",overwritePending=").append(overwritePending);
- sb.append(",overwriteCommitted=").append(overwriteCommitted);
return sb.toString();
}
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/CommitUpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/CommitUpdateCommand.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/CommitUpdateCommand.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/CommitUpdateCommand.java Fri Oct 3 14:26:50 2008
@@ -35,6 +35,7 @@
super("commit");
this.optimize=optimize;
}
+ @Override
public String toString() {
return "commit(optimize="+optimize
+",waitFlush="+waitFlush
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/DeleteUpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/DeleteUpdateCommand.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/DeleteUpdateCommand.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/DeleteUpdateCommand.java Fri Oct 3 14:26:50 2008
@@ -29,6 +29,7 @@
super("delete");
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder(commandName);
sb.append(':');
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/DirectUpdateHandler2.java Fri Oct 3 14:26:50 2008
@@ -152,7 +152,7 @@
// must only be called when iwCommit lock held
private void deleteAll() throws IOException {
- core.log.info(core.getLogId()+"REMOVING ALL DOCUMENTS FROM INDEX");
+ SolrCore.log.info(core.getLogId()+"REMOVING ALL DOCUMENTS FROM INDEX");
closeWriter();
writer = createMainIndexWriter("DirectUpdateHandler2", true);
}
@@ -176,6 +176,7 @@
}
}
+ @Override
public int addDoc(AddUpdateCommand cmd) throws IOException {
addCommands.incrementAndGet();
addCommandsCumulative.incrementAndGet();
@@ -184,8 +185,6 @@
// if there is no ID field, use allowDups
if( idField == null ) {
cmd.allowDups = true;
- cmd.overwriteCommitted = false;
- cmd.overwritePending = false;
}
iwAccess.lock();
@@ -204,7 +203,7 @@
// this is the only unsynchronized code in the iwAccess block, which
// should account for most of the time
- if (cmd.overwriteCommitted || cmd.overwritePending) {
+ if ( !cmd.allowDups ) {
if (cmd.indexedId == null) {
cmd.indexedId = getIndexedId(cmd.doc);
}
@@ -230,6 +229,7 @@
// 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();
@@ -260,7 +260,8 @@
// 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();
@@ -308,6 +309,7 @@
+ @Override
public void commit(CommitUpdateCommand cmd) throws IOException {
if (cmd.optimize) {
@@ -371,6 +373,7 @@
}
+ @Override
public void close() throws IOException {
log.info("closing " + this);
iwCommit.lock();
@@ -511,6 +514,7 @@
// to facilitate testing: blocks if called during commit
public synchronized int getCommitCount() { return autoCommitCount; }
+ @Override
public String toString() {
if(timeUpperBound > 0 || docsUpperBound > 0) {
return
@@ -581,6 +585,7 @@
return lst;
}
+ @Override
public String toString() {
return "DirectUpdateHandler2" + getStatistics();
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/SolrIndexWriter.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/SolrIndexWriter.java Fri Oct 3 14:26:50 2008
@@ -152,6 +152,7 @@
* ****
*/
+ @Override
public void close() throws IOException {
log.debug("Closing Writer " + name);
super.close();
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/UpdateCommand.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/UpdateCommand.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/UpdateCommand.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/UpdateCommand.java Fri Oct 3 14:26:50 2008
@@ -29,6 +29,7 @@
this.commandName = commandName;
}
+ @Override
public String toString() {
return commandName;
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/UpdateHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/UpdateHandler.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/UpdateHandler.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/UpdateHandler.java Fri Oct 3 14:26:50 2008
@@ -167,6 +167,7 @@
this.searcher = searcher;
}
+ @Override
public void collect(int doc, float score) {
try {
searcher.getReader().deleteDocument(doc);
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java Fri Oct 3 14:26:50 2008
@@ -52,7 +52,7 @@
@Override
public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp, UpdateRequestProcessor next) {
- boolean doLog = LogUpdateProcessor.log.isInfoEnabled();
+ boolean doLog = UpdateRequestProcessor.log.isInfoEnabled();
// LogUpdateProcessor.log.error("Will Log=" + doLog);
if( doLog ) {
// only create the log processor if we will use it
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/AbstractSolrTestCase.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/AbstractSolrTestCase.java Fri Oct 3 14:26:50 2008
@@ -91,13 +91,14 @@
* </ul>
*
*/
+ @Override
public void setUp() throws Exception {
dataDir = new File(System.getProperty("java.io.tmpdir")
+ System.getProperty("file.separator")
+ getClass().getName() + "-" + System.currentTimeMillis());
dataDir.mkdirs();
- solrConfig = h.createConfig(getSolrConfigFile());
+ solrConfig = TestHarness.createConfig(getSolrConfigFile());
h = new TestHarness( dataDir.getAbsolutePath(),
solrConfig,
getSchemaFile());
@@ -110,6 +111,7 @@
* to delete dataDir, unless the system property "solr.test.leavedatadir"
* is set.
*/
+ @Override
public void tearDown() throws Exception {
if (h != null) { h.close(); }
String skip = System.getProperty("solr.test.leavedatadir");
@@ -202,13 +204,13 @@
* @see TestHarness#optimize
*/
public String optimize(String... args) {
- return h.optimize();
+ return TestHarness.optimize();
}
/**
* @see TestHarness#commit
*/
public String commit(String... args) {
- return h.commit();
+ return TestHarness.commit();
}
/**
@@ -258,7 +260,7 @@
* @see TestHarness#deleteById
*/
public String delI(String id) {
- return h.deleteById(id);
+ return TestHarness.deleteById(id);
}
/**
* Generates a <delete>... XML string for an query
@@ -266,7 +268,7 @@
* @see TestHarness#deleteByQuery
*/
public String delQ(String q) {
- return h.deleteByQuery(q);
+ return TestHarness.deleteByQuery(q);
}
/**
@@ -277,7 +279,7 @@
*/
public Doc doc(String... fieldsAndValues) {
Doc d = new Doc();
- d.xml = h.makeSimpleDoc(fieldsAndValues).toString();
+ d.xml = TestHarness.makeSimpleDoc(fieldsAndValues).toString();
return d;
}
@@ -308,6 +310,7 @@
/** Neccessary to make method signatures un-ambiguous */
public static class Doc {
public String xml;
+ @Override
public String toString() { return xml; }
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/BoundedTreeSet.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/BoundedTreeSet.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/BoundedTreeSet.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/BoundedTreeSet.java Fri Oct 3 14:26:50 2008
@@ -55,11 +55,13 @@
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/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/CharArrayMap.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/CharArrayMap.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/CharArrayMap.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/CharArrayMap.java Fri Oct 3 14:26:50 2008
@@ -364,6 +364,7 @@
return old;
}
+ @Override
public String toString() {
return getKey() + '=' + getValue();
}
@@ -372,9 +373,11 @@
private class EntrySet extends AbstractSet<Map.Entry<String, V>> {
+ @Override
public EntryIterator iterator() {
return new EntryIterator();
}
+ @Override
public boolean contains(Object o) {
if (!(o instanceof Map.Entry))
return false;
@@ -385,12 +388,15 @@
Object v = get(key);
return v==null ? val==null : v.equals(val);
}
+ @Override
public boolean remove(Object o) {
throw new UnsupportedOperationException();
}
+ @Override
public int size() {
return count;
}
+ @Override
public void clear() {
CharArrayMap.this.clear();
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/HighFrequencyDictionary.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/HighFrequencyDictionary.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/HighFrequencyDictionary.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/HighFrequencyDictionary.java Fri Oct 3 14:26:50 2008
@@ -62,7 +62,7 @@
HighFrequencyIterator() {
try {
termEnum = reader.terms(new Term(field, ""));
- minNumDocs = (int)(thresh * (float)reader.numDocs());
+ minNumDocs = (int)(thresh * reader.numDocs());
} catch (IOException e) {
throw new RuntimeException(e);
}
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/OpenBitSet.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/OpenBitSet.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/OpenBitSet.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/OpenBitSet.java Fri Oct 3 14:26:50 2008
@@ -590,6 +590,7 @@
+ @Override
public Object clone() {
try {
OpenBitSet obs = (OpenBitSet)super.clone();
@@ -727,6 +728,7 @@
/** returns true if both sets have the same bits set */
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof OpenBitSet)) return false;
@@ -752,6 +754,7 @@
}
+ @Override
public int hashCode() {
long h = 0x98761234; // something non-zero for length==0
for (int i = bits.length; --i>=0;) {
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/SolrPluginUtils.java Fri Oct 3 14:26:50 2008
@@ -25,6 +25,7 @@
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.AppendedSolrParams;
import org.apache.solr.common.params.DefaultSolrParams;
+import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
@@ -93,15 +94,6 @@
req.setParams(p);
}
-
- /**
- * standard param for field list
- *
- * @deprecated Use org.apache.solr.common.params.CommonParams.FL.
- */
- @Deprecated
- public static String FL = org.apache.solr.common.params.CommonParams.FL;
-
/**
* SolrIndexSearch.numDocs(Query,Query) freaks out if the filtering
* query is null, so we use this workarround.
@@ -111,58 +103,7 @@
return (null == f) ? s.getDocSet(q).size() : s.numDocs(q,f);
- }
-
- /**
- * Returns the param, or the default if it's empty or not specified.
- * @deprecated use SolrParam.get(String,String)
- */
- public static String getParam(SolrQueryRequest req,
- String param, String def) {
-
- String v = req.getParam(param);
- // Note: parameters passed but given only white-space value are
- // considered equivalent to passing nothing for that parameter.
- if (null == v || "".equals(v.trim())) {
- return def;
- }
- return v;
- }
-
- /**
- * Treats the param value as a Number, returns the default if nothing is
- * there or if it's not a number.
- * @deprecated use SolrParam.getFloat(String,float)
- */
- public static Number getNumberParam(SolrQueryRequest req,
- String param, Number def) {
-
- Number r = def;
- String v = req.getParam(param);
- if (null == v || "".equals(v.trim())) {
- return r;
- }
- try {
- r = new Float(v);
- } catch (NumberFormatException e) {
- /* :NOOP" */
- }
- return r;
- }
-
- /**
- * Treats parameter value as a boolean. The string 'false' is false;
- * any other non-empty string is true.
- * @deprecated use SolrParam.getBool(String,boolean)
- */
- public static boolean getBooleanParam(SolrQueryRequest req,
- String param, boolean def) {
- String v = req.getParam(param);
- if (null == v || "".equals(v.trim())) {
- return def;
- }
- return !"false".equals(v.trim());
- }
+ }
private final static Pattern splitList=Pattern.compile(",| ");
@@ -259,84 +200,6 @@
}
}
- /**
- * <p>
- * Returns a NamedList containing many "standard" pieces of debugging
- * information.
- * </p>
- *
- * <ul>
- * <li>rawquerystring - the 'q' param exactly as specified by the client
- * </li>
- * <li>querystring - the 'q' param after any preprocessing done by the plugin
- * </li>
- * <li>parsedquery - the main query executed formated by the Solr
- * QueryParsing utils class (which knows about field types)
- * </li>
- * <li>parsedquery_toString - the main query executed formated by it's
- * own toString method (in case it has internal state Solr
- * doesn't know about)
- * </li>
- * <li>expain - the list of score explanations for each document in
- * results against query.
- * </li>
- * <li>otherQuery - the query string specified in 'explainOther' query param.
- * </li>
- * <li>explainOther - the list of score explanations for each document in
- * results against 'otherQuery'
- * </li>
- * </ul>
- *
- * @param req the request we are dealing with
- * @param userQuery the users query as a string, after any basic
- * preprocessing has been done
- * @param query the query built from the userQuery
- * (and perhaps other clauses) that identifies the main
- * result set of the response.
- * @param results the main result set of the response
- * @deprecated Use doStandardDebug(SolrQueryRequest,String,Query,DocList) with setDefaults
- */
- public static NamedList doStandardDebug(SolrQueryRequest req,
- String userQuery,
- Query query,
- DocList results,
- CommonParams params)
- throws IOException {
-
- String debug = getParam(req, org.apache.solr.common.params.CommonParams.DEBUG_QUERY, params.debugQuery);
-
- NamedList dbg = null;
- if (debug!=null) {
- dbg = new SimpleOrderedMap();
-
- /* userQuery may have been pre-processes .. expose that */
- dbg.add("rawquerystring", req.getQueryString());
- dbg.add("querystring", userQuery);
-
- /* QueryParsing.toString isn't perfect, use it to see converted
- * values, use regular toString to see any attributes of the
- * underlying Query it may have missed.
- */
- dbg.add("parsedquery",QueryParsing.toString(query, req.getSchema()));
- dbg.add("parsedquery_toString", query.toString());
-
- dbg.add("explain", getExplainList
- (query, results, req.getSearcher(), req.getSchema()));
- String otherQueryS = req.getParam("explainOther");
- if (otherQueryS != null && otherQueryS.length() > 0) {
- DocList otherResults = doSimpleQuery
- (otherQueryS,req.getSearcher(), req.getSchema(),0,10);
- dbg.add("otherQuery",otherQueryS);
- dbg.add("explainOther", getExplainList
- (query, otherResults,
- req.getSearcher(),
- req.getSchema()));
- }
- }
-
- return dbg;
- }
-
/**
* <p>
@@ -762,6 +625,7 @@
* DisjunctionMaxQuery. (so yes: aliases which point at other
* aliases should work)
*/
+ @Override
protected Query getFieldQuery(String field, String queryText)
throws ParseException {
Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/TestHarness.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/TestHarness.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/TestHarness.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/util/TestHarness.java Fri Oct 3 14:26:50 2008
@@ -18,7 +18,11 @@
package org.apache.solr.util;
import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.ContentStream;
+import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.XML;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
@@ -29,6 +33,7 @@
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.QueryResponseWriter;
import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.request.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.w3c.dom.Document;
@@ -36,7 +41,6 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
@@ -44,9 +48,9 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.StringReader;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -201,12 +205,19 @@
*/
@Deprecated
public String update(String xml) {
-
- StringReader req = new StringReader(xml);
- StringWriter writer = new StringWriter(32000);
-
- updater.doLegacyUpdate(req, writer);
- return writer.toString();
+
+ ArrayList<ContentStream> streams = new ArrayList<ContentStream>();
+ streams.add( new ContentStreamBase.StringStream( xml ) );
+ SolrQueryRequestBase req = new SolrQueryRequestBase( core, new ModifiableSolrParams() ) {};
+ req.setContentStreams( streams );
+
+ SolrQueryResponse rsp = new SolrQueryResponse(); // ignored
+ rsp.getValues().add( "responseHeader", new SimpleOrderedMap() );
+ updater.handleRequest(req, rsp);
+ if( rsp.getException() != null ) {
+ return("<result status=\"1\"></result>"); //
+ }
+ return("<result status=\"0\"></result>"); // legacy
}