You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/01/30 16:10:25 UTC
svn commit: r1065304 [3/6] - in /lucene/dev/trunk:
lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/
lucene/contrib/misc/src/java/org/apache/lucene/store/
lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/preced...
Modified: lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java (original)
+++ lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java Sun Jan 30 15:10:15 2011
@@ -133,6 +133,7 @@ public class ConcurrentLRUCache<K,V> {
if (currentSize > upperWaterMark && !isCleaning) {
if (newThreadForCleanup) {
new Thread() {
+ @Override
public void run() {
markAndSweep();
}
@@ -362,6 +363,7 @@ public class ConcurrentLRUCache<K,V> {
return Collections.unmodifiableCollection(Arrays.asList(heap));
}
+ @Override
protected boolean lessThan(CacheEntry a, CacheEntry b) {
// reverse the parameter order so that the queue keeps the oldest items
return b.lastAccessedCopy < a.lastAccessedCopy;
@@ -491,14 +493,17 @@ public class ConcurrentLRUCache<K,V> {
return this.lastAccessedCopy < that.lastAccessedCopy ? 1 : -1;
}
+ @Override
public int hashCode() {
return value.hashCode();
}
+ @Override
public boolean equals(Object obj) {
return value.equals(obj);
}
+ @Override
public String toString() {
return "key: " + key + " value: " + value + " lastAccessed:" + lastAccessed;
}
@@ -579,6 +584,7 @@ public class ConcurrentLRUCache<K,V> {
cache = new WeakReference<ConcurrentLRUCache>(c);
}
+ @Override
public void run() {
while (true) {
synchronized (this) {
@@ -608,6 +614,7 @@ public class ConcurrentLRUCache<K,V> {
}
}
+ @Override
protected void finalize() throws Throwable {
try {
if(!isDestroyed){
Modified: lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/FastOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/FastOutputStream.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/FastOutputStream.java (original)
+++ lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/FastOutputStream.java Sun Jan 30 15:10:15 2011
@@ -50,6 +50,7 @@ public class FastOutputStream extends Ou
write((byte)b);
}
+ @Override
public void write(byte b[]) throws IOException {
write(b,0,b.length);
}
Modified: lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/NamedList.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/NamedList.java (original)
+++ lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/NamedList.java Sun Jan 30 15:10:15 2011
@@ -246,6 +246,7 @@ public class NamedList<T> implements Clo
return result;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append('{');
@@ -317,6 +318,7 @@ public class NamedList<T> implements Clo
/**
* Makes a <i>shallow copy</i> of the named list.
*/
+ @Override
public NamedList<T> clone() {
ArrayList<Object> newList = new ArrayList<Object>(nvPairs.size());
newList.addAll(nvPairs);
@@ -355,6 +357,7 @@ public class NamedList<T> implements Clo
return list.getVal( index );
}
+ @Override
public String toString()
{
return getKey()+"="+getValue();
Modified: lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java (original)
+++ lucene/dev/trunk/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java Sun Jan 30 15:10:15 2011
@@ -37,6 +37,7 @@ public final class RegexFileFilter imple
public boolean accept(File f) {
return pattern.matcher(f.getName()).matches();
}
+ @Override
public String toString() {
return "regex:" + pattern.toString();
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java Sun Jan 30 15:10:15 2011
@@ -29,6 +29,7 @@ import java.util.Map;
@Deprecated
public class ArabicLetterTokenizerFactory extends BaseTokenizerFactory{
+ @Override
public void init(Map<String,String> args) {
super.init(args);
assureMatchVersion();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java Sun Jan 30 15:10:15 2011
@@ -29,6 +29,7 @@ import org.apache.lucene.analysis.cn.Chi
*/
@Deprecated
public class ChineseFilterFactory extends BaseTokenFilterFactory {
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("Use StopFilterFactory instead.");
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java Sun Jan 30 15:10:15 2011
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.cn.Chi
*/
@Deprecated
public class ChineseTokenizerFactory extends BaseTokenizerFactory {
+ @Override
public void init(Map<String,String> args) {
super.init(args);
warnDeprecated("Use StandardTokenizerFactory instead.");
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java Sun Jan 30 15:10:15 2011
@@ -36,6 +36,7 @@ public class DictionaryCompoundWordToken
private int minSubwordSize;
private int maxSubwordSize;
private boolean onlyLongestMatch;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
assureMatchVersion();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java Sun Jan 30 15:10:15 2011
@@ -61,6 +61,7 @@ public class HyphenationCompoundWordToke
private int maxSubwordSize;
private boolean onlyLongestMatch;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
assureMatchVersion();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java Sun Jan 30 15:10:15 2011
@@ -26,6 +26,7 @@ import org.apache.lucene.analysis.id.Ind
public class IndonesianStemFilterFactory extends BaseTokenFilterFactory {
private boolean stemDerivational = true;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
stemDerivational = getBoolean("stemDerivational", true);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java Sun Jan 30 15:10:15 2011
@@ -27,6 +27,7 @@ import java.util.Map;
public class NumericPayloadTokenFilterFactory extends BaseTokenFilterFactory {
private float payload;
private String typeMatch;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
payload = Float.parseFloat(args.get("payload"));
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java Sun Jan 30 15:10:15 2011
@@ -36,6 +36,7 @@ public class PatternReplaceCharFilterFac
private int maxBlockChars;
private String blockDelimiters;
+ @Override
public void init(Map<String, String> args) {
super.init( args );
try {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java Sun Jan 30 15:10:15 2011
@@ -33,6 +33,7 @@ import java.util.Map;
public class PositionFilterFactory extends BaseTokenFilterFactory {
private int positionIncrement;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
positionIncrement = getInt("positionIncrement", 0);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java Sun Jan 30 15:10:15 2011
@@ -34,6 +34,7 @@ public class ShingleFilterFactory extend
private boolean outputUnigramsIfNoShingles;
private String tokenSeparator;
+ @Override
public void init(Map<String, String> args) {
super.init(args);
maxShingleSize = getInt("maxShingleSize",
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java Sun Jan 30 15:10:15 2011
@@ -32,6 +32,7 @@ public abstract class SolrAnalyzer exten
posIncGap=gap;
}
+ @Override
public int getPositionIncrementGap(String fieldName) {
return posIncGap;
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/TokenizerChain.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/TokenizerChain.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/TokenizerChain.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/TokenizerChain.java Sun Jan 30 15:10:15 2011
@@ -73,6 +73,7 @@ public final class TokenizerChain extend
return new TokenStreamInfo(tk,ts);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("TokenizerChain(");
for (CharFilterFactory filter: charFilters) {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/SolrZkServer.java Sun Jan 30 15:10:15 2011
@@ -319,6 +319,7 @@ class SolrZkServerProps extends QuorumPe
* @throws java.io.IOException
* @throws ConfigException
*/
+ @Override
public void parseProperties(Properties zkProp)
throws IOException, ConfigException {
for (Entry<Object, Object> entry : zkProp.entrySet()) {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java Sun Jan 30 15:10:15 2011
@@ -68,6 +68,7 @@ public class ZkSolrResourceLoader extend
*
* @return the stream for the named resource
*/
+ @Override
public InputStream openResource(String resource) {
InputStream is = null;
String file = collectionZkPath + "/" + resource;
@@ -93,12 +94,14 @@ public class ZkSolrResourceLoader extend
return is;
}
+ @Override
public String getConfigDir() {
throw new ZooKeeperException(
ErrorCode.SERVER_ERROR,
"ZkSolrResourceLoader does not support getConfigDir() - likely, what you are trying to do is not supported in ZooKeeper mode");
}
+ @Override
public String[] listConfigDir() {
List<String> list;
try {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java Sun Jan 30 15:10:15 2011
@@ -42,6 +42,7 @@ class AbstractSolrEventListener implemen
throw new UnsupportedOperationException();
}
+ @Override
public String toString() {
return getClass().getName() + args;
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java Sun Jan 30 15:10:15 2011
@@ -45,6 +45,7 @@ public class RAMDirectoryFactory extends
}
}
+ @Override
public boolean exists(String path) {
synchronized (RAMDirectoryFactory.class) {
RefCntRamDirectory directory = directories.get(path);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java Sun Jan 30 15:10:15 2011
@@ -51,6 +51,7 @@ public class RefCntRamDirectory extends
}
}
+ @Override
public final synchronized void close() {
decRef();
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/RunExecutableListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/RunExecutableListener.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/RunExecutableListener.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/RunExecutableListener.java Sun Jan 30 15:10:15 2011
@@ -37,6 +37,7 @@ class RunExecutableListener extends Abst
protected String[] envp;
protected boolean wait=true;
+ @Override
public void init(NamedList args) {
super.init(args);
@@ -102,6 +103,7 @@ class RunExecutableListener extends Abst
}
+ @Override
public void postCommit() {
// anything generic need to be passed to the external program?
// the directory of the index? the command that caused it to be
@@ -109,6 +111,7 @@ class RunExecutableListener extends Abst
exec("postCommit");
}
+ @Override
public void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {
exec("newSearcher");
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/SolrCore.java Sun Jan 30 15:10:15 2011
@@ -696,6 +696,7 @@ public final class SolrCore implements S
return refCount.get() <= 0;
}
+ @Override
protected void finalize() throws Throwable {
try {
if (getOpenCount() != 0) {
@@ -1192,6 +1193,7 @@ public final class SolrCore implements S
private RefCounted<SolrIndexSearcher> newHolder(SolrIndexSearcher newSearcher) {
RefCounted<SolrIndexSearcher> holder = new RefCounted<SolrIndexSearcher>(newSearcher) {
+ @Override
public void close() {
try {
synchronized(searcherLock) {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java Sun Jan 30 15:10:15 2011
@@ -28,6 +28,7 @@ import org.apache.lucene.store.FSDirecto
*/
public class StandardDirectoryFactory extends DirectoryFactory {
+ @Override
public Directory open(String path) throws IOException {
return FSDirectory.open(new File(path));
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java Sun Jan 30 15:10:15 2011
@@ -32,6 +32,7 @@ public class StandardIndexReaderFactory
/* (non-Javadoc)
* @see org.apache.solr.core.IndexReaderFactory#newReader(org.apache.lucene.store.Directory, boolean)
*/
+ @Override
public IndexReader newReader(Directory indexDir, boolean readOnly)
throws IOException {
return IndexReader.open(indexDir, null, readOnly, termInfosIndexDivisor);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java Sun Jan 30 15:10:15 2011
@@ -56,6 +56,7 @@ public abstract class AnalysisRequestHan
public static final Set<BytesRef> EMPTY_BYTES_SET = Collections.emptySet();
+ @Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
rsp.add("analysis", doAnalysis(req));
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java Sun Jan 30 15:10:15 2011
@@ -46,8 +46,10 @@ import java.util.List;
public class BinaryUpdateRequestHandler extends ContentStreamHandlerBase {
+ @Override
protected ContentStreamLoader newLoader(SolrQueryRequest req, final UpdateRequestProcessor processor) {
return new ContentStreamLoader() {
+ @Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp, ContentStream stream) throws Exception {
InputStream is = null;
try {
@@ -111,18 +113,22 @@ public class BinaryUpdateRequestHandler
}
}
+ @Override
public String getDescription() {
return "Add/Update multiple documents with javabin format";
}
+ @Override
public String getSourceId() {
return "$Id$";
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public String getVersion() {
return "$Revision$";
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java Sun Jan 30 15:10:15 2011
@@ -42,6 +42,7 @@ import java.io.*;
public class CSVRequestHandler extends ContentStreamHandlerBase {
+ @Override
protected ContentStreamLoader newLoader(SolrQueryRequest req, UpdateRequestProcessor processor) {
return new SingleThreadedCSVLoader(req, processor);
}
@@ -118,6 +119,7 @@ abstract class CSVLoader extends Content
/** add zero length fields */
private class FieldAdderEmpty extends CSVLoader.FieldAdder {
+ @Override
void add(SolrInputDocument doc, int line, int column, String val) {
doc.addField(fields[column].getName(),val,1.0f);
}
@@ -127,6 +129,7 @@ abstract class CSVLoader extends Content
private class FieldTrimmer extends CSVLoader.FieldAdder {
private final CSVLoader.FieldAdder base;
FieldTrimmer(CSVLoader.FieldAdder base) { this.base=base; }
+ @Override
void add(SolrInputDocument doc, int line, int column, String val) {
base.add(doc, line, column, val.trim());
}
@@ -145,6 +148,7 @@ abstract class CSVLoader extends Content
this.to=to;
this.base=base;
}
+ @Override
void add(SolrInputDocument doc, int line, int column, String val) {
if (from.equals(val)) val=to;
base.add(doc,line,column,val);
@@ -162,6 +166,7 @@ abstract class CSVLoader extends Content
this.base = base;
}
+ @Override
void add(SolrInputDocument doc, int line, int column, String val) {
CSVParser parser = new CSVParser(new StringReader(val), strategy);
try {
@@ -327,6 +332,7 @@ abstract class CSVLoader extends Content
}
/** load the CSV input */
+ @Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp, ContentStream stream) throws IOException {
errHeader = "CSVLoader: input=" + stream.getSourceInfo();
Reader reader = null;
@@ -403,6 +409,7 @@ class SingleThreadedCSVLoader extends CS
super(req, processor);
}
+ @Override
void addDoc(int line, String[] vals) throws IOException {
templateAdd.indexedId = null;
SolrInputDocument doc = new SolrInputDocument();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java Sun Jan 30 15:10:15 2011
@@ -32,6 +32,7 @@ import org.apache.solr.update.processor.
**/
public abstract class ContentStreamHandlerBase extends RequestHandlerBase {
+ @Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
SolrParams params = req.getParams();
UpdateRequestProcessorChain processorChain =
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java Sun Jan 30 15:10:15 2011
@@ -105,6 +105,7 @@ public class DocumentAnalysisRequestHand
/**
* {@inheritDoc}
*/
+ @Override
protected NamedList doAnalysis(SolrQueryRequest req) throws Exception {
DocumentAnalysisRequest analysisRequest = resolveAnalysisRequest(req);
return handleAnalysisRequest(analysisRequest, req.getSchema());
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java Sun Jan 30 15:10:15 2011
@@ -94,6 +94,7 @@ public class FieldAnalysisRequestHandler
/**
* {@inheritDoc}
*/
+ @Override
protected NamedList doAnalysis(SolrQueryRequest req) throws Exception {
FieldAnalysisRequest analysisRequest = resolveAnalysisRequest(req);
IndexSchema indexSchema = req.getCore().getSchema();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java Sun Jan 30 15:10:15 2011
@@ -35,6 +35,7 @@ public class JsonUpdateRequestHandler ex
super.init(args);
}
+ @Override
protected ContentStreamLoader newLoader(SolrQueryRequest req, UpdateRequestProcessor processor) {
return new JsonLoader(processor);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java Sun Jan 30 15:10:15 2011
@@ -98,6 +98,7 @@ public class ReplicationHandler extends
private AtomicBoolean replicationEnabled = new AtomicBoolean(true);
+ @Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
rsp.setHttpCaching(false);
final SolrParams solrParams = req.getParams();
@@ -143,6 +144,7 @@ public class ReplicationHandler extends
}
final SolrParams paramsCopy = new ModifiableSolrParams(solrParams);
new Thread() {
+ @Override
public void run() {
doFetch(paramsCopy);
}
@@ -447,18 +449,22 @@ public class ReplicationHandler extends
return fileMeta;
}
+ @Override
public String getDescription() {
return "ReplicationHandler provides replication of index and configuration files from Master to Slaves";
}
+ @Override
public String getSourceId() {
return "$Id$";
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public String getVersion() {
return "$Revision$";
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SnapPuller.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SnapPuller.java Sun Jan 30 15:10:15 2011
@@ -508,6 +508,7 @@ public class SnapPuller {
private void reloadCore() {
new Thread() {
+ @Override
public void run() {
try {
solrCore.getCoreDescriptor().getCoreContainer().reload(solrCore.getName());
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SnapShooter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SnapShooter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SnapShooter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/SnapShooter.java Sun Jan 30 15:10:15 2011
@@ -64,6 +64,7 @@ public class SnapShooter {
replicationHandler.core.getDeletionPolicy().saveCommitPoint(indexCommit.getVersion());
new Thread() {
+ @Override
public void run() {
createSnapshot(indexCommit, replicationHandler);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XMLLoader.java Sun Jan 30 15:10:15 2011
@@ -54,6 +54,7 @@ class XMLLoader extends ContentStreamLoa
this.inputFactory = inputFactory;
}
+ @Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp, ContentStream stream) throws Exception {
errHeader = "XMLLoader: " + stream.getSourceInfo();
Reader reader = null;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java Sun Jan 30 15:10:15 2011
@@ -80,6 +80,7 @@ public class XmlUpdateRequestHandler ext
}
}
+ @Override
protected ContentStreamLoader newLoader(SolrQueryRequest req, UpdateRequestProcessor processor) {
return new XMLLoader(processor, inputFactory);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java Sun Jan 30 15:10:15 2011
@@ -49,6 +49,7 @@ public class SolrInfoMBeanHandler extend
}
+ @Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
SolrCore core = req.getCore();
@@ -94,18 +95,22 @@ public class SolrInfoMBeanHandler extend
rsp.setHttpCaching(false); // never cache, no matter what init config looks like
}
+ @Override
public String getDescription() {
return "Get Info (and statistics) about all registered SolrInfoMBeans";
}
+ @Override
public String getSourceId() {
return "$Id$";
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public String getVersion() {
return "$Revision$";
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/DebugComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/DebugComponent.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/DebugComponent.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/DebugComponent.java Sun Jan 30 15:10:15 2011
@@ -86,6 +86,7 @@ public class DebugComponent extends Sear
}
+ @Override
public void modifyRequest(ResponseBuilder rb, SearchComponent who, ShardRequest sreq) {
if (!rb.isDebug()) return;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/FacetComponent.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/FacetComponent.java Sun Jan 30 15:10:15 2011
@@ -726,6 +726,7 @@ public class FacetComponent extends Sear
public long count;
public int termNum; // term number starting at 0 (used in bit arrays)
+ @Override
public String toString() {
return "{term="+name+",termNum="+termNum+",count="+count+"}";
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java Sun Jan 30 15:10:15 2011
@@ -131,6 +131,7 @@ public class HighlightComponent extends
}
}
+ @Override
public void modifyRequest(ResponseBuilder rb, SearchComponent who, ShardRequest sreq) {
if (!rb.doHighlights) return;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Sun Jan 30 15:10:15 2011
@@ -474,6 +474,7 @@ class ElevationComparatorSource extends
this.priority = boosts;
}
+ @Override
public FieldComparator newComparator(final String fieldname, final int numHits, int sortPos, boolean reversed) throws IOException {
return new FieldComparator() {
@@ -482,10 +483,12 @@ class ElevationComparatorSource extends
int bottomVal;
private final BytesRef tempBR = new BytesRef();
+ @Override
public int compare(int slot1, int slot2) {
return values[slot2] - values[slot1]; // values will be small enough that there is no overflow concern
}
+ @Override
public void setBottom(int slot) {
bottomVal = values[slot];
}
@@ -496,19 +499,23 @@ class ElevationComparatorSource extends
return prio == null ? 0 : prio.intValue();
}
+ @Override
public int compareBottom(int doc) throws IOException {
return docVal(doc) - bottomVal;
}
+ @Override
public void copy(int slot, int doc) throws IOException {
values[slot] = docVal(doc);
}
+ @Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
idIndex = FieldCache.DEFAULT.getTermsIndex(context.reader, fieldname);
return this;
}
+ @Override
public Comparable value(int slot) {
return values[slot];
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardDoc.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardDoc.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardDoc.java Sun Jan 30 15:10:15 2011
@@ -56,6 +56,7 @@ public class ShardDoc {
int positionInResponse;
// the ordinal position in the merged response arraylist
+ @Override
public String toString(){
return "id="+id
+" ,score="+score
@@ -226,6 +227,7 @@ class ShardFieldSortedHitQueue extends P
// the negative sign on the final compareTo().
Comparator comparatorNatural(String fieldName) {
return new ShardComparator(fieldName) {
+ @Override
public final int compare(final Object o1, final Object o2) {
ShardDoc sd1 = (ShardDoc) o1;
ShardDoc sd2 = (ShardDoc) o2;
@@ -247,6 +249,7 @@ class ShardFieldSortedHitQueue extends P
Locale locale) {
final Collator collator = Collator.getInstance(locale);
return new ShardComparator(fieldName) {
+ @Override
public final int compare(final Object o1, final Object o2) {
ShardDoc sd1 = (ShardDoc) o1;
ShardDoc sd2 = (ShardDoc) o2;
@@ -266,6 +269,7 @@ class ShardFieldSortedHitQueue extends P
Comparator comparatorMissingStringLast(final String fieldName) {
return new ShardComparator(fieldName) {
+ @Override
public final int compare(final Object o1, final Object o2) {
ShardDoc sd1 = (ShardDoc) o1;
ShardDoc sd2 = (ShardDoc) o2;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardRequest.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardRequest.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardRequest.java Sun Jan 30 15:10:15 2011
@@ -56,6 +56,7 @@ public class ShardRequest {
// this would work well if we ever transitioned to using internal ids and
// didn't require a uniqueId
+ @Override
public String toString() {
return "ShardRequest:{params=" + params
+ ", purpose=" + Integer.toHexString(purpose)
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardResponse.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardResponse.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/ShardResponse.java Sun Jan 30 15:10:15 2011
@@ -27,6 +27,7 @@ public final class ShardResponse {
private Throwable exception;
private SolrResponse rsp;
+ @Override
public String toString() {
return "ShardResponse:{shard="+shard+",shardAddress="+shardAddress
+"\n\trequest=" + req
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java Sun Jan 30 15:10:15 2011
@@ -71,6 +71,7 @@ public class TermVectorComponent extends
public static final String TERM_VECTORS = "termVectors";
+ @Override
public void process(ResponseBuilder rb) throws IOException {
SolrParams params = rb.req.getParams();
if (!params.getBool(COMPONENT_NAME, false)) {
@@ -288,6 +289,7 @@ public class TermVectorComponent extends
this.reader = reader;
}
+ @Override
public void map(BytesRef term, int frequency, TermVectorOffsetInfo[] offsets, int[] positions) {
NamedList<Object> termInfo = new NamedList<Object>();
fieldNL.add(term.utf8ToString(), termInfo);
@@ -336,6 +338,7 @@ public class TermVectorComponent extends
return result;
}
+ @Override
public void setExpectations(String field, int numTerms, boolean storeOffsets, boolean storePositions) {
if (fieldOptions.docFreq == true && reader != null) {
@@ -358,6 +361,7 @@ public class TermVectorComponent extends
}
}
+ @Override
public void prepare(ResponseBuilder rb) throws IOException {
}
@@ -374,18 +378,22 @@ public class TermVectorComponent extends
}
+ @Override
public String getVersion() {
return "$Revision$";
}
+ @Override
public String getSourceId() {
return "$Id$";
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public String getDescription() {
return "A Component for working with Term Vectors";
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/TermsComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/TermsComponent.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/TermsComponent.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/TermsComponent.java Sun Jan 30 15:10:15 2011
@@ -68,6 +68,7 @@ public class TermsComponent extends Sear
}
}
+ @Override
public void process(ResponseBuilder rb) throws IOException {
SolrParams params = rb.req.getParams();
if (!params.getBool(TermsParams.TERMS, false)) return;
@@ -463,18 +464,22 @@ public class TermsComponent extends Sear
}
}
+ @Override
public String getVersion() {
return "$Revision$";
}
+ @Override
public String getSourceId() {
return "$Id$";
}
+ @Override
public String getSource() {
return "$URL$";
}
+ @Override
public String getDescription() {
return "A Component for working with Term Enumerators";
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Sun Jan 30 15:10:15 2011
@@ -120,6 +120,7 @@ public class DefaultSolrHighlighter exte
}
//just for back-compat with the deprecated method
private boolean initialized = false;
+ @Override
@Deprecated
public void initalize( SolrConfig config) {
if (initialized) return;
@@ -333,6 +334,7 @@ public class DefaultSolrHighlighter exte
* @return NamedList containing a NamedList for each document, which in
* turns contains sets (field, summary) pairs.
*/
+ @Override
@SuppressWarnings("unchecked")
public NamedList<Object> doHighlighting(DocList docs, Query query, SolrQueryRequest req, String[] defaultFields) throws IOException {
SolrParams params = req.getParams();
@@ -639,6 +641,7 @@ class TermOffsetsTokenStream {
this.length = length;
}
+ @Override
public boolean incrementToken() throws IOException {
while( true ){
if( bufferedToken == null ) {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/GapFragmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/GapFragmenter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/GapFragmenter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/GapFragmenter.java Sun Jan 30 15:10:15 2011
@@ -92,6 +92,7 @@ class LuceneGapFragmenter extends Simple
/* (non-Javadoc)
* @see org.apache.lucene.search.highlight.TextFragmenter#start(java.lang.String)
*/
+ @Override
public void start(String originalText, TokenStream tokenStream) {
offsetAtt = tokenStream.getAttribute(OffsetAttribute.class);
posIncAtt = tokenStream.getAttribute(PositionIncrementAttribute.class);
@@ -101,6 +102,7 @@ class LuceneGapFragmenter extends Simple
/* (non-Javadoc)
* @see org.apache.lucene.search.highlight.TextFragmenter#isNewFragment(org.apache.lucene.analysis.Token)
*/
+ @Override
public boolean isNewFragment() {
int endOffset = offsetAtt.endOffset();
boolean isNewFrag =
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java Sun Jan 30 15:10:15 2011
@@ -54,6 +54,7 @@ public class RegexFragmenter extends Hig
protected String defaultPatternRaw;
protected Pattern defaultPattern;
+ @Override
public void init(NamedList args) {
super.init(args);
defaultPatternRaw = LuceneRegexFragmenter.DEFAULT_PATTERN_RAW;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/request/ServletSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/request/ServletSolrParams.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/request/ServletSolrParams.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/request/ServletSolrParams.java Sun Jan 30 15:10:15 2011
@@ -29,6 +29,7 @@ public class ServletSolrParams extends M
super(req.getParameterMap());
}
+ @Override
public String get(String name) {
String[] arr = map.get(name);
if (arr==null) return null;
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/request/SimpleFacets.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/request/SimpleFacets.java Sun Jan 30 15:10:15 2011
@@ -1177,9 +1177,11 @@ public class SimpleFacets {
}
public K key;
public V val;
+ @Override
public int hashCode() {
return key.hashCode() ^ val.hashCode();
}
+ @Override
public boolean equals(Object o) {
if (! (o instanceof CountPair)) return false;
CountPair<?,?> that = (CountPair<?,?>) o;
@@ -1290,9 +1292,11 @@ public class SimpleFacets {
extends RangeEndpointCalculator<Float> {
public FloatRangeEndpointCalculator(final SchemaField f) { super(f); }
+ @Override
protected Float parseVal(String rawval) {
return Float.valueOf(rawval);
}
+ @Override
public Float parseAndAddGap(Float value, String gap) {
return new Float(value.floatValue() + Float.valueOf(gap).floatValue());
}
@@ -1301,9 +1305,11 @@ public class SimpleFacets {
extends RangeEndpointCalculator<Double> {
public DoubleRangeEndpointCalculator(final SchemaField f) { super(f); }
+ @Override
protected Double parseVal(String rawval) {
return Double.valueOf(rawval);
}
+ @Override
public Double parseAndAddGap(Double value, String gap) {
return new Double(value.floatValue() + Double.valueOf(gap).floatValue());
}
@@ -1312,9 +1318,11 @@ public class SimpleFacets {
extends RangeEndpointCalculator<Integer> {
public IntegerRangeEndpointCalculator(final SchemaField f) { super(f); }
+ @Override
protected Integer parseVal(String rawval) {
return Integer.valueOf(rawval);
}
+ @Override
public Integer parseAndAddGap(Integer value, String gap) {
return new Integer(value.intValue() + Integer.valueOf(gap).intValue());
}
@@ -1323,9 +1331,11 @@ public class SimpleFacets {
extends RangeEndpointCalculator<Long> {
public LongRangeEndpointCalculator(final SchemaField f) { super(f); }
+ @Override
protected Long parseVal(String rawval) {
return Long.valueOf(rawval);
}
+ @Override
public Long parseAndAddGap(Long value, String gap) {
return new Long(value.intValue() + Long.valueOf(gap).intValue());
}
@@ -1342,15 +1352,19 @@ public class SimpleFacets {
("SchemaField must use filed type extending DateField");
}
}
+ @Override
public String formatValue(Date val) {
return ((DateField)field.getType()).toExternal(val);
}
+ @Override
protected Date parseVal(String rawval) {
return ((DateField)field.getType()).parseMath(now, rawval);
}
+ @Override
protected Object parseGap(final String rawval) {
return rawval;
}
+ @Override
public Date parseAndAddGap(Date value, String gap) throws java.text.ParseException {
final DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.US);
dmp.setNow(value);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java Sun Jan 30 15:10:15 2011
@@ -127,6 +127,7 @@ public abstract class SolrQueryRequestBa
return origParams.toString();
}
+ @Override
public String toString() {
return this.getClass().getSimpleName() + '{' + params + '}';
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/request/UnInvertedField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/request/UnInvertedField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/request/UnInvertedField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/request/UnInvertedField.java Sun Jan 30 15:10:15 2011
@@ -882,6 +882,7 @@ public class UnInvertedField {
return te.skipTo(termNum);
}
+ @Override
public String toString() {
return "{field=" + field
+ ",memSize="+memSize()
@@ -1158,6 +1159,7 @@ class TermIndex {
ArrayList<BytesRef> lst;
PagedBytes bytes;
+ @Override
protected BytesRef setTerm() throws IOException {
BytesRef br = super.setTerm();
if (br != null && (pos & intervalMask)==0) {
@@ -1173,10 +1175,12 @@ class TermIndex {
return br;
}
+ @Override
public BytesRef skipTo(int termNumber) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public void close() throws IOException {
nTerms=pos;
super.close();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/JSONResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/JSONResponseWriter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/JSONResponseWriter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/JSONResponseWriter.java Sun Jan 30 15:10:15 2011
@@ -286,6 +286,7 @@ class JSONWriter extends TextResponseWri
}
+ @Override
public void writeNamedList(String name, NamedList val) throws IOException {
if (val instanceof SimpleOrderedMap) {
writeNamedListAsMapWithDups(name,val);
@@ -391,6 +392,7 @@ class JSONWriter extends TextResponseWri
writeMapCloser();
}
+ @Override
public void writeSolrDocument(String name, SolrDocument doc, Set<String> returnFields, Map pseudoFields) throws IOException {
writeMapOpener(-1); // no trivial way to determine map size
// TODO: could easily figure out size for SolrDocument if needed...
@@ -437,6 +439,7 @@ class JSONWriter extends TextResponseWri
// if a Doc can ever contain another doc, this optimization would have to go.
private final HashMap scoreMap = new HashMap(1);
+ @Override
public void writeDoc(String name, Document doc, Set<String> returnFields, float score, boolean includeScore) throws IOException {
Map other = null;
if (includeScore) {
@@ -446,6 +449,7 @@ class JSONWriter extends TextResponseWri
writeDoc(name, doc.getFields(), returnFields, other);
}
+ @Override
public void writeDocList(String name, DocList ids, Set<String> fields, Map otherFields) throws IOException {
boolean includeScore=false;
if (fields!=null) {
@@ -595,6 +599,7 @@ class JSONWriter extends TextResponseWri
writer.write(']');
}
+ @Override
public void writeStr(String name, String val, boolean needsEscaping) throws IOException {
// it might be more efficient to use a stringbuilder or write substrings
// if writing chars to the stream is slow.
@@ -647,6 +652,7 @@ class JSONWriter extends TextResponseWri
}
+ @Override
public void writeMap(String name, Map val, boolean excludeOuter, boolean isFirstVal) throws IOException {
if (!excludeOuter) {
writeMapOpener(val.size());
@@ -678,6 +684,7 @@ class JSONWriter extends TextResponseWri
}
}
+ @Override
public void writeArray(String name, Iterator val) throws IOException {
writeArrayOpener(-1); // no trivial way to determine array size
incLevel();
@@ -697,30 +704,37 @@ class JSONWriter extends TextResponseWri
//
// Primitive types
//
+ @Override
public void writeNull(String name) throws IOException {
writer.write("null");
}
+ @Override
public void writeInt(String name, String val) throws IOException {
writer.write(val);
}
+ @Override
public void writeLong(String name, String val) throws IOException {
writer.write(val);
}
+ @Override
public void writeBool(String name, String val) throws IOException {
writer.write(val);
}
+ @Override
public void writeFloat(String name, String val) throws IOException {
writer.write(val);
}
+ @Override
public void writeDouble(String name, String val) throws IOException {
writer.write(val);
}
+ @Override
public void writeDate(String name, String val) throws IOException {
writeStr(name, val, false);
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java Sun Jan 30 15:10:15 2011
@@ -92,6 +92,7 @@ class PHPSerializedWriter extends JSONWr
doIndent = false;
}
+ @Override
public void writeResponse() throws IOException {
Boolean omitHeader = req.getParams().getBool(CommonParams.OMIT_HEADER);
if(omitHeader != null && omitHeader) rsp.getValues().remove("responseHeader");
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/PageTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/PageTool.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/PageTool.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/PageTool.java Sun Jan 30 15:10:15 2011
@@ -73,6 +73,7 @@ public class PageTool {
return current_page_number;
}
+ @Override
public String toString() {
return "Found " + results_found +
" Page " + current_page_number + " of " + page_count +
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/RubyResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/RubyResponseWriter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/RubyResponseWriter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/RubyResponseWriter.java Sun Jan 30 15:10:15 2011
@@ -45,7 +45,9 @@ public class RubyResponseWriter implemen
class RubyWriter extends NaNFloatWriter {
+ @Override
protected String getNaN() { return "(0.0/0.0)"; }
+ @Override
protected String getInf() { return "(1.0/0.0)"; }
public RubyWriter(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) {
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java Sun Jan 30 15:10:15 2011
@@ -49,18 +49,22 @@ public class SolrParamResourceLoader ext
}
}
+ @Override
public void init(ExtendedProperties extendedProperties) {
}
+ @Override
public InputStream getResourceStream(String s) throws ResourceNotFoundException {
String template = templates.get(s);
return template == null ? null : new ByteArrayInputStream(template.getBytes());
}
+ @Override
public boolean isSourceModified(Resource resource) {
return false;
}
+ @Override
public long getLastModified(Resource resource) {
return 0;
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java Sun Jan 30 15:10:15 2011
@@ -33,17 +33,21 @@ public class SolrVelocityResourceLoader
this.loader = loader;
}
+ @Override
public void init(ExtendedProperties extendedProperties) {
}
+ @Override
public InputStream getResourceStream(String template_name) throws ResourceNotFoundException {
return loader.openResource(template_name);
}
+ @Override
public boolean isSourceModified(Resource resource) {
return false;
}
+ @Override
public long getLastModified(Resource resource) {
return 0;
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/response/XMLWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/response/XMLWriter.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/response/XMLWriter.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/response/XMLWriter.java Sun Jan 30 15:10:15 2011
@@ -436,6 +436,7 @@ public final class XMLWriter extends Tex
}
+ @Override
public void writeVal(String name, Object val) throws IOException {
// if there get to be enough types, perhaps hashing on the type
@@ -494,6 +495,7 @@ public final class XMLWriter extends Tex
// Generic compound types
//
+ @Override
public void writeNamedList(String name, NamedList val) throws IOException {
int sz = val.size();
startTag("lst", name, sz<=0);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java Sun Jan 30 15:10:15 2011
@@ -103,6 +103,7 @@ public abstract class AbstractSubTypeFie
/**
* Throws UnsupportedOperationException()
*/
+ @Override
public Query getFieldQuery(QParser parser, SchemaField field, String externalVal) {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BCDIntField.java Sun Jan 30 15:10:15 2011
@@ -30,9 +30,11 @@ import java.io.IOException;
* @version $Id$
*/
public class BCDIntField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
@@ -42,11 +44,13 @@ public class BCDIntField extends FieldTy
throw new UnsupportedOperationException("ValueSource not implemented");
}
+ @Override
public String toInternal(String val) {
// TODO? make sure each character is a digit?
return BCDUtils.base10toBase10kSortableInt(val);
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
@@ -57,10 +61,12 @@ public class BCDIntField extends FieldTy
return Integer.valueOf( toExternal(f) );
}
+ @Override
public String indexedToReadable(String indexedForm) {
return BCDUtils.base10kSortableIntToBase10(indexedForm);
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeInt(name,toExternal(f));
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BinaryField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BinaryField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BinaryField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BinaryField.java Sun Jan 30 15:10:15 2011
@@ -33,19 +33,23 @@ public class BinaryField extends FieldTy
return Base64.byteArrayToBase64(buf.array(), buf.position(), buf.limit()-buf.position());
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeStr(name, toBase64String(toObject(f)), false);
}
+ @Override
public SortField getSortField(SchemaField field, boolean top) {
throw new RuntimeException("Cannot sort on a Binary field");
}
+ @Override
public String toExternal(Fieldable f) {
return toBase64String(toObject(f));
}
+ @Override
public ByteBuffer toObject(Fieldable f) {
return ByteBuffer.wrap(f.getBinaryValue(), f.getBinaryOffset(), f.getBinaryLength() ) ;
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/BoolField.java Sun Jan 30 15:10:15 2011
@@ -37,9 +37,11 @@ import java.io.IOException;
* @version $Id$
*/
public class BoolField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
@@ -58,6 +60,7 @@ public class BoolField extends FieldType
// handle single valued non-text fields (int,bool,etc) if needed.
protected final static Analyzer boolAnalyzer = new SolrAnalyzer() {
+ @Override
public TokenStreamInfo getStream(String fieldName, Reader reader) {
Tokenizer tokenizer = new Tokenizer(reader) {
final CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
@@ -88,19 +91,23 @@ public class BoolField extends FieldType
};
+ @Override
public Analyzer getAnalyzer() {
return boolAnalyzer;
}
+ @Override
public Analyzer getQueryAnalyzer() {
return boolAnalyzer;
}
+ @Override
public String toInternal(String val) {
char ch = (val!=null && val.length()>0) ? val.charAt(0) : 0;
return (ch=='1' || ch=='t' || ch=='T') ? "T" : "F";
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
@@ -115,6 +122,7 @@ public class BoolField extends FieldType
return term.bytes[0] == 'T';
}
+ @Override
public String indexedToReadable(String indexedForm) {
char ch = indexedForm.charAt(0);
return ch=='T' ? "true" : "false";
@@ -129,6 +137,7 @@ public class BoolField extends FieldType
}
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeBool(name, f.stringValue().charAt(0) =='T');
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ByteField.java Sun Jan 30 15:10:15 2011
@@ -33,11 +33,13 @@ import java.util.Map;
* @version $Id$
*/
public class ByteField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String, String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
/////////////////////////////////////////////////////////////
+ @Override
public SortField getSortField(SchemaField field, boolean reverse) {
return new SortField(field.name, SortField.BYTE, reverse);
}
@@ -47,6 +49,7 @@ public class ByteField extends FieldType
return new ByteFieldSource( new ByteValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String s = f.stringValue();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DateField.java Sun Jan 30 15:10:15 2011
@@ -125,12 +125,14 @@ public class DateField extends FieldType
// The easiest fix is to simply remove the 'Z' for the internal
// format.
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
}
protected static String NOW = "NOW";
protected static char Z = 'Z';
+ @Override
public String toInternal(String val) {
return toInternal(parseMath(null, val));
}
@@ -183,6 +185,7 @@ public class DateField extends FieldType
return formatDate(val);
}
+ @Override
public String indexedToReadable(String indexedForm) {
return indexedForm + Z;
}
@@ -193,6 +196,7 @@ public class DateField extends FieldType
out.write(Z);
}
+ @Override
public String toExternal(Fieldable f) {
return indexedToReadable(f.stringValue());
}
@@ -211,6 +215,7 @@ public class DateField extends FieldType
}
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return getStringSort(field,reverse);
}
@@ -219,6 +224,7 @@ public class DateField extends FieldType
return new OrdFieldSource(field.name);
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
writer.writeDate(name, toExternal(f));
}
@@ -336,6 +342,7 @@ public class DateField extends FieldType
this.setTimeZone(CANONICAL_TZ);
}
+ @Override
public Date parse(String i, ParsePosition p) {
/* delegate to SimpleDateFormat for easy stuff */
Date d = super.parse(i, p);
@@ -357,6 +364,7 @@ public class DateField extends FieldType
return d;
}
+ @Override
public StringBuffer format(Date d, StringBuffer toAppendTo,
FieldPosition pos) {
/* delegate to SimpleDateFormat for easy stuff */
@@ -375,6 +383,7 @@ public class DateField extends FieldType
return toAppendTo;
}
+ @Override
public Object clone() {
ISO8601CanonicalDateFormat c
= (ISO8601CanonicalDateFormat) super.clone();
@@ -391,6 +400,7 @@ public class DateField extends FieldType
super();
proto = d;
}
+ @Override
protected DateFormat initialValue() {
return (DateFormat) proto.clone();
}
@@ -423,34 +433,42 @@ class DateFieldSource extends FieldCache
this.ft = ft;
}
+ @Override
public String description() {
return "date(" + field + ')';
}
+ @Override
public DocValues getValues(Map context, AtomicReaderContext readerContext) throws IOException {
return new StringIndexDocValues(this, readerContext, field) {
+ @Override
protected String toTerm(String readableValue) {
// needed for frange queries to work properly
return ft.toInternal(readableValue);
}
+ @Override
public float floatVal(int doc) {
return (float)intVal(doc);
}
+ @Override
public int intVal(int doc) {
int ord=termsIndex.getOrd(doc);
return ord;
}
+ @Override
public long longVal(int doc) {
return (long)intVal(doc);
}
+ @Override
public double doubleVal(int doc) {
return (double)intVal(doc);
}
+ @Override
public String strVal(int doc) {
int ord=termsIndex.getOrd(doc);
if (ord == 0) {
@@ -463,18 +481,21 @@ class DateFieldSource extends FieldCache
}
}
+ @Override
public String toString(int doc) {
return description() + '=' + intVal(doc);
}
};
}
+ @Override
public boolean equals(Object o) {
return o instanceof DateFieldSource
&& super.equals(o);
}
private static int hcode = DateFieldSource.class.hashCode();
+ @Override
public int hashCode() {
return hcode + super.hashCode();
};
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/DoubleField.java Sun Jan 30 15:10:15 2011
@@ -33,11 +33,13 @@ import java.util.Map;
* @version $Id$
*/
public class DoubleField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String, String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
/////////////////////////////////////////////////////////////
+ @Override
public SortField getSortField(SchemaField field, boolean reverse) {
return new SortField(field.name, SortField.DOUBLE, reverse);
}
@@ -48,6 +50,7 @@ public class DoubleField extends FieldTy
return new DoubleFieldSource( new DoubleValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String s = f.stringValue();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ExternalFileField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ExternalFileField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ExternalFileField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/ExternalFileField.java Sun Jan 30 15:10:15 2011
@@ -59,6 +59,7 @@ public class ExternalFileField extends F
private IndexSchema schema;
private float defVal;
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
String ftypeS = getArg("valType", args);
@@ -74,14 +75,17 @@ public class ExternalFileField extends F
this.schema = schema;
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
throw new UnsupportedOperationException();
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
throw new UnsupportedOperationException();
}
+ @Override
public ValueSource getValueSource(SchemaField field, QParser parser) {
// default key field to unique key
SchemaField keyField = keyFieldName==null ? schema.getUniqueKeyField() : schema.getField(keyFieldName);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FieldType.java Sun Jan 30 15:10:15 2011
@@ -185,6 +185,7 @@ public abstract class FieldType extends
this.typeName = typeName;
}
+ @Override
public String toString() {
return typeName + "{class=" + this.getClass().getName()
// + propertiesToString(properties)
@@ -390,6 +391,7 @@ public abstract class FieldType extends
this.maxChars=maxChars;
}
+ @Override
public TokenStreamInfo getStream(String fieldName, Reader reader) {
Tokenizer ts = new Tokenizer(reader) {
final char[] cbuf = new char[maxChars];
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/FloatField.java Sun Jan 30 15:10:15 2011
@@ -32,10 +32,12 @@ import java.io.IOException;
* @version $Id$
*/
public class FloatField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return new SortField(field.name,SortField.FLOAT, reverse);
}
@@ -45,6 +47,7 @@ public class FloatField extends FieldTyp
return new FloatFieldSource( new FloatValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String s = f.stringValue();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IndexSchema.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IndexSchema.java Sun Jan 30 15:10:15 2011
@@ -316,6 +316,7 @@ public final class IndexSchema {
return analyzer!=null ? analyzer : getDynamicFieldType(fieldName).getAnalyzer();
}
+ @Override
public TokenStream tokenStream(String fieldName, Reader reader)
{
return getAnalyzer(fieldName).tokenStream(fieldName,reader);
@@ -497,6 +498,7 @@ public final class IndexSchema {
Node node = (Node) xpath.evaluate("/schema/similarity", document, XPathConstants.NODE);
if (node==null) {
similarityFactory = new SimilarityFactory() {
+ @Override
public SimilarityProvider getSimilarityProvider() {
return IndexSearcher.getDefaultSimilarityProvider();
}
@@ -512,6 +514,7 @@ public final class IndexSchema {
} else {
// just like always, assume it's a SimilarityProvider and get a ClassCastException - reasonable error handling
similarityFactory = new SimilarityFactory() {
+ @Override
public SimilarityProvider getSimilarityProvider() {
return (SimilarityProvider) obj;
}
@@ -946,6 +949,7 @@ public final class IndexSchema {
return new SchemaField(prototype, name);
}
+ @Override
public String toString() {
return prototype.toString();
}
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/IntField.java Sun Jan 30 15:10:15 2011
@@ -32,10 +32,12 @@ import java.io.IOException;
* @version $Id$
*/
public class IntField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return new SortField(field.name,SortField.INT, reverse);
}
@@ -45,6 +47,7 @@ public class IntField extends FieldType
return new IntFieldSource(new IntValuesCreator( field.name, null, CachedArrayCreator.CACHE_VALUES_AND_BITS ) );
}
+ @Override
public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
String s = f.stringValue();
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/LongField.java Sun Jan 30 15:10:15 2011
@@ -32,12 +32,14 @@ import java.util.Map;
* @version $Id$
*/
public class LongField extends FieldType {
+ @Override
protected void init(IndexSchema schema, Map<String,String> args) {
restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
}
/////////////////////////////////////////////////////////////
+ @Override
public SortField getSortField(SchemaField field,boolean reverse) {
return new SortField(field.name,SortField.LONG, reverse);
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java?rev=1065304&r1=1065303&r2=1065304&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/schema/RandomSortField.java Sun Jan 30 15:10:15 2011
@@ -100,33 +100,40 @@ public class RandomSortField extends Fie
private static FieldComparatorSource randomComparatorSource = new FieldComparatorSource() {
+ @Override
public FieldComparator newComparator(final String fieldname, final int numHits, int sortPos, boolean reversed) throws IOException {
return new FieldComparator() {
int seed;
private final int[] values = new int[numHits];
int bottomVal;
+ @Override
public int compare(int slot1, int slot2) {
return values[slot1] - values[slot2]; // values will be positive... no overflow possible.
}
+ @Override
public void setBottom(int slot) {
bottomVal = values[slot];
}
+ @Override
public int compareBottom(int doc) throws IOException {
return bottomVal - hash(doc+seed);
}
+ @Override
public void copy(int slot, int doc) throws IOException {
values[slot] = hash(doc+seed);
}
+ @Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
seed = getSeed(fieldname, context);
return this;
}
+ @Override
public Comparable value(int slot) {
return values[slot];
}