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 18:40:37 UTC
svn commit: r1355069 [5/8] - in /lucene/dev/trunk:
lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/
lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/
lucene/analysis/common/src/java/org/apache/lucene/analys...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java Thu Jun 28 16:39:25 2012
@@ -24,14 +24,12 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.FixedBitSet;
@@ -44,7 +42,7 @@ public class TestFilteredSearch extends
private static final String FIELD = "category";
- public void testFilteredSearch() throws CorruptIndexException, LockObtainFailedException, IOException {
+ public void testFilteredSearch() throws IOException {
boolean enforceSingleSegment = true;
Directory directory = newDirectory();
int[] filterBits = {1, 36};
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Thu Jun 28 16:39:25 2012
@@ -178,7 +178,7 @@ public class TestMultiTermConstantScore
private int base = 0;
private Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java Thu Jun 28 16:39:25 2012
@@ -27,7 +27,6 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -37,7 +36,6 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.index.ThreadedIndexingAndSearchingTestCase;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.NRTCachingDirectory;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
@@ -367,7 +365,7 @@ public class TestNRTManager extends Thre
public LatchedIndexWriter(Directory d, IndexWriterConfig conf,
CountDownLatch latch, CountDownLatch signal)
- throws CorruptIndexException, LockObtainFailedException, IOException {
+ throws IOException {
super(d, conf);
this.latch = latch;
this.signal = signal;
@@ -376,7 +374,7 @@ public class TestNRTManager extends Thre
public void updateDocument(Term term,
Iterable<? extends IndexableField> doc, Analyzer analyzer)
- throws CorruptIndexException, IOException {
+ throws IOException {
super.updateDocument(term, doc, analyzer);
try {
if (waitAfterUpdate) {
@@ -398,7 +396,7 @@ public class TestNRTManager extends Thre
final SearcherFactory theEvilOne = new SearcherFactory() {
@Override
- public IndexSearcher newSearcher(IndexReader ignored) throws IOException {
+ public IndexSearcher newSearcher(IndexReader ignored) {
return new IndexSearcher(other);
}
};
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java Thu Jun 28 16:39:25 2012
@@ -17,8 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -34,17 +32,17 @@ public class TestPositiveScoresOnlyColle
super(weight);
}
- @Override public float score() throws IOException {
+ @Override public float score() {
return idx == scores.length ? Float.NaN : scores[idx];
}
@Override public int docID() { return idx; }
- @Override public int nextDoc() throws IOException {
+ @Override public int nextDoc() {
return ++idx != scores.length ? idx : NO_MORE_DOCS;
}
- @Override public int advance(int target) throws IOException {
+ @Override public int advance(int target) {
idx = target;
return idx < scores.length ? idx : NO_MORE_DOCS;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java Thu Jun 28 16:39:25 2012
@@ -91,7 +91,7 @@ public class TestPrefixRandom extends Lu
private class SimplePrefixTermsEnum extends FilteredTermsEnum {
private final BytesRef prefix;
- private SimplePrefixTermsEnum(TermsEnum tenum, BytesRef prefix) throws IOException {
+ private SimplePrefixTermsEnum(TermsEnum tenum, BytesRef prefix) {
super(tenum);
this.prefix = prefix;
setInitialSeekTerm(new BytesRef(""));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java Thu Jun 28 16:39:25 2012
@@ -102,7 +102,7 @@ public class TestRegexpQuery extends Luc
BasicAutomata.makeString("brown"),
BasicAutomata.makeString("bob")));
- public Automaton getAutomaton(String name) throws IOException {
+ public Automaton getAutomaton(String name) {
if (name.equals("quickBrown")) return quickBrownAutomaton;
else return null;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java Thu Jun 28 16:39:25 2012
@@ -116,7 +116,7 @@ public class TestRegexpRandom2 extends L
CharacterRunAutomaton runAutomaton = new CharacterRunAutomaton(automaton);
CharsRef utf16 = new CharsRef(10);
- private SimpleAutomatonTermsEnum(TermsEnum tenum) throws IOException {
+ private SimpleAutomatonTermsEnum(TermsEnum tenum) {
super(tenum);
setInitialSeekTerm(new BytesRef(""));
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java Thu Jun 28 16:39:25 2012
@@ -36,7 +36,7 @@ public class TestScoreCachingWrappingSco
super(weight);
}
- @Override public float score() throws IOException {
+ @Override public float score() {
// advance idx on purpose, so that consecutive calls to score will get
// different results. This is to emulate computation of a score. If
// ScoreCachingWrappingScorer is used, this should not be called more than
@@ -46,11 +46,11 @@ public class TestScoreCachingWrappingSco
@Override public int docID() { return doc; }
- @Override public int nextDoc() throws IOException {
+ @Override public int nextDoc() {
return ++doc < scores.length ? doc : NO_MORE_DOCS;
}
- @Override public int advance(int target) throws IOException {
+ @Override public int advance(int target) {
doc = target;
return doc < scores.length ? doc : NO_MORE_DOCS;
}
@@ -80,11 +80,10 @@ public class TestScoreCachingWrappingSco
++idx;
}
- @Override public void setNextReader(AtomicReaderContext context)
- throws IOException {
+ @Override public void setNextReader(AtomicReaderContext context) {
}
- @Override public void setScorer(Scorer scorer) throws IOException {
+ @Override public void setScorer(Scorer scorer) {
this.scorer = new ScoreCachingWrappingScorer(scorer);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java Thu Jun 28 16:39:25 2012
@@ -208,7 +208,7 @@ public class TestSearcherManager extends
final ExecutorService es = random().nextBoolean() ? null : Executors.newCachedThreadPool(new NamedThreadFactory("testIntermediateClose"));
final SearcherFactory factory = new SearcherFactory() {
@Override
- public IndexSearcher newSearcher(IndexReader r) throws IOException {
+ public IndexSearcher newSearcher(IndexReader r) {
try {
if (triedReopen.get()) {
awaitEnterWarm.countDown();
@@ -334,7 +334,7 @@ public class TestSearcherManager extends
final SearcherFactory theEvilOne = new SearcherFactory() {
@Override
- public IndexSearcher newSearcher(IndexReader ignored) throws IOException {
+ public IndexSearcher newSearcher(IndexReader ignored) {
return new IndexSearcher(other);
}
};
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java Thu Jun 28 16:39:25 2012
@@ -78,7 +78,7 @@ public class TestSimilarity extends Luce
searcher.search(new TermQuery(b), new Collector() {
private Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@Override
@@ -101,7 +101,7 @@ public class TestSimilarity extends Luce
private int base = 0;
private Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@Override
@@ -127,7 +127,7 @@ public class TestSimilarity extends Luce
new Collector() {
private Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@Override
@@ -148,7 +148,7 @@ public class TestSimilarity extends Luce
searcher.search(pq, new Collector() {
private Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Thu Jun 28 16:39:25 2012
@@ -207,7 +207,7 @@ public class TestSloppyPhraseQuery exten
Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@@ -218,7 +218,7 @@ public class TestSloppyPhraseQuery exten
}
@Override
- public void setNextReader(AtomicReaderContext context) throws IOException {
+ public void setNextReader(AtomicReaderContext context) {
// do nothing
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java Thu Jun 28 16:39:25 2012
@@ -184,7 +184,7 @@ public class TestSloppyPhraseQuery2 exte
}
}
- private MultiPhraseQuery randomPhraseQuery(long seed) throws Exception {
+ private MultiPhraseQuery randomPhraseQuery(long seed) {
Random random = new Random(seed);
int length = _TestUtil.nextInt(random, 2, 5);
MultiPhraseQuery pq = new MultiPhraseQuery();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java Thu Jun 28 16:39:25 2012
@@ -42,7 +42,6 @@ import org.apache.lucene.document.Straig
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
@@ -55,7 +54,6 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.DocIdBitSet;
@@ -87,7 +85,7 @@ public class TestSort extends LuceneTest
private Sort sort;
@BeforeClass
- public static void beforeClass() throws Exception {
+ public static void beforeClass() {
NUM_STRINGS = atLeast(500);
}
@@ -217,7 +215,7 @@ public class TestSort extends LuceneTest
return getIndex (true, true);
}
- private IndexSearcher getFullStrings() throws CorruptIndexException, LockObtainFailedException, IOException {
+ private IndexSearcher getFullStrings() throws IOException {
Directory indexStore = newDirectory();
dirs.add(indexStore);
IndexWriter writer = new IndexWriter(
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java Thu Jun 28 16:39:25 2012
@@ -89,7 +89,7 @@ public class TestTermScorer extends Luce
private Scorer scorer;
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java Thu Jun 28 16:39:25 2012
@@ -55,19 +55,18 @@ public class TestTopDocsCollector extend
}
@Override
- public void collect(int doc) throws IOException {
+ public void collect(int doc) {
++totalHits;
pq.insertWithOverflow(new ScoreDoc(doc + base, scores[idx++]));
}
@Override
- public void setNextReader(AtomicReaderContext context)
- throws IOException {
+ public void setNextReader(AtomicReaderContext context) {
base = context.docBase;
}
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
// Don't do anything. Assign scores in random
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java Thu Jun 28 16:39:25 2012
@@ -185,8 +185,7 @@ public class TestSimilarityBase extends
* Similarities in {@link #sims} and checks if the score is valid; i.e. it
* is a finite positive real number.
*/
- private void unitTestCore(BasicStats stats, float freq, int docLen)
- throws IOException {
+ private void unitTestCore(BasicStats stats, float freq, int docLen) {
for (SimilarityBase sim : sims) {
BasicStats realStats = (BasicStats) sim.computeWeight(stats.getTotalBoost(),
toCollectionStats(stats),
@@ -518,8 +517,7 @@ public class TestSimilarityBase extends
* Similarities in {@link #sims} and compares the score against the manually
* computed {@code gold}.
*/
- private void correctnessTestCore(SimilarityBase sim, float gold)
- throws IOException {
+ private void correctnessTestCore(SimilarityBase sim, float gold) {
BasicStats stats = createStats();
BasicStats realStats = (BasicStats) sim.computeWeight(stats.getTotalBoost(),
toCollectionStats(stats),
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java Thu Jun 28 16:39:25 2012
@@ -52,12 +52,12 @@ final class JustCompileSearchSpans {
}
@Override
- public boolean next() throws IOException {
+ public boolean next() {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@Override
- public boolean skipTo(int target) throws IOException {
+ public boolean skipTo(int target) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -67,7 +67,7 @@ final class JustCompileSearchSpans {
}
@Override
- public Collection<byte[]> getPayload() throws IOException {
+ public Collection<byte[]> getPayload() {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -86,7 +86,7 @@ final class JustCompileSearchSpans {
}
@Override
- public Spans getSpans(AtomicReaderContext context, Bits acceptDocs, Map<Term,TermContext> termContexts) throws IOException {
+ public Spans getSpans(AtomicReaderContext context, Bits acceptDocs, Map<Term,TermContext> termContexts) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -100,7 +100,7 @@ final class JustCompileSearchSpans {
static final class JustCompilePayloadSpans extends Spans {
@Override
- public Collection<byte[]> getPayload() throws IOException {
+ public Collection<byte[]> getPayload() {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -120,12 +120,12 @@ final class JustCompileSearchSpans {
}
@Override
- public boolean next() throws IOException {
+ public boolean next() {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@Override
- public boolean skipTo(int target) throws IOException {
+ public boolean skipTo(int target) {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
@@ -144,7 +144,7 @@ final class JustCompileSearchSpans {
}
@Override
- protected boolean setFreqCurrentDoc() throws IOException {
+ protected boolean setFreqCurrentDoc() {
throw new UnsupportedOperationException(UNSUPPORTED_MSG);
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Thu Jun 28 16:39:25 2012
@@ -23,14 +23,17 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.MockTokenizer;
+import org.apache.lucene.analysis.TokenFilter;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
@@ -42,7 +45,6 @@ import org.apache.lucene.search.payloads
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -248,8 +250,7 @@ public class TestPayloadSpans extends Lu
directory.close();
}
- public void testShrinkToAfterShortestMatch() throws CorruptIndexException,
- LockObtainFailedException, IOException {
+ public void testShrinkToAfterShortestMatch() throws IOException {
Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
@@ -286,8 +287,7 @@ public class TestPayloadSpans extends Lu
directory.close();
}
- public void testShrinkToAfterShortestMatch2() throws CorruptIndexException,
- LockObtainFailedException, IOException {
+ public void testShrinkToAfterShortestMatch2() throws IOException {
Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
@@ -322,8 +322,7 @@ public class TestPayloadSpans extends Lu
directory.close();
}
- public void testShrinkToAfterShortestMatch3() throws CorruptIndexException,
- LockObtainFailedException, IOException {
+ public void testShrinkToAfterShortestMatch3() throws IOException {
Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestNumericUtils.java Thu Jun 28 16:39:25 2012
@@ -219,7 +219,7 @@ public class TestNumericUtils extends Lu
/** Note: The neededBounds Iterable must be unsigned (easier understanding what's happening) */
private void assertLongRangeSplit(final long lower, final long upper, int precisionStep,
final boolean useBitSet, final Iterable<Long> expectedBounds, final Iterable<Integer> expectedShifts
- ) throws Exception {
+ ) {
// Cannot use FixedBitSet since the range could be long:
final OpenBitSet bits=useBitSet ? new OpenBitSet(upper-lower+1) : null;
final Iterator<Long> neededBounds = (expectedBounds == null) ? null : expectedBounds.iterator();
@@ -460,7 +460,7 @@ public class TestNumericUtils extends Lu
/** Note: The neededBounds Iterable must be unsigned (easier understanding what's happening) */
private void assertIntRangeSplit(final int lower, final int upper, int precisionStep,
final boolean useBitSet, final Iterable<Integer> expectedBounds, final Iterable<Integer> expectedShifts
- ) throws Exception {
+ ) {
final FixedBitSet bits=useBitSet ? new FixedBitSet(upper-lower+1) : null;
final Iterator<Integer> neededBounds = (expectedBounds == null) ? null : expectedBounds.iterator();
final Iterator<Integer> neededShifts = (expectedShifts == null) ? null : expectedShifts.iterator();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestReproduceMessage.java Thu Jun 28 16:39:25 2012
@@ -293,7 +293,7 @@ public class TestReproduceMessage extend
Assert.assertTrue(runAndReturnSyserr().contains("NOTE: reproduce with:"));
}
- private String runAndReturnSyserr() throws Exception {
+ private String runAndReturnSyserr() {
JUnitCore.runClasses(Nested.class);
String err = getSysErr();
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java Thu Jun 28 16:39:25 2012
@@ -37,7 +37,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -126,7 +125,7 @@ public class FormBasedXmlQueryDemo exten
}
}
- private void openExampleIndex() throws CorruptIndexException, IOException {
+ private void openExampleIndex() throws IOException {
//Create a RAM-based index from our test data file
RAMDirectory rd = new RAMDirectory();
IndexWriterConfig iwConfig = new IndexWriterConfig(Version.LUCENE_40, analyzer);
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsCategoryTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsCategoryTokenizer.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsCategoryTokenizer.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsCategoryTokenizer.java Thu Jun 28 16:39:25 2012
@@ -1,6 +1,5 @@
package org.apache.lucene.facet.enhancements;
-import java.io.IOException;
import java.util.List;
import org.apache.lucene.analysis.TokenStream;
@@ -59,10 +58,9 @@ public class EnhancementsCategoryTokeniz
* The stream of category tokens.
* @param indexingParams
* The indexing params to use.
- * @throws IOException
*/
public EnhancementsCategoryTokenizer(TokenStream input,
- EnhancementsIndexingParams indexingParams) throws IOException {
+ EnhancementsIndexingParams indexingParams) {
super(input, indexingParams);
payloadBytes = new byte[Vint8.MAXIMUM_BYTES_NEEDED
* (indexingParams.getCategoryEnhancements().size() + 1)];
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsDocumentBuilder.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsDocumentBuilder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsDocumentBuilder.java Thu Jun 28 16:39:25 2012
@@ -46,10 +46,9 @@ public class EnhancementsDocumentBuilder
* @param taxonomyWriter
* @param params
* Indexing params which include {@link CategoryEnhancement}s.
- * @throws IOException
*/
public EnhancementsDocumentBuilder(TaxonomyWriter taxonomyWriter,
- EnhancementsIndexingParams params) throws IOException {
+ EnhancementsIndexingParams params) {
super(taxonomyWriter, params);
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java Thu Jun 28 16:39:25 2012
@@ -93,11 +93,9 @@ public class CategoryDocumentBuilder {
* @param taxonomyWriter
* to which new categories will be added, as well as translating
* known categories to ordinals
- * @throws IOException
- *
+ *
*/
- public CategoryDocumentBuilder(TaxonomyWriter taxonomyWriter)
- throws IOException {
+ public CategoryDocumentBuilder(TaxonomyWriter taxonomyWriter) {
this(taxonomyWriter, new DefaultFacetIndexingParams());
}
@@ -111,10 +109,9 @@ public class CategoryDocumentBuilder {
* @param params
* holds all parameters the indexing process should use such as
* category-list parameters
- * @throws IOException
*/
public CategoryDocumentBuilder(TaxonomyWriter taxonomyWriter,
- FacetIndexingParams params) throws IOException {
+ FacetIndexingParams params) {
this.taxonomyWriter = taxonomyWriter;
this.indexingParams = params;
this.categoriesMap = new HashMap<String, List<CategoryAttribute>>();
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/streaming/CategoryAttributesStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/streaming/CategoryAttributesStream.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/streaming/CategoryAttributesStream.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/streaming/CategoryAttributesStream.java Thu Jun 28 16:39:25 2012
@@ -1,6 +1,5 @@
package org.apache.lucene.facet.index.streaming;
-import java.io.IOException;
import java.util.Iterator;
import org.apache.lucene.analysis.TokenStream;
@@ -59,7 +58,7 @@ public class CategoryAttributesStream ex
}
@Override
- public final boolean incrementToken() throws IOException {
+ public final boolean incrementToken() {
if (iterator == null) {
if (iterable == null) {
return false;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoredDocIdCollector.java Thu Jun 28 16:39:25 2012
@@ -51,7 +51,7 @@ public abstract class ScoredDocIdCollect
public boolean acceptsDocsOutOfOrder() { return true; }
@Override
- public void collect(int doc) throws IOException {
+ public void collect(int doc) {
docIds.fastSet(docBase + doc);
++numDocIds;
}
@@ -62,7 +62,7 @@ public abstract class ScoredDocIdCollect
}
@Override
- public ScoredDocIDsIterator scoredDocIdsIterator() throws IOException {
+ public ScoredDocIDsIterator scoredDocIdsIterator() {
return new ScoredDocIDsIterator() {
private DocIdSetIterator docIdsIter = docIds.iterator();
@@ -92,7 +92,7 @@ public abstract class ScoredDocIdCollect
}
@Override
- public void setScorer(Scorer scorer) throws IOException {}
+ public void setScorer(Scorer scorer) {}
}
private static final class ScoringDocIdCollector extends ScoredDocIdCollector {
@@ -124,7 +124,7 @@ public abstract class ScoredDocIdCollect
}
@Override
- public ScoredDocIDsIterator scoredDocIdsIterator() throws IOException {
+ public ScoredDocIDsIterator scoredDocIdsIterator() {
return new ScoredDocIDsIterator() {
private DocIdSetIterator docIdsIter = docIds.iterator();
@@ -160,7 +160,7 @@ public abstract class ScoredDocIdCollect
public void setDefaultScore(float defaultScore) {}
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java Thu Jun 28 16:39:25 2012
@@ -12,7 +12,6 @@ import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.facet.index.params.CategoryListParams;
import org.apache.lucene.facet.index.params.FacetIndexingParams;
@@ -73,7 +72,7 @@ public class TotalFacetCounts {
* Construct by key - from index Directory or by recomputing.
*/
private TotalFacetCounts (TaxonomyReader taxonomy, FacetIndexingParams facetIndexingParams,
- int[][] counts, CreationType createType4Test) throws IOException, LockObtainFailedException {
+ int[][] counts, CreationType createType4Test) {
this.taxonomy = taxonomy;
this.facetIndexingParams = facetIndexingParams;
this.totalCounts = counts;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java Thu Jun 28 16:39:25 2012
@@ -1013,7 +1013,7 @@ public class CategoryPath implements Ser
osw.flush();
}
- private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws IOException {
InputStreamReader isr = new InputStreamReader(in, "UTF-8");
this.deserializeFromStreamReader(isr);
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java Thu Jun 28 16:39:25 2012
@@ -1,7 +1,5 @@
package org.apache.lucene.facet.taxonomy.directory;
-import java.io.IOException;
-
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.StoredFieldVisitor;
@@ -41,12 +39,12 @@ abstract class Consts {
private String fullPath;
@Override
- public void stringField(FieldInfo fieldInfo, String value) throws IOException {
+ public void stringField(FieldInfo fieldInfo, String value) {
fullPath = value;
}
@Override
- public Status needsField(FieldInfo fieldInfo) throws IOException {
+ public Status needsField(FieldInfo fieldInfo) {
return fullPath == null ? Status.YES : Status.STOP;
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java Thu Jun 28 16:39:25 2012
@@ -127,7 +127,7 @@ public class DirectoryTaxonomyReader imp
parentArray.refresh(indexReader);
}
- protected DirectoryReader openIndexReader(Directory directory) throws CorruptIndexException, IOException {
+ protected DirectoryReader openIndexReader(Directory directory) throws IOException {
return DirectoryReader.open(directory);
}
@@ -218,7 +218,7 @@ public class DirectoryTaxonomyReader imp
return ret;
}
- public CategoryPath getPath(int ordinal) throws CorruptIndexException, IOException {
+ public CategoryPath getPath(int ordinal) throws IOException {
ensureOpen();
// TODO (Facet): Currently, the LRU cache we use (getCategoryCache) holds
// strings with delimiters, not CategoryPath objects, so even if
@@ -235,7 +235,7 @@ public class DirectoryTaxonomyReader imp
return new CategoryPath(label, delimiter);
}
- public boolean getPath(int ordinal, CategoryPath result) throws CorruptIndexException, IOException {
+ public boolean getPath(int ordinal, CategoryPath result) throws IOException {
ensureOpen();
String label = getLabel(ordinal);
if (label==null) {
@@ -246,7 +246,7 @@ public class DirectoryTaxonomyReader imp
return true;
}
- private String getLabel(int catID) throws CorruptIndexException, IOException {
+ private String getLabel(int catID) throws IOException {
ensureOpen();
// First try to find the answer in the LRU cache. It is very
// unfortunate that we need to allocate an Integer object here -
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Thu Jun 28 16:39:25 2012
@@ -312,7 +312,7 @@ public class DirectoryTaxonomyWriter imp
* {@link #defaultTaxonomyWriterCache()}.
*/
public DirectoryTaxonomyWriter(Directory directory, OpenMode openMode)
- throws CorruptIndexException, LockObtainFailedException, IOException {
+ throws IOException {
this(directory, openMode, defaultTaxonomyWriterCache());
}
@@ -330,9 +330,7 @@ public class DirectoryTaxonomyWriter imp
// convenience constructors:
- public DirectoryTaxonomyWriter(Directory d)
- throws CorruptIndexException, LockObtainFailedException,
- IOException {
+ public DirectoryTaxonomyWriter(Directory d) throws IOException {
this(d, OpenMode.CREATE_OR_APPEND);
}
@@ -342,14 +340,14 @@ public class DirectoryTaxonomyWriter imp
* {@link Directory}.
*/
@Override
- public synchronized void close() throws CorruptIndexException, IOException {
+ public synchronized void close() throws IOException {
if (!isClosed) {
indexWriter.commit(combinedCommitData(null));
doClose();
}
}
- private void doClose() throws CorruptIndexException, IOException {
+ private void doClose() throws IOException {
indexWriter.close();
isClosed = true;
closeResources();
@@ -656,7 +654,7 @@ public class DirectoryTaxonomyWriter imp
* See {@link TaxonomyWriter#commit()}
*/
@Override
- public synchronized void commit() throws CorruptIndexException, IOException {
+ public synchronized void commit() throws IOException {
ensureOpen();
indexWriter.commit(combinedCommitData(null));
}
@@ -681,7 +679,7 @@ public class DirectoryTaxonomyWriter imp
* See {@link TaxonomyWriter#commit(Map)}.
*/
@Override
- public synchronized void commit(Map<String,String> commitUserData) throws CorruptIndexException, IOException {
+ public synchronized void commit(Map<String,String> commitUserData) throws IOException {
ensureOpen();
indexWriter.commit(combinedCommitData(commitUserData));
}
@@ -691,7 +689,7 @@ public class DirectoryTaxonomyWriter imp
* See {@link IndexWriter#prepareCommit}.
*/
@Override
- public synchronized void prepareCommit() throws CorruptIndexException, IOException {
+ public synchronized void prepareCommit() throws IOException {
ensureOpen();
indexWriter.prepareCommit(combinedCommitData(null));
}
@@ -701,7 +699,7 @@ public class DirectoryTaxonomyWriter imp
* See {@link IndexWriter#prepareCommit(Map)}
*/
@Override
- public synchronized void prepareCommit(Map<String,String> commitUserData) throws CorruptIndexException, IOException {
+ public synchronized void prepareCommit(Map<String,String> commitUserData) throws IOException {
ensureOpen();
indexWriter.prepareCommit(combinedCommitData(commitUserData));
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java Thu Jun 28 16:39:25 2012
@@ -147,7 +147,7 @@ class ParentArray {
* NOTE: add() and refresh() CANNOT be used together. If you call add(),
* this changes the arrays and refresh() can no longer be used.
*/
- void add(int ordinal, int parentOrdinal) throws IOException {
+ void add(int ordinal, int parentOrdinal) {
if (ordinal >= prefetchParentOrdinal.length) {
// grow the array, if necessary.
// In Java 6, we could just do Arrays.copyOf()...
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java Thu Jun 28 16:39:25 2012
@@ -125,13 +125,13 @@ public class ScoredDocIdsUtils {
public boolean isCacheable() { return true; }
@Override
- public DocIdSetIterator iterator() throws IOException {
+ public DocIdSetIterator iterator() {
return new DocIdSetIterator() {
private int next = -1;
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
while (next < size && docids[next++] < target) {
}
return next == size ? NO_MORE_DOCS : docids[next];
@@ -143,7 +143,7 @@ public class ScoredDocIdsUtils {
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
if (++next >= size) {
return NO_MORE_DOCS;
}
@@ -155,7 +155,7 @@ public class ScoredDocIdsUtils {
};
}
- public ScoredDocIDsIterator iterator() throws IOException {
+ public ScoredDocIDsIterator iterator() {
return new ScoredDocIDsIterator() {
int next = -1;
@@ -251,12 +251,12 @@ public class ScoredDocIdsUtils {
}
@Override
- public DocIdSetIterator iterator() throws IOException {
+ public DocIdSetIterator iterator() {
return new DocIdSetIterator() {
private int next = -1;
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
if (target <= next) {
target = next + 1;
}
@@ -270,7 +270,7 @@ public class ScoredDocIdsUtils {
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
return ++next < maxDoc ? next : NO_MORE_DOCS;
}
@@ -337,13 +337,13 @@ public class ScoredDocIdsUtils {
}
@Override
- public DocIdSetIterator iterator() throws IOException {
+ public DocIdSetIterator iterator() {
return new DocIdSetIterator() {
final Bits liveDocs = MultiFields.getLiveDocs(reader);
private int next = -1;
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
if (target > next) {
next = target - 1;
}
@@ -356,7 +356,7 @@ public class ScoredDocIdsUtils {
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
do {
++next;
} while (next < maxDoc && liveDocs != null && !liveDocs.get(next));
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java Thu Jun 28 16:39:25 2012
@@ -15,7 +15,6 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -92,7 +91,7 @@ public abstract class FacetTestBase exte
protected IndexSearcher searcher;
@BeforeClass
- public static void beforeClassFacetTestBase() throws Exception {
+ public static void beforeClassFacetTestBase() {
TEST_DIR = _TestUtil.getTempDir("facets");
dirsPerPartitionSize = new HashMap<Integer, FacetTestBase.SearchTaxoDirPair>();
}
@@ -215,7 +214,7 @@ public abstract class FacetTestBase exte
* <p>Subclasses can override this to test different scenarios
*/
protected void populateIndex(RandomIndexWriter iw, TaxonomyWriter taxo, FacetIndexingParams iParams)
- throws IOException, CorruptIndexException {
+ throws IOException {
// add test documents
int numDocsToIndex = numDocsToIndex();
for (int doc=0; doc<numDocsToIndex; doc++) {
@@ -257,8 +256,7 @@ public abstract class FacetTestBase exte
/** utility Create a dummy document with specified categories and content */
protected final void indexDoc(FacetIndexingParams iParams, RandomIndexWriter iw,
- TaxonomyWriter tw, String content, List<CategoryPath> categories) throws IOException,
- CorruptIndexException {
+ TaxonomyWriter tw, String content, List<CategoryPath> categories) throws IOException {
Document d = new Document();
CategoryDocumentBuilder builder = new CategoryDocumentBuilder(tw, iParams);
builder.setCategoryPaths(categories);
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java Thu Jun 28 16:39:25 2012
@@ -8,7 +8,6 @@ import org.apache.lucene.analysis.standa
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -53,7 +52,7 @@ import org.apache.lucene.facet.taxonomy.
public class FacetTestUtils {
- public static Directory[][] createIndexTaxonomyDirs(int number) throws IOException {
+ public static Directory[][] createIndexTaxonomyDirs(int number) {
Directory[][] dirs = new Directory[number][2];
for (int i = 0; i < number; i++) {
dirs[i][0] = LuceneTestCase.newDirectory();
@@ -93,8 +92,7 @@ public class FacetTestUtils {
public static Collector[] search(IndexSearcher searcher,
TaxonomyReader taxonomyReader, DefaultFacetIndexingParams iParams,
- int k, String... facetNames) throws IOException,
- IllegalAccessException, InstantiationException {
+ int k, String... facetNames) throws IOException {
Collector[] collectors = new Collector[2];
@@ -121,8 +119,7 @@ public class FacetTestUtils {
}
public static void add(FacetIndexingParams iParams, RandomIndexWriter iw,
- TaxonomyWriter tw, String... strings) throws IOException,
- CorruptIndexException {
+ TaxonomyWriter tw, String... strings) throws IOException {
ArrayList<CategoryPath> cps = new ArrayList<CategoryPath>();
CategoryPath cp = new CategoryPath(strings);
cps.add(cp);
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java Thu Jun 28 16:39:25 2012
@@ -6,7 +6,6 @@ import java.util.List;
import org.junit.Test;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.facet.example.ExampleResult;
import org.apache.lucene.facet.example.multiCL.MultiCLMain;
import org.apache.lucene.facet.search.results.FacetResult;
import org.apache.lucene.facet.search.results.FacetResultNode;
@@ -40,8 +39,7 @@ public class TestMultiCLExample extends
assertCorrectMultiResults(res);
}
- public static void assertCorrectMultiResults(ExampleResult exampleResults)
- throws Exception {
+ public static void assertCorrectMultiResults(ExampleResult exampleResults) {
List<FacetResult> results = exampleResults.getFacetResults();
FacetResult result = results.get(0);
assertNotNull("Result should not be null", result);
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/index/streaming/CategoryParentsStreamTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/index/streaming/CategoryParentsStreamTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/index/streaming/CategoryParentsStreamTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/index/streaming/CategoryParentsStreamTest.java Thu Jun 28 16:39:25 2012
@@ -15,9 +15,6 @@ import org.apache.lucene.facet.index.cat
import org.apache.lucene.facet.index.categorypolicy.PathPolicy;
import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams;
import org.apache.lucene.facet.index.params.FacetIndexingParams;
-import org.apache.lucene.facet.index.streaming.CategoryAttributesStream;
-import org.apache.lucene.facet.index.streaming.CategoryListTokenizer;
-import org.apache.lucene.facet.index.streaming.CategoryParentsStream;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
@@ -116,7 +113,7 @@ public class CategoryParentsStreamTest e
* @throws FacetException
*/
@Test
- public void testNoRetainableAttributes() throws IOException, FacetException {
+ public void testNoRetainableAttributes() throws IOException {
Directory directory = newDirectory();
TaxonomyWriter taxonomyWriter = new DirectoryTaxonomyWriter(directory);
@@ -150,7 +147,7 @@ public class CategoryParentsStreamTest e
* @throws FacetException
*/
@Test
- public void testRetainableAttributes() throws IOException, FacetException {
+ public void testRetainableAttributes() throws IOException {
Directory directory = newDirectory();
TaxonomyWriter taxonomyWriter = new DirectoryTaxonomyWriter(
directory);
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java Thu Jun 28 16:39:25 2012
@@ -4,7 +4,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.util._TestUtil;
@@ -51,7 +50,7 @@ public abstract class BaseTestTopK exten
@Override
protected void populateIndex(RandomIndexWriter iw, TaxonomyWriter taxo,
- FacetIndexingParams iParams) throws IOException, CorruptIndexException {
+ FacetIndexingParams iParams) throws IOException {
currDoc = -1;
super.populateIndex(iw, taxo, iParams);
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java Thu Jun 28 16:39:25 2012
@@ -57,7 +57,7 @@ public class CategoryListIteratorTest ex
private boolean exhausted = false;
private CharTermAttribute term = addAttribute(CharTermAttribute.class);
- public DataTokenStream(String text, IntEncoder encoder) throws IOException {
+ public DataTokenStream(String text, IntEncoder encoder) {
this.encoder = encoder;
term.setEmpty().append(text);
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java Thu Jun 28 16:39:25 2012
@@ -8,7 +8,6 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -17,7 +16,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.LockObtainFailedException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -58,7 +56,7 @@ public class DrillDownTest extends Lucen
private static Directory dir;
private static Directory taxoDir;
- public DrillDownTest() throws IOException {
+ public DrillDownTest() {
PerDimensionIndexingParams iParams = new PerDimensionIndexingParams();
CategoryListParams aClParams = new CategoryListParams(new Term("testing_facets_a", "a"));
CategoryListParams bClParams = new CategoryListParams(new Term("testing_facets_b", "b"));
@@ -70,7 +68,7 @@ public class DrillDownTest extends Lucen
}
@BeforeClass
- public static void createIndexes() throws CorruptIndexException, LockObtainFailedException, IOException {
+ public static void createIndexes() throws IOException {
dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false)));
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestCategoryListCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestCategoryListCache.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestCategoryListCache.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestCategoryListCache.java Thu Jun 28 16:39:25 2012
@@ -72,7 +72,7 @@ public class TestCategoryListCache exten
doTest(true,true);
}
- private void doTest(boolean withCache, boolean plantWrongData) throws IOException, Exception {
+ private void doTest(boolean withCache, boolean plantWrongData) throws Exception {
Map<CategoryPath,Integer> truth = facetCountsTruth();
CategoryPath cp = (CategoryPath) truth.keySet().toArray()[0]; // any category path will do for this test
CountFacetRequest frq = new CountFacetRequest(cp, 10);
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java Thu Jun 28 16:39:25 2012
@@ -19,7 +19,6 @@ import org.apache.lucene.facet.taxonomy.
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -271,12 +270,12 @@ public class TestMultipleCategoryLists e
IOUtils.close(dirs[0]);
}
- private Directory[][] getDirs() throws IOException {
+ private Directory[][] getDirs() {
return FacetTestUtils.createIndexTaxonomyDirs(1);
}
private void assertCorrectResults(FacetsCollector facetsCollector)
- throws IOException, IllegalAccessException, InstantiationException {
+ throws IOException {
List<FacetResult> res = facetsCollector.getFacetResults();
FacetResult results = res.get(0);
@@ -354,7 +353,7 @@ public class TestMultipleCategoryLists e
}
private void seedIndex(RandomIndexWriter iw, TaxonomyWriter tw,
- FacetIndexingParams iParams) throws IOException, CorruptIndexException {
+ FacetIndexingParams iParams) throws IOException {
FacetTestUtils.add(iParams, iw, tw, "Author", "Mark Twain");
FacetTestUtils.add(iParams, iw, tw, "Author", "Stephen King");
FacetTestUtils.add(iParams, iw, tw, "Author", "Kurt Vonnegut");
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java Thu Jun 28 16:39:25 2012
@@ -8,7 +8,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.RandomIndexWriter;
@@ -321,8 +320,7 @@ public class TestTopKInEachNodeResultHan
}
private void prvt_add(DefaultFacetIndexingParams iParams, RandomIndexWriter iw,
- TaxonomyWriter tw, String... strings) throws IOException,
- CorruptIndexException {
+ TaxonomyWriter tw, String... strings) throws IOException {
ArrayList<CategoryPath> cps = new ArrayList<CategoryPath>();
CategoryPath cp = new CategoryPath(strings);
cps.add(cp);
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java Thu Jun 28 16:39:25 2012
@@ -34,7 +34,7 @@ import org.apache.lucene.facet.taxonomy.
public class TestTopKResultsHandlerRandom extends BaseTestTopK {
private List<FacetResult> countFacets(int partitionSize, int numResults, final boolean doComplement)
- throws IOException, IllegalAccessException, InstantiationException {
+ throws IOException {
Query q = new MatchAllDocsQuery();
FacetSearchParams facetSearchParams = searchParamsWithRequests(numResults, partitionSize);
FacetsCollector fc = new FacetsCollector(facetSearchParams, indexReader, taxoReader) {
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java Thu Jun 28 16:39:25 2012
@@ -8,7 +8,6 @@ import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -140,8 +139,7 @@ public class TestTotalFacetCountsCache e
}
private void doTestGeneralSynchronization(int numThreads, int sleepMillis,
- int cacheSize) throws Exception, CorruptIndexException, IOException,
- InterruptedException {
+ int cacheSize) throws Exception {
TFC.setCacheSize(cacheSize);
SlowRAMDirectory slowIndexDir = new SlowRAMDirectory(-1, random());
MockDirectoryWrapper indexDir = new MockDirectoryWrapper(random(), slowIndexDir);
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/params/MultiIteratorsPerCLParamsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/params/MultiIteratorsPerCLParamsTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/params/MultiIteratorsPerCLParamsTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/params/MultiIteratorsPerCLParamsTest.java Thu Jun 28 16:39:25 2012
@@ -7,7 +7,6 @@ import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -84,8 +83,7 @@ public class MultiIteratorsPerCLParamsTe
doTestCLParamMultiIteratorsByRequest(true);
}
- private void doTestCLParamMultiIteratorsByRequest(boolean cacheCLI) throws Exception,
- CorruptIndexException, IOException {
+ private void doTestCLParamMultiIteratorsByRequest(boolean cacheCLI) throws Exception {
// Create a CLP which generates different CLIs according to the
// FacetRequest's dimension
CategoryListParams clp = new CategoryListParams();
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java Thu Jun 28 16:39:25 2012
@@ -1,6 +1,5 @@
package org.apache.lucene.facet.search.sampling;
-import java.io.IOException;
import java.util.List;
import java.util.Random;
@@ -53,7 +52,7 @@ public abstract class BaseSampleTestTopK
* Lots of randomly generated data is being indexed, and later on a "90% docs" faceted search
* is performed. The results are compared to non-sampled ones.
*/
- public void testCountUsingSamping() throws Exception, IOException {
+ public void testCountUsingSamping() throws Exception {
boolean useRandomSampler = random().nextBoolean();
for (int partitionSize : partitionSizes) {
try {
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingTest.java Thu Jun 28 16:39:25 2012
@@ -9,16 +9,6 @@ import java.util.TreeSet;
import org.junit.Test;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.encoding.DGapIntEncoder;
-import org.apache.lucene.util.encoding.EightFlagsIntEncoder;
-import org.apache.lucene.util.encoding.FourFlagsIntEncoder;
-import org.apache.lucene.util.encoding.IntDecoder;
-import org.apache.lucene.util.encoding.IntEncoder;
-import org.apache.lucene.util.encoding.NOnesIntEncoder;
-import org.apache.lucene.util.encoding.SimpleIntEncoder;
-import org.apache.lucene.util.encoding.SortingIntEncoder;
-import org.apache.lucene.util.encoding.UniqueValuesIntEncoder;
-import org.apache.lucene.util.encoding.VInt8IntEncoder;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -142,7 +132,7 @@ public class EncodingTest extends Lucene
}
private static void decoding(ByteArrayOutputStream baos, IntDecoder decoder)
- throws IOException, InstantiationException, IllegalAccessException {
+ throws IOException {
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
decoder.reInit(bais);
Modified: lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java Thu Jun 28 16:39:25 2012
@@ -65,10 +65,9 @@ public abstract class DVAllGroupHeadsCol
* @param type The {@link Type} which is used to select a concrete implementation.
* @param diskResident Whether the values to group by should be disk resident
* @return an <code>AbstractAllGroupHeadsCollector</code> instance based on the supplied arguments
- * @throws IOException If I/O related errors occur
*/
@SuppressWarnings("unchecked")
- public static <T extends AbstractAllGroupHeadsCollector.GroupHead<?>> DVAllGroupHeadsCollector<T> create(String groupField, Sort sortWithinGroup, DocValues.Type type, boolean diskResident) throws IOException {
+ public static <T extends AbstractAllGroupHeadsCollector.GroupHead<?>> DVAllGroupHeadsCollector<T> create(String groupField, Sort sortWithinGroup, DocValues.Type type, boolean diskResident) {
switch (type) {
case VAR_INTS:
case FIXED_INTS_8:
@@ -162,7 +161,7 @@ public abstract class DVAllGroupHeadsCol
private final Sort sortWithinGroup;
private final Map<Comparable<?>, GroupHead> groups;
- GeneralAllGroupHeadsCollector(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) throws IOException {
+ GeneralAllGroupHeadsCollector(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) {
super(groupField, valueType, sortWithinGroup.getSort().length, diskResident);
this.sortWithinGroup = sortWithinGroup;
groups = new HashMap<Comparable<?>, GroupHead>();
@@ -218,7 +217,7 @@ public abstract class DVAllGroupHeadsCol
private DocValues.SortedSource source;
- SortedBR(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) throws IOException {
+ SortedBR(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) {
super(groupField, valueType, sortWithinGroup, diskResident);
}
@@ -244,7 +243,7 @@ public abstract class DVAllGroupHeadsCol
private DocValues.Source source;
- BR(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) throws IOException {
+ BR(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) {
super(groupField, valueType, sortWithinGroup, diskResident);
}
@@ -266,7 +265,7 @@ public abstract class DVAllGroupHeadsCol
private DocValues.Source source;
- Lng(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) throws IOException {
+ Lng(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) {
super(groupField, valueType, sortWithinGroup, diskResident);
}
@@ -287,7 +286,7 @@ public abstract class DVAllGroupHeadsCol
private DocValues.Source source;
- Dbl(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) throws IOException {
+ Dbl(String groupField, DocValues.Type valueType, Sort sortWithinGroup, boolean diskResident) {
super(groupField, valueType, sortWithinGroup, diskResident);
}
Modified: lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java Thu Jun 28 16:39:25 2012
@@ -57,9 +57,8 @@ public abstract class TermAllGroupHeadsC
* @param groupField The field to group by
* @param sortWithinGroup The sort within each group
* @return an <code>AbstractAllGroupHeadsCollector</code> instance based on the supplied arguments
- * @throws IOException If I/O related errors occur
*/
- public static AbstractAllGroupHeadsCollector<?> create(String groupField, Sort sortWithinGroup) throws IOException {
+ public static AbstractAllGroupHeadsCollector<?> create(String groupField, Sort sortWithinGroup) {
return create(groupField, sortWithinGroup, DEFAULT_INITIAL_SIZE);
}
@@ -73,9 +72,8 @@ public abstract class TermAllGroupHeadsC
* the total number of expected unique groups. Be aware that the heap usage is
* 4 bytes * initialSize.
* @return an <code>AbstractAllGroupHeadsCollector</code> instance based on the supplied arguments
- * @throws IOException If I/O related errors occur
*/
- public static AbstractAllGroupHeadsCollector<?> create(String groupField, Sort sortWithinGroup, int initialSize) throws IOException {
+ public static AbstractAllGroupHeadsCollector<?> create(String groupField, Sort sortWithinGroup, int initialSize) {
boolean sortAllScore = true;
boolean sortAllFieldValue = true;
@@ -113,7 +111,7 @@ public abstract class TermAllGroupHeadsC
private Scorer scorer;
- GeneralAllGroupHeadsCollector(String groupField, Sort sortWithinGroup) throws IOException {
+ GeneralAllGroupHeadsCollector(String groupField, Sort sortWithinGroup) {
super(groupField, sortWithinGroup.getSort().length);
this.sortWithinGroup = sortWithinGroup;
groups = new HashMap<BytesRef, GroupHead>();
@@ -409,7 +407,7 @@ public abstract class TermAllGroupHeadsC
BytesRef[] sortValues;
int[] sortOrds;
- private GroupHead(int doc, BytesRef groupValue) throws IOException {
+ private GroupHead(int doc, BytesRef groupValue) {
super(groupValue, doc + readerContext.docBase);
sortValues = new BytesRef[sortsIndex.length];
sortOrds = new int[sortsIndex.length];
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java Thu Jun 28 16:39:25 2012
@@ -429,7 +429,7 @@ public class AllGroupHeadsCollectorTest
return true;
}
- private int[] createExpectedGroupHeads(String searchTerm, GroupDoc[] groupDocs, Sort docSort, boolean sortByScoreOnly, int[] fieldIdToDocID) throws IOException {
+ private int[] createExpectedGroupHeads(String searchTerm, GroupDoc[] groupDocs, Sort docSort, boolean sortByScoreOnly, int[] fieldIdToDocID) {
Map<BytesRef, List<GroupDoc>> groupHeads = new HashMap<BytesRef, List<GroupDoc>>();
for (GroupDoc groupDoc : groupDocs) {
if (!groupDoc.content.startsWith(searchTerm)) {
@@ -518,7 +518,7 @@ public class AllGroupHeadsCollectorTest
}
@SuppressWarnings({"unchecked","rawtypes"})
- private AbstractAllGroupHeadsCollector<?> createRandomCollector(String groupField, Sort sortWithinGroup, boolean canUseIDV, Type valueType) throws IOException {
+ private AbstractAllGroupHeadsCollector<?> createRandomCollector(String groupField, Sort sortWithinGroup, boolean canUseIDV, Type valueType) {
AbstractAllGroupHeadsCollector<? extends AbstractAllGroupHeadsCollector.GroupHead> collector;
if (random().nextBoolean()) {
ValueSource vs = new BytesRefFieldSource(groupField);
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java?rev=1355069&r1=1355068&r2=1355069&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java Thu Jun 28 16:39:25 2012
@@ -33,7 +33,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import java.io.IOException;
import java.util.HashMap;
public class AllGroupsCollectorTest extends LuceneTestCase {
@@ -127,7 +126,7 @@ public class AllGroupsCollectorTest exte
}
}
- private AbstractAllGroupsCollector<?> createRandomCollector(String groupField, boolean canUseIDV) throws IOException {
+ private AbstractAllGroupsCollector<?> createRandomCollector(String groupField, boolean canUseIDV) {
AbstractAllGroupsCollector<?> selected;
if (random().nextBoolean() && canUseIDV) {
boolean diskResident = random().nextBoolean();