You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/02/09 02:04:13 UTC
svn commit: r1068718 [13/21] - in /lucene/dev/branches/bulkpostings: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/ant/
dev-tools/maven/lucene/contrib/db/bdb-j...
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/PlainTextEntityProcessor.java Wed Feb 9 01:03:49 2011
@@ -40,11 +40,13 @@ public class PlainTextEntityProcessor ex
private static final Logger LOG = LoggerFactory.getLogger(PlainTextEntityProcessor.class);
private boolean ended = false;
+ @Override
public void init(Context context) {
super.init(context);
ended = false;
}
+ @Override
public Map<String, Object> nextRow() {
if (ended) return null;
DataSource<Reader> ds = context.getDataSource();
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/RegexTransformer.java Wed Feb 9 01:03:49 2011
@@ -43,6 +43,7 @@ import java.util.regex.Pattern;
public class RegexTransformer extends Transformer {
private static final Logger LOG = LoggerFactory.getLogger(RegexTransformer.class);
+ @Override
@SuppressWarnings("unchecked")
public Map<String, Object> transformRow(Map<String, Object> row,
Context ctx) {
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java Wed Feb 9 01:03:49 2011
@@ -47,6 +47,7 @@ public class ScriptTransformer extends T
private String functionName;
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
try {
if (engine == null)
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SqlEntityProcessor.java Wed Feb 9 01:03:49 2011
@@ -46,6 +46,7 @@ public class SqlEntityProcessor extends
protected DataSource<Iterator<Map<String, Object>>> dataSource;
+ @Override
@SuppressWarnings("unchecked")
public void init(Context context) {
super.init(context);
@@ -65,6 +66,7 @@ public class SqlEntityProcessor extends
}
}
+ @Override
public Map<String, Object> nextRow() {
if (rowIterator == null) {
String q = getQuery();
@@ -73,6 +75,7 @@ public class SqlEntityProcessor extends
return getNext();
}
+ @Override
public Map<String, Object> nextModifiedRowKey() {
if (rowIterator == null) {
String deltaQuery = context.getEntityAttribute(DELTA_QUERY);
@@ -83,6 +86,7 @@ public class SqlEntityProcessor extends
return getNext();
}
+ @Override
public Map<String, Object> nextDeletedRowKey() {
if (rowIterator == null) {
String deletedPkQuery = context.getEntityAttribute(DEL_PK_QUERY);
@@ -93,6 +97,7 @@ public class SqlEntityProcessor extends
return getNext();
}
+ @Override
public Map<String, Object> nextModifiedParentRowKey() {
if (rowIterator == null) {
String parentDeltaQuery = context.getEntityAttribute(PARENT_DELTA_QUERY);
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/TemplateTransformer.java Wed Feb 9 01:03:49 2011
@@ -51,6 +51,7 @@ public class TemplateTransformer extends
private static final Logger LOG = LoggerFactory.getLogger(TemplateTransformer.class);
private Map<String ,List<String>> templateVsVars = new HashMap<String, List<String>>();
+ @Override
@SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> row, Context context) {
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/URLDataSource.java Wed Feb 9 01:03:49 2011
@@ -56,6 +56,7 @@ public class URLDataSource extends DataS
public URLDataSource() {
}
+ @Override
public void init(Context context, Properties initProps) {
this.context = context;
this.initProps = initProps;
@@ -81,6 +82,7 @@ public class URLDataSource extends DataS
}
}
+ @Override
public Reader getData(String query) {
URL url = null;
try {
@@ -114,6 +116,7 @@ public class URLDataSource extends DataS
}
}
+ @Override
public void close() {
}
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/VariableResolverImpl.java Wed Feb 9 01:03:49 2011
@@ -91,10 +91,12 @@ public class VariableResolverImpl extend
container.remove(name);
}
+ @Override
public String replaceTokens(String template) {
return templateString.replaceTokens(template, this);
}
+ @Override
@SuppressWarnings("unchecked")
public Object resolve(String name) {
if (name == null)
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/XPathEntityProcessor.java Wed Feb 9 01:03:49 2011
@@ -80,6 +80,7 @@ public class XPathEntityProcessor extend
protected Thread publisherThread;
+ @Override
@SuppressWarnings("unchecked")
public void init(Context context) {
super.init(context);
@@ -171,6 +172,7 @@ public class XPathEntityProcessor extend
}
+ @Override
public Map<String, Object> nextRow() {
Map<String, Object> result;
@@ -398,6 +400,7 @@ public class XPathEntityProcessor extend
final AtomicBoolean isEnd = new AtomicBoolean(false);
final AtomicBoolean throwExp = new AtomicBoolean(true);
publisherThread = new Thread() {
+ @Override
public void run() {
try {
xpathReader.streamRecords(data, new XPathRecordReader.Handler() {
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/AbstractDataImportHandlerTestCase.java Wed Feb 9 01:03:49 2011
@@ -197,89 +197,110 @@ public abstract class AbstractDataImport
this.root = root;
}
+ @Override
public String getEntityAttribute(String name) {
return entityAttrs == null ? delegate.getEntityAttribute(name) : entityAttrs.get(name);
}
+ @Override
public String getResolvedEntityAttribute(String name) {
return entityAttrs == null ? delegate.getResolvedEntityAttribute(name) :
delegate.getVariableResolver().replaceTokens(entityAttrs.get(name));
}
+ @Override
public List<Map<String, String>> getAllEntityFields() {
return entityFields == null ? delegate.getAllEntityFields()
: entityFields;
}
+ @Override
public VariableResolver getVariableResolver() {
return delegate.getVariableResolver();
}
+ @Override
public DataSource getDataSource() {
return delegate.getDataSource();
}
+ @Override
public boolean isRootEntity() {
return root;
}
+ @Override
public String currentProcess() {
return delegate.currentProcess();
}
+ @Override
public Map<String, Object> getRequestParameters() {
return delegate.getRequestParameters();
}
+ @Override
public EntityProcessor getEntityProcessor() {
return null;
}
+ @Override
public void setSessionAttribute(String name, Object val, String scope) {
delegate.setSessionAttribute(name, val, scope);
}
+ @Override
public Object getSessionAttribute(String name, String scope) {
return delegate.getSessionAttribute(name, scope);
}
+ @Override
public Context getParentContext() {
return delegate.getParentContext();
}
+ @Override
public DataSource getDataSource(String name) {
return delegate.getDataSource(name);
}
+ @Override
public SolrCore getSolrCore() {
return delegate.getSolrCore();
}
+ @Override
public Map<String, Object> getStats() {
return delegate.getStats();
}
+ @Override
public String getScript() {
return script == null ? delegate.getScript() : script;
}
+ @Override
public String getScriptLanguage() {
return scriptlang == null ? delegate.getScriptLanguage() : scriptlang;
}
+ @Override
public void deleteDoc(String id) {
}
+ @Override
public void deleteDocByQuery(String query) {
}
+ @Override
public Object resolve(String var) {
return delegate.resolve(var);
}
+ @Override
public String replaceTokens(String template) {
return delegate.replaceTokens(template);
}
@@ -318,31 +339,37 @@ public abstract class AbstractDataImport
reset();
}
+ @Override
public void finish() throws IOException {
finishCalled = true;
super.finish();
}
+ @Override
public void processAdd(AddUpdateCommand cmd) throws IOException {
processAddCalled = true;
super.processAdd(cmd);
}
+ @Override
public void processCommit(CommitUpdateCommand cmd) throws IOException {
processCommitCalled = true;
super.processCommit(cmd);
}
+ @Override
public void processDelete(DeleteUpdateCommand cmd) throws IOException {
processDeleteCalled = true;
super.processDelete(cmd);
}
+ @Override
public void processMergeIndexes(MergeIndexesCommand cmd) throws IOException {
mergeIndexesCalled = true;
super.processMergeIndexes(cmd);
}
+ @Override
public void processRollback(RollbackUpdateCommand cmd) throws IOException {
rollbackCalled = true;
super.processRollback(cmd);
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestCachedSqlEntityProcessor.java Wed Feb 9 01:03:49 2011
@@ -158,6 +158,7 @@ public class TestCachedSqlEntityProcesso
public static class DoubleTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>();
rows.add(row);
@@ -169,6 +170,7 @@ public class TestCachedSqlEntityProcesso
public static class UppercaseTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
for (Map.Entry<String, Object> entry : row.entrySet()) {
Object val = entry.getValue();
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java Wed Feb 9 01:03:49 2011
@@ -43,6 +43,7 @@ public class TestContentStreamDataSource
SolrInstance instance = null;
JettySolrRunner jetty;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -51,6 +52,7 @@ public class TestContentStreamDataSource
jetty = createJetty(instance);
}
+ @Override
@After
public void tearDown() throws Exception {
jetty.stop();
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDataConfig.java Wed Feb 9 01:03:49 2011
@@ -19,9 +19,10 @@ package org.apache.solr.handler.dataimpo
import org.junit.BeforeClass;
import org.junit.Test;
import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.ByteArrayInputStream;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
@@ -55,7 +56,7 @@ public class TestDataConfig extends Abst
public void testBasic() throws Exception {
javax.xml.parsers.DocumentBuilder builder = DocumentBuilderFactory
.newInstance().newDocumentBuilder();
- Document doc = builder.parse(new ByteArrayInputStream(xml.getBytes()));
+ Document doc = builder.parse(new InputSource(new StringReader(xml)));
DataConfig dc = new DataConfig();
dc.readFromXml(doc.getDocumentElement());
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder.java Wed Feb 9 01:03:49 2011
@@ -33,6 +33,7 @@ import java.util.*;
*/
public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
+ @Override
@After
public void tearDown() throws Exception {
MockDataSource.clearCache();
@@ -200,22 +201,27 @@ public class TestDocBuilder extends Abst
super(null, ".",null);
}
+ @Override
public boolean upload(SolrInputDocument doc) {
return docs.add(doc);
}
+ @Override
public void log(int event, String name, Object row) {
// Do nothing
}
+ @Override
public void doDeleteAll() {
deleteAllCalled = Boolean.TRUE;
}
+ @Override
public void commit(boolean b) {
commitCalled = Boolean.TRUE;
}
+ @Override
public void finish() {
finishCalled = Boolean.TRUE;
}
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestDocBuilder2.java Wed Feb 9 01:03:49 2011
@@ -252,6 +252,7 @@ public class TestDocBuilder2 extends Abs
}
public static class MockTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
assertTrue("Context gave incorrect data source", context.getDataSource("mockDs") instanceof MockDataSource2);
return row;
@@ -259,6 +260,7 @@ public class TestDocBuilder2 extends Abs
}
public static class AddDynamicFieldTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
// Add a dynamic field
row.put("dynamic_s", "test");
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEntityProcessorBase.java Wed Feb 9 01:03:49 2011
@@ -57,6 +57,7 @@ public class TestEntityProcessorBase ext
static class T1 extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
aRow.put("T1", "T1 called");
return aRow;
@@ -66,6 +67,7 @@ public class TestEntityProcessorBase ext
static class T2 extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
aRow.put("T2", "T2 called");
return aRow;
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestErrorHandling.java Wed Feb 9 01:03:49 2011
@@ -78,19 +78,23 @@ public class TestErrorHandling extends A
public static class StringDataSource extends DataSource<Reader> {
public static String xml = "";
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public Reader getData(String query) {
return new StringReader(xml);
}
+ @Override
public void close() {
}
}
public static class ExceptionTransformer extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> row, Context context) {
throw new RuntimeException("Test exception");
}
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestEvaluatorBag.java Wed Feb 9 01:03:49 2011
@@ -39,6 +39,7 @@ public class TestEvaluatorBag extends Ab
Map<String, String> urlTests;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestJdbcDataSource.java Wed Feb 9 01:03:49 2011
@@ -57,6 +57,7 @@ public class TestJdbcDataSource extends
String sysProp = System.getProperty("java.naming.factory.initial");
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
@@ -69,6 +70,7 @@ public class TestJdbcDataSource extends
connection = mockControl.createMock(Connection.class);
}
+ @Override
@After
public void tearDown() throws Exception {
if (sysProp == null) {
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java Wed Feb 9 01:03:49 2011
@@ -207,12 +207,15 @@ public class TestLineEntityProcessor ext
private DataSource<Reader> getDataSource(final String xml) {
return new DataSource<Reader>() {
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public void close() {
}
+ @Override
public Reader getData(String query) {
return new StringReader(xml);
}
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java Wed Feb 9 01:03:49 2011
@@ -42,15 +42,18 @@ public class TestPlainTextEntityProcesso
public static class DS extends DataSource {
static String s = "hello world";
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public Object getData(String query) {
return new StringReader(s);
}
+ @Override
public void close() {
}
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java Wed Feb 9 01:03:49 2011
@@ -135,19 +135,23 @@ public class TestSqlEntityProcessor exte
private static DataSource<Iterator<Map<String, Object>>> getDs(
final List<Map<String, Object>> rows) {
return new DataSource<Iterator<Map<String, Object>>>() {
+ @Override
public Iterator<Map<String, Object>> getData(String query) {
return rows.iterator();
}
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public void close() {
}
};
}
public static class T extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
aRow.put("T", "Class T");
return aRow;
@@ -162,6 +166,7 @@ public class TestSqlEntityProcessor exte
}
public static class T2 extends Transformer {
+ @Override
public Object transformRow(Map<String, Object> aRow, Context context) {
Integer count = local.get();
local.set(count + 1);
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor2.java Wed Feb 9 01:03:49 2011
@@ -214,6 +214,7 @@ public class TestSqlEntityProcessor2 ext
}
static class DateFormatValidatingEvaluator extends Evaluator {
+ @Override
public String evaluate(String expression, Context context) {
List l = EvaluatorBag.parseParams(expression, context.getVariableResolver());
Object o = l.get(0);
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestVariableResolver.java Wed Feb 9 01:03:49 2011
@@ -169,6 +169,7 @@ public class TestVariableResolver extend
}
public static class E extends Evaluator{
+ @Override
public String evaluate(String expression, Context context) {
return "Hello World";
}
Modified: lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestXPathEntityProcessor.java Wed Feb 9 01:03:49 2011
@@ -46,7 +46,7 @@ public class TestXPathEntityProcessor ex
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
- createFile(tmpdir, "x.xsl", xsl.getBytes(), false);
+ createFile(tmpdir, "x.xsl", xsl.getBytes("UTF-8"), false);
Map entityAttrs = createMap("name", "e", "url", "cd.xml",
XPathEntityProcessor.FOR_EACH, "/catalog/cd");
List fields = new ArrayList();
@@ -211,7 +211,7 @@ public class TestXPathEntityProcessor ex
tmpdir.delete();
tmpdir.mkdir();
tmpdir.deleteOnExit();
- TestFileListEntityProcessor.createFile(tmpdir, "x.xsl", xsl.getBytes(),
+ TestFileListEntityProcessor.createFile(tmpdir, "x.xsl", xsl.getBytes("UTF-8"),
false);
Map entityAttrs = createMap("name", "e",
XPathEntityProcessor.USE_SOLR_ADD_SCHEMA, "true", "xsl", ""
@@ -236,12 +236,15 @@ public class TestXPathEntityProcessor ex
private DataSource<Reader> getDataSource(final String xml) {
return new DataSource<Reader>() {
+ @Override
public void init(Context context, Properties initProps) {
}
+ @Override
public void close() {
}
+ @Override
public Reader getData(String query) {
return new StringReader(xml);
}
Modified: lucene/dev/branches/bulkpostings/solr/contrib/extraction/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/extraction/build.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/extraction/build.xml (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/extraction/build.xml Wed Feb 9 01:03:49 2011
@@ -40,7 +40,7 @@
<pathelement path="${dest}/classes" />
<pathelement path="${dest}/test-classes" />
<pathelement location="${solr-path}/build/tests"/> <!-- include solr test code -->
- <pathelement location="${solr-path}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${solr-path}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<pathelement path="${java.class.path}"/>
</path>
Modified: lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingDocumentLoader.java Wed Feb 9 01:03:49 2011
@@ -120,6 +120,7 @@ public class ExtractingDocumentLoader ex
* @param stream
* @throws java.io.IOException
*/
+ @Override
public void load(SolrQueryRequest req, SolrQueryResponse rsp, ContentStream stream) throws IOException {
errHeader = "ExtractingDocumentLoader: " + stream.getSourceInfo();
Parser parser = null;
Modified: lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java Wed Feb 9 01:03:49 2011
@@ -111,6 +111,7 @@ public class ExtractingRequestHandler ex
}
+ @Override
protected ContentStreamLoader newLoader(SolrQueryRequest req, UpdateRequestProcessor processor) {
return new ExtractingDocumentLoader(req, processor, config, factory);
}
Modified: lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java Wed Feb 9 01:03:49 2011
@@ -46,6 +46,7 @@ public class ExtractingRequestHandlerTes
initCore("solrconfig.xml", "schema.xml", "solr-extraction");
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/bulkpostings/solr/contrib/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/uima/build.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/uima/build.xml (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/uima/build.xml Wed Feb 9 01:03:49 2011
@@ -41,7 +41,7 @@
<pathelement path="${dest}/classes" />
<pathelement path="${dest}/test-classes" />
<pathelement location="${solr-path}/build/tests"/> <!-- include solr test code -->
- <pathelement location="${solr-path}/../lucene/build/classes/test" /> <!-- include some lucene test code -->
+ <pathelement location="${solr-path}/../lucene/build/classes/test-framework" /> <!-- include some lucene test code -->
<pathelement path="${java.class.path}"/>
</path>
Modified: lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java Wed Feb 9 01:03:49 2011
@@ -56,6 +56,7 @@ public class UIMAUpdateRequestProcessor
solrUIMAConfiguration.getAePath(), solrUIMAConfiguration.getRuntimeParameters());
}
+ @Override
public void processAdd(AddUpdateCommand cmd) throws IOException {
try {
/* get Solr document */
Modified: lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/uima/src/main/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java Wed Feb 9 01:03:49 2011
@@ -29,6 +29,7 @@ import org.apache.solr.update.processor.
*/
public class UIMAUpdateRequestProcessorFactory extends UpdateRequestProcessorFactory {
+ @Override
public UpdateRequestProcessor getInstance(SolrQueryRequest req, SolrQueryResponse rsp,
UpdateRequestProcessor next) {
return new UIMAUpdateRequestProcessor(next, req.getCore());
Modified: lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java (original)
+++ lucene/dev/branches/bulkpostings/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java Wed Feb 9 01:03:49 2011
@@ -50,6 +50,7 @@ public class UIMAUpdateRequestProcessorT
initCore("solrconfig.xml", "schema.xml", "solr-uima");
}
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
Modified: lucene/dev/branches/bulkpostings/solr/example/exampledocs/post.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/example/exampledocs/post.sh?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/example/exampledocs/post.sh (original)
+++ lucene/dev/branches/bulkpostings/solr/example/exampledocs/post.sh Wed Feb 9 01:03:49 2011
@@ -19,10 +19,10 @@ URL=http://localhost:8983/solr/update
for f in $FILES; do
echo Posting file $f to $URL
- curl $URL --data-binary @$f -H 'Content-type:text/xml; charset=utf-8'
+ curl $URL --data-binary @$f -H 'Content-type:application/xml'
echo
done
#send the commit command to make sure all the changes are flushed and visible
-curl $URL --data-binary '<commit/>' -H 'Content-type:text/xml; charset=utf-8'
+curl $URL --data-binary '<commit/>' -H 'Content-type:application/xml'
echo
Modified: lucene/dev/branches/bulkpostings/solr/example/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/example/solr/conf/schema.xml?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/example/solr/conf/schema.xml (original)
+++ lucene/dev/branches/bulkpostings/solr/example/solr/conf/schema.xml Wed Feb 9 01:03:49 2011
@@ -376,6 +376,11 @@
</analyzer>
</fieldType>
+ <fieldType name="text_path" class="solr.TextField" positionIncrementGap="100">
+ <analyzer>
+ <tokenizer class="solr.PathHierarchyTokenizerFactory"/>
+ </analyzer>
+ </fieldType>
<!-- since fields of this type are by default not stored or indexed,
any data added to them will be ignored outright. -->
Modified: lucene/dev/branches/bulkpostings/solr/example/start.jar
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/example/start.jar?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocument.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocument.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocument.java Wed Feb 9 01:03:49 2011
@@ -220,6 +220,7 @@ public class SolrDocument implements Map
public Collection<Collection<Object>> values() {throw new UnsupportedOperationException();}
public Collection<Object> put(String key, Collection<Object> value) {throw new UnsupportedOperationException();}
public Collection<Object> remove(Object key) {throw new UnsupportedOperationException();}
+ @Override
public String toString() {return _fields.toString();}
};
}
@@ -248,6 +249,7 @@ public class SolrDocument implements Map
public Collection<Object> values() {throw new UnsupportedOperationException();}
public Collection<Object> put(String key, Object value) {throw new UnsupportedOperationException();}
public Collection<Object> remove(Object key) {throw new UnsupportedOperationException();}
+ @Override
public String toString() {return _fields.toString();}
};
}
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocumentList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocumentList.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocumentList.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/SolrDocumentList.java Wed Feb 9 01:03:49 2011
@@ -57,6 +57,7 @@ public class SolrDocumentList extends Ar
this.start = start;
}
+ @Override
public String toString() {
return "{numFound="+numFound
+",start="+start
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/CloudState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/CloudState.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/CloudState.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/CloudState.java Wed Feb 9 01:03:49 2011
@@ -140,6 +140,7 @@ public class CloudState {
return liveNodesSet;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("live nodes:" + liveNodes);
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/SolrZkClient.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/SolrZkClient.java Wed Feb 9 01:03:49 2011
@@ -74,7 +74,6 @@ public class SolrZkClient {
* @param zkClientTimeout
* @param strat
* @param onReconnect
- * @param clientConnectTimeout
* @throws InterruptedException
* @throws TimeoutException
* @throws IOException
@@ -164,7 +163,7 @@ public class SolrZkClient {
/**
* @param path
- * @return
+ * @return true if path exists
* @throws KeeperException
* @throws InterruptedException
*/
@@ -178,7 +177,7 @@ public class SolrZkClient {
* @param data
* @param acl
* @param createMode
- * @return
+ * @return path of created node
* @throws KeeperException
* @throws InterruptedException
*/
@@ -190,7 +189,7 @@ public class SolrZkClient {
/**
* @param path
* @param watcher
- * @return
+ * @return children of the node at the path
* @throws KeeperException
* @throws InterruptedException
*/
@@ -203,7 +202,7 @@ public class SolrZkClient {
* @param path
* @param watcher
* @param stat
- * @return
+ * @return node's data
* @throws KeeperException
* @throws InterruptedException
*/
@@ -216,7 +215,7 @@ public class SolrZkClient {
* @param path
* @param data
* @param version
- * @return
+ * @return node's state
* @throws KeeperException
* @throws InterruptedException
*/
@@ -229,8 +228,8 @@ public class SolrZkClient {
*
* @param path
* @param data
- * @param watcher
- * @return
+ * @param createMode
+ * @return path of created node
* @throws KeeperException
* @throws InterruptedException
*/
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/ZkNodeProps.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/ZkNodeProps.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/ZkNodeProps.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/cloud/ZkNodeProps.java Wed Feb 9 01:03:49 2011
@@ -46,6 +46,7 @@ public class ZkNodeProps extends HashMap
return sb.toString().getBytes("UTF-8");
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
Set<Entry<String,String>> entries = entrySet();
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/params/FacetParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/params/FacetParams.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/params/FacetParams.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/params/FacetParams.java Wed Feb 9 01:03:49 2011
@@ -228,7 +228,6 @@ public interface FacetParams {
* String indicating what "other" ranges should be computed for a
* numerical range facet (multi-value).
* Can be overriden on a per field basis.
- * @see FacetNumberOther
*/
public static final String FACET_RANGE_OTHER = FACET_RANGE + ".other";
/**
@@ -270,6 +269,7 @@ public interface FacetParams {
*/
public enum FacetRangeOther {
BEFORE, AFTER, BETWEEN, ALL, NONE;
+ @Override
public String toString() { return super.toString().toLowerCase(); }
public static FacetRangeOther get(String label) {
try {
@@ -288,6 +288,7 @@ public interface FacetParams {
@Deprecated
public enum FacetDateOther {
BEFORE, AFTER, BETWEEN, ALL, NONE;
+ @Override
public String toString() { return super.toString().toLowerCase(); }
public static FacetDateOther get(String label) {
try {
@@ -321,6 +322,7 @@ public interface FacetParams {
*/
public enum FacetRangeInclude {
ALL, LOWER, UPPER, EDGE, OUTER;
+ @Override
public String toString() { return super.toString().toLowerCase(Locale.ENGLISH); }
public static FacetRangeInclude get(String label) {
try {
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/params/QueryElevationParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/params/QueryElevationParams.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/params/QueryElevationParams.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/params/QueryElevationParams.java Wed Feb 9 01:03:49 2011
@@ -1,5 +1,22 @@
package org.apache.solr.common.params;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/**
* Parameters used with the QueryElevationComponent
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/FastOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/FastOutputStream.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/FastOutputStream.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/FastOutputStream.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/JavaBinCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/JavaBinCodec.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/JavaBinCodec.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/JavaBinCodec.java Wed Feb 9 01:03:49 2011
@@ -96,7 +96,8 @@ public class JavaBinCodec {
FastInputStream dis = FastInputStream.wrap(is);
version = dis.readByte();
if (version != VERSION) {
- throw new RuntimeException("Invalid version or the data in not in 'javabin' format");
+ throw new RuntimeException("Invalid version (expected " + VERSION +
+ ", but " + version + ") or the data in not in 'javabin' format");
}
return readVal(dis);
}
Modified: lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/NamedList.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/NamedList.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/NamedList.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/NamedList.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/StrUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/StrUtils.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/StrUtils.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/common/org/apache/solr/common/util/StrUtils.java Wed Feb 9 01:03:49 2011
@@ -242,7 +242,7 @@ public class StrUtils {
* {@link NullPointerException} and {@link SolrException} free version of {@link #parseBool(String)}
* @param s
* @param def
- * @return
+ * @return parsed boolean value (or def, if s is null or invalid)
*/
public static boolean parseBool(String s, boolean def) {
if( s != null ) {
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java Wed Feb 9 01:03:49 2011
@@ -23,22 +23,27 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.miscellaneous.KeepWordFilter;
import org.apache.lucene.analysis.util.CharArraySet;
+import java.util.Map;
import java.util.Set;
import java.io.IOException;
/**
* @version $Id$
- * @since solr 1.3
*/
public class KeepWordFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
- private CharArraySet words;
- private boolean ignoreCase;
+ @Override
+ public void init(Map<String,String> args) {
+ super.init(args);
+ assureMatchVersion();
+ }
public void inform(ResourceLoader loader) {
String wordFiles = args.get("words");
ignoreCase = getBoolean("ignoreCase", false);
- if (wordFiles != null) {
+ enablePositionIncrements = getBoolean("enablePositionIncrements",false);
+
+ if (wordFiles != null) {
try {
words = getWordSet(loader, wordFiles, ignoreCase);
} catch (IOException e) {
@@ -47,6 +52,10 @@ public class KeepWordFilterFactory exten
}
}
+ private CharArraySet words;
+ private boolean ignoreCase;
+ private boolean enablePositionIncrements;
+
/**
* Set the keep word list.
* NOTE: if ignoreCase==true, the words are expected to be lowercase
@@ -62,15 +71,19 @@ public class KeepWordFilterFactory exten
this.ignoreCase = ignoreCase;
}
- public KeepWordFilter create(TokenStream input) {
- return new KeepWordFilter(input, words);
+ public boolean isEnablePositionIncrements() {
+ return enablePositionIncrements;
+ }
+
+ public boolean isIgnoreCase() {
+ return ignoreCase;
}
public CharArraySet getWords() {
return words;
}
- public boolean isIgnoreCase() {
- return ignoreCase;
+ public KeepWordFilter create(TokenStream input) {
+ return new KeepWordFilter(enablePositionIncrements, input, words);
}
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java Wed Feb 9 01:03:49 2011
@@ -27,6 +27,7 @@ import java.util.Map;
*/
public class LengthFilterFactory extends BaseTokenFilterFactory {
int min,max;
+ boolean enablePositionIncrements;
public static final String MIN_KEY = "min";
public static final String MAX_KEY = "max";
@@ -35,8 +36,10 @@ public class LengthFilterFactory extends
super.init(args);
min=Integer.parseInt(args.get(MIN_KEY));
max=Integer.parseInt(args.get(MAX_KEY));
+ enablePositionIncrements = getBoolean("enablePositionIncrements",false);
}
+
public LengthFilter create(TokenStream input) {
- return new LengthFilter(input,min,max);
+ return new LengthFilter(enablePositionIncrements, input,min,max);
}
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java Wed Feb 9 01:03:49 2011
@@ -32,6 +32,7 @@ public abstract class SolrAnalyzer exten
posIncGap=gap;
}
+ @Override
public int getPositionIncrementGap(String fieldName) {
return posIncGap;
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java Wed Feb 9 01:03:49 2011
@@ -29,6 +29,15 @@ import java.util.Set;
import java.io.IOException;
/**
+ * Factory for {@link StopFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_stop" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.StopFilterFactory" ignoreCase="true"
+ * words="stopwords.txt" enablePositionIncrements="true"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class StopFilterFactory extends BaseTokenFilterFactory implements ResourceLoaderAware {
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/TokenizerChain.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/TokenizerChain.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/TokenizerChain.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/analysis/TokenizerChain.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/SolrZkServer.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/SolrZkServer.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/SolrZkServer.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/ZkController.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/ZkController.java Wed Feb 9 01:03:49 2011
@@ -186,7 +186,7 @@ public final class ZkController {
/**
* @param collection
* @param fileName
- * @return
+ * @return true if config file exists
* @throws KeeperException
* @throws InterruptedException
*/
@@ -206,7 +206,7 @@ public final class ZkController {
/**
* @param zkConfigName
* @param fileName
- * @return
+ * @return config file data (in bytes)
* @throws KeeperException
* @throws InterruptedException
*/
@@ -250,7 +250,7 @@ public final class ZkController {
}
/**
- * @return
+ * @return zookeeper server address
*/
public String getZkServerAddress() {
return zkServerAddress;
@@ -392,7 +392,7 @@ public final class ZkController {
/**
* @param path
- * @return
+ * @return true if the path exists
* @throws KeeperException
* @throws InterruptedException
*/
@@ -403,7 +403,7 @@ public final class ZkController {
/**
* @param collection
- * @return
+ * @return config value
* @throws KeeperException
* @throws InterruptedException
* @throws IOException
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java Wed Feb 9 01:03:49 2011
@@ -42,6 +42,7 @@ class AbstractSolrEventListener implemen
throw new UnsupportedOperationException();
}
+ @Override
public String toString() {
return getClass().getName() + args;
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/CoreContainer.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/CoreContainer.java Wed Feb 9 01:03:49 2011
@@ -232,7 +232,7 @@ public class CoreContainer
cores.load(solrHome, fconf);
} else {
log.info("no solr.xml file found - using default");
- cores.load(solrHome, new ByteArrayInputStream(DEF_SOLR_XML.getBytes()));
+ cores.load(solrHome, new ByteArrayInputStream(DEF_SOLR_XML.getBytes("UTF-8")));
cores.configFile = fconf;
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java Wed Feb 9 01:03:49 2011
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.solr.core;
import java.io.IOException;
@@ -34,6 +51,7 @@ public class RefCntRamDirectory extends
}
}
+ @Override
public final synchronized void close() {
decRef();
}
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RunExecutableListener.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RunExecutableListener.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RunExecutableListener.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/RunExecutableListener.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrConfig.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrConfig.java Wed Feb 9 01:03:49 2011
@@ -141,7 +141,7 @@ public class SolrConfig extends Config {
filtOptThreshold = getFloat("query/boolTofilterOptimizer/@threshold",.05f);
useFilterForSortedQuery = getBool("query/useFilterForSortedQuery", false);
- queryResultWindowSize = getInt("query/queryResultWindowSize", 1);
+ queryResultWindowSize = Math.max(1, getInt("query/queryResultWindowSize", 1));
queryResultMaxDocsCached = getInt("query/queryResultMaxDocsCached", Integer.MAX_VALUE);
enableLazyFieldLoading = getBool("query/enableLazyFieldLoading", false);
Modified: lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrCore.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/SolrCore.java Wed Feb 9 01:03:49 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/branches/bulkpostings/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java?rev=1068718&r1=1068717&r2=1068718&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java (original)
+++ lucene/dev/branches/bulkpostings/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java Wed Feb 9 01:03:49 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));
}