You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/06/28 19:52:10 UTC
svn commit: r1355088 [7/8] - in /lucene/dev/branches/branch_4x: ./
dev-tools/ lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
lucene/analysis/commo...
Modified: lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_4x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Thu Jun 28 17:51:38 2012
@@ -756,7 +756,7 @@ public abstract class LuceneTestCase ext
* some features of Windows, such as not allowing open files to be
* overwritten.
*/
- public static MockDirectoryWrapper newDirectory() throws IOException {
+ public static MockDirectoryWrapper newDirectory() {
return newDirectory(random());
}
@@ -764,7 +764,7 @@ public abstract class LuceneTestCase ext
* Returns a new Directory instance, using the specified random.
* See {@link #newDirectory()} for more information.
*/
- public static MockDirectoryWrapper newDirectory(Random r) throws IOException {
+ public static MockDirectoryWrapper newDirectory(Random r) {
Directory impl = newDirectoryImpl(r, TEST_DIRECTORY);
MockDirectoryWrapper dir = new MockDirectoryWrapper(r, maybeNRTWrap(r, impl));
closeAfterSuite(new CloseableDirectory(dir, suiteFailureMarker));
@@ -786,12 +786,12 @@ public abstract class LuceneTestCase ext
}
/** Returns a new FSDirectory instance over the given file, which must be a folder. */
- public static MockDirectoryWrapper newFSDirectory(File f) throws IOException {
+ public static MockDirectoryWrapper newFSDirectory(File f) {
return newFSDirectory(f, null);
}
/** Returns a new FSDirectory instance over the given file, which must be a folder. */
- public static MockDirectoryWrapper newFSDirectory(File f, LockFactory lf) throws IOException {
+ public static MockDirectoryWrapper newFSDirectory(File f, LockFactory lf) {
String fsdirClass = TEST_DIRECTORY;
if (fsdirClass.equals("random")) {
fsdirClass = RandomPicks.randomFrom(random(), FS_DIRECTORIES);
Modified: lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java Thu Jun 28 17:51:38 2012
@@ -147,7 +147,7 @@ public class CarrotClusteringEngine exte
final IResource foundResource = new IResource() {
@Override
- public InputStream open() throws IOException {
+ public InputStream open() {
return new ByteArrayInputStream(asBytes);
}
Modified: lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java Thu Jun 28 17:51:38 2012
@@ -180,7 +180,7 @@ public class LuceneCarrot2StemmerFactory
private char[] buffer = new char[0];
- private LuceneStemmerAdapter() throws Exception {
+ private LuceneStemmerAdapter() {
delegate = new org.apache.lucene.analysis.ar.ArabicStemmer();
normalizer = new org.apache.lucene.analysis.ar.ArabicNormalizer();
}
Modified: lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java Thu Jun 28 17:51:38 2012
@@ -141,7 +141,7 @@ public class LuceneCarrot2TokenizerFacto
array.reset(term.buffer(), 0, term.length());
}
- public void reset(Reader input) throws IOException {
+ public void reset(Reader input) {
try {
sentenceTokenizer.reset(input);
wordTokenFilter = (TokenStream) tokenFilterClass.getConstructor(
Modified: lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java Thu Jun 28 17:51:38 2012
@@ -39,7 +39,7 @@ public class DuplicatingTokenizerFactory
}
@Override
- public void reset(Reader input) throws IOException {
+ public void reset(Reader input) {
delegate.reset(input);
}
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java Thu Jun 28 17:51:38 2012
@@ -46,7 +46,7 @@ public class TestErrorHandling extends A
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java Thu Jun 28 17:51:38 2012
@@ -101,13 +101,13 @@ public class TestSolrEntityProcessorEndT
//TODO: fix this test to close its directories
static String savedFactory;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
savedFactory = System.getProperty("solr.DirectoryFactory");
System.setProperty("solr.directoryFactory", "solr.StandardDirectoryFactory");
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java Thu Jun 28 17:51:38 2012
@@ -22,7 +22,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
-import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -70,7 +69,7 @@ public class TestSqlEntityProcessorDelta
}
@AfterClass
- public static void afterClass() throws Exception {
+ public static void afterClass() {
if (savedFactory == null) {
System.clearProperty("solr.directoryFactory");
} else {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java Thu Jun 28 17:51:38 2012
@@ -73,15 +73,11 @@ final class TrieTokenizer extends Tokeni
this.precisionStep = precisionStep;
this.ts = ts;
- try {
- reset(input);
- } catch (IOException e) {
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unable to create TrieIndexTokenizer", e);
- }
+ reset(input);
}
@Override
- public void reset(Reader input) throws IOException {
+ public void reset(Reader input) {
try {
super.reset(input);
input = super.input;
@@ -132,7 +128,7 @@ final class TrieTokenizer extends Tokeni
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
if (ts.incrementToken()) {
ofsAtt.setOffset(startOfs, endOfs);
return true;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java Thu Jun 28 17:51:38 2012
@@ -21,9 +21,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Set;
-import org.apache.lucene.document.Document;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
@@ -45,9 +43,6 @@ import org.apache.solr.request.SolrReque
import org.apache.solr.response.BinaryResponseWriter;
import org.apache.solr.response.ResultContext;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.response.transform.DocTransformer;
-import org.apache.solr.search.DocIterator;
-import org.apache.solr.search.DocList;
import org.apache.solr.servlet.SolrRequestParsers;
/**
@@ -187,7 +182,7 @@ public class EmbeddedSolrServer extends
new JavaBinCodec(resolver) {
@Override
- public void writeSolrDocument(SolrDocument doc) throws IOException {
+ public void writeSolrDocument(SolrDocument doc) {
callback.streamSolrDocument( doc );
//super.writeSolrDocument( doc, fields );
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/Overseer.java Thu Jun 28 17:51:38 2012
@@ -156,8 +156,7 @@ public class Overseer {
}
private CloudState processMessage(CloudState cloudState,
- final ZkNodeProps message, final String operation)
- throws KeeperException, InterruptedException {
+ final ZkNodeProps message, final String operation) {
if ("state".equals(operation)) {
cloudState = updateState(cloudState, message);
} else if ("deletecore".equals(operation)) {
@@ -197,10 +196,8 @@ public class Overseer {
}
/**
* Try to assign core to the cluster.
- * @throws KeeperException
- * @throws InterruptedException
*/
- private CloudState updateState(CloudState state, final ZkNodeProps message) throws KeeperException, InterruptedException {
+ private CloudState updateState(CloudState state, final ZkNodeProps message) {
final String collection = message.get(ZkStateReader.COLLECTION_PROP);
final String zkCoreNodeName = message.get(ZkStateReader.NODE_NAME_PROP) + "_" + message.get(ZkStateReader.CORE_NAME_PROP);
final Integer numShards = message.get(ZkStateReader.NUM_SHARDS_PROP)!=null?Integer.parseInt(message.get(ZkStateReader.NUM_SHARDS_PROP)):null;
@@ -379,7 +376,7 @@ public class Overseer {
}
}
- public Overseer(final ZkStateReader reader, final String id) throws KeeperException, InterruptedException {
+ public Overseer(final ZkStateReader reader, final String id) {
log.info("Overseer (id=" + id + ") starting");
createOverseerNode(reader.getZkClient());
//launch cluster state updater thread
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java Thu Jun 28 17:51:38 2012
@@ -18,12 +18,10 @@ package org.apache.solr.cloud;
*/
import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import java.util.concurrent.TimeoutException;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -162,8 +160,7 @@ public class RecoveryStrategy extends Th
}
}
- private void commitOnLeader(String leaderUrl) throws MalformedURLException,
- SolrServerException, IOException {
+ private void commitOnLeader(String leaderUrl) throws SolrServerException, IOException {
HttpSolrServer server = new HttpSolrServer(leaderUrl);
server.setConnectionTimeout(30000);
server.setSoTimeout(30000);
@@ -176,7 +173,7 @@ public class RecoveryStrategy extends Th
}
private void sendPrepRecoveryCmd(String leaderBaseUrl,
- String leaderCoreName) throws MalformedURLException, SolrServerException,
+ String leaderCoreName) throws SolrServerException,
IOException {
HttpSolrServer server = new HttpSolrServer(leaderBaseUrl);
server.setConnectionTimeout(45000);
@@ -430,7 +427,7 @@ public class RecoveryStrategy extends Th
}
private Future<RecoveryInfo> replay(UpdateLog ulog)
- throws InterruptedException, ExecutionException, TimeoutException {
+ throws InterruptedException, ExecutionException {
Future<RecoveryInfo> future = ulog.applyBufferedUpdates();
if (future == null) {
// no replay needed\
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java Thu Jun 28 17:51:38 2012
@@ -17,14 +17,11 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
-import java.io.IOException;
-import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.http.client.HttpClient;
-import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.client.solrj.request.CoreAdminRequest.RequestRecovery;
@@ -160,8 +157,7 @@ public class SyncStrategy {
}
private boolean syncWithReplicas(ZkController zkController, SolrCore core,
- ZkNodeProps props, String collection, String shardId)
- throws MalformedURLException, SolrServerException, IOException {
+ ZkNodeProps props, String collection, String shardId) {
List<ZkCoreNodeProps> nodes = zkController.getZkStateReader()
.getReplicaProps(collection, shardId,
props.get(ZkStateReader.NODE_NAME_PROP),
@@ -191,8 +187,7 @@ public class SyncStrategy {
}
private void syncToMe(ZkController zkController, String collection,
- String shardId, ZkNodeProps leaderProps) throws MalformedURLException,
- SolrServerException, IOException {
+ String shardId, ZkNodeProps leaderProps) {
// sync everyone else
// TODO: we should do this in parallel at least
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Thu Jun 28 17:51:38 2012
@@ -26,7 +26,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeoutException;
import java.util.regex.Matcher;
@@ -460,10 +459,9 @@ public final class ZkController {
* @return config value
* @throws KeeperException
* @throws InterruptedException
- * @throws IOException
*/
public String readConfigName(String collection) throws KeeperException,
- InterruptedException, IOException {
+ InterruptedException {
String configName = null;
@@ -685,17 +683,12 @@ public final class ZkController {
* @param core
* @param cc
* @return whether or not a recovery was started
- * @throws InterruptedException
- * @throws KeeperException
- * @throws IOException
- * @throws ExecutionException
*/
private boolean checkRecovery(String coreName, final CoreDescriptor desc,
boolean recoverReloadedCores, final boolean isLeader,
final CloudDescriptor cloudDesc, final String collection,
final String shardZkNodeName, String shardId, ZkNodeProps leaderProps,
- SolrCore core, CoreContainer cc) throws InterruptedException,
- KeeperException, IOException, ExecutionException {
+ SolrCore core, CoreContainer cc) {
if (SKIP_AUTO_RECOVERY) {
log.warn("Skipping recovery according to sys prop solrcloud.skip.autorecovery");
return false;
@@ -814,7 +807,7 @@ public final class ZkController {
zkClient.printLayoutToStdOut();
}
- public void createCollectionZkNode(CloudDescriptor cd) throws KeeperException, InterruptedException, IOException {
+ public void createCollectionZkNode(CloudDescriptor cd) throws KeeperException, InterruptedException {
String collection = cd.getCollectionName();
log.info("Check for collection zkNode:" + collection);
@@ -943,8 +936,7 @@ public final class ZkController {
return zkStateReader;
}
- private String doGetShardIdProcess(String coreName, CloudDescriptor descriptor)
- throws InterruptedException {
+ private String doGetShardIdProcess(String coreName, CloudDescriptor descriptor) {
final String shardZkNodeName = getNodeName() + "_" + coreName;
int retryCount = 120;
while (retryCount-- > 0) {
@@ -996,11 +988,7 @@ public final class ZkController {
String shardZkNodeName = getCoreNodeName(cd);
if (cd.getCloudDescriptor().getShardId() == null && needsToBeAssignedShardId(cd, zkStateReader.getCloudState(), shardZkNodeName)) {
String shardId;
- try {
- shardId = doGetShardIdProcess(cd.getName(), cd.getCloudDescriptor());
- } catch (InterruptedException e) {
- throw new SolrException(ErrorCode.SERVER_ERROR, "Interrupted");
- }
+ shardId = doGetShardIdProcess(cd.getName(), cd.getCloudDescriptor());
cd.getCloudDescriptor().setShardId(shardId);
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/SolrCore.java Thu Jun 28 17:51:38 2012
@@ -28,15 +28,31 @@ import org.apache.lucene.store.LockObtai
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.CommonParams.EchoParamStyle;
-import org.apache.solr.common.params.ShardParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.handler.admin.ShowFileRequestHandler;
-import org.apache.solr.handler.component.*;
+import org.apache.solr.handler.component.DebugComponent;
+import org.apache.solr.handler.component.FacetComponent;
+import org.apache.solr.handler.component.HighlightComponent;
+import org.apache.solr.handler.component.MoreLikeThisComponent;
+import org.apache.solr.handler.component.QueryComponent;
+import org.apache.solr.handler.component.RealTimeGetComponent;
+import org.apache.solr.handler.component.SearchComponent;
+import org.apache.solr.handler.component.StatsComponent;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
-import org.apache.solr.response.*;
+import org.apache.solr.response.BinaryResponseWriter;
+import org.apache.solr.response.CSVResponseWriter;
+import org.apache.solr.response.JSONResponseWriter;
+import org.apache.solr.response.PHPResponseWriter;
+import org.apache.solr.response.PHPSerializedResponseWriter;
+import org.apache.solr.response.PythonResponseWriter;
+import org.apache.solr.response.QueryResponseWriter;
+import org.apache.solr.response.RawResponseWriter;
+import org.apache.solr.response.RubyResponseWriter;
+import org.apache.solr.response.SolrQueryResponse;
+import org.apache.solr.response.XMLResponseWriter;
import org.apache.solr.response.transform.TransformerFactory;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.QParserPlugin;
@@ -46,7 +62,11 @@ import org.apache.solr.search.ValueSourc
import org.apache.solr.update.DirectUpdateHandler2;
import org.apache.solr.update.SolrIndexWriter;
import org.apache.solr.update.UpdateHandler;
-import org.apache.solr.update.processor.*;
+import org.apache.solr.update.processor.DistributedUpdateProcessorFactory;
+import org.apache.solr.update.processor.LogUpdateProcessorFactory;
+import org.apache.solr.update.processor.RunUpdateProcessorFactory;
+import org.apache.solr.update.processor.UpdateRequestProcessorChain;
+import org.apache.solr.update.processor.UpdateRequestProcessorFactory;
import org.apache.solr.util.RefCounted;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
import org.apache.solr.util.plugin.PluginInfoInitialized;
@@ -56,11 +76,35 @@ import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import javax.xml.parsers.ParserConfigurationException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
import java.lang.reflect.Constructor;
import java.net.URL;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
@@ -75,7 +119,7 @@ public final class SolrCore implements S
// These should *only* be used for debugging or monitoring purposes
public static final AtomicLong numOpens = new AtomicLong();
public static final AtomicLong numCloses = new AtomicLong();
- public static Map<SolrCore,Exception> openHandles = Collections.synchronizedMap(new IdentityHashMap<SolrCore,Exception>());
+ public static Map<SolrCore,Exception> openHandles = Collections.synchronizedMap(new IdentityHashMap<SolrCore, Exception>());
public static Logger log = LoggerFactory.getLogger(SolrCore.class);
@@ -1003,12 +1047,7 @@ public final class SolrCore implements S
* {@link org.apache.solr.request.SolrQueryRequest#getSearcher()} instead.
*/
public RefCounted<SolrIndexSearcher> getSearcher() {
- try {
- return getSearcher(false,true,null);
- } catch (IOException e) {
- SolrException.log(log,null,e);
- return null;
- }
+ return getSearcher(false,true,null);
}
/**
@@ -1072,7 +1111,7 @@ public final class SolrCore implements S
}
- public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, final Future[] waitSearcher) throws IOException {
+ public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, final Future[] waitSearcher) {
return getSearcher(forceNew, returnSearcher, waitSearcher, false);
}
@@ -1217,9 +1256,8 @@ public final class SolrCore implements S
* @param returnSearcher if true, returns a {@link SolrIndexSearcher} holder with the refcount already incremented.
* @param waitSearcher if non-null, will be filled in with a {@link Future} that will return after the new searcher is registered.
* @param updateHandlerReopens if true, the UpdateHandler will be used when reopening a {@link SolrIndexSearcher}.
- * @throws IOException
*/
- public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, final Future[] waitSearcher, boolean updateHandlerReopens) throws IOException {
+ public RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew, boolean returnSearcher, final Future[] waitSearcher, boolean updateHandlerReopens) {
// it may take some time to open an index.... we may need to make
// sure that two threads aren't trying to open one at the same time
// if it isn't necessary.
@@ -1476,7 +1514,7 @@ public final class SolrCore implements S
//
// onDeckSearchers will also be decremented (it should have been incremented
// as a result of opening a new searcher).
- private void registerSearcher(RefCounted<SolrIndexSearcher> newSearcherHolder) throws IOException {
+ private void registerSearcher(RefCounted<SolrIndexSearcher> newSearcherHolder) {
synchronized (searcherLock) {
try {
if (_searcher != null) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java Thu Jun 28 17:51:38 2012
@@ -326,7 +326,7 @@ public abstract class AnalysisRequestHan
}
@Override
- public boolean incrementToken() throws IOException {
+ public boolean incrementToken() {
if (tokenIterator.hasNext()) {
clearAttributes();
AttributeSource next = tokenIterator.next();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java Thu Jun 28 17:51:38 2012
@@ -942,7 +942,7 @@ public class ReplicationHandler extends
stream.write(out);
}
- public void write(Writer writer, SolrQueryRequest request, SolrQueryResponse response) throws IOException {
+ public void write(Writer writer, SolrQueryRequest request, SolrQueryResponse response) {
throw new RuntimeException("This is a binary writer , Cannot write to a characterstream");
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java Thu Jun 28 17:51:38 2012
@@ -90,8 +90,7 @@ public class RequestHandlerUtils
/**
* Modify UpdateCommand based on request parameters
*/
- public static void updateCommit(CommitUpdateCommand cmd, SolrParams params) throws IOException
- {
+ public static void updateCommit(CommitUpdateCommand cmd, SolrParams params) {
if( params == null ) return;
cmd.openSearcher = params.getBool( UpdateParams.OPEN_SEARCHER, cmd.openSearcher );
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Thu Jun 28 17:51:38 2012
@@ -651,7 +651,7 @@ public class SnapPuller {
/**
* Copy all index files from the temp index dir to the actual index. The segments_N file is copied last.
*/
- private boolean copyIndexFiles(File tmpIdxDir, File indexDir) throws IOException {
+ private boolean copyIndexFiles(File tmpIdxDir, File indexDir) {
String segmentsFile = null;
List<String> copiedfiles = new ArrayList<String>();
for (Map<String, Object> f : filesDownloaded) {
@@ -678,7 +678,7 @@ public class SnapPuller {
/**
* The conf files are copied to the tmp dir to the conf dir. A backup of the old file is maintained
*/
- private void copyTmpConfFiles2Conf(File tmpconfDir) throws IOException {
+ private void copyTmpConfFiles2Conf(File tmpconfDir) {
File confDir = new File(solrCore.getResourceLoader().getConfigDir());
for (File file : tmpconfDir.listFiles()) {
File oldFile = new File(confDir, file.getName());
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapShooter.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapShooter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapShooter.java Thu Jun 28 17:51:38 2012
@@ -53,7 +53,7 @@ public class SnapShooter {
private SolrCore solrCore;
private SimpleFSLockFactory lockFactory;
- public SnapShooter(SolrCore core, String location) throws IOException {
+ public SnapShooter(SolrCore core, String location) {
solrCore = core;
if (location == null) snapDir = core.getDataDir();
else {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Thu Jun 28 17:51:38 2012
@@ -195,8 +195,7 @@ public class ShowFileRequestHandler exte
rsp.setHttpCaching(false);
}
- private void showFromFileSystem(SolrQueryRequest req, SolrQueryResponse rsp)
- throws IOException {
+ private void showFromFileSystem(SolrQueryRequest req, SolrQueryResponse rsp) {
File adminFile = null;
final SolrResourceLoader loader = req.getCore().getResourceLoader();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Thu Jun 28 17:51:38 2012
@@ -81,8 +81,7 @@ public class SystemInfoHandler extends R
/**
* Get system info
*/
- private SimpleOrderedMap<Object> getCoreInfo( SolrCore core ) throws Exception
- {
+ private SimpleOrderedMap<Object> getCoreInfo( SolrCore core ) {
SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
IndexSchema schema = core.getSchema();
@@ -110,8 +109,7 @@ public class SystemInfoHandler extends R
/**
* Get system info
*/
- public static SimpleOrderedMap<Object> getSystemInfo() throws Exception
- {
+ public static SimpleOrderedMap<Object> getSystemInfo() {
SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
OperatingSystemMXBean os = ManagementFactory.getOperatingSystemMXBean();
@@ -255,8 +253,7 @@ public class SystemInfoHandler extends R
return jvm;
}
- private static SimpleOrderedMap<Object> getLuceneInfo() throws Exception
- {
+ private static SimpleOrderedMap<Object> getLuceneInfo() {
SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
Package p = SolrCore.class.getPackage();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java Thu Jun 28 17:51:38 2012
@@ -79,8 +79,7 @@ public class ThreadDumpHandler extends R
//--------------------------------------------------------------------------------
//--------------------------------------------------------------------------------
- private static SimpleOrderedMap<Object> getThreadInfo( ThreadInfo ti, ThreadMXBean tmbean ) throws IOException
- {
+ private static SimpleOrderedMap<Object> getThreadInfo( ThreadInfo ti, ThreadMXBean tmbean ) {
SimpleOrderedMap<Object> info = new SimpleOrderedMap<Object>();
long tid = ti.getThreadId();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Thu Jun 28 17:51:38 2012
@@ -480,7 +480,7 @@ public class QueryElevationComponent ext
private SentinelIntSet ordSet; //the key half of the map
private BytesRef[] termValues;//the value half of the map
- public ElevationComparatorSource(final QueryElevationComponent.ElevationObj elevations) throws IOException {
+ public ElevationComparatorSource(final QueryElevationComponent.ElevationObj elevations) {
this.elevations = elevations;
int size = elevations.ids.size();
ordSet = new SentinelIntSet(size, -1);
@@ -506,7 +506,7 @@ public class QueryElevationComponent ext
bottomVal = values[slot];
}
- private int docVal(int doc) throws IOException {
+ private int docVal(int doc) {
if (ordSet.size() > 0) {
int slot = ordSet.find(doc);
if (slot >= 0) {
@@ -519,12 +519,12 @@ public class QueryElevationComponent ext
}
@Override
- public int compareBottom(int doc) throws IOException {
+ public int compareBottom(int doc) {
return bottomVal - docVal(doc);
}
@Override
- public void copy(int slot, int doc) throws IOException {
+ public void copy(int slot, int doc) {
values[slot] = docVal(doc);
}
@@ -562,7 +562,7 @@ public class QueryElevationComponent ext
}
@Override
- public int compareDocToValue(int doc, Integer valueObj) throws IOException {
+ public int compareDocToValue(int doc, Integer valueObj) {
final int value = valueObj.intValue();
final int docValue = docVal(doc);
return docValue - value; // values will be small enough that there is no overflow concern
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@
package org.apache.solr.handler.component;
-import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
@@ -35,7 +34,10 @@ import org.apache.solr.util.plugin.SolrC
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
/**
*
@@ -156,7 +158,7 @@ public class SearchHandler extends Reque
@Override
- public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception, ParseException, InstantiationException, IllegalAccessException
+ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception
{
// int sleep = req.getParams().getInt("sleep",0);
// if (sleep > 0) {log.error("SLEEPING for " + sleep); Thread.sleep(sleep);}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java Thu Jun 28 17:51:38 2012
@@ -252,22 +252,22 @@ public class TermVectorComponent extends
// once we find it...
final StoredFieldVisitor getUniqValue = new StoredFieldVisitor() {
@Override
- public void stringField(FieldInfo fieldInfo, String value) throws IOException {
+ public void stringField(FieldInfo fieldInfo, String value) {
uniqValues.add(value);
}
@Override
- public void intField(FieldInfo fieldInfo, int value) throws IOException {
+ public void intField(FieldInfo fieldInfo, int value) {
uniqValues.add(Integer.toString(value));
}
@Override
- public void longField(FieldInfo fieldInfo, long value) throws IOException {
+ public void longField(FieldInfo fieldInfo, long value) {
uniqValues.add(Long.toString(value));
}
@Override
- public Status needsField(FieldInfo fieldInfo) throws IOException {
+ public Status needsField(FieldInfo fieldInfo) {
return (fieldInfo.name.equals(finalUniqFieldName)) ? Status.YES : Status.NO;
}
};
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java Thu Jun 28 17:51:38 2012
@@ -48,7 +48,6 @@ import javax.xml.stream.FactoryConfigura
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLInputFactory;
import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
@@ -190,9 +189,7 @@ public class XMLLoader extends ContentSt
* @since solr 1.2
*/
void processUpdate(SolrQueryRequest req, UpdateRequestProcessor processor, XMLStreamReader parser)
- throws XMLStreamException, IOException, FactoryConfigurationError,
- InstantiationException, IllegalAccessException,
- TransformerConfigurationException {
+ throws XMLStreamException, IOException, FactoryConfigurationError {
AddUpdateCommand addCmd = null;
SolrParams params = req.getParams();
while (true) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Thu Jun 28 17:51:38 2012
@@ -202,9 +202,8 @@ public class DefaultSolrHighlighter exte
* @param tokenStream document text CachingTokenStream
* @param fieldName The name of the field
* @param request The SolrQueryRequest
- * @throws IOException
*/
- private QueryScorer getSpanQueryScorer(Query query, String fieldName, TokenStream tokenStream, SolrQueryRequest request) throws IOException {
+ private QueryScorer getSpanQueryScorer(Query query, String fieldName, TokenStream tokenStream, SolrQueryRequest request) {
boolean reqFieldMatch = request.getParams().getFieldBool(fieldName, HighlightParams.FIELD_MATCH, false);
Boolean highlightMultiTerm = request.getParams().getBool(HighlightParams.HIGHLIGHT_MULTI_TERM, true);
if(highlightMultiTerm == null) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Thu Jun 28 17:51:38 2012
@@ -20,14 +20,12 @@ package org.apache.solr.schema;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.AnalyzerWrapper;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.Version;
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.util.DOMUtil;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.util.SystemIdResolver;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.Config;
@@ -39,11 +37,18 @@ import org.xml.sax.InputSource;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
/**
* <code>IndexSchema</code> contains information about the valid fields in an index
* and the types of those fields.
@@ -688,7 +693,7 @@ public final class IndexSchema {
return newArr;
}
- static SimilarityFactory readSimilarity(ResourceLoader loader, Node node) throws XPathExpressionException {
+ static SimilarityFactory readSimilarity(ResourceLoader loader, Node node) {
if (node==null) {
return null;
} else {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java Thu Jun 28 17:51:38 2012
@@ -214,7 +214,7 @@ public class PreAnalyzedField extends Fi
return binaryValue;
}
- public final boolean incrementToken() throws IOException {
+ public final boolean incrementToken() {
// lazy init the iterator
if (it == null) {
it = cachedStates.iterator();
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/RandomSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/RandomSortField.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/RandomSortField.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/RandomSortField.java Thu Jun 28 17:51:38 2012
@@ -102,7 +102,7 @@ public class RandomSortField extends Fie
private static FieldComparatorSource randomComparatorSource = new FieldComparatorSource() {
@Override
- public FieldComparator<Integer> newComparator(final String fieldname, final int numHits, int sortPos, boolean reversed) throws IOException {
+ public FieldComparator<Integer> newComparator(final String fieldname, final int numHits, int sortPos, boolean reversed) {
return new FieldComparator<Integer>() {
int seed;
private final int[] values = new int[numHits];
@@ -119,17 +119,17 @@ public class RandomSortField extends Fie
}
@Override
- public int compareBottom(int doc) throws IOException {
+ public int compareBottom(int doc) {
return bottomVal - hash(doc+seed);
}
@Override
- public void copy(int slot, int doc) throws IOException {
+ public void copy(int slot, int doc) {
values[slot] = hash(doc+seed);
}
@Override
- public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
+ public FieldComparator setNextReader(AtomicReaderContext context) {
seed = getSeed(fieldname, context);
return this;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/TextField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/TextField.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/TextField.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/schema/TextField.java Thu Jun 28 17:51:38 2012
@@ -186,11 +186,7 @@ public class TextField extends FieldType
PositionIncrementAttribute posIncrAtt = null;
int numTokens = 0;
- try {
- buffer.reset();
- } catch (IOException e) {
- throw new RuntimeException("Unable to initialize TokenStream to analyze query text", e);
- }
+ buffer.reset();
if (buffer.hasAttribute(CharTermAttribute.class)) {
termAtt = buffer.getAttribute(CharTermAttribute.class);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/BitDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/BitDocSet.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/BitDocSet.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/BitDocSet.java Thu Jun 28 17:51:38 2012
@@ -18,7 +18,6 @@
package org.apache.solr.search;
import org.apache.lucene.index.AtomicReader;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.BitsFilteredDocIdSet;
import org.apache.lucene.search.DocIdSet;
@@ -28,8 +27,6 @@ import org.apache.lucene.util.OpenBitSet
import org.apache.lucene.util.OpenBitSetIterator;
import org.apache.lucene.search.DocIdSetIterator;
-import java.io.IOException;
-
/**
* <code>BitDocSet</code> represents an unordered set of Lucene Document Ids
* using a BitSet. A set bit represents inclusion in the set for that document.
@@ -249,7 +246,7 @@ public class BitDocSet extends DocSetBas
return new Filter() {
@Override
- public DocIdSet getDocIdSet(final AtomicReaderContext context, final Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(final AtomicReaderContext context, final Bits acceptDocs) {
AtomicReader reader = context.reader();
// all Solr DocSets that are used as filters only include live docs
final Bits acceptDocs2 = acceptDocs == null ? null : (reader.getLiveDocs() == acceptDocs ? null : acceptDocs);
@@ -264,7 +261,7 @@ public class BitDocSet extends DocSetBas
return BitsFilteredDocIdSet.wrap(new DocIdSet() {
@Override
- public DocIdSetIterator iterator() throws IOException {
+ public DocIdSetIterator iterator() {
return new DocIdSetIterator() {
int pos=base-1;
int adjustedDoc=-1;
@@ -275,13 +272,13 @@ public class BitDocSet extends DocSetBas
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
pos = bs.nextSetBit(pos+1);
return adjustedDoc = (pos>=0 && pos<max) ? pos-base : NO_MORE_DOCS;
}
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
if (target==NO_MORE_DOCS) return adjustedDoc=NO_MORE_DOCS;
pos = bs.nextSetBit(target+base);
return adjustedDoc = (pos>=0 && pos<max) ? pos-base : NO_MORE_DOCS;
@@ -295,7 +292,7 @@ public class BitDocSet extends DocSetBas
}
@Override
- public Bits bits() throws IOException {
+ public Bits bits() {
return new Bits() {
@Override
public boolean get(int index) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/DocSetBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/DocSetBase.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/DocSetBase.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/DocSetBase.java Thu Jun 28 17:51:38 2012
@@ -27,8 +27,6 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.search.BitsFilteredDocIdSet;
import org.apache.lucene.index.AtomicReaderContext;
-import java.io.IOException;
-
/** A base class that may be usefull for implementing DocSets */
abstract class DocSetBase implements DocSet {
@@ -140,7 +138,7 @@ abstract class DocSetBase implements Doc
return new Filter() {
@Override
- public DocIdSet getDocIdSet(final AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(final AtomicReaderContext context, Bits acceptDocs) {
AtomicReader reader = context.reader();
// all Solr DocSets that are used as filters only include live docs
final Bits acceptDocs2 = acceptDocs == null ? null : (reader.getLiveDocs() == acceptDocs ? null : acceptDocs);
@@ -155,7 +153,7 @@ abstract class DocSetBase implements Doc
return BitsFilteredDocIdSet.wrap(new DocIdSet() {
@Override
- public DocIdSetIterator iterator() throws IOException {
+ public DocIdSetIterator iterator() {
return new DocIdSetIterator() {
int pos=base-1;
int adjustedDoc=-1;
@@ -166,13 +164,13 @@ abstract class DocSetBase implements Doc
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
pos = bs.nextSetBit(pos+1);
return adjustedDoc = (pos>=0 && pos<max) ? pos-base : NO_MORE_DOCS;
}
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
if (target==NO_MORE_DOCS) return adjustedDoc=NO_MORE_DOCS;
pos = bs.nextSetBit(target+base);
return adjustedDoc = (pos>=0 && pos<max) ? pos-base : NO_MORE_DOCS;
@@ -186,7 +184,7 @@ abstract class DocSetBase implements Doc
}
@Override
- public Bits bits() throws IOException {
+ public Bits bits() {
// sparse filters should not use random access
return null;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java Thu Jun 28 17:51:38 2012
@@ -420,9 +420,8 @@ class ExtendedDismaxQParser extends QPar
* Extracts all the alised fields from the requests and adds them to up
* @param up
* @param tiebreaker
- * @throws ParseException
*/
- private void addAliasesFromRequest(ExtendedSolrQueryParser up, float tiebreaker) throws ParseException {
+ private void addAliasesFromRequest(ExtendedSolrQueryParser up, float tiebreaker) {
Iterator<String> it = solrParams.getParameterNamesIterator();
while(it.hasNext()) {
String param = it.next();
@@ -1155,7 +1154,7 @@ class ExtendedDismaxQParser extends QPar
return lst;
}
- private Query getQuery() throws ParseException {
+ private Query getQuery() {
try {
switch (type) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/FastLRUCache.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/FastLRUCache.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/FastLRUCache.java Thu Jun 28 17:51:38 2012
@@ -20,9 +20,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.util.ConcurrentLRUCache;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.core.SolrCore;
-import java.io.IOException;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@@ -136,7 +134,7 @@ public class FastLRUCache<K,V> extends S
cache.setAlive(state == State.LIVE);
}
- public void warm(SolrIndexSearcher searcher, SolrCache old) throws IOException {
+ public void warm(SolrIndexSearcher searcher, SolrCache old) {
if (regenerator == null) return;
long warmingStartTime = System.currentTimeMillis();
FastLRUCache other = (FastLRUCache) old;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java Thu Jun 28 17:51:38 2012
@@ -16,8 +16,7 @@
*/
package org.apache.solr.search;
-import org.apache.lucene.queryparser.classic.ParseException;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.Query;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
@@ -42,7 +41,7 @@ public class FieldQParserPlugin extends
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
@Override
- public Query parse() throws ParseException {
+ public Query parse() {
String field = localParams.get(QueryParsing.F);
String queryText = localParams.get(QueryParsing.V);
SchemaField sf = req.getSchema().getField(field);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java Thu Jun 28 17:51:38 2012
@@ -135,7 +135,7 @@ class JoinQuery extends Query {
private float queryWeight;
ResponseBuilder rb;
- public JoinQueryWeight(SolrIndexSearcher searcher) throws IOException {
+ public JoinQueryWeight(SolrIndexSearcher searcher) {
this.fromSearcher = searcher;
SolrRequestInfo info = SolrRequestInfo.getRequestInfo();
if (info != null) {
@@ -175,7 +175,7 @@ class JoinQuery extends Query {
final RefCounted<SolrIndexSearcher> ref = fromRef;
info.addCloseHook(new Closeable() {
@Override
- public void close() throws IOException {
+ public void close() {
ref.decref();
}
});
@@ -183,7 +183,7 @@ class JoinQuery extends Query {
info.addCloseHook(new Closeable() {
@Override
- public void close() throws IOException {
+ public void close() {
fromCore.close();
}
});
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/LFUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/LFUCache.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/LFUCache.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/LFUCache.java Thu Jun 28 17:51:38 2012
@@ -22,7 +22,6 @@ import org.apache.solr.common.util.Simpl
import org.apache.solr.core.SolrCore;
import org.apache.solr.util.ConcurrentLFUCache;
-import java.io.IOException;
import java.io.Serializable;
import java.net.URL;
import java.util.List;
@@ -155,7 +154,7 @@ public class LFUCache<K, V> implements S
return state;
}
- public void warm(SolrIndexSearcher searcher, SolrCache old) throws IOException {
+ public void warm(SolrIndexSearcher searcher, SolrCache old) {
if (regenerator == null) return;
long warmingStartTime = System.currentTimeMillis();
LFUCache other = (LFUCache) old;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/LRUCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/LRUCache.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/LRUCache.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/LRUCache.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@
package org.apache.solr.search;
-import java.io.IOException;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -144,7 +143,7 @@ public class LRUCache<K,V> extends SolrC
}
}
- public void warm(SolrIndexSearcher searcher, SolrCache<K,V> old) throws IOException {
+ public void warm(SolrIndexSearcher searcher, SolrCache<K,V> old) {
if (regenerator==null) return;
long warmingStartTime = System.currentTimeMillis();
LRUCache<K,V> other = (LRUCache<K,V>)old;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@
package org.apache.solr.search;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
import org.apache.solr.common.params.SolrParams;
@@ -40,7 +39,7 @@ public class PrefixQParserPlugin extends
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
@Override
- public Query parse() throws ParseException {
+ public Query parse() {
return new PrefixQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
}
};
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QueryParsing.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QueryParsing.java Thu Jun 28 17:51:38 2012
@@ -637,7 +637,7 @@ public class QueryParsing {
}
}
- float getFloat() throws ParseException {
+ float getFloat() {
eatws();
char[] arr = new char[end - pos];
int i;
@@ -657,7 +657,7 @@ public class QueryParsing {
return Float.parseFloat(new String(arr, 0, i));
}
- Number getNumber() throws ParseException {
+ Number getNumber() {
eatws();
int start = pos;
boolean flt = false;
@@ -682,7 +682,7 @@ public class QueryParsing {
}
}
- double getDouble() throws ParseException {
+ double getDouble() {
eatws();
char[] arr = new char[end - pos];
int i;
@@ -702,7 +702,7 @@ public class QueryParsing {
return Double.parseDouble(new String(arr, 0, i));
}
- int getInt() throws ParseException {
+ int getInt() {
eatws();
char[] arr = new char[end - pos];
int i;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QueryResultKey.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QueryResultKey.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QueryResultKey.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QueryResultKey.java Thu Jun 28 17:51:38 2012
@@ -20,7 +20,6 @@ package org.apache.solr.search;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
-import java.io.IOException;
import java.util.List;
/** A hash key encapsulating a query, a list of filters, and a sort
@@ -38,7 +37,7 @@ public final class QueryResultKey {
private static SortField[] defaultSort = new SortField[0];
- public QueryResultKey(Query query, List<Query> filters, Sort sort, int nc_flags) throws IOException {
+ public QueryResultKey(Query query, List<Query> filters, Sort sort, int nc_flags) {
this.query = query;
this.sort = sort;
this.filters = filters;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@
package org.apache.solr.search;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.solr.common.params.SolrParams;
@@ -44,7 +43,7 @@ public class RawQParserPlugin extends QP
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
@Override
- public Query parse() throws ParseException {
+ public Query parse() {
return new TermQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
}
};
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ReturnFields.java Thu Jun 28 17:51:38 2012
@@ -155,7 +155,7 @@ public class ReturnFields
// like getId, but also accepts dashes for legacy fields
- String getFieldName(QueryParsing.StrParser sp) throws ParseException {
+ String getFieldName(QueryParsing.StrParser sp) {
sp.eatws();
int id_start = sp.pos;
char ch;
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrCache.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrCache.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrCache.java Thu Jun 28 17:51:38 2012
@@ -22,7 +22,6 @@ import org.apache.solr.core.SolrInfoMBea
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
/**
@@ -125,7 +124,7 @@ public interface SolrCache<K,V> extends
* Warm this cache associated with <code>searcher</code> using the <code>old</code>
* cache object. <code>this</code> and <code>old</code> will have the same concrete type.
*/
- void warm(SolrIndexSearcher searcher, SolrCache<K,V> old) throws IOException;
+ void warm(SolrIndexSearcher searcher, SolrCache<K,V> old);
// Q: an alternative to passing the searcher here would be to pass it in
// init and have the cache implementation save it.
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Thu Jun 28 17:51:38 2012
@@ -1300,14 +1300,14 @@ public class SolrIndexSearcher extends I
if (!needScores) {
collector = new Collector () {
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
}
@Override
- public void collect(int doc) throws IOException {
+ public void collect(int doc) {
numHits[0]++;
}
@Override
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ public void setNextReader(AtomicReaderContext context) {
}
@Override
public boolean acceptsDocsOutOfOrder() {
@@ -1318,7 +1318,7 @@ public class SolrIndexSearcher extends I
collector = new Collector() {
Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@Override
@@ -1328,7 +1328,7 @@ public class SolrIndexSearcher extends I
if (score > topscore[0]) topscore[0]=score;
}
@Override
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ public void setNextReader(AtomicReaderContext context) {
}
@Override
public boolean acceptsDocsOutOfOrder() {
@@ -1441,7 +1441,7 @@ public class SolrIndexSearcher extends I
collector = setCollector = new DocSetDelegateCollector(smallSetSize, maxDoc, new Collector() {
Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@Override
@@ -1450,7 +1450,7 @@ public class SolrIndexSearcher extends I
if (score > topscore[0]) topscore[0]=score;
}
@Override
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ public void setNextReader(AtomicReaderContext context) {
}
@Override
public boolean acceptsDocsOutOfOrder() {
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java Thu Jun 28 17:51:38 2012
@@ -24,11 +24,8 @@ import org.apache.lucene.search.BitsFilt
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.AtomicReaderContext;
-import java.io.IOException;
-
/**
* <code>SortedIntDocSet</code> represents a sorted set of Lucene Document Ids.
*/
@@ -658,7 +655,7 @@ public class SortedIntDocSet extends Doc
int lastEndIdx = 0;
@Override
- public DocIdSet getDocIdSet(final AtomicReaderContext context, final Bits acceptDocs) throws IOException {
+ public DocIdSet getDocIdSet(final AtomicReaderContext context, final Bits acceptDocs) {
AtomicReader reader = context.reader();
// all Solr DocSets that are used as filters only include live docs
final Bits acceptDocs2 = acceptDocs == null ? null : (reader.getLiveDocs() == acceptDocs ? null : acceptDocs);
@@ -695,7 +692,7 @@ public class SortedIntDocSet extends Doc
return BitsFilteredDocIdSet.wrap(new DocIdSet() {
@Override
- public DocIdSetIterator iterator() throws IOException {
+ public DocIdSetIterator iterator() {
return new DocIdSetIterator() {
int idx = startIdx;
int adjustedDoc = -1;
@@ -706,12 +703,12 @@ public class SortedIntDocSet extends Doc
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
return adjustedDoc = (idx > endIdx) ? NO_MORE_DOCS : (docs[idx++] - base);
}
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
if (idx > endIdx || target==NO_MORE_DOCS) return adjustedDoc=NO_MORE_DOCS;
target += base;
@@ -757,7 +754,7 @@ public class SortedIntDocSet extends Doc
}
@Override
- public Bits bits() throws IOException {
+ public Bits bits() {
// random access is expensive for this set
return null;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@
package org.apache.solr.search;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.BytesRef;
@@ -51,7 +50,7 @@ public class TermQParserPlugin extends Q
public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
return new QParser(qstr, localParams, params, req) {
@Override
- public Query parse() throws ParseException {
+ public Query parse() {
String fname = localParams.get(QueryParsing.F);
FieldType ft = req.getSchema().getFieldTypeNoEx(fname);
String val = localParams.get(QueryParsing.V);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java Thu Jun 28 17:51:38 2012
@@ -529,13 +529,13 @@ public abstract class ValueSourceParser
addParser("pi", new ValueSourceParser() {
@Override
- public ValueSource parse(FunctionQParser fp) throws ParseException {
+ public ValueSource parse(FunctionQParser fp) {
return new DoubleConstValueSource(Math.PI);
}
});
addParser("e", new ValueSourceParser() {
@Override
- public ValueSource parse(FunctionQParser fp) throws ParseException {
+ public ValueSource parse(FunctionQParser fp) {
return new DoubleConstValueSource(Math.E);
}
});
@@ -601,28 +601,28 @@ public abstract class ValueSourceParser
addParser("maxdoc", new ValueSourceParser() {
@Override
- public ValueSource parse(FunctionQParser fp) throws ParseException {
+ public ValueSource parse(FunctionQParser fp) {
return new MaxDocValueSource();
}
});
addParser("numdocs", new ValueSourceParser() {
@Override
- public ValueSource parse(FunctionQParser fp) throws ParseException {
+ public ValueSource parse(FunctionQParser fp) {
return new NumDocsValueSource();
}
});
addParser("true", new ValueSourceParser() {
@Override
- public ValueSource parse(FunctionQParser fp) throws ParseException {
+ public ValueSource parse(FunctionQParser fp) {
return new BoolConstValueSource(true);
}
});
addParser("false", new ValueSourceParser() {
@Override
- public ValueSource parse(FunctionQParser fp) throws ParseException {
+ public ValueSource parse(FunctionQParser fp) {
return new BoolConstValueSource(false);
}
});
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java Thu Jun 28 17:51:38 2012
@@ -81,7 +81,7 @@ public class ValueSourceRangeFilter exte
return valueSource.getValues(context, readerContext).getRangeScorer(readerContext.reader(), lowerVal, upperVal, includeLower, includeUpper);
}
@Override
- public Bits bits() throws IOException {
+ public Bits bits() {
return null; // don't use random access
}
}, acceptDocs);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java Thu Jun 28 17:51:38 2012
@@ -36,7 +36,7 @@ public class FilterCollector extends Col
private int docBase;
private int matches;
- public FilterCollector(DocSet filter, Collector delegate) throws IOException {
+ public FilterCollector(DocSet filter, Collector delegate) {
this.filter = filter;
this.delegate = delegate;
}
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java Thu Jun 28 17:51:38 2012
@@ -74,7 +74,7 @@ public class SearchGroupsResultTransform
/**
* {@inheritDoc}
*/
- public Map<String, Pair<Integer, Collection<SearchGroup<BytesRef>>>> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort sortWithinGroup, String shard) throws IOException {
+ public Map<String, Pair<Integer, Collection<SearchGroup<BytesRef>>>> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort sortWithinGroup, String shard) {
Map<String, Pair<Integer, Collection<SearchGroup<BytesRef>>>> result = new HashMap<String, Pair<Integer, Collection<SearchGroup<BytesRef>>>>();
for (Map.Entry<String, NamedList> command : shardResponse) {
List<SearchGroup<BytesRef>> searchGroups = new ArrayList<SearchGroup<BytesRef>>();