You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2012/12/11 15:34:28 UTC
svn commit: r1420195 [11/13] - in /lucene/dev/trunk:
lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/
lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/
lucene/analysis/common/src/java/org/apache/lucene/analysis/br/ lucene/ana...
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java Tue Dec 11 14:31:01 2012
@@ -52,32 +52,38 @@ public abstract class SolrQueryRequestBa
this.params = this.origParams = params;
}
+ @Override
public Map<Object,Object> getContext() {
// SolrQueryRequest as a whole isn't thread safe, and this isn't either.
if (context==null) context = new HashMap<Object,Object>();
return context;
}
+ @Override
public SolrParams getParams() {
return params;
}
+ @Override
public SolrParams getOriginalParams() {
return origParams;
}
+ @Override
public void setParams(SolrParams params) {
this.params = params;
}
protected final long startTime=System.currentTimeMillis();
// Get the start time of this request in milliseconds
+ @Override
public long getStartTime() {
return startTime;
}
// The index searcher associated with this request
protected RefCounted<SolrIndexSearcher> searcherHolder;
+ @Override
public SolrIndexSearcher getSearcher() {
if(core == null) return null;//a request for a core admin will no have a core
// should this reach out and get a searcher from the core singleton, or
@@ -92,11 +98,13 @@ public abstract class SolrQueryRequestBa
}
// The solr core (coordinator, etc) associated with this request
+ @Override
public SolrCore getCore() {
return core;
}
// The index schema associated with this request
+ @Override
public IndexSchema getSchema() {
//a request for a core admin will no have a core
return core == null? null: core.getSchema();
@@ -106,6 +114,7 @@ public abstract class SolrQueryRequestBa
* Frees resources associated with this request, this method <b>must</b>
* be called when the object is no longer in use.
*/
+ @Override
public void close() {
if (searcherHolder!=null) {
searcherHolder.decref();
@@ -115,6 +124,7 @@ public abstract class SolrQueryRequestBa
/** A Collection of ContentStreams passed to the request
*/
+ @Override
public Iterable<ContentStream> getContentStreams() {
return streams;
}
@@ -123,6 +133,7 @@ public abstract class SolrQueryRequestBa
streams = s;
}
+ @Override
public String getParamString() {
return origParams.toString();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -43,6 +43,7 @@ public class BinaryResponseWriter implem
private static final Logger LOG = LoggerFactory.getLogger(BinaryResponseWriter.class);
public static final Set<Class> KNOWN_TYPES = new HashSet<Class>();
+ @Override
public void write(OutputStream out, SolrQueryRequest req, SolrQueryResponse response) throws IOException {
Resolver resolver = new Resolver(req, response.getReturnFields());
Boolean omitHeader = req.getParams().getBool(CommonParams.OMIT_HEADER);
@@ -51,14 +52,17 @@ public class BinaryResponseWriter implem
codec.marshal(response.getValues(), out);
}
+ @Override
public void write(Writer writer, SolrQueryRequest request, SolrQueryResponse response) throws IOException {
throw new RuntimeException("This is a binary writer , Cannot write to a characterstream");
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
return "application/octet-stream";
}
+ @Override
public void init(NamedList args) {
/* NOOP */
}
@@ -78,6 +82,7 @@ public class BinaryResponseWriter implem
this.returnFields = returnFields;
}
+ @Override
public Object resolve(Object o, JavaBinCodec codec) throws IOException {
if (o instanceof ResultContext) {
writeResults((ResultContext) o, codec);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -45,9 +45,11 @@ import java.util.*;
public class CSVResponseWriter implements QueryResponseWriter {
+ @Override
public void init(NamedList n) {
}
+ @Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
CSVWriter w = new CSVWriter(writer, req, rsp);
try {
@@ -57,6 +59,7 @@ public class CSVResponseWriter implement
}
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
// using the text/plain allows this to be viewed in the browser easily
return CONTENT_TYPE_TEXT_UTF8;
@@ -352,12 +355,14 @@ class CSVWriter extends TextResponseWrit
public void writeNamedList(String name, NamedList val) throws IOException {
}
+ @Override
public void writeStartDocumentList(String name,
long start, int size, long numFound, Float maxScore) throws IOException
{
// nothing
}
+ @Override
public void writeEndDocumentList() throws IOException
{
// nothing
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -45,6 +45,7 @@ public class JSONResponseWriter implemen
private String contentType = CONTENT_TYPE_JSON_UTF8;
+ @Override
public void init(NamedList namedList) {
String contentType = (String) namedList.get("content-type");
if (contentType != null) {
@@ -52,6 +53,7 @@ public class JSONResponseWriter implemen
}
}
+ @Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
JSONWriter w = new JSONWriter(writer, req, rsp);
try {
@@ -61,6 +63,7 @@ public class JSONResponseWriter implemen
}
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
return contentType;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -26,11 +26,13 @@ import org.apache.solr.request.SolrQuery
public class PHPResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_PHP_UTF8="text/x-php;charset=UTF-8";
+ @Override
public void init(NamedList n) {
/* NOOP */
}
- public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
+ @Override
+public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
PHPWriter w = new PHPWriter(writer, req, rsp);
try {
w.writeResponse();
@@ -39,6 +41,7 @@ public class PHPResponseWriter implement
}
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
return CONTENT_TYPE_TEXT_UTF8;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -41,10 +41,12 @@ import org.apache.solr.search.ReturnFiel
public class PHPSerializedResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_PHP_UTF8="text/x-php-serialized;charset=UTF-8";
+ @Override
public void init(NamedList n) {
}
- public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
+ @Override
+public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
PHPSerializedWriter w = new PHPSerializedWriter(writer, req, rsp);
try {
w.writeResponse();
@@ -53,6 +55,7 @@ public class PHPSerializedResponseWriter
}
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
return CONTENT_TYPE_TEXT_UTF8;
}
@@ -82,6 +85,7 @@ class PHPSerializedWriter extends JSONWr
+ @Override
public void writeStartDocumentList(String name,
long start, int size, long numFound, Float maxScore) throws IOException
{
@@ -99,6 +103,7 @@ class PHPSerializedWriter extends JSONWr
writeArrayOpener(size);
}
+ @Override
public void writeEndDocumentList() throws IOException
{
writeArrayCloser(); // doc list
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -26,10 +26,12 @@ import org.apache.solr.request.SolrQuery
public class PythonResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_PYTHON_ASCII="text/x-python;charset=US-ASCII";
+ @Override
public void init(NamedList n) {
/* NOOP */
}
+ @Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
PythonWriter w = new PythonWriter(writer, req, rsp);
try {
@@ -39,13 +41,16 @@ public class PythonResponseWriter implem
}
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
return CONTENT_TYPE_TEXT_ASCII;
}
}
class PythonWriter extends NaNFloatWriter {
+ @Override
protected String getNaN() { return "float('NaN')"; }
+ @Override
protected String getInf() { return "float('Inf')"; }
public PythonWriter(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -80,6 +80,7 @@ public interface QueryResponseWriter ext
* may be specified when declaring a response writer in
* solrconfig.xml
*/
+ @Override
public void init(NamedList args);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -54,6 +54,7 @@ public class RawResponseWriter implement
public static final String CONTENT = "content";
private String _baseWriter = null;
+ @Override
public void init(NamedList n) {
if( n != null ) {
Object base = n.get( "base" );
@@ -69,6 +70,7 @@ public class RawResponseWriter implement
return request.getCore().getQueryResponseWriter( _baseWriter );
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
Object obj = response.getValues().get( CONTENT );
if( obj != null && (obj instanceof ContentStream ) ) {
@@ -77,6 +79,7 @@ public class RawResponseWriter implement
return getBaseWriter( request ).getContentType( request, response );
}
+ @Override
public void write(Writer writer, SolrQueryRequest request, SolrQueryResponse response) throws IOException
{
Object obj = response.getValues().get( CONTENT );
@@ -95,6 +98,7 @@ public class RawResponseWriter implement
}
}
+@Override
public void write(OutputStream out, SolrQueryRequest request,
SolrQueryResponse response) throws IOException {
Object obj = response.getValues().get( CONTENT );
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -25,11 +25,13 @@ import org.apache.solr.request.SolrQuery
public class RubyResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_RUBY_UTF8="text/x-ruby;charset=UTF-8";
+ @Override
public void init(NamedList n) {
/* NOOP */
}
- public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
+ @Override
+public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
RubyWriter w = new RubyWriter(writer, req, rsp);
try {
w.writeResponse();
@@ -38,6 +40,7 @@ public class RubyResponseWriter implemen
}
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
return CONTENT_TYPE_TEXT_UTF8;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -27,10 +27,12 @@ import org.apache.solr.request.SolrQuery
*
*/
public class XMLResponseWriter implements QueryResponseWriter {
+ @Override
public void init(NamedList n) {
/* NOOP */
}
+ @Override
public void write(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) throws IOException {
XMLWriter w = new XMLWriter(writer, req, rsp);
try {
@@ -40,6 +42,7 @@ public class XMLResponseWriter implement
}
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
return CONTENT_TYPE_XML_UTF8;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java Tue Dec 11 14:31:01 2012
@@ -56,6 +56,7 @@ public class XSLTResponseWriter implemen
private static final Logger log = LoggerFactory.getLogger(XSLTResponseWriter.class);
private static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
+ @Override
public void init(NamedList n) {
final SolrParams p = SolrParams.toSolrParams(n);
xsltCacheLifetimeSeconds = p.getInt(XSLT_CACHE_PARAM,XSLT_CACHE_DEFAULT);
@@ -63,6 +64,7 @@ public class XSLTResponseWriter implemen
}
+ @Override
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
Transformer t = null;
try {
@@ -91,6 +93,7 @@ public class XSLTResponseWriter implemen
return mediaType;
}
+ @Override
public void write(Writer writer, SolrQueryRequest request, SolrQueryResponse response) throws IOException {
final Transformer t = getTransformer(request);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExcludedMarkerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExcludedMarkerFactory.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExcludedMarkerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/ExcludedMarkerFactory.java Tue Dec 11 14:31:01 2012
@@ -49,6 +49,7 @@ class ExcludedTransformer extends BaseEd
super(name, idFieldName, ft);
}
+ @Override
protected Set<String> getIdSet() {
return (Set<String>)context.req.getContext().get(QueryElevationComponent.EXCLUDED);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java Tue Dec 11 14:31:01 2012
@@ -34,6 +34,7 @@ public abstract class TransformerFactory
{
protected String defaultUserArgs = null;
+ @Override
public void init(NamedList args) {
defaultUserArgs = (String)args.get( "args" );
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java Tue Dec 11 14:31:01 2012
@@ -93,6 +93,7 @@ public abstract class AbstractSubTypeFie
return proto;
}
+ @Override
public void inform(IndexSchema schema) {
//Can't do this until here b/c the Dynamic Fields are not initialized until here.
if (subType != null) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/CurrencyField.java Tue Dec 11 14:31:01 2012
@@ -192,6 +192,7 @@ public class CurrencyField extends Field
*
* @param indexSchema The index schema.
*/
+ @Override
public void inform(IndexSchema indexSchema) {
createDynamicCurrencyField(FIELD_SUFFIX_CURRENCY, fieldTypeCurrency);
createDynamicCurrencyField(FIELD_SUFFIX_AMOUNT_RAW, fieldTypeAmountRaw);
@@ -202,6 +203,7 @@ public class CurrencyField extends Field
*
* @param resourceLoader The resource loader.
*/
+ @Override
public void inform(ResourceLoader resourceLoader) {
provider.inform(resourceLoader);
boolean reloaded = provider.reload();
@@ -275,6 +277,7 @@ public class CurrencyField extends Field
amountValues = amountField.getType().getValueSource(amountField, parser);
}
+ @Override
public FunctionValues getValues(Map context, AtomicReaderContext reader) throws IOException {
final FunctionValues amounts = amountValues.getValues(context, reader);
final FunctionValues currencies = currencyValues.getValues(context, reader);
@@ -310,6 +313,7 @@ public class CurrencyField extends Field
}
}
+ @Override
public long longVal(int doc) {
if (!initializedCache) {
for (int i = 0; i < fractionDigitCache.length; i++) {
@@ -356,22 +360,27 @@ public class CurrencyField extends Field
return CurrencyValue.convertAmount(exchangeRate, sourceFractionDigits, amount, targetFractionDigits);
}
+ @Override
public int intVal(int doc) {
return (int) longVal(doc);
}
+ @Override
public double doubleVal(int doc) {
return (double) longVal(doc);
}
+ @Override
public float floatVal(int doc) {
return (float) longVal(doc);
}
+ @Override
public String strVal(int doc) {
return Long.toString(longVal(doc));
}
+ @Override
public String toString(int doc) {
return name() + '(' + amounts.toString(doc) + ',' + currencies.toString(doc) + ')';
}
@@ -433,6 +442,7 @@ class FileExchangeRateProvider implement
* @return The exchange rate.
* @throws SolrException if the requested currency pair cannot be found
*/
+ @Override
public double getExchangeRate(String sourceCurrencyCode, String targetCurrencyCode) {
if (sourceCurrencyCode == null || targetCurrencyCode == null) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Cannot get exchange rate; currency was null.");
@@ -508,6 +518,7 @@ class FileExchangeRateProvider implement
return rates != null ? rates.hashCode() : 0;
}
+ @Override
public String toString() {
return "["+this.getClass().getName()+" : " + rates.size() + " rates.]";
}
@@ -776,6 +787,7 @@ class CurrencyValue {
return new CurrencyValue(convertAmount(exchangeRates, this.getCurrencyCode(), this.getAmount(), targetCurrencyCode), targetCurrencyCode);
}
+ @Override
public String toString() {
return String.valueOf(amount) + "," + currencyCode;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/DateField.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/DateField.java Tue Dec 11 14:31:01 2012
@@ -190,6 +190,7 @@ public class DateField extends Primitive
}
}
+ @Override
public StorableField createField(SchemaField field, Object value, float boost) {
// Convert to a string before indexing
if(value instanceof Date) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/GeoHashField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/GeoHashField.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/GeoHashField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/GeoHashField.java Tue Dec 11 14:31:01 2012
@@ -58,6 +58,7 @@ public class GeoHashField extends FieldT
//QUESTION: Should we do a fast and crude one? Or actually check distances
//Fast and crude could use EdgeNGrams, but that would require a different
//encoding. Plus there are issues around the Equator/Prime Meridian
+ @Override
public Query createSpatialQuery(QParser parser, SpatialOptions options) {
double [] point = new double[0];
try {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Tue Dec 11 14:31:01 2012
@@ -765,6 +765,7 @@ public final class IndexSchema {
* as this object is less than, equal to, or greater than
* the specified object.
*/
+ @Override
public int compareTo(DynamicReplacement other) {
return other.regex.length() - regex.length();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java Tue Dec 11 14:31:01 2012
@@ -64,6 +64,7 @@ public class OpenExchangeRatesOrgProvide
* @return The exchange rate.
* @throws SolrException if the requested currency pair cannot be found
*/
+ @Override
public double getExchangeRate(String sourceCurrencyCode, String targetCurrencyCode) {
if (rates == null) {
throw new SolrException(SolrException.ErrorCode.SERVICE_UNAVAILABLE, "Rates not initialized.");
@@ -105,6 +106,7 @@ public class OpenExchangeRatesOrgProvide
return rates != null ? rates.hashCode() : 0;
}
+ @Override
public String toString() {
return "["+this.getClass().getName()+" : " + rates.getRates().size() + " rates.]";
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PointType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PointType.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PointType.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PointType.java Tue Dec 11 14:31:01 2012
@@ -177,6 +177,7 @@ public class PointType extends Coordinat
* @param options The {@link org.apache.solr.search.SpatialOptions} for this filter.
* @return The Query representing the bounding box around the point.
*/
+ @Override
public Query createSpatialQuery(QParser parser, SpatialOptions options) {
Query result = null;
double [] point = new double[0];
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java Tue Dec 11 14:31:01 2012
@@ -212,6 +212,7 @@ public class PreAnalyzedField extends Fi
return binaryValue;
}
+ @Override
public final boolean incrementToken() {
// lazy init the iterator
if (it == null) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java Tue Dec 11 14:31:01 2012
@@ -152,6 +152,7 @@ public final class SimplePreAnalyzedPars
attr.clear();
}
+ @Override
public String toString() {
return "tok='" + token + "',attr=" + attr;
}
@@ -451,6 +452,7 @@ public final class SimplePreAnalyzedPars
return resState;
}
+ @Override
public String toFormattedString(Field f) throws IOException {
StringBuilder sb = new StringBuilder();
sb.append(VERSION + " ");
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java Tue Dec 11 14:31:01 2012
@@ -87,6 +87,7 @@ public class SortableFloatField extends
return NumberUtils.SortableStr2floatStr(indexedForm);
}
+ @Override
public CharsRef indexedToReadable(BytesRef input, CharsRef charsRef) {
// TODO: this could be more efficient, but the sortable types should be deprecated instead
UnicodeUtil.UTF8toUTF16(input, charsRef);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableIntField.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableIntField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableIntField.java Tue Dec 11 14:31:01 2012
@@ -85,6 +85,7 @@ public class SortableIntField extends Pr
return NumberUtils.SortableStr2int(indexedForm);
}
+ @Override
public CharsRef indexedToReadable(BytesRef input, CharsRef charsRef) {
// TODO: this could be more efficient, but the sortable types should be deprecated instead
UnicodeUtil.UTF8toUTF16(input, charsRef);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableLongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableLongField.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableLongField.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SortableLongField.java Tue Dec 11 14:31:01 2012
@@ -76,6 +76,7 @@ public class SortableLongField extends P
return NumberUtils.SortableStr2long(indexedForm);
}
+ @Override
public CharsRef indexedToReadable(BytesRef input, CharsRef charsRef) {
// TODO: this could be more efficient, but the sortable types should be deprecated instead
UnicodeUtil.UTF8toUTF16(input, charsRef);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitDocSet.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitDocSet.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BitDocSet.java Tue Dec 11 14:31:01 2012
@@ -86,28 +86,34 @@ public class BitDocSet extends DocSetBas
}
***/
+ @Override
public DocIterator iterator() {
return new DocIterator() {
private final OpenBitSetIterator iter = new OpenBitSetIterator(bits);
private int pos = iter.nextDoc();
+ @Override
public boolean hasNext() {
return pos != DocIdSetIterator.NO_MORE_DOCS;
}
+ @Override
public Integer next() {
return nextDoc();
}
+ @Override
public void remove() {
bits.clear(pos);
}
+ @Override
public int nextDoc() {
int old=pos;
pos=iter.nextDoc();
return old;
}
+ @Override
public float score() {
return 0.0f;
}
@@ -136,6 +142,7 @@ public class BitDocSet extends DocSetBas
size=-1; // invalidate size
}
+ @Override
public int size() {
if (size!=-1) return size;
return size=(int)bits.cardinality();
@@ -152,6 +159,7 @@ public class BitDocSet extends DocSetBas
/** Returns true of the doc exists in the set.
* Should only be called when doc < OpenBitSet.size()
*/
+ @Override
public boolean exists(int doc) {
return bits.fastGet(doc);
}
@@ -229,6 +237,7 @@ public class BitDocSet extends DocSetBas
}
+ @Override
public long memSize() {
return (bits.getBits().length << 3) + 16;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -40,6 +40,7 @@ public class BoostQParserPlugin extends
public static String NAME = "boost";
public static String BOOSTFUNC = "b";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -112,6 +112,7 @@ import org.apache.solr.request.SolrQuery
public class DisMaxQParserPlugin extends QParserPlugin {
public static String NAME = "dismax";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocList.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocList.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocList.java Tue Dec 11 14:31:01 2012
@@ -36,6 +36,7 @@ public interface DocList extends DocSet
/**
* Returns the number of ids in this list.
*/
+ @Override
public int size();
/**
@@ -76,6 +77,7 @@ public interface DocList extends DocSet
* </p>
* @see #hasScores
*/
+ @Override
public DocIterator iterator();
/** True if scores were retained */
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBase.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBase.java Tue Dec 11 14:31:01 2012
@@ -55,6 +55,7 @@ abstract class DocSetBase implements Doc
/**
* @throws SolrException Base implementation does not allow modifications
*/
+ @Override
public void add(int doc) {
throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,"Unsupported Operation");
}
@@ -62,6 +63,7 @@ abstract class DocSetBase implements Doc
/**
* @throws SolrException Base implementation does not allow modifications
*/
+ @Override
public void addUnique(int doc) {
throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,"Unsupported Operation");
}
@@ -71,6 +73,7 @@ abstract class DocSetBase implements Doc
*
* @see BitDocSet#getBits
*/
+ @Override
public OpenBitSet getBits() {
OpenBitSet bits = new OpenBitSet();
for (DocIterator iter = iterator(); iter.hasNext();) {
@@ -79,6 +82,7 @@ abstract class DocSetBase implements Doc
return bits;
};
+ @Override
public DocSet intersection(DocSet other) {
// intersection is overloaded in the smaller DocSets to be more
// efficient, so dispatch off of it instead.
@@ -92,6 +96,7 @@ abstract class DocSetBase implements Doc
return new BitDocSet(newbits);
}
+ @Override
public boolean intersects(DocSet other) {
// intersection is overloaded in the smaller DocSets to be more
// efficient, so dispatch off of it instead.
@@ -103,12 +108,14 @@ abstract class DocSetBase implements Doc
}
+ @Override
public DocSet union(DocSet other) {
OpenBitSet newbits = (OpenBitSet)(this.getBits().clone());
newbits.or(other.getBits());
return new BitDocSet(newbits);
}
+ @Override
public int intersectionSize(DocSet other) {
// intersection is overloaded in the smaller DocSets to be more
// efficient, so dispatch off of it instead.
@@ -119,20 +126,24 @@ abstract class DocSetBase implements Doc
return intersection(other).size();
}
+ @Override
public int unionSize(DocSet other) {
return this.size() + other.size() - this.intersectionSize(other);
}
+ @Override
public DocSet andNot(DocSet other) {
OpenBitSet newbits = (OpenBitSet)(this.getBits().clone());
newbits.andNot(other.getBits());
return new BitDocSet(newbits);
}
+ @Override
public int andNotSize(DocSet other) {
return this.size() - this.intersectionSize(other);
}
+ @Override
public Filter getTopFilter() {
final OpenBitSet bs = getBits();
@@ -194,6 +205,7 @@ abstract class DocSetBase implements Doc
};
}
+ @Override
public void setBitsOn(OpenBitSet target) {
DocIterator iter = iterator();
while (iter.hasNext()) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSlice.java Tue Dec 11 14:31:01 2012
@@ -52,6 +52,7 @@ public class DocSlice extends DocSetBase
this.maxScore=maxScore;
}
+ @Override
public DocList subset(int offset, int len) {
if (this.offset == offset && this.len==len) return this;
@@ -65,20 +66,26 @@ public class DocSlice extends DocSetBase
return new DocSlice(offset, realLen, docs, scores, matches, maxScore);
}
+ @Override
public boolean hasScores() {
return scores!=null;
}
+ @Override
public float maxScore() {
return maxScore;
}
+ @Override
public int offset() { return offset; }
+ @Override
public int size() { return len; }
+ @Override
public int matches() { return matches; }
+ @Override
public long memSize() {
return (docs.length<<2)
+ (scores==null ? 0 : (scores.length<<2))
@@ -86,6 +93,7 @@ public class DocSlice extends DocSetBase
}
+ @Override
public boolean exists(int doc) {
int end = offset+len;
for (int i=offset; i<end; i++) {
@@ -96,14 +104,17 @@ public class DocSlice extends DocSetBase
// Hmmm, maybe I could have reused the scorer interface here...
// except that it carries Similarity baggage...
+ @Override
public DocIterator iterator() {
return new DocIterator() {
int pos=offset;
final int end=offset+len;
+ @Override
public boolean hasNext() {
return pos < end;
}
+ @Override
public Integer next() {
return nextDoc();
}
@@ -111,14 +122,17 @@ public class DocSlice extends DocSetBase
/**
* The remove operation is not supported by this Iterator.
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException("The remove operation is not supported by this Iterator.");
}
+ @Override
public int nextDoc() {
return docs[pos++];
}
+ @Override
public float score() {
return scores[pos-1];
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -54,6 +54,7 @@ import org.apache.solr.util.SolrPluginUt
public class ExtendedDismaxQParserPlugin extends QParserPlugin {
public static final String NAME = "edismax";
+ @Override
public void init(NamedList args) {
}
@@ -1375,10 +1376,12 @@ class ExtendedDismaxQParser extends QPar
* as this object is less than, equal to, or greater than
* the specified object.
*/
+ @Override
public int compareTo(DynamicField other) {
return other.wildcard.length() - wildcard.length();
}
+ @Override
public String toString() {
return this.wildcard;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java Tue Dec 11 14:31:01 2012
@@ -49,6 +49,7 @@ public class ExtendedQueryBase extends Q
this.cost = cost;
}
+ @Override
public int getCost() {
return cost;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FastLRUCache.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FastLRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FastLRUCache.java Tue Dec 11 14:31:01 2012
@@ -51,6 +51,7 @@ public class FastLRUCache<K,V> extends S
private ConcurrentLRUCache<K,V> cache;
private int showItems = 0;
+ @Override
public Object init(Map args, Object persistence, CacheRegenerator regenerator) {
super.init(args, regenerator);
String str = (String) args.get("size");
@@ -113,27 +114,33 @@ public class FastLRUCache<K,V> extends S
return description;
}
+ @Override
public int size() {
return cache.size();
}
+ @Override
public V put(K key, V value) {
return cache.put(key, value);
}
+ @Override
public V get(K key) {
return cache.get(key);
}
+ @Override
public void clear() {
cache.clear();
}
+ @Override
public void setState(State state) {
super.setState(state);
cache.setAlive(state == State.LIVE);
}
+ @Override
public void warm(SolrIndexSearcher searcher, SolrCache old) {
if (regenerator == null) return;
long warmingStartTime = System.currentTimeMillis();
@@ -162,6 +169,7 @@ public class FastLRUCache<K,V> extends S
}
+ @Override
public void close() {
// add the stats to the cumulative stats object (the first in the statsList)
statsList.get(0).add(cache.getStats());
@@ -170,19 +178,23 @@ public class FastLRUCache<K,V> extends S
}
//////////////////////// SolrInfoMBeans methods //////////////////////
+ @Override
public String getName() {
return FastLRUCache.class.getName();
}
+ @Override
public String getDescription() {
return description;
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public NamedList getStatistics() {
NamedList<Serializable> lst = new SimpleOrderedMap<Serializable>();
if (cache == null) return lst;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -34,6 +34,7 @@ import org.apache.solr.schema.SchemaFiel
public class FieldQParserPlugin extends QParserPlugin {
public static String NAME = "field";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -28,6 +28,7 @@ import org.apache.solr.request.SolrQuery
public class FunctionQParserPlugin extends QParserPlugin {
public static String NAME = "func";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -38,6 +38,7 @@ import org.apache.solr.search.function.*
public class FunctionRangeQParserPlugin extends QParserPlugin {
public static String NAME = "frange";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/Grouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/Grouping.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/Grouping.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/Grouping.java Tue Dec 11 14:31:01 2012
@@ -681,6 +681,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected void prepare() throws IOException {
actualGroupsToFind = getMax(offset, numGroups, maxDoc);
}
@@ -688,6 +689,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected Collector createFirstPassCollector() throws IOException {
// Ok we don't want groups, but do want a total count
if (actualGroupsToFind <= 0) {
@@ -703,6 +705,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected Collector createSecondPassCollector() throws IOException {
if (actualGroupsToFind <= 0) {
allGroupsCollector = new TermAllGroupsCollector(groupBy);
@@ -747,6 +750,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected void finish() throws IOException {
result = secondPass != null ? secondPass.getTopGroups(0) : null;
if (main) {
@@ -796,6 +800,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
public int getMatches() {
if (result == null && fallBackCollector == null) {
return 0;
@@ -807,6 +812,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected Integer getNumberOfGroups() {
return allGroupsCollector == null ? null : allGroupsCollector.getGroupCount();
}
@@ -825,6 +831,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected void prepare() throws IOException {
actualGroupsToFind = getMax(offset, numGroups, maxDoc);
}
@@ -832,6 +839,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected Collector createFirstPassCollector() throws IOException {
DocSet groupFilt = searcher.getDocSet(query);
topCollector = newCollector(groupSort, needScores);
@@ -851,6 +859,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected void finish() throws IOException {
TopDocsCollector topDocsCollector = (TopDocsCollector) collector.getDelegate();
TopDocs topDocs = topDocsCollector.topDocs();
@@ -866,6 +875,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
public int getMatches() {
return collector.getMatches();
}
@@ -889,6 +899,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected void prepare() throws IOException {
Map context = ValueSource.newContext(searcher);
groupBy.createWeight(context, searcher);
@@ -898,6 +909,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected Collector createFirstPassCollector() throws IOException {
// Ok we don't want groups, but do want a total count
if (actualGroupsToFind <= 0) {
@@ -913,6 +925,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected Collector createSecondPassCollector() throws IOException {
if (actualGroupsToFind <= 0) {
allGroupsCollector = new FunctionAllGroupsCollector(groupBy, context);
@@ -954,6 +967,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected void finish() throws IOException {
result = secondPass != null ? secondPass.getTopGroups(0) : null;
if (main) {
@@ -989,6 +1003,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
public int getMatches() {
if (result == null && fallBackCollector == null) {
return 0;
@@ -1000,6 +1015,7 @@ public class Grouping {
/**
* {@inheritDoc}
*/
+ @Override
protected Integer getNumberOfGroups() {
return allGroupsCollector == null ? null : allGroupsCollector.getGroupCount();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/HashDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/HashDocSet.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/HashDocSet.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/HashDocSet.java Tue Dec 11 14:31:01 2012
@@ -96,6 +96,7 @@ public final class HashDocSet extends Do
table[s]=doc;
}
+ @Override
public boolean exists(int doc) {
int s = doc & mask;
for(;;) {
@@ -108,24 +109,29 @@ public final class HashDocSet extends Do
}
+ @Override
public int size() {
return size;
}
+ @Override
public DocIterator iterator() {
return new DocIterator() {
int pos=0;
int doc;
{ goNext(); }
+ @Override
public boolean hasNext() {
return pos < table.length;
}
+ @Override
public Integer next() {
return nextDoc();
}
+ @Override
public void remove() {
}
@@ -134,6 +140,7 @@ public final class HashDocSet extends Do
}
// modify to return -1 at end of iteration?
+ @Override
public int nextDoc() {
int doc = table[pos];
pos++;
@@ -141,12 +148,14 @@ public final class HashDocSet extends Do
return doc;
}
+ @Override
public float score() {
return 0.0f;
}
};
}
+ @Override
public long memSize() {
return (table.length<<2) + 20;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -47,11 +47,14 @@ import java.util.Set;
public class JoinQParserPlugin extends QParserPlugin {
public static String NAME = "join";
+ @Override
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 SyntaxError {
String fromField = getParam("from");
String fromIndex = getParam("fromIndex");
@@ -121,6 +124,7 @@ class JoinQuery extends Query {
public void extractTerms(Set terms) {
}
+ @Override
public Weight createWeight(IndexSearcher searcher) throws IOException {
return new JoinQueryWeight((SolrIndexSearcher)searcher);
}
@@ -191,6 +195,7 @@ class JoinQuery extends Query {
this.toSearcher = searcher;
}
+ @Override
public Query getQuery() {
return JoinQuery.this;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LFUCache.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LFUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LFUCache.java Tue Dec 11 14:31:01 2012
@@ -59,6 +59,7 @@ public class LFUCache<K, V> implements S
private int showItems = 0;
private Boolean timeDecay = true;
+ @Override
public Object init(Map args, Object persistence, CacheRegenerator regenerator) {
state = State.CREATED;
this.regenerator = regenerator;
@@ -124,36 +125,44 @@ public class LFUCache<K, V> implements S
return statsList;
}
+ @Override
public String name() {
return name;
}
+ @Override
public int size() {
return cache.size();
}
+ @Override
public V put(K key, V value) {
return cache.put(key, value);
}
+ @Override
public V get(K key) {
return cache.get(key);
}
+ @Override
public void clear() {
cache.clear();
}
+ @Override
public void setState(State state) {
this.state = state;
cache.setAlive(state == State.LIVE);
}
+ @Override
public State getState() {
return state;
}
+ @Override
public void warm(SolrIndexSearcher searcher, SolrCache old) {
if (regenerator == null) return;
long warmingStartTime = System.currentTimeMillis();
@@ -182,6 +191,7 @@ public class LFUCache<K, V> implements S
}
+ @Override
public void close() {
// add the stats to the cumulative stats object (the first in the statsList)
statsList.get(0).add(cache.getStats());
@@ -190,26 +200,32 @@ public class LFUCache<K, V> implements S
}
//////////////////////// SolrInfoMBeans methods //////////////////////
+ @Override
public String getName() {
return LFUCache.class.getName();
}
+ @Override
public String getVersion() {
return SolrCore.version;
}
+ @Override
public String getDescription() {
return description;
}
+ @Override
public Category getCategory() {
return Category.CACHE;
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public URL[] getDocs() {
return null;
}
@@ -223,6 +239,7 @@ public class LFUCache<K, V> implements S
return "0." + hundredths;
}
+ @Override
public NamedList getStatistics() {
NamedList<Serializable> lst = new SimpleOrderedMap<Serializable>();
if (cache == null) return lst;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LRUCache.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LRUCache.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LRUCache.java Tue Dec 11 14:31:01 2012
@@ -56,6 +56,7 @@ public class LRUCache<K,V> extends SolrC
private Map<K,V> map;
private String description="LRU Cache";
+ @Override
public Object init(Map args, Object persistence, CacheRegenerator regenerator) {
super.init(args, regenerator);
String str = (String)args.get("size");
@@ -102,12 +103,14 @@ public class LRUCache<K,V> extends SolrC
return description;
}
+ @Override
public int size() {
synchronized(map) {
return map.size();
}
}
+ @Override
public V put(K key, V value) {
synchronized (map) {
if (getState() == State.LIVE) {
@@ -121,6 +124,7 @@ public class LRUCache<K,V> extends SolrC
}
}
+ @Override
public V get(K key) {
synchronized (map) {
V val = map.get(key);
@@ -137,12 +141,14 @@ public class LRUCache<K,V> extends SolrC
}
}
+ @Override
public void clear() {
synchronized(map) {
map.clear();
}
}
+ @Override
public void warm(SolrIndexSearcher searcher, SolrCache<K,V> old) {
if (regenerator==null) return;
long warmingStartTime = System.currentTimeMillis();
@@ -192,6 +198,7 @@ public class LRUCache<K,V> extends SolrC
}
+ @Override
public void close() {
}
@@ -199,18 +206,22 @@ public class LRUCache<K,V> extends SolrC
//////////////////////// SolrInfoMBeans methods //////////////////////
+ @Override
public String getName() {
return LRUCache.class.getName();
}
+ @Override
public String getDescription() {
return description;
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public NamedList getStatistics() {
NamedList lst = new SimpleOrderedMap();
synchronized (map) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -36,6 +36,7 @@ import java.util.List;
public class LuceneQParserPlugin extends QParserPlugin {
public static String NAME = "lucene";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -34,6 +34,7 @@ import org.apache.solr.request.SolrQuery
public class NestedQParserPlugin extends QParserPlugin {
public static String NAME = "query";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -28,6 +28,7 @@ import org.apache.solr.request.SolrQuery
public class OldLuceneQParserPlugin extends QParserPlugin {
public static String NAME = "lucenePlusSort";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -32,6 +32,7 @@ import org.apache.solr.request.SolrQuery
public class PrefixQParserPlugin extends QParserPlugin {
public static String NAME = "prefix";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -36,6 +36,7 @@ import org.apache.solr.request.SolrQuery
public class RawQParserPlugin extends QParserPlugin {
public static String NAME = "raw";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java Tue Dec 11 14:31:01 2012
@@ -38,19 +38,26 @@ public class SolrFieldCacheMBean impleme
protected FieldCacheSanityChecker checker = new FieldCacheSanityChecker();
+ @Override
public String getName() { return this.getClass().getName(); }
+ @Override
public String getVersion() { return SolrCore.version; }
+ @Override
public String getDescription() {
return "Provides introspection of the Lucene FieldCache, "
+ "this is **NOT** a cache that is managed by Solr.";
}
+ @Override
public Category getCategory() { return Category.CACHE; }
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public URL[] getDocs() {
return null;
}
+ @Override
public NamedList getStatistics() {
NamedList stats = new SimpleOrderedMap();
CacheEntry[] entries = FieldCache.DEFAULT.getCacheEntries();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Tue Dec 11 14:31:01 2012
@@ -252,6 +252,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 (debug) {
if (cachingEnabled) {
@@ -331,6 +332,7 @@ public class SolrIndexSearcher extends I
if (solrConfig.fieldValueCacheConfig != null && solrConfig.fieldValueCacheConfig.getRegenerator() == null) {
solrConfig.fieldValueCacheConfig.setRegenerator(
new CacheRegenerator() {
+ @Override
public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache, SolrCache oldCache, Object oldKey, Object oldVal) throws IOException {
if (oldVal instanceof UnInvertedField) {
UnInvertedField.getUnInvertedField((String)oldKey, newSearcher);
@@ -344,6 +346,7 @@ public class SolrIndexSearcher extends I
if (solrConfig.filterCacheConfig != null && solrConfig.filterCacheConfig.getRegenerator() == null) {
solrConfig.filterCacheConfig.setRegenerator(
new CacheRegenerator() {
+ @Override
public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache, SolrCache oldCache, Object oldKey, Object oldVal) throws IOException {
newSearcher.cacheDocSet((Query)oldKey, null, false);
return true;
@@ -356,6 +359,7 @@ public class SolrIndexSearcher extends I
final int queryResultWindowSize = solrConfig.queryResultWindowSize;
solrConfig.queryResultCacheConfig.setRegenerator(
new CacheRegenerator() {
+ @Override
public boolean regenerateItem(SolrIndexSearcher newSearcher, SolrCache newCache, SolrCache oldCache, Object oldKey, Object oldVal) throws IOException {
QueryResultKey key = (QueryResultKey)oldKey;
int nDocs=1;
@@ -438,6 +442,7 @@ public class SolrIndexSearcher extends I
lazyDoc = new LazyDocument(reader, docID);
}
+ @Override
public Status needsField(FieldInfo fieldInfo) {
if (fieldsToLoad.contains(fieldInfo.name)) {
return Status.YES;
@@ -1953,30 +1958,37 @@ public class SolrIndexSearcher extends I
// SolrInfoMBean stuff: Statistics and Module Info
/////////////////////////////////////////////////////////////////////
+ @Override
public String getName() {
return SolrIndexSearcher.class.getName();
}
+ @Override
public String getVersion() {
return SolrCore.version;
}
+ @Override
public String getDescription() {
return "index searcher";
}
+ @Override
public Category getCategory() {
return Category.CORE;
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public URL[] getDocs() {
return null;
}
+ @Override
public NamedList<Object> getStatistics() {
NamedList<Object> lst = new SimpleOrderedMap<Object>();
lst.add("searcherName", name);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java Tue Dec 11 14:31:01 2012
@@ -50,8 +50,10 @@ public class SortedIntDocSet extends Doc
public int[] getDocs() { return docs; }
+ @Override
public int size() { return docs.length; }
+ @Override
public long memSize() {
return (docs.length<<2)+8;
}
@@ -219,6 +221,7 @@ public class SortedIntDocSet extends Doc
return false;
}
+ @Override
public int intersectionSize(DocSet other) {
if (!(other instanceof SortedIntDocSet)) {
// assume other implementations are better at random access than we are,
@@ -567,6 +570,7 @@ public class SortedIntDocSet extends Doc
}
+ @Override
public boolean exists(int doc) {
// this could be faster by estimating where in the list the doc is likely to appear,
// but we should get away from using exists() anyway.
@@ -591,13 +595,16 @@ public class SortedIntDocSet extends Doc
}
+ @Override
public DocIterator iterator() {
return new DocIterator() {
int pos=0;
+ @Override
public boolean hasNext() {
return pos < docs.length;
}
+ @Override
public Integer next() {
return nextDoc();
}
@@ -605,14 +612,17 @@ public class SortedIntDocSet extends Doc
/**
* The remove operation is not supported by this Iterator.
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException("The remove operation is not supported by this Iterator.");
}
+ @Override
public int nextDoc() {
return docs[pos++];
}
+ @Override
public float score() {
return 0.0f;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -58,6 +58,7 @@ public class SpatialFilterQParserPlugin
return new SpatialFilterQParser(qstr, localParams, params, req, false);
}
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java Tue Dec 11 14:31:01 2012
@@ -43,6 +43,7 @@ import org.apache.solr.schema.FieldType;
public class TermQParserPlugin extends QParserPlugin {
public static String NAME = "term";
+ @Override
public void init(NamedList args) {
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java Tue Dec 11 14:31:01 2012
@@ -55,6 +55,7 @@ public abstract class ValueSourceParser
/**
* Initialize the plugin.
*/
+ @Override
public void init(NamedList args) {}
/**
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java Tue Dec 11 14:31:01 2012
@@ -41,10 +41,12 @@ public class FilterCollector extends Col
this.delegate = delegate;
}
+ @Override
public void setScorer(Scorer scorer) throws IOException {
delegate.setScorer(scorer);
}
+ @Override
public void collect(int doc) throws IOException {
matches++;
if (filter.exists(doc + docBase)) {
@@ -52,11 +54,13 @@ public class FilterCollector extends Col
}
}
+ @Override
public void setNextReader(AtomicReaderContext context) throws IOException {
this.docBase = context.docBase;
delegate.setNextReader(context);
}
+ @Override
public boolean acceptsDocsOutOfOrder() {
return delegate.acceptsDocsOutOfOrder();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java Tue Dec 11 14:31:01 2012
@@ -123,6 +123,7 @@ public class QueryCommand implements Com
this.queryString = queryString;
}
+ @Override
public List<Collector> create() throws IOException {
if (sort == null || sort == Sort.RELEVANCE) {
collector = TopScoreDocCollector.create(docsToCollect, true);
@@ -133,18 +134,22 @@ public class QueryCommand implements Com
return Arrays.asList((Collector) filterCollector);
}
+ @Override
public QueryCommandResult result() {
return new QueryCommandResult(collector.topDocs(), filterCollector.getMatches());
}
+ @Override
public String getKey() {
return queryString != null ? queryString : query.toString();
}
+ @Override
public Sort getGroupSort() {
return sort;
}
+ @Override
public Sort getSortWithinGroup() {
return null;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java Tue Dec 11 14:31:01 2012
@@ -86,6 +86,7 @@ public class SearchGroupsFieldCommand im
this.includeGroupCount = includeGroupCount;
}
+ @Override
public List<Collector> create() throws IOException {
List<Collector> collectors = new ArrayList<Collector>();
if (topNGroups > 0) {
@@ -99,6 +100,7 @@ public class SearchGroupsFieldCommand im
return collectors;
}
+ @Override
public Pair<Integer, Collection<SearchGroup<BytesRef>>> result() {
final Collection<SearchGroup<BytesRef>> topGroups;
if (topNGroups > 0) {
@@ -115,14 +117,17 @@ public class SearchGroupsFieldCommand im
return new Pair<Integer, Collection<SearchGroup<BytesRef>>>(groupCount, topGroups);
}
+ @Override
public Sort getSortWithinGroup() {
return null;
}
+ @Override
public Sort getGroupSort() {
return groupSort;
}
+ @Override
public String getKey() {
return field.getName();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java Tue Dec 11 14:31:01 2012
@@ -119,6 +119,7 @@ public class TopGroupsFieldCommand imple
this.needMaxScore = needMaxScore;
}
+ @Override
public List<Collector> create() throws IOException {
if (firstPhaseGroups.isEmpty()) {
return Collections.emptyList();
@@ -132,6 +133,7 @@ public class TopGroupsFieldCommand imple
return collectors;
}
+ @Override
@SuppressWarnings("unchecked")
public TopGroups<BytesRef> result() {
if (firstPhaseGroups.isEmpty()) {
@@ -141,14 +143,17 @@ public class TopGroupsFieldCommand imple
return secondPassCollector.getTopGroups(0);
}
+ @Override
public String getKey() {
return field.getName();
}
+ @Override
public Sort getGroupSort() {
return groupSort;
}
+ @Override
public Sort getSortWithinGroup() {
return sortWithinGroup;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java Tue Dec 11 14:31:01 2012
@@ -36,6 +36,7 @@ public class SearchGroupsRequestFactory
/**
* {@inheritDoc}
*/
+ @Override
public ShardRequest[] constructRequest(ResponseBuilder rb) {
ShardRequest sreq = new ShardRequest();
GroupingSpecification groupingSpecification = rb.getGroupingSpec();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java Tue Dec 11 14:31:01 2012
@@ -50,6 +50,7 @@ public class TopGroupsShardRequestFactor
/**
* {@inheritDoc}
*/
+ @Override
public ShardRequest[] constructRequest(ResponseBuilder rb) {
// If we have a group.query we need to query all shards... Or we move this to the group first phase queries
boolean containsGroupByQuery = rb.getGroupingSpec().getQueries().length > 0;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java Tue Dec 11 14:31:01 2012
@@ -41,6 +41,7 @@ public class SearchGroupShardResponsePro
/**
* {@inheritDoc}
*/
+ @Override
public void process(ResponseBuilder rb, ShardRequest shardRequest) {
SortSpec ss = rb.getSortSpec();
Sort groupSort = rb.getGroupingSpec().getGroupSort();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java Tue Dec 11 14:31:01 2012
@@ -35,6 +35,7 @@ public class StoredFieldsShardResponsePr
/**
* {@inheritDoc}
*/
+ @Override
public void process(ResponseBuilder rb, ShardRequest shardRequest) {
boolean returnScores = (rb.getFieldFlags() & SolrIndexSearcher.GET_SCORES) != 0;
ShardResponse srsp = shardRequest.responses.get(0);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java Tue Dec 11 14:31:01 2012
@@ -48,6 +48,7 @@ public class TopGroupsShardResponseProce
/**
* {@inheritDoc}
*/
+ @Override
@SuppressWarnings("unchecked")
public void process(ResponseBuilder rb, ShardRequest shardRequest) {
Sort groupSort = rb.getGroupingSpec().getGroupSort();
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java?rev=1420195&r1=1420194&r2=1420195&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java Tue Dec 11 14:31:01 2012
@@ -47,6 +47,7 @@ public class SearchGroupsResultTransform
/**
* {@inheritDoc}
*/
+ @Override
public NamedList transform(List<Command> data) throws IOException {
NamedList<NamedList> result = new NamedList<NamedList>();
for (Command command : data) {
@@ -74,6 +75,7 @@ public class SearchGroupsResultTransform
/**
* {@inheritDoc}
*/
+ @Override
public Map<String, Pair<Integer, Collection<SearchGroup<BytesRef>>>> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort sortWithinGroup, String shard) {
Map<String, Pair<Integer, Collection<SearchGroup<BytesRef>>>> result = new HashMap<String, Pair<Integer, Collection<SearchGroup<BytesRef>>>>();
for (Map.Entry<String, NamedList> command : shardResponse) {
Re: svn commit: r1420195 [11/13] - in /lucene/dev/trunk: lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/
lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/ lucene/analysis/common/src/java/org/apache/lucene/analysis/br/
lucene/ana...
Posted by Mark Miller <ma...@gmail.com>.
Okay, I think I see it. On 4x, this test extends LuceneTestCase and on
5x it extends SolrTestCaseJ4.
I think part of some changes in the Directory first class issue that
have no been ported back yet.
I was not seeing the commit on 5x because I needed to update :) But it
compiles fine there because it's extending SolrTestCaseJ4.
- Mark
On 12/11/2012 12:20 PM, Mark Miller wrote:
> Okay, cool. Yeah, I don't know why it doesn't compile for me at all -
> perhaps because I'm using java 1.7 and you are using 1.6? A guess.
>
> I was confused because 5x was fine, but I couldn't get 4x to compile.
> I was trying clean-eclipse and whatever I could do - then finally took
> a look at the history on the offending file and saw this change.
>
> - Mark
>
> On 12/11/2012 12:03 PM, Shai Erera wrote:
>> I already committed that for trunk!
>>
>> That last commit was an "svn merge" and i did run "ant clean compile"
>>
>> Hmm ... but it doesn't compile tests I guess. I'll check what's wrong
>> and fix it. Sorry
>>
>> Shai
>>
>>
>> On Tue, Dec 11, 2012 at 6:58 PM, Mark Miller <markrmiller@gmail.com
>> <ma...@gmail.com>> wrote:
>>
>> Hey Shaie, your are going to do this Override thing on 5x too right?
>>
>> It seems to have gotten AbstractSolrTestCase wrong according to my
>> compiler - 2 errors that keep me from compiling with eclipse or ant.
>>
>> - Mark
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
>> <ma...@lucene.apache.org>
>> For additional commands, e-mail: dev-help@lucene.apache.org
>> <ma...@lucene.apache.org>
>>
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r1420195 [11/13] - in /lucene/dev/trunk: lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/
lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/ lucene/analysis/common/src/java/org/apache/lucene/analysis/br/
lucene/ana...
Posted by Mark Miller <ma...@gmail.com>.
Okay, cool. Yeah, I don't know why it doesn't compile for me at all -
perhaps because I'm using java 1.7 and you are using 1.6? A guess.
I was confused because 5x was fine, but I couldn't get 4x to compile. I
was trying clean-eclipse and whatever I could do - then finally took a
look at the history on the offending file and saw this change.
- Mark
On 12/11/2012 12:03 PM, Shai Erera wrote:
> I already committed that for trunk!
>
> That last commit was an "svn merge" and i did run "ant clean compile"
>
> Hmm ... but it doesn't compile tests I guess. I'll check what's wrong
> and fix it. Sorry
>
> Shai
>
>
> On Tue, Dec 11, 2012 at 6:58 PM, Mark Miller <markrmiller@gmail.com
> <ma...@gmail.com>> wrote:
>
> Hey Shaie, your are going to do this Override thing on 5x too right?
>
> It seems to have gotten AbstractSolrTestCase wrong according to my
> compiler - 2 errors that keep me from compiling with eclipse or ant.
>
> - Mark
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> <ma...@lucene.apache.org>
> For additional commands, e-mail: dev-help@lucene.apache.org
> <ma...@lucene.apache.org>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r1420195 [11/13] - in /lucene/dev/trunk:
lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/
lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/
lucene/analysis/common/src/java/org/apache/lucene/analysis/br/ lucene/ana...
Posted by Shai Erera <se...@gmail.com>.
I already committed that for trunk!
That last commit was an "svn merge" and i did run "ant clean compile"
Hmm ... but it doesn't compile tests I guess. I'll check what's wrong and
fix it. Sorry
Shai
On Tue, Dec 11, 2012 at 6:58 PM, Mark Miller <ma...@gmail.com> wrote:
> Hey Shaie, your are going to do this Override thing on 5x too right?
>
> It seems to have gotten AbstractSolrTestCase wrong according to my
> compiler - 2 errors that keep me from compiling with eclipse or ant.
>
> - Mark
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
>
Re: svn commit: r1420195 [11/13] - in /lucene/dev/trunk:
lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/
lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/
lucene/analysis/common/src/java/org/apache/lucene/analysis/br/ lucene/ana...
Posted by Mark Miller <ma...@gmail.com>.
Hey Shaie, your are going to do this Override thing on 5x too right?
It seems to have gotten AbstractSolrTestCase wrong according to my
compiler - 2 errors that keep me from compiling with eclipse or ant.
- Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org