You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by bu...@apache.org on 2011/02/22 02:01:11 UTC
svn commit: r1073192 [26/32] - in /lucene/dev/branches/realtime_search: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/ant/
dev-tools/idea/lucene/contrib/demo/
dev-tools/idea/lucene/contrib/highlighter/ dev-tools/idea/lucene/...
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TextField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TextField.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TextField.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TextField.java Tue Feb 22 01:00:39 2011
@@ -49,6 +49,7 @@ import java.io.StringReader;
public class TextField extends FieldType {
protected boolean autoGeneratePhraseQueries = true;
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
properties |= TOKENIZED;
if (schema.getVersion()> 1.1f) properties &= ~OMIT_TF_POSITIONS;
@@ -62,10 +63,13 @@ public class TextField extends FieldType
return autoGeneratePhraseQueries;
}
+ @Override
public SortField getSortField(SchemaField field, boolean reverse) {
+ /* :TODO: maybe warn if isTokenized(), but doesn't use LimitTokenCountFilter in it's chain? */
return getStringSort(field, reverse);
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeStr(name, f.stringValue(), true);
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieDateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieDateField.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieDateField.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieDateField.java Tue Feb 22 01:00:39 2011
@@ -78,16 +78,13 @@ public class TrieDateField extends DateF
@Override
public SortField getSortField(SchemaField field, boolean top) {
+ field.checkSortability();
return new SortField(new LongValuesCreator( field.getName(), FieldCache.NUMERIC_UTILS_LONG_PARSER, CachedArrayCreator.CACHE_VALUES_AND_BITS ), top);
}
@Override
- public ValueSource getValueSource(SchemaField field) {
- return new TrieDateFieldSource( new LongValuesCreator( field.getName(), FieldCache.NUMERIC_UTILS_LONG_PARSER, CachedArrayCreator.CACHE_VALUES_AND_BITS ));
- }
-
- @Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
+ field.checkFieldCacheSource(parser);
return new TrieDateFieldSource( new LongValuesCreator( field.getName(), FieldCache.NUMERIC_UTILS_LONG_PARSER, CachedArrayCreator.CACHE_VALUES_AND_BITS ));
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieField.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/schema/TrieField.java Tue Feb 22 01:00:39 2011
@@ -121,7 +121,10 @@ public class TrieField extends FieldType
}
}
+ @Override
public SortField getSortField(SchemaField field, boolean top) {
+ field.checkSortability();
+
int flags = CachedArrayCreator.CACHE_VALUES_AND_BITS;
Object missingValue = null;
boolean sortMissingLast = on( SORT_MISSING_LAST, properties );
@@ -176,6 +179,7 @@ public class TrieField extends FieldType
@Override
public ValueSource getValueSource(SchemaField field, QParser qparser) {
+ field.checkFieldCacheSource(qparser);
int flags = CachedArrayCreator.CACHE_VALUES_AND_BITS;
switch (type) {
case INTEGER:
@@ -194,6 +198,7 @@ public class TrieField extends FieldType
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
byte[] arr = f.getBinaryValue();
if (arr==null) {
@@ -586,6 +591,7 @@ class TrieDateFieldSource extends LongFi
super(creator);
}
+ @Override
public String description() {
return "date(" + field + ')';
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/BitDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/BitDocSet.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/BitDocSet.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/BitDocSet.java Tue Feb 22 01:00:39 2011
@@ -113,15 +113,18 @@ public class BitDocSet extends DocSetBas
*
* @return the <b>internal</b> OpenBitSet that should <b>not</b> be modified.
*/
+ @Override
public OpenBitSet getBits() {
return bits;
}
+ @Override
public void add(int doc) {
bits.set(doc);
size=-1; // invalidate size
}
+ @Override
public void addUnique(int doc) {
bits.set(doc);
size=-1; // invalidate size
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -43,12 +43,14 @@ public class BoostQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
QParser baseParser;
ValueSource vs;
String b;
+ @Override
public Query parse() throws ParseException {
b = localParams.get(BOOSTFUNC);
baseParser = subQuery(localParams.get(QueryParsing.V), null);
@@ -65,14 +67,17 @@ public class BoostQParserPlugin extends
}
+ @Override
public String[] getDefaultHighlightFields() {
return baseParser.getDefaultHighlightFields();
}
+ @Override
public Query getHighlightQuery() throws ParseException {
return baseParser.getHighlightQuery();
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
// encapsulate base debug info in a sub-list?
baseParser.addDebugInfo(debugInfo);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DisMaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DisMaxQParser.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DisMaxQParser.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DisMaxQParser.java Tue Feb 22 01:00:39 2011
@@ -79,6 +79,7 @@ public class DisMaxQParser extends QPars
protected QParser altQParser;
+ @Override
public Query parse() throws ParseException {
SolrParams solrParams = localParams == null ? params : new DefaultSolrParams(localParams, params);
queryFields = SolrPluginUtils.parseFieldBoosts(solrParams.getParams(DisMaxParams.QF));
@@ -244,6 +245,7 @@ public class DisMaxQParser extends QPars
return parsedUserQuery == null ? altUserQuery : parsedUserQuery;
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
super.addDebugInfo(debugInfo);
debugInfo.add("altquerystring", altUserQuery);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -115,6 +115,7 @@ public class DisMaxQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new DisMaxQParser(qstr, localParams, params, req);
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DocSet.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DocSet.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DocSet.java Tue Feb 22 01:00:39 2011
@@ -152,6 +152,7 @@ public interface DocSet /* extends Colle
abstract class DocSetBase implements DocSet {
// Not implemented efficiently... for testing purposes only
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof DocSet)) return false;
DocSet other = (DocSet)obj;
@@ -247,9 +248,8 @@ abstract class DocSetBase implements Doc
return new Filter() {
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext ctx) throws IOException {
- IndexReader.AtomicReaderContext context = (IndexReader.AtomicReaderContext)ctx; // TODO: remove after lucene migration
- IndexReader reader = ctx.reader;
+ public DocIdSet getDocIdSet(AtomicReaderContext context) throws IOException {
+ IndexReader reader = context.reader;
if (context.isTopLevel) {
return bs;
@@ -260,6 +260,7 @@ abstract class DocSetBase implements Doc
final int max = base + maxDoc; // one past the max doc in this segment.
return new DocIdSet() {
+ @Override
public DocIdSetIterator iterator() throws IOException {
return new DocIdSetIterator() {
int pos=base-1;
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DocSetHitCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DocSetHitCollector.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DocSetHitCollector.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/DocSetHitCollector.java Tue Feb 22 01:00:39 2011
@@ -45,6 +45,7 @@ class DocSetCollector extends Collector
this.maxDoc = maxDoc;
this.scratch = new int[smallSetSize];
}
+ @Override
public void collect(int doc) throws IOException {
doc += base;
// optimistically collect the first docs in an array
@@ -77,13 +78,16 @@ class DocSetCollector extends Collector
}
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
this.base = context.docBase;
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return false;
}
@@ -97,6 +101,7 @@ class DocSetDelegateCollector extends Do
this.collector = collector;
}
+ @Override
public void collect(int doc) throws IOException {
collector.collect(doc);
@@ -120,6 +125,7 @@ class DocSetDelegateCollector extends Do
pos++;
}
+ @Override
public DocSet getDocSet() {
if (pos<=scratch.length) {
// assumes docs were collected in sorted order!
@@ -131,10 +137,12 @@ class DocSetDelegateCollector extends Do
}
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
collector.setScorer(scorer);
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
collector.setNextReader(context);
this.base = context.docBase;
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -48,6 +48,7 @@ import java.io.IOException;
/**
* An advanced multi-field query parser.
+ * @lucene.experimental
*/
public class ExtendedDismaxQParserPlugin extends QParserPlugin {
public static final String NAME = "edismax";
@@ -55,6 +56,7 @@ public class ExtendedDismaxQParserPlugin
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new ExtendedDismaxQParser(qstr, localParams, params, req);
}
@@ -96,6 +98,7 @@ class ExtendedDismaxQParser extends QPar
private QParser altQParser;
+ @Override
public Query parse() throws ParseException {
SolrParams localParams = getLocalParams();
SolrParams params = getParams();
@@ -483,6 +486,7 @@ class ExtendedDismaxQParser extends QPar
return parsedUserQuery == null ? altUserQuery : parsedUserQuery;
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
super.addDebugInfo(debugInfo);
debugInfo.add("altquerystring", altUserQuery);
@@ -820,6 +824,7 @@ class ExtendedDismaxQParser extends QPar
analyzer.removeStopFilter = remove;
}
+ @Override
protected Query getBooleanQuery(List clauses, boolean disableCoord) throws ParseException {
Query q = super.getBooleanQuery(clauses, disableCoord);
if (q != null) {
@@ -834,6 +839,7 @@ class ExtendedDismaxQParser extends QPar
////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
+ @Override
protected void addClause(List clauses, int conj, int mods, Query q) {
//System.out.println("addClause:clauses="+clauses+" conj="+conj+" mods="+mods+" q="+q);
super.addClause(clauses, conj, mods, q);
@@ -1075,6 +1081,7 @@ final class ExtendedAnalyzer extends Ana
this.queryAnalyzer = parser.getReq().getSchema().getQueryAnalyzer();
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader) {
if (!removeStopFilter) {
return queryAnalyzer.tokenStream(fieldName, reader);
@@ -1138,10 +1145,12 @@ final class ExtendedAnalyzer extends Ana
return newa.tokenStream(fieldName, reader);
}
+ @Override
public int getPositionIncrementGap(String fieldName) {
return queryAnalyzer.getPositionIncrementGap(fieldName);
}
+ @Override
public TokenStream reusableTokenStream(String fieldName, Reader reader) throws IOException {
if (!removeStopFilter) {
return queryAnalyzer.reusableTokenStream(fieldName, reader);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FastLRUCache.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FastLRUCache.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FastLRUCache.java Tue Feb 22 01:00:39 2011
@@ -274,6 +274,7 @@ public class FastLRUCache<K,V> extends S
return lst;
}
+ @Override
public String toString() {
return name + getStatistics().toString();
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -38,8 +38,10 @@ public class FieldQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
+ @Override
public Query parse() throws ParseException {
String field = localParams.get(QueryParsing.F);
String queryText = localParams.get(QueryParsing.V);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionQParser.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionQParser.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionQParser.java Tue Feb 22 01:00:39 2011
@@ -56,6 +56,7 @@ public class FunctionQParser extends QPa
return parseMultipleSources;
}
+ @Override
public Query parse() throws ParseException {
sp = new QueryParsing.StrParser(getString());
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -31,6 +31,7 @@ public class FunctionQParserPlugin exten
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new FunctionQParser(qstr, localParams, params, req);
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -39,11 +39,13 @@ public class FunctionRangeQParserPlugin
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
ValueSource vs;
String funcStr;
+ @Override
public Query parse() throws ParseException {
funcStr = localParams.get(QueryParsing.V, null);
Query funcQ = subQuery(funcStr, FunctionQParserPlugin.NAME).parse();
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/Grouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/Grouping.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/Grouping.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/Grouping.java Tue Feb 22 01:00:39 2011
@@ -77,10 +77,11 @@ public class Grouping {
int docsToCollect = getMax(off, len, max);
// TODO: implement a DocList impl that doesn't need to start at offset=0
- TopDocs topDocs = collector.topDocs(0, docsToCollect);
+ TopDocs topDocs = collector.topDocs(0, Math.max(docsToCollect,1)); // 0 isn't supported as a valid value
+ int docsCollected = Math.min(docsToCollect, topDocs.scoreDocs.length);
- int ids[] = new int[topDocs.scoreDocs.length];
- float[] scores = needScores ? new float[topDocs.scoreDocs.length] : null;
+ int ids[] = new int[docsCollected];
+ float[] scores = needScores ? new float[docsCollected] : null;
for (int i=0; i<ids.length; i++) {
ids[i] = topDocs.scoreDocs[i].doc;
if (scores != null)
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LRUCache.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LRUCache.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LRUCache.java Tue Feb 22 01:00:39 2011
@@ -77,6 +77,7 @@ public class LRUCache<K,V> extends SolrC
description += ')';
map = new LinkedHashMap<K,V>(initialSize, 0.75f, true) {
+ @Override
protected boolean removeEldestEntry(Map.Entry eldest) {
if (size() > limit) {
// increment evictions regardless of state.
@@ -277,6 +278,7 @@ public class LRUCache<K,V> extends SolrC
return lst;
}
+ @Override
public String toString() {
return name + getStatistics().toString();
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -41,6 +41,7 @@ public class LuceneQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new LuceneQParser(qstr, localParams, params, req);
}
@@ -55,6 +56,7 @@ class LuceneQParser extends QParser {
}
+ @Override
public Query parse() throws ParseException {
String qstr = getString();
if (qstr == null) return null;
@@ -73,6 +75,7 @@ class LuceneQParser extends QParser {
}
+ @Override
public String[] getDefaultHighlightFields() {
return lparser == null ? new String[]{} : new String[]{lparser.getField()};
}
@@ -87,6 +90,7 @@ class OldLuceneQParser extends LuceneQPa
super(qstr, localParams, params, req);
}
+ @Override
public Query parse() throws ParseException {
// handle legacy "query;sort" syntax
if (getLocalParams() == null) {
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java Tue Feb 22 01:00:39 2011
@@ -46,6 +46,7 @@ class LuceneQueryOptimizer {
*/
public LuceneQueryOptimizer(final int cacheSize, float threshold) {
this.cache = new LinkedHashMap(cacheSize, 0.75f, true) {
+ @Override
protected boolean removeEldestEntry(Map.Entry eldest) {
return size() > cacheSize; // limit size of cache
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java Tue Feb 22 01:00:39 2011
@@ -47,6 +47,7 @@ public class MissingStringLastComparator
this.missingValueProxy=missingValueProxy;
}
+ @Override
public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException {
return new TermOrdValComparator_SML(numHits, fieldname, sortPos, reversed, missingValueProxy);
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/MutableValue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/MutableValue.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/MutableValue.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/MutableValue.java Tue Feb 22 01:00:39 2011
@@ -50,6 +50,7 @@ public abstract class MutableValue imple
return (c1 == c2) && this.equalsSameType(other);
}
+ @Override
public abstract int hashCode();
@Override
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -38,25 +38,30 @@ public class NestedQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
QParser baseParser;
ValueSource vs;
String b;
+ @Override
public Query parse() throws ParseException {
baseParser = subQuery(localParams.get(QueryParsing.V), null);
return baseParser.getQuery();
}
+ @Override
public String[] getDefaultHighlightFields() {
return baseParser.getDefaultHighlightFields();
}
+ @Override
public Query getHighlightQuery() throws ParseException {
return baseParser.getHighlightQuery();
}
+ @Override
public void addDebugInfo(NamedList<Object> debugInfo) {
// encapsulate base debug info in a sub-list?
baseParser.addDebugInfo(debugInfo);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -31,6 +31,7 @@ public class OldLuceneQParserPlugin exte
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new OldLuceneQParser(qstr, localParams, params, req);
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -36,8 +36,10 @@ public class PrefixQParserPlugin extends
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
+ @Override
public Query parse() throws ParseException {
return new PrefixQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/QueryParsing.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/QueryParsing.java Tue Feb 22 01:00:39 2011
@@ -330,16 +330,9 @@ public class QueryParsing {
}
throw new SolrException
(SolrException.ErrorCode.BAD_REQUEST,
- "sort param fiedl can't be found: " + field);
+ "sort param field can't be found: " + field);
}
-
- // TODO: remove this - it should be up to the FieldType
- if (!sf.indexed()) {
- throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
- "can not sort on unindexed field: "
- + field);
- }
- lst.add(sf.getType().getSortField(sf, top));
+ lst.add(sf.getSortField(top));
}
}
@@ -828,6 +821,7 @@ public class QueryParsing {
return pos < end ? val.charAt(pos) : 0;
}
+ @Override
public String toString() {
return "'" + val + "'" + ", pos=" + pos;
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/QueryResultKey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/QueryResultKey.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/QueryResultKey.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/QueryResultKey.java Tue Feb 22 01:00:39 2011
@@ -56,10 +56,12 @@ public final class QueryResultKey {
hc = h;
}
+ @Override
public int hashCode() {
return hc;
}
+ @Override
public boolean equals(Object o) {
if (o==this) return true;
if (!(o instanceof QueryResultKey)) return false;
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/RawQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/RawQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/RawQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/RawQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -40,8 +40,10 @@ public class RawQParserPlugin extends QP
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
+ @Override
public Query parse() throws ParseException {
return new TermQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrCacheBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrCacheBase.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrCacheBase.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrCacheBase.java Tue Feb 22 01:00:39 2011
@@ -55,6 +55,7 @@ public abstract class SolrCacheBase {
throw new RuntimeException("Can't parse autoWarm value: " + configValue, e);
}
}
+ @Override
public String toString() {
return strVal;
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java Tue Feb 22 01:00:39 2011
@@ -41,14 +41,17 @@ public class SolrConstantScoreQuery exte
}
/** Returns the encapsulated filter */
+ @Override
public Filter getFilter() {
return filter;
}
+ @Override
public Query rewrite(IndexReader reader) throws IOException {
return this;
}
+ @Override
public void extractTerms(Set terms) {
// OK to not add any terms when used for MultiSearcher,
// but may not be OK for highlighting
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java Tue Feb 22 01:00:39 2011
@@ -184,6 +184,7 @@ public class SolrIndexSearcher extends I
}
+ @Override
public String toString() {
return name;
}
@@ -207,6 +208,7 @@ public class SolrIndexSearcher extends I
*
* In particular, the underlying reader and any cache's in use are closed.
*/
+ @Override
public void close() throws IOException {
if (cachingEnabled) {
StringBuilder sb = new StringBuilder();
@@ -355,7 +357,7 @@ public class SolrIndexSearcher extends I
/**
* @return the indexDir on which this searcher is opened
- * @see org.apache.solr.search.SolrIndexSearcher#SolrIndexSearcher(org.apache.solr.core.SolrCore, org.apache.solr.schema.IndexSchema, String, String, boolean)
+ * @see #SolrIndexSearcher(SolrCore, IndexSchema, String, Directory, boolean)
*/
public String getIndexDir() {
return indexDir;
@@ -390,6 +392,7 @@ public class SolrIndexSearcher extends I
/**
* Retrieve the {@link Document} instance corresponding to the document id.
*/
+ @Override
public Document doc(int i) throws IOException {
return doc(i, (Set<String>)null);
}
@@ -398,6 +401,7 @@ public class SolrIndexSearcher extends I
* This method does not currently use the Solr document cache.
*
* @see IndexReader#document(int, FieldSelector) */
+ @Override
public Document doc(int n, FieldSelector fieldSelector) throws IOException {
return getIndexReader().document(n, fieldSelector);
}
@@ -1129,13 +1133,17 @@ public class SolrIndexSearcher extends I
if (!needScores) {
collector = new Collector () {
+ @Override
public void setScorer(Scorer scorer) throws IOException {
}
+ @Override
public void collect(int doc) throws IOException {
numHits[0]++;
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -1143,16 +1151,20 @@ public class SolrIndexSearcher extends I
} else {
collector = new Collector() {
Scorer scorer;
+ @Override
public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
+ @Override
public void collect(int doc) throws IOException {
numHits[0]++;
float score = scorer.score();
if (score > topscore[0]) topscore[0]=score;
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return true;
}
@@ -1250,16 +1262,20 @@ public class SolrIndexSearcher extends I
} else {
collector = setCollector = new DocSetDelegateCollector(smallSetSize, maxDoc, new Collector() {
Scorer scorer;
- public void setScorer(Scorer scorer) throws IOException {
+ @Override
+ public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
- public void collect(int doc) throws IOException {
+ @Override
+ public void collect(int doc) throws IOException {
float score = scorer.score();
if (score > topscore[0]) topscore[0]=score;
}
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ @Override
+ public void setNextReader(AtomicReaderContext context) throws IOException {
}
- public boolean acceptsDocsOutOfOrder() {
+ @Override
+ public boolean acceptsDocsOutOfOrder() {
return false;
}
});
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SortedIntDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SortedIntDocSet.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SortedIntDocSet.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SortedIntDocSet.java Tue Feb 22 01:00:39 2011
@@ -552,8 +552,7 @@ public class SortedIntDocSet extends Doc
int lastEndIdx = 0;
@Override
- public DocIdSet getDocIdSet(AtomicReaderContext contextX) throws IOException {
- AtomicReaderContext context = (AtomicReaderContext)contextX; // TODO: remove after lucene migration
+ public DocIdSet getDocIdSet(AtomicReaderContext context) throws IOException {
IndexReader reader = context.reader;
final int base = context.docBase;
@@ -587,6 +586,7 @@ public class SortedIntDocSet extends Doc
return new DocIdSet() {
+ @Override
public DocIdSetIterator iterator() throws IOException {
return new DocIdSetIterator() {
int idx = startIdx;
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -31,6 +31,7 @@ public class SpatialBoxQParserPlugin ext
return new SpatialFilterQParser(qstr, localParams, params, req, true);
}
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/TermQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/TermQParserPlugin.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/TermQParserPlugin.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/TermQParserPlugin.java Tue Feb 22 01:00:39 2011
@@ -47,8 +47,10 @@ public class TermQParserPlugin extends Q
public void init(NamedList args) {
}
+ @Override
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
+ @Override
public Query parse() throws ParseException {
String fname = localParams.get(QueryParsing.F);
FieldType ft = req.getSchema().getFieldTypeNoEx(fname);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ValueSourceParser.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ValueSourceParser.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/ValueSourceParser.java Tue Feb 22 01:00:39 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();
@@ -112,14 +117,8 @@ public abstract class ValueSourceParser
return new LinearFloatFunction(source, slope, intercept);
}
});
- addParser("max", new ValueSourceParser() {
- public ValueSource parse(FunctionQParser fp) throws ParseException {
- ValueSource source = fp.parseValueSource();
- float val = fp.parseFloat();
- return new MaxFloatFunction(source, val);
- }
- });
addParser("recip", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource source = fp.parseValueSource();
float m = fp.parseFloat();
@@ -129,6 +128,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 +137,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 +145,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 +157,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 +174,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 +183,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 +192,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 +210,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 +228,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 +237,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 +248,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 +289,7 @@ public abstract class ValueSourceParser
});
addParser("ghhsin", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
double radius = fp.parseDouble();
@@ -285,6 +301,7 @@ public abstract class ValueSourceParser
});
addParser("geohash", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource lat = fp.parseValueSource();
@@ -294,6 +311,7 @@ public abstract class ValueSourceParser
}
});
addParser("strdist", new ValueSourceParser() {
+ @Override
public ValueSource parse(FunctionQParser fp) throws ParseException {
ValueSource str1 = fp.parseValueSource();
@@ -319,117 +337,152 @@ 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(new Double2Parser("max") {
+ @Override
+ public double func(int doc, DocValues a, DocValues b) {
+ return Math.max(a.doubleVal(doc), b.doubleVal(doc));
+ }
+ });
+ addParser(new Double2Parser("min") {
+ @Override
+ public double func(int doc, DocValues a, DocValues b) {
+ return Math.min(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 +492,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 +504,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 +518,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 +526,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 +534,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 +542,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 +550,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 +558,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 +662,7 @@ public abstract class ValueSourceParser
class DateValueSourceParser extends ValueSourceParser {
DateField df = new TrieDateField();
+ @Override
public void init(NamedList args) {
}
@@ -619,6 +683,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 +720,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 +734,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 +748,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 +777,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 +874,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 +884,7 @@ abstract class DoubleParser extends Name
super(source);
}
+ @Override
public String name() {
return DoubleParser.this.name();
}
@@ -810,21 +893,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 +930,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 +948,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 +989,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 +999,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/realtime_search/solr/src/java/org/apache/solr/search/function/BoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/BoostedQuery.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/BoostedQuery.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/BoostedQuery.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/ByteFieldSource.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/ConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/ConstValueSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/ConstValueSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/ConstValueSource.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DivFloatFunction.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DocFreqValueSource.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DoubleConstValueSource.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/DualFloatFunction.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FieldCacheSource.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FileFloatSource.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/FloatFieldSource.java Tue Feb 22 01:00:39 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/realtime_search/solr/src/java/org/apache/solr/search/function/IntFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/IntFieldSource.java?rev=1073192&r1=1073191&r2=1073192&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/IntFieldSource.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/search/function/IntFieldSource.java Tue Feb 22 01:00:39 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);
}