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 [3/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/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu Jun 28 17:51:38 2012
@@ -500,7 +500,6 @@ public class IndexWriter implements Clos
* Obtain a ReadersAndLiveDocs instance from the
* readerPool. If create is true, you must later call
* {@link #release(ReadersAndLiveDocs)}.
- * @throws IOException
*/
public synchronized ReadersAndLiveDocs get(SegmentInfoPerCommit info, boolean create) {
@@ -532,7 +531,7 @@ public class IndexWriter implements Clos
* If the reader isn't being pooled, the segmentInfo's
* delCount is returned.
*/
- public int numDeletedDocs(SegmentInfoPerCommit info) throws IOException {
+ public int numDeletedDocs(SegmentInfoPerCommit info) {
ensureOpen(false);
int delCount = info.getDelCount();
@@ -574,19 +573,13 @@ public class IndexWriter implements Clos
* @param conf
* the configuration settings according to which IndexWriter should
* be initialized.
- * @throws CorruptIndexException
- * if the index is corrupt
- * @throws LockObtainFailedException
- * if another writer has this index open (<code>write.lock</code>
- * could not be obtained)
* @throws IOException
* if the directory cannot be read/written to, or if it does not
* exist and <code>conf.getOpenMode()</code> is
* <code>OpenMode.APPEND</code> or if there is any other low-level
* IO error
*/
- public IndexWriter(Directory d, IndexWriterConfig conf)
- throws CorruptIndexException, LockObtainFailedException, IOException {
+ public IndexWriter(Directory d, IndexWriterConfig conf) throws IOException {
config = new LiveIndexWriterConfig(conf.clone());
directory = d;
analyzer = config.getAnalyzer();
@@ -762,7 +755,7 @@ public class IndexWriter implements Clos
return config;
}
- private void messageState() throws IOException {
+ private void messageState() {
if (infoStream.isEnabled("IW")) {
infoStream.message("IW", "\ndir=" + directory + "\n" +
"index=" + segString() + "\n" +
@@ -810,10 +803,9 @@ public class IndexWriter implements Clos
* you should immediately close the writer, again. See <a
* href="#OOME">above</a> for details.</p>
*
- * @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void close() throws CorruptIndexException, IOException {
+ public void close() throws IOException {
close(true);
}
@@ -840,7 +832,7 @@ public class IndexWriter implements Clos
* finished (which should be at most a few seconds), and
* then return.
*/
- public void close(boolean waitForMerges) throws CorruptIndexException, IOException {
+ public void close(boolean waitForMerges) throws IOException {
// Ensure that only one thread actually gets to do the
// closing, and make sure no commit is also in progress:
@@ -879,7 +871,7 @@ public class IndexWriter implements Clos
}
}
- private void closeInternal(boolean waitForMerges, boolean doFlush) throws CorruptIndexException, IOException {
+ private void closeInternal(boolean waitForMerges, boolean doFlush) throws IOException {
try {
@@ -989,7 +981,7 @@ public class IndexWriter implements Clos
* are not counted. If you really need these to be
* counted you should call {@link #commit()} first.
* @see #numDocs */
- public synchronized int numDocs() throws IOException {
+ public synchronized int numDocs() {
ensureOpen();
int count;
if (docWriter != null)
@@ -1003,7 +995,7 @@ public class IndexWriter implements Clos
return count;
}
- public synchronized boolean hasDeletions() throws IOException {
+ public synchronized boolean hasDeletions() {
ensureOpen();
if (bufferedDeletesStream.any()) {
return true;
@@ -1061,7 +1053,7 @@ public class IndexWriter implements Clos
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void addDocument(Iterable<? extends IndexableField> doc) throws CorruptIndexException, IOException {
+ public void addDocument(Iterable<? extends IndexableField> doc) throws IOException {
addDocument(doc, analyzer);
}
@@ -1080,7 +1072,7 @@ public class IndexWriter implements Clos
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void addDocument(Iterable<? extends IndexableField> doc, Analyzer analyzer) throws CorruptIndexException, IOException {
+ public void addDocument(Iterable<? extends IndexableField> doc, Analyzer analyzer) throws IOException {
updateDocument(null, doc, analyzer);
}
@@ -1125,7 +1117,7 @@ public class IndexWriter implements Clos
*
* @lucene.experimental
*/
- public void addDocuments(Iterable<? extends Iterable<? extends IndexableField>> docs) throws CorruptIndexException, IOException {
+ public void addDocuments(Iterable<? extends Iterable<? extends IndexableField>> docs) throws IOException {
addDocuments(docs, analyzer);
}
@@ -1140,7 +1132,7 @@ public class IndexWriter implements Clos
*
* @lucene.experimental
*/
- public void addDocuments(Iterable<? extends Iterable<? extends IndexableField>> docs, Analyzer analyzer) throws CorruptIndexException, IOException {
+ public void addDocuments(Iterable<? extends Iterable<? extends IndexableField>> docs, Analyzer analyzer) throws IOException {
updateDocuments(null, docs, analyzer);
}
@@ -1157,7 +1149,7 @@ public class IndexWriter implements Clos
*
* @lucene.experimental
*/
- public void updateDocuments(Term delTerm, Iterable<? extends Iterable<? extends IndexableField>> docs) throws CorruptIndexException, IOException {
+ public void updateDocuments(Term delTerm, Iterable<? extends Iterable<? extends IndexableField>> docs) throws IOException {
updateDocuments(delTerm, docs, analyzer);
}
@@ -1175,7 +1167,7 @@ public class IndexWriter implements Clos
*
* @lucene.experimental
*/
- public void updateDocuments(Term delTerm, Iterable<? extends Iterable<? extends IndexableField>> docs, Analyzer analyzer) throws CorruptIndexException, IOException {
+ public void updateDocuments(Term delTerm, Iterable<? extends Iterable<? extends IndexableField>> docs, Analyzer analyzer) throws IOException {
ensureOpen();
try {
boolean success = false;
@@ -1209,7 +1201,7 @@ public class IndexWriter implements Clos
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void deleteDocuments(Term term) throws CorruptIndexException, IOException {
+ public void deleteDocuments(Term term) throws IOException {
ensureOpen();
try {
docWriter.deleteTerms(term);
@@ -1232,7 +1224,7 @@ public class IndexWriter implements Clos
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void deleteDocuments(Term... terms) throws CorruptIndexException, IOException {
+ public void deleteDocuments(Term... terms) throws IOException {
ensureOpen();
try {
docWriter.deleteTerms(terms);
@@ -1252,7 +1244,7 @@ public class IndexWriter implements Clos
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void deleteDocuments(Query query) throws CorruptIndexException, IOException {
+ public void deleteDocuments(Query query) throws IOException {
ensureOpen();
try {
docWriter.deleteQueries(query);
@@ -1274,7 +1266,7 @@ public class IndexWriter implements Clos
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void deleteDocuments(Query... queries) throws CorruptIndexException, IOException {
+ public void deleteDocuments(Query... queries) throws IOException {
ensureOpen();
try {
docWriter.deleteQueries(queries);
@@ -1300,7 +1292,7 @@ public class IndexWriter implements Clos
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void updateDocument(Term term, Iterable<? extends IndexableField> doc) throws CorruptIndexException, IOException {
+ public void updateDocument(Term term, Iterable<? extends IndexableField> doc) throws IOException {
ensureOpen();
updateDocument(term, doc, getAnalyzer());
}
@@ -1324,7 +1316,7 @@ public class IndexWriter implements Clos
* @throws IOException if there is a low-level IO error
*/
public void updateDocument(Term term, Iterable<? extends IndexableField> doc, Analyzer analyzer)
- throws CorruptIndexException, IOException {
+ throws IOException {
ensureOpen();
try {
boolean success = false;
@@ -1465,7 +1457,7 @@ public class IndexWriter implements Clos
* @param maxNumSegments maximum number of segments left
* in the index after merging finishes
*/
- public void forceMerge(int maxNumSegments) throws CorruptIndexException, IOException {
+ public void forceMerge(int maxNumSegments) throws IOException {
forceMerge(maxNumSegments, true);
}
@@ -1479,7 +1471,7 @@ public class IndexWriter implements Clos
* you should immediately close the writer. See <a
* href="#OOME">above</a> for details.</p>
*/
- public void forceMerge(int maxNumSegments, boolean doWait) throws CorruptIndexException, IOException {
+ public void forceMerge(int maxNumSegments, boolean doWait) throws IOException {
ensureOpen();
if (maxNumSegments < 1)
@@ -1590,7 +1582,7 @@ public class IndexWriter implements Clos
* {@link MergePolicy.MergeAbortedException}.
*/
public void forceMergeDeletes(boolean doWait)
- throws CorruptIndexException, IOException {
+ throws IOException {
ensureOpen();
flush(true, true);
@@ -1675,7 +1667,7 @@ public class IndexWriter implements Clos
* you should immediately close the writer. See <a
* href="#OOME">above</a> for details.</p>
*/
- public void forceMergeDeletes() throws CorruptIndexException, IOException {
+ public void forceMergeDeletes() throws IOException {
forceMergeDeletes(true);
}
@@ -1693,18 +1685,18 @@ public class IndexWriter implements Clos
* you should immediately close the writer. See <a
* href="#OOME">above</a> for details.</p>
*/
- public final void maybeMerge() throws CorruptIndexException, IOException {
+ public final void maybeMerge() throws IOException {
maybeMerge(-1);
}
- private final void maybeMerge(int maxNumSegments) throws CorruptIndexException, IOException {
+ private final void maybeMerge(int maxNumSegments) throws IOException {
ensureOpen(false);
updatePendingMerges(maxNumSegments);
mergeScheduler.merge(this);
}
private synchronized void updatePendingMerges(int maxNumSegments)
- throws CorruptIndexException, IOException {
+ throws IOException {
assert maxNumSegments == -1 || maxNumSegments > 0;
if (stopMerges) {
@@ -1922,7 +1914,7 @@ public class IndexWriter implements Clos
}
}
- private synchronized void finishMerges(boolean waitForMerges) throws IOException {
+ private synchronized void finishMerges(boolean waitForMerges) {
if (!waitForMerges) {
stopMerges = true;
@@ -2088,7 +2080,7 @@ public class IndexWriter implements Clos
return newSegment;
}
- synchronized void publishFrozenDeletes(FrozenBufferedDeletes packet) throws IOException {
+ synchronized void publishFrozenDeletes(FrozenBufferedDeletes packet) {
assert packet != null && packet.any();
synchronized (bufferedDeletesStream) {
bufferedDeletesStream.push(packet);
@@ -2197,7 +2189,7 @@ public class IndexWriter implements Clos
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public void addIndexes(Directory... dirs) throws CorruptIndexException, IOException {
+ public void addIndexes(Directory... dirs) throws IOException {
ensureOpen();
noDupDirs(dirs);
@@ -2281,7 +2273,7 @@ public class IndexWriter implements Clos
* @throws IOException
* if there is a low-level IO error
*/
- public void addIndexes(IndexReader... readers) throws CorruptIndexException, IOException {
+ public void addIndexes(IndexReader... readers) throws IOException {
ensureOpen();
int numDocs = 0;
@@ -2489,7 +2481,7 @@ public class IndexWriter implements Clos
* href="#OOME">above</a> for details.</p>
*
* @see #prepareCommit(Map) */
- public final void prepareCommit() throws CorruptIndexException, IOException {
+ public final void prepareCommit() throws IOException {
ensureOpen();
prepareCommit(null);
}
@@ -2524,7 +2516,7 @@ public class IndexWriter implements Clos
* only "stick" if there are actually changes in the
* index to commit.
*/
- public final void prepareCommit(Map<String,String> commitUserData) throws CorruptIndexException, IOException {
+ public final void prepareCommit(Map<String,String> commitUserData) throws IOException {
ensureOpen(false);
synchronized(commitLock) {
@@ -2655,7 +2647,7 @@ public class IndexWriter implements Clos
* @see #prepareCommit
* @see #commit(Map)
*/
- public final void commit() throws CorruptIndexException, IOException {
+ public final void commit() throws IOException {
commit(null);
}
@@ -2668,14 +2660,14 @@ public class IndexWriter implements Clos
* you should immediately close the writer. See <a
* href="#OOME">above</a> for details.</p>
*/
- public final void commit(Map<String,String> commitUserData) throws CorruptIndexException, IOException {
+ public final void commit(Map<String,String> commitUserData) throws IOException {
ensureOpen();
commitInternal(commitUserData);
}
- private final void commitInternal(Map<String,String> commitUserData) throws CorruptIndexException, IOException {
+ private final void commitInternal(Map<String,String> commitUserData) throws IOException {
if (infoStream.isEnabled("IW")) {
infoStream.message("IW", "commit: start");
@@ -2703,7 +2695,7 @@ public class IndexWriter implements Clos
}
}
- private synchronized final void finishCommit() throws CorruptIndexException, IOException {
+ private synchronized final void finishCommit() throws IOException {
if (pendingCommit != null) {
try {
@@ -2749,7 +2741,7 @@ public class IndexWriter implements Clos
* deletes or docs were flushed) if necessary
* @param applyAllDeletes whether pending deletes should also
*/
- protected final void flush(boolean triggerMerge, boolean applyAllDeletes) throws CorruptIndexException, IOException {
+ protected final void flush(boolean triggerMerge, boolean applyAllDeletes) throws IOException {
// NOTE: this method cannot be sync'd because
// maybeMerge() in turn calls mergeScheduler.merge which
@@ -2765,7 +2757,7 @@ public class IndexWriter implements Clos
}
}
- private boolean doFlush(boolean applyAllDeletes) throws CorruptIndexException, IOException {
+ private boolean doFlush(boolean applyAllDeletes) throws IOException {
if (hitOOM) {
throw new IllegalStateException("this writer hit an OutOfMemoryError; cannot flush");
}
@@ -2872,7 +2864,7 @@ public class IndexWriter implements Clos
return docWriter.getNumDocs();
}
- private synchronized void ensureValidMerge(MergePolicy.OneMerge merge) throws IOException {
+ private synchronized void ensureValidMerge(MergePolicy.OneMerge merge) {
for(SegmentInfoPerCommit info : merge.segments) {
if (!segmentInfos.contains(info)) {
throw new MergePolicy.MergeException("MergePolicy selected a segment (" + info.info.name + ") that is not in the current index " + segString(), directory);
@@ -3132,8 +3124,7 @@ public class IndexWriter implements Clos
*
* @lucene.experimental
*/
- public void merge(MergePolicy.OneMerge merge)
- throws CorruptIndexException, IOException {
+ public void merge(MergePolicy.OneMerge merge) throws IOException {
boolean success = false;
@@ -3195,7 +3186,7 @@ public class IndexWriter implements Clos
* are now participating in a merge, and true is
* returned. Else (the merge conflicts) false is
* returned. */
- final synchronized boolean registerMerge(MergePolicy.OneMerge merge) throws MergePolicy.MergeAbortedException, IOException {
+ final synchronized boolean registerMerge(MergePolicy.OneMerge merge) throws IOException {
if (merge.registerDone) {
return true;
@@ -3378,7 +3369,7 @@ public class IndexWriter implements Clos
/** Does fininishing for a merge, which is fast but holds
* the synchronized lock on IndexWriter instance. */
- final synchronized void mergeFinish(MergePolicy.OneMerge merge) throws IOException {
+ final synchronized void mergeFinish(MergePolicy.OneMerge merge) {
// forceMerge, addIndexes or finishMerges may be waiting
// on merges to finish.
@@ -3439,8 +3430,7 @@ public class IndexWriter implements Clos
/** Does the actual (time-consuming) work of the merge,
* but without holding synchronized lock on IndexWriter
* instance */
- private int mergeMiddle(MergePolicy.OneMerge merge)
- throws CorruptIndexException, IOException {
+ private int mergeMiddle(MergePolicy.OneMerge merge) throws IOException {
merge.checkAborted(directory);
@@ -3682,12 +3672,12 @@ public class IndexWriter implements Clos
}
/** @lucene.internal */
- public synchronized String segString() throws IOException {
+ public synchronized String segString() {
return segString(segmentInfos);
}
/** @lucene.internal */
- public synchronized String segString(Iterable<SegmentInfoPerCommit> infos) throws IOException {
+ public synchronized String segString(Iterable<SegmentInfoPerCommit> infos) {
final StringBuilder buffer = new StringBuilder();
for(final SegmentInfoPerCommit info : infos) {
if (buffer.length() > 0) {
@@ -3699,7 +3689,7 @@ public class IndexWriter implements Clos
}
/** @lucene.internal */
- public synchronized String segString(SegmentInfoPerCommit info) throws IOException {
+ public synchronized String segString(SegmentInfoPerCommit info) {
return info.toString(info.info.dir, numDeletedDocs(info) - info.getDelCount());
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java Thu Jun 28 17:51:38 2012
@@ -421,7 +421,7 @@ public abstract class LogMergePolicy ext
*/
@Override
public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos)
- throws CorruptIndexException, IOException {
+ throws IOException {
final List<SegmentInfoPerCommit> segments = segmentInfos.asList();
final int numSegments = segments.size();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java Thu Jun 28 17:51:38 2012
@@ -299,7 +299,7 @@ public abstract class MergePolicy implem
* the total set of segments in the index
*/
public abstract MergeSpecification findMerges(SegmentInfos segmentInfos)
- throws CorruptIndexException, IOException;
+ throws IOException;
/**
* Determine what set of merge operations is necessary in
@@ -324,7 +324,7 @@ public abstract class MergePolicy implem
*/
public abstract MergeSpecification findForcedMerges(
SegmentInfos segmentInfos, int maxSegmentCount, Map<SegmentInfoPerCommit,Boolean> segmentsToMerge)
- throws CorruptIndexException, IOException;
+ throws IOException;
/**
* Determine what set of merge operations is necessary in order to expunge all
@@ -334,7 +334,7 @@ public abstract class MergePolicy implem
* the total set of segments in the index
*/
public abstract MergeSpecification findForcedDeletesMerges(
- SegmentInfos segmentInfos) throws CorruptIndexException, IOException;
+ SegmentInfos segmentInfos) throws IOException;
/**
* Release all resources for the policy.
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java Thu Jun 28 17:51:38 2012
@@ -29,10 +29,8 @@ import java.io.IOException;
public abstract class MergeScheduler {
/** Run the merges provided by {@link IndexWriter#getNextMerge()}. */
- public abstract void merge(IndexWriter writer)
- throws CorruptIndexException, IOException;
+ public abstract void merge(IndexWriter writer) throws IOException;
/** Close this MergeScheduler. */
- public abstract void close()
- throws CorruptIndexException, IOException;
+ public abstract void close() throws IOException;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergeState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergeState.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergeState.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MergeState.java Thu Jun 28 17:51:38 2012
@@ -247,7 +247,7 @@ public class MergeState {
* @lucene.internal */
static final MergeState.CheckAbort NONE = new MergeState.CheckAbort(null, null) {
@Override
- public void work(double units) throws MergePolicy.MergeAbortedException {
+ public void work(double units) {
// do nothing
}
};
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java Thu Jun 28 17:51:38 2012
@@ -51,7 +51,7 @@ public class MultiDocValues extends DocV
return reader.normValues(field);
}
- public boolean stopLoadingOnNull(AtomicReader reader, String field) throws IOException {
+ public boolean stopLoadingOnNull(AtomicReader reader, String field) {
// for norms we drop all norms if one leaf reader has no norms and the field is present
FieldInfos fieldInfos = reader.getFieldInfos();
FieldInfo fieldInfo = fieldInfos.fieldInfo(field);
@@ -79,7 +79,7 @@ public class MultiDocValues extends DocV
return reader.docValues(field);
}
- public boolean stopLoadingOnNull(AtomicReader reader, String field) throws IOException {
+ public boolean stopLoadingOnNull(AtomicReader reader, String field) {
return false;
}
}
@@ -437,7 +437,7 @@ public class MultiDocValues extends DocV
ordToOffset = type == Type.BYTES_VAR_SORTED ? new long[2] : null;
}
@Override
- public void consume(BytesRef ref, int ord, long offset) throws IOException {
+ public void consume(BytesRef ref, int ord, long offset) {
pagedBytes.copy(ref);
if (ordToOffset != null) {
if (ord+1 >= ordToOffset.length) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java Thu Jun 28 17:51:38 2012
@@ -46,7 +46,7 @@ public final class MultiDocsAndPositions
return this.parent == parent;
}
- public MultiDocsAndPositionsEnum reset(final EnumWithSlice[] subs, final int numSubs) throws IOException {
+ public MultiDocsAndPositionsEnum reset(final EnumWithSlice[] subs, final int numSubs) {
this.numSubs = numSubs;
this.subs = new EnumWithSlice[subs.length];
for(int i=0;i<subs.length;i++) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java Thu Jun 28 17:51:38 2012
@@ -42,7 +42,7 @@ public final class MultiDocsEnum extends
subDocsEnum = new DocsEnum[subReaderCount];
}
- MultiDocsEnum reset(final EnumWithSlice[] subs, final int numSubs) throws IOException {
+ MultiDocsEnum reset(final EnumWithSlice[] subs, final int numSubs) {
this.numSubs = numSubs;
this.subs = new EnumWithSlice[subs.length];
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java Thu Jun 28 17:51:38 2012
@@ -110,7 +110,7 @@ public final class MultiFieldsEnum exte
final int index;
String current;
- public FieldsEnumWithSlice(FieldsEnum fields, ReaderSlice slice, int index) throws IOException {
+ public FieldsEnumWithSlice(FieldsEnum fields, ReaderSlice slice, int index) {
this.slice = slice;
this.index = index;
assert slice.length >= 0: "length=" + slice.length;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiReader.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiReader.java Thu Jun 28 17:51:38 2012
@@ -45,7 +45,7 @@ public class MultiReader extends BaseCom
* <p>Note that all subreaders are closed if this Multireader is closed.</p>
* @param subReaders set of (sub)readers
*/
- public MultiReader(IndexReader... subReaders) throws IOException {
+ public MultiReader(IndexReader... subReaders) {
this(subReaders, true);
}
@@ -55,7 +55,7 @@ public class MultiReader extends BaseCom
* @param closeSubReaders indicates whether the subreaders should be closed
* when this MultiReader is closed
*/
- public MultiReader(IndexReader[] subReaders, boolean closeSubReaders) throws IOException {
+ public MultiReader(IndexReader[] subReaders, boolean closeSubReaders) {
super(subReaders.clone());
this.closeSubReaders = closeSubReaders;
if (!closeSubReaders) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java Thu Jun 28 17:51:38 2012
@@ -95,7 +95,7 @@ public final class MultiTerms extends Te
}
@Override
- public long size() throws IOException {
+ public long size() {
return -1;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java Thu Jun 28 17:51:38 2012
@@ -258,12 +258,12 @@ public final class MultiTermsEnum extend
}
@Override
- public void seekExact(long ord) throws IOException {
+ public void seekExact(long ord) {
throw new UnsupportedOperationException();
}
@Override
- public long ord() throws IOException {
+ public long ord() {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.IOException;
import java.util.List;
/**
@@ -34,8 +33,8 @@ public final class NoDeletionPolicy impl
// keep private to avoid instantiation
}
- public void onCommit(List<? extends IndexCommit> commits) throws IOException {}
+ public void onCommit(List<? extends IndexCommit> commits) {}
- public void onInit(List<? extends IndexCommit> commits) throws IOException {}
+ public void onInit(List<? extends IndexCommit> commits) {}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java Thu Jun 28 17:51:38 2012
@@ -17,7 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.IOException;
import java.util.Map;
/**
@@ -54,17 +53,14 @@ public final class NoMergePolicy extends
public void close() {}
@Override
- public MergeSpecification findMerges(SegmentInfos segmentInfos)
- throws CorruptIndexException, IOException { return null; }
+ public MergeSpecification findMerges(SegmentInfos segmentInfos) { return null; }
@Override
public MergeSpecification findForcedMerges(SegmentInfos segmentInfos,
- int maxSegmentCount, Map<SegmentInfoPerCommit,Boolean> segmentsToMerge)
- throws CorruptIndexException, IOException { return null; }
+ int maxSegmentCount, Map<SegmentInfoPerCommit,Boolean> segmentsToMerge) { return null; }
@Override
- public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos)
- throws CorruptIndexException, IOException { return null; }
+ public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos) { return null; }
@Override
public boolean useCompoundFile(SegmentInfos segments, SegmentInfoPerCommit newSegment) { return useCompoundFile; }
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java Thu Jun 28 17:51:38 2012
@@ -17,8 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.IOException;
-
/**
* A {@link MergeScheduler} which never executes any merges. It is also a
* singleton and can be accessed through {@link NoMergeScheduler#INSTANCE}. Use
@@ -42,5 +40,5 @@ public final class NoMergeScheduler exte
public void close() {}
@Override
- public void merge(IndexWriter writer) throws CorruptIndexException, IOException {}
+ public void merge(IndexWriter writer) {}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NormsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NormsConsumer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NormsConsumer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/NormsConsumer.java Thu Jun 28 17:51:38 2012
@@ -87,10 +87,10 @@ final class NormsConsumer extends Invert
}
@Override
- void finishDocument() throws IOException {}
+ void finishDocument() {}
@Override
- void startDocument() throws IOException {}
+ void startDocument() {}
@Override
InvertedDocEndConsumerPerField addField(DocInverterPerField docInverterPerField,
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java Thu Jun 28 17:51:38 2012
@@ -162,7 +162,7 @@ public final class ParallelAtomicReader
}
@Override
- public String next() throws IOException {
+ public String next() {
if (keys.hasNext()) {
currentField = keys.next();
} else {
@@ -172,7 +172,7 @@ public final class ParallelAtomicReader
}
@Override
- public Terms terms() throws IOException {
+ public Terms terms() {
return fields.terms(currentField);
}
@@ -185,22 +185,22 @@ public final class ParallelAtomicReader
ParallelFields() {
}
- void addField(String fieldName, Terms terms) throws IOException {
+ void addField(String fieldName, Terms terms) {
fields.put(fieldName, terms);
}
@Override
- public FieldsEnum iterator() throws IOException {
+ public FieldsEnum iterator() {
return new ParallelFieldsEnum(this);
}
@Override
- public Terms terms(String field) throws IOException {
+ public Terms terms(String field) {
return fields.get(field);
}
@Override
- public int size() throws IOException {
+ public int size() {
return fields.size();
}
}
@@ -249,7 +249,7 @@ public final class ParallelAtomicReader
}
@Override
- public void document(int docID, StoredFieldVisitor visitor) throws CorruptIndexException, IOException {
+ public void document(int docID, StoredFieldVisitor visitor) throws IOException {
ensureOpen();
for (final AtomicReader reader: storedFieldsReaders) {
reader.document(docID, visitor);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java Thu Jun 28 17:51:38 2012
@@ -28,7 +28,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.util.Version;
/**
@@ -106,8 +105,7 @@ public class PersistentSnapshotDeletionP
* IndexWriter.
*/
public PersistentSnapshotDeletionPolicy(IndexDeletionPolicy primary,
- Directory dir, OpenMode mode, Version matchVersion)
- throws CorruptIndexException, LockObtainFailedException, IOException {
+ Directory dir, OpenMode mode, Version matchVersion) throws IOException {
super(primary, null);
// Initialize the index writer over the snapshot directory.
@@ -175,7 +173,7 @@ public class PersistentSnapshotDeletionP
}
/** Closes the index which writes the snapshots to the directory. */
- public void close() throws CorruptIndexException, IOException {
+ public void close() throws IOException {
writer.close();
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java Thu Jun 28 17:51:38 2012
@@ -166,7 +166,7 @@ public final class SegmentInfo {
* modify it.
*/
- public Set<String> files() throws IOException {
+ public Set<String> files() {
if (setFiles == null) {
throw new IllegalStateException("files were not computed yet");
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Thu Jun 28 17:51:38 2012
@@ -194,7 +194,7 @@ public final class SegmentInfos implemen
* @param files -- array of file names to check
*/
- public static String getLastCommitSegmentsFileName(String[] files) throws IOException {
+ public static String getLastCommitSegmentsFileName(String[] files) {
return IndexFileNames.fileNameFromGeneration(IndexFileNames.SEGMENTS,
"",
getLastCommitGeneration(files));
@@ -262,7 +262,7 @@ public final class SegmentInfos implemen
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public final void read(Directory directory, String segmentFileName) throws CorruptIndexException, IOException {
+ public final void read(Directory directory, String segmentFileName) throws IOException {
boolean success = false;
// Clear any previous segments:
@@ -320,13 +320,13 @@ public final class SegmentInfos implemen
}
}
- public final void read(Directory directory) throws CorruptIndexException, IOException {
+ public final void read(Directory directory) throws IOException {
generation = lastGeneration = -1;
new FindSegmentsFile(directory) {
@Override
- protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
+ protected Object doBody(String segmentFileName) throws IOException {
read(directory, segmentFileName);
return null;
}
@@ -596,11 +596,11 @@ public final class SegmentInfos implemen
this.directory = directory;
}
- public Object run() throws CorruptIndexException, IOException {
+ public Object run() throws IOException {
return run(null);
}
- public Object run(IndexCommit commit) throws CorruptIndexException, IOException {
+ public Object run(IndexCommit commit) throws IOException {
if (commit != null) {
if (directory != commit.getDirectory())
throw new IOException("the specified commit does not match the specified Directory");
@@ -806,7 +806,7 @@ public final class SegmentInfos implemen
* during the processing that could have been caused by
* a writer committing.
*/
- protected abstract Object doBody(String segmentFileName) throws CorruptIndexException, IOException;
+ protected abstract Object doBody(String segmentFileName) throws IOException;
}
// Carry over generation numbers from another SegmentInfos
@@ -815,7 +815,7 @@ public final class SegmentInfos implemen
generation = other.generation;
}
- final void rollbackCommit(Directory dir) throws IOException {
+ final void rollbackCommit(Directory dir) {
if (pendingSegnOutput != null) {
try {
pendingSegnOutput.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java Thu Jun 28 17:51:38 2012
@@ -91,7 +91,7 @@ final class SegmentMerger {
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- final MergeState merge() throws CorruptIndexException, IOException {
+ final MergeState merge() throws IOException {
// NOTE: it's important to add calls to
// checkAbort.work(...) if you make any changes to this
// method that will spend alot of time. The frequency
@@ -244,7 +244,7 @@ final class SegmentMerger {
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- private int mergeFields() throws CorruptIndexException, IOException {
+ private int mergeFields() throws IOException {
final StoredFieldsWriter fieldsWriter = codec.storedFieldsFormat().fieldsWriter(directory, mergeState.segmentInfo, context);
try {
@@ -300,7 +300,7 @@ final class SegmentMerger {
return docBase;
}
- private final void mergeTerms(SegmentWriteState segmentWriteState) throws CorruptIndexException, IOException {
+ private final void mergeTerms(SegmentWriteState segmentWriteState) throws IOException {
final List<Fields> fields = new ArrayList<Fields>();
final List<ReaderSlice> slices = new ArrayList<ReaderSlice>();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java Thu Jun 28 17:51:38 2012
@@ -89,7 +89,7 @@ public final class SegmentReader extends
// SegmentReader and using the provided in-memory
// liveDocs. Used by IndexWriter to provide a new NRT
// reader:
- SegmentReader(SegmentInfoPerCommit si, SegmentCoreReaders core, Bits liveDocs, int numDocs) throws IOException {
+ SegmentReader(SegmentInfoPerCommit si, SegmentCoreReaders core, Bits liveDocs, int numDocs) {
this.si = si;
this.core = core;
core.incRef();
@@ -131,7 +131,7 @@ public final class SegmentReader extends
}
@Override
- public void document(int docID, StoredFieldVisitor visitor) throws CorruptIndexException, IOException {
+ public void document(int docID, StoredFieldVisitor visitor) throws IOException {
if (docID < 0 || docID >= maxDoc()) {
throw new IllegalArgumentException("docID must be >= 0 and < maxDoc=" + maxDoc() + " (got docID=" + docID + ")");
}
@@ -139,7 +139,7 @@ public final class SegmentReader extends
}
@Override
- public Fields fields() throws IOException {
+ public Fields fields() {
ensureOpen();
return core.fields;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SerialMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SerialMergeScheduler.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SerialMergeScheduler.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SerialMergeScheduler.java Thu Jun 28 17:51:38 2012
@@ -27,8 +27,7 @@ public class SerialMergeScheduler extend
* "synchronized" so that even if the application is using
* multiple threads, only one merge may run at a time. */
@Override
- synchronized public void merge(IndexWriter writer)
- throws CorruptIndexException, IOException {
+ synchronized public void merge(IndexWriter writer) throws IOException {
while(true) {
MergePolicy.OneMerge merge = writer.getNextMerge();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SingleTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SingleTermsEnum.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SingleTermsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SingleTermsEnum.java Thu Jun 28 17:51:38 2012
@@ -17,8 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.search.MultiTermQuery; // javadocs
import org.apache.lucene.util.BytesRef;
@@ -39,7 +37,7 @@ public final class SingleTermsEnum exten
* After calling the constructor the enumeration is already pointing to the term,
* if it exists.
*/
- public SingleTermsEnum(TermsEnum tenum, BytesRef termText) throws IOException {
+ public SingleTermsEnum(TermsEnum tenum, BytesRef termText) {
super(tenum);
singleRef = termText;
setInitialSeekTerm(termText);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java Thu Jun 28 17:51:38 2012
@@ -75,7 +75,7 @@ public final class SlowCompositeReaderWr
}
@Override
- public Fields fields() throws IOException {
+ public Fields fields() {
ensureOpen();
return fields;
}
@@ -117,7 +117,7 @@ public final class SlowCompositeReaderWr
}
@Override
- public void document(int docID, StoredFieldVisitor visitor) throws CorruptIndexException, IOException {
+ public void document(int docID, StoredFieldVisitor visitor) throws IOException {
ensureOpen();
in.document(docID, visitor);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java Thu Jun 28 17:51:38 2012
@@ -218,7 +218,7 @@ public final class SortedBytesMergeUtils
current = top[0].current;
}
- private void pushTop() throws IOException {
+ private void pushTop() {
// call next() on each top, and put back into queue
for (int i = 0; i < numTop; i++) {
top[i].current = top[i].next();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java Thu Jun 28 17:51:38 2012
@@ -38,7 +38,7 @@ final class StandardDirectoryReader exte
/** called only from static open() methods */
StandardDirectoryReader(Directory directory, AtomicReader[] readers, IndexWriter writer,
- SegmentInfos sis, int termInfosIndexDivisor, boolean applyAllDeletes) throws IOException {
+ SegmentInfos sis, int termInfosIndexDivisor, boolean applyAllDeletes) {
super(directory, readers);
this.writer = writer;
this.segmentInfos = sis;
@@ -48,10 +48,10 @@ final class StandardDirectoryReader exte
/** called from DirectoryReader.open(...) methods */
static DirectoryReader open(final Directory directory, final IndexCommit commit,
- final int termInfosIndexDivisor) throws CorruptIndexException, IOException {
+ final int termInfosIndexDivisor) throws IOException {
return (DirectoryReader) new SegmentInfos.FindSegmentsFile(directory) {
@Override
- protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
+ protected Object doBody(String segmentFileName) throws IOException {
SegmentInfos sis = new SegmentInfos();
sis.read(directory, segmentFileName);
final SegmentReader[] readers = new SegmentReader[sis.size()];
@@ -226,12 +226,12 @@ final class StandardDirectoryReader exte
}
@Override
- protected DirectoryReader doOpenIfChanged() throws CorruptIndexException, IOException {
+ protected DirectoryReader doOpenIfChanged() throws IOException {
return doOpenIfChanged(null);
}
@Override
- protected DirectoryReader doOpenIfChanged(final IndexCommit commit) throws CorruptIndexException, IOException {
+ protected DirectoryReader doOpenIfChanged(final IndexCommit commit) throws IOException {
ensureOpen();
// If we were obtained by writer.getReader(), re-ask the
@@ -244,7 +244,7 @@ final class StandardDirectoryReader exte
}
@Override
- protected DirectoryReader doOpenIfChanged(IndexWriter writer, boolean applyAllDeletes) throws CorruptIndexException, IOException {
+ protected DirectoryReader doOpenIfChanged(IndexWriter writer, boolean applyAllDeletes) throws IOException {
ensureOpen();
if (writer == this.writer && applyAllDeletes == this.applyAllDeletes) {
return doOpenFromWriter(null);
@@ -253,7 +253,7 @@ final class StandardDirectoryReader exte
}
}
- private DirectoryReader doOpenFromWriter(IndexCommit commit) throws CorruptIndexException, IOException {
+ private DirectoryReader doOpenFromWriter(IndexCommit commit) throws IOException {
if (commit != null) {
throw new IllegalArgumentException("a reader obtained from IndexWriter.getReader() cannot currently accept a commit");
}
@@ -273,7 +273,7 @@ final class StandardDirectoryReader exte
return reader;
}
- private synchronized DirectoryReader doOpenNoWriter(IndexCommit commit) throws CorruptIndexException, IOException {
+ private synchronized DirectoryReader doOpenNoWriter(IndexCommit commit) throws IOException {
if (commit == null) {
if (isCurrent()) {
@@ -290,7 +290,7 @@ final class StandardDirectoryReader exte
return (DirectoryReader) new SegmentInfos.FindSegmentsFile(directory) {
@Override
- protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
+ protected Object doBody(String segmentFileName) throws IOException {
final SegmentInfos infos = new SegmentInfos();
infos.read(directory, segmentFileName);
return doOpenIfChanged(infos, null);
@@ -298,7 +298,7 @@ final class StandardDirectoryReader exte
}.run(commit);
}
- synchronized DirectoryReader doOpenIfChanged(SegmentInfos infos, IndexWriter writer) throws CorruptIndexException, IOException {
+ synchronized DirectoryReader doOpenIfChanged(SegmentInfos infos, IndexWriter writer) throws IOException {
return StandardDirectoryReader.open(directory, writer, infos, getSequentialSubReaders(), termInfosIndexDivisor);
}
@@ -309,7 +309,7 @@ final class StandardDirectoryReader exte
}
@Override
- public boolean isCurrent() throws CorruptIndexException, IOException {
+ public boolean isCurrent() throws IOException {
ensureOpen();
if (writer == null || writer.isClosed()) {
// Fully read the segments file: this ensures that it's
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/StoredFieldsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/StoredFieldsConsumer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/StoredFieldsConsumer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/StoredFieldsConsumer.java Thu Jun 28 17:51:38 2012
@@ -126,7 +126,7 @@ final class StoredFieldsConsumer {
assert docWriter.writer.testPoint("StoredFieldsWriter.finishDocument end");
}
- public void addField(IndexableField field, FieldInfo fieldInfo) throws IOException {
+ public void addField(IndexableField field, FieldInfo fieldInfo) {
if (numStoredFields == storedFields.length) {
int newSize = ArrayUtil.oversize(numStoredFields + 1, RamUsageEstimator.NUM_BYTES_OBJECT_REF);
IndexableField[] newArray = new IndexableField[newSize];
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java Thu Jun 28 17:51:38 2012
@@ -158,7 +158,7 @@ final class TermVectorsConsumer extends
}
@Override
- void startDocument() throws IOException {
+ void startDocument() {
assert clearLastVectorFieldName();
reset();
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java Thu Jun 28 17:51:38 2012
@@ -90,7 +90,7 @@ final class TermVectorsConsumerPerField
* are enabled, to write the vectors to
* RAMOutputStream, which is then quickly flushed to
* the real term vectors files in the Directory. */ @Override
- void finish() throws IOException {
+ void finish() {
if (!doVectors || termsHashPerField.bytesHash.size() == 0) {
return;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java Thu Jun 28 17:51:38 2012
@@ -240,12 +240,12 @@ public abstract class TermsEnum implemen
}
@Override
- public TermState termState() throws IOException {
+ public TermState termState() {
throw new IllegalStateException("this method should never be called");
}
@Override
- public void seekExact(BytesRef term, TermState state) throws IOException {
+ public void seekExact(BytesRef term, TermState state) {
throw new IllegalStateException("this method should never be called");
}
};
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java Thu Jun 28 17:51:38 2012
@@ -553,8 +553,7 @@ public class TieredMergePolicy extends M
}
@Override
- public MergeSpecification findForcedDeletesMerges(SegmentInfos infos)
- throws CorruptIndexException, IOException {
+ public MergeSpecification findForcedDeletesMerges(SegmentInfos infos) throws IOException {
if (verbose()) {
message("findForcedDeletesMerges infos=" + writer.get().segString(infos) + " forceMergeDeletesPctAllowed=" + forceMergeDeletesPctAllowed);
}
@@ -623,8 +622,7 @@ public class TieredMergePolicy extends M
public void close() {
}
- private boolean isMerged(SegmentInfoPerCommit info)
- throws IOException {
+ private boolean isMerged(SegmentInfoPerCommit info) {
IndexWriter w = writer.get();
assert w != null;
boolean hasDeletions = w.numDeletedDocs(info) > 0;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java Thu Jun 28 17:51:38 2012
@@ -74,12 +74,12 @@ public class UpgradeIndexMergePolicy ext
}
@Override
- public MergeSpecification findMerges(SegmentInfos segmentInfos) throws CorruptIndexException, IOException {
+ public MergeSpecification findMerges(SegmentInfos segmentInfos) throws IOException {
return base.findMerges(segmentInfos);
}
@Override
- public MergeSpecification findForcedMerges(SegmentInfos segmentInfos, int maxSegmentCount, Map<SegmentInfoPerCommit,Boolean> segmentsToMerge) throws CorruptIndexException, IOException {
+ public MergeSpecification findForcedMerges(SegmentInfos segmentInfos, int maxSegmentCount, Map<SegmentInfoPerCommit,Boolean> segmentsToMerge) throws IOException {
// first find all old segments
final Map<SegmentInfoPerCommit,Boolean> oldSegments = new HashMap<SegmentInfoPerCommit,Boolean>();
for (final SegmentInfoPerCommit si : segmentInfos) {
@@ -129,7 +129,7 @@ public class UpgradeIndexMergePolicy ext
}
@Override
- public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos) throws CorruptIndexException, IOException {
+ public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos) throws IOException {
return base.findForcedDeletesMerges(segmentInfos);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java Thu Jun 28 17:51:38 2012
@@ -98,7 +98,7 @@ final class BooleanScorer extends Scorer
}
@Override
- public void setScorer(Scorer scorer) throws IOException {
+ public void setScorer(Scorer scorer) {
this.scorer = scorer;
}
@@ -122,7 +122,7 @@ final class BooleanScorer extends Scorer
public BucketScorer(Weight weight) { super(weight); }
@Override
- public int advance(int target) throws IOException { return NO_MORE_DOCS; }
+ public int advance(int target) { return NO_MORE_DOCS; }
@Override
public int docID() { return doc; }
@@ -131,10 +131,10 @@ final class BooleanScorer extends Scorer
public float freq() { return freq; }
@Override
- public int nextDoc() throws IOException { return NO_MORE_DOCS; }
+ public int nextDoc() { return NO_MORE_DOCS; }
@Override
- public float score() throws IOException { return score; }
+ public float score() { return score; }
}
@@ -181,8 +181,7 @@ final class BooleanScorer extends Scorer
public SubScorer next;
public SubScorer(Scorer scorer, boolean required, boolean prohibited,
- Collector collector, SubScorer next)
- throws IOException {
+ Collector collector, SubScorer next) {
if (required) {
throw new IllegalArgumentException("this scorer cannot handle required=true");
}
@@ -299,7 +298,7 @@ final class BooleanScorer extends Scorer
}
@Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
throw new UnsupportedOperationException();
}
@@ -309,7 +308,7 @@ final class BooleanScorer extends Scorer
}
@Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
throw new UnsupportedOperationException();
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java Thu Jun 28 17:51:38 2012
@@ -338,13 +338,13 @@ public abstract class CachingCollector e
}
@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) {}
@Override
- public void setNextReader(AtomicReaderContext context) throws IOException {}
+ public void setNextReader(AtomicReaderContext context) {}
};
return create(other, cacheScores, maxRAMMB);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java Thu Jun 28 17:51:38 2012
@@ -32,7 +32,7 @@ class ConjunctionTermScorer extends Scor
private final DocsAndFreqs lead;
ConjunctionTermScorer(Weight weight, float coord,
- DocsAndFreqs[] docsAndFreqs) throws IOException {
+ DocsAndFreqs[] docsAndFreqs) {
super(weight);
this.coord = coord;
this.docsAndFreqs = docsAndFreqs;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreAutoRewrite.java Thu Jun 28 17:51:38 2012
@@ -122,7 +122,7 @@ class ConstantScoreAutoRewrite extends T
}
@Override
- public void setNextEnum(TermsEnum termsEnum) throws IOException {
+ public void setNextEnum(TermsEnum termsEnum) {
this.termsEnum = termsEnum;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java Thu Jun 28 17:51:38 2012
@@ -172,7 +172,7 @@ public class ConstantScoreQuery extends
final DocIdSetIterator docIdSetIterator;
final float theScore;
- public ConstantScorer(DocIdSetIterator docIdSetIterator, Weight w, float theScore) throws IOException {
+ public ConstantScorer(DocIdSetIterator docIdSetIterator, Weight w, float theScore) {
super(w);
this.theScore = theScore;
this.docIdSetIterator = docIdSetIterator;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java Thu Jun 28 17:51:38 2012
@@ -55,7 +55,7 @@ class DisjunctionMaxScorer extends Score
* length may be larger than the actual number of scorers.
*/
public DisjunctionMaxScorer(Weight weight, float tieBreakerMultiplier,
- Scorer[] subScorers, int numScorers) throws IOException {
+ Scorer[] subScorers, int numScorers) {
super(weight);
this.tieBreakerMultiplier = tieBreakerMultiplier;
// The passed subScorers array includes only scorers which have documents
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java Thu Jun 28 17:51:38 2012
@@ -31,11 +31,11 @@ public abstract class DocIdSet {
private final DocIdSetIterator iterator = new DocIdSetIterator() {
@Override
- public int advance(int target) throws IOException { return NO_MORE_DOCS; }
+ public int advance(int target) { return NO_MORE_DOCS; }
@Override
public int docID() { return NO_MORE_DOCS; }
@Override
- public int nextDoc() throws IOException { return NO_MORE_DOCS; }
+ public int nextDoc() { return NO_MORE_DOCS; }
};
@Override
@@ -50,7 +50,7 @@ public abstract class DocIdSet {
// we explicitely provide no random access, as this filter is 100% sparse and iterator exits faster
@Override
- public Bits bits() throws IOException {
+ public Bits bits() {
return null;
}
};
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java Thu Jun 28 17:51:38 2012
@@ -194,7 +194,7 @@ final class ExactPhraseScorer extends Sc
}
@Override
- public float score() throws IOException {
+ public float score() {
return docScorer.score(docID, freq);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java Thu Jun 28 17:51:38 2012
@@ -337,8 +337,7 @@ public class FuzzyTermsEnum extends Term
private final BoostAttribute boostAtt =
attributes().addAttribute(BoostAttribute.class);
- public AutomatonFuzzyTermsEnum(TermsEnum tenum, CompiledAutomaton compiled[])
- throws IOException {
+ public AutomatonFuzzyTermsEnum(TermsEnum tenum, CompiledAutomaton compiled[]) {
super(tenum, false);
this.matchers = new ByteRunAutomaton[compiled.length];
for (int i = 0; i < compiled.length; i++)
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Thu Jun 28 17:51:38 2012
@@ -34,7 +34,6 @@ import java.util.concurrent.locks.Reentr
import org.apache.lucene.document.Document;
import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader; // javadocs
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
@@ -182,17 +181,17 @@ public class IndexSearcher {
}
/** Sugar for <code>.getIndexReader().document(docID)</code> */
- public Document doc(int docID) throws CorruptIndexException, IOException {
+ public Document doc(int docID) throws IOException {
return reader.document(docID);
}
/** Sugar for <code>.getIndexReader().document(docID, fieldVisitor)</code> */
- public void doc(int docID, StoredFieldVisitor fieldVisitor) throws CorruptIndexException, IOException {
+ public void doc(int docID, StoredFieldVisitor fieldVisitor) throws IOException {
reader.document(docID, fieldVisitor);
}
/** Sugar for <code>.getIndexReader().document(docID, fieldsToLoad)</code> */
- public final Document document(int docID, Set<String> fieldsToLoad) throws CorruptIndexException, IOException {
+ public final Document document(int docID, Set<String> fieldsToLoad) throws IOException {
return reader.document(docID, fieldsToLoad);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java Thu Jun 28 17:51:38 2012
@@ -38,7 +38,7 @@ public class MatchAllDocsQuery extends Q
private final int maxDoc;
private final Bits liveDocs;
- MatchAllScorer(IndexReader reader, Bits liveDocs, Weight w, float score) throws IOException {
+ MatchAllScorer(IndexReader reader, Bits liveDocs, Weight w, float score) {
super(w);
this.liveDocs = liveDocs;
this.score = score;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java Thu Jun 28 17:51:38 2012
@@ -17,17 +17,15 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.IOException;
-
/** Scorer for conjunctions, sets of terms, all of which are required. */
final class MatchOnlyConjunctionTermScorer extends ConjunctionTermScorer {
MatchOnlyConjunctionTermScorer(Weight weight, float coord,
- DocsAndFreqs[] docsAndFreqs) throws IOException {
+ DocsAndFreqs[] docsAndFreqs) {
super(weight, coord, docsAndFreqs);
}
@Override
- public float score() throws IOException {
+ public float score() {
float sum = 0.0f;
for (DocsAndFreqs docs : docsAndFreqs) {
sum += docs.docScorer.score(lastDoc, 1);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java Thu Jun 28 17:51:38 2012
@@ -42,7 +42,7 @@ final class MatchOnlyTermScorer extends
* The </code>Similarity.ExactSimScorer</code> implementation
* to be used for score computations.
*/
- MatchOnlyTermScorer(Weight weight, DocsEnum td, Similarity.ExactSimScorer docScorer) throws IOException {
+ MatchOnlyTermScorer(Weight weight, DocsEnum td, Similarity.ExactSimScorer docScorer) {
super(weight);
this.docScorer = docScorer;
this.docsEnum = td;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java Thu Jun 28 17:51:38 2012
@@ -568,7 +568,7 @@ class UnionDocsAndPositionsEnum extends
}
@Override
- public final int freq() throws IOException {
+ public final int freq() {
return _freq;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NRTManager.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NRTManager.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NRTManager.java Thu Jun 28 17:51:38 2012
@@ -26,7 +26,6 @@ import java.util.concurrent.locks.Condit
import java.util.concurrent.locks.ReentrantLock;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader; // javadocs
import org.apache.lucene.index.IndexWriter;
@@ -232,13 +231,13 @@ public class NRTManager extends Referenc
return indexingGen.get();
}
- public long addIndexes(Directory... dirs) throws CorruptIndexException, IOException {
+ public long addIndexes(Directory... dirs) throws IOException {
writer.addIndexes(dirs);
// Return gen as of when indexing finished:
return indexingGen.get();
}
- public long addIndexes(IndexReader... readers) throws CorruptIndexException, IOException {
+ public long addIndexes(IndexReader... readers) throws IOException {
writer.addIndexes(readers);
// Return gen as of when indexing finished:
return indexingGen.get();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java Thu Jun 28 17:51:38 2012
@@ -415,7 +415,7 @@ public final class NumericRangeQuery<T e
private final LinkedList<BytesRef> rangeBounds = new LinkedList<BytesRef>();
private final Comparator<BytesRef> termComp;
- NumericRangeTermsEnum(final TermsEnum tenum) throws IOException {
+ NumericRangeTermsEnum(final TermsEnum tenum) {
super(tenum);
switch (dataType) {
case LONG:
@@ -517,7 +517,7 @@ public final class NumericRangeQuery<T e
}
@Override
- protected final BytesRef nextSeekTerm(BytesRef term) throws IOException {
+ protected final BytesRef nextSeekTerm(BytesRef term) {
while (rangeBounds.size() >= 2) {
nextRange();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/PrefixTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/PrefixTermsEnum.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/PrefixTermsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/PrefixTermsEnum.java Thu Jun 28 17:51:38 2012
@@ -17,8 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.index.FilteredTermsEnum;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
@@ -35,7 +33,7 @@ public class PrefixTermsEnum extends Fil
private final BytesRef prefixRef;
- public PrefixTermsEnum(TermsEnum tenum, BytesRef prefixText) throws IOException {
+ public PrefixTermsEnum(TermsEnum tenum, BytesRef prefixText) {
super(tenum);
setInitialSeekTerm(this.prefixRef = prefixText);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java Thu Jun 28 17:51:38 2012
@@ -186,7 +186,7 @@ public abstract class ReferenceManager<G
* will return a refreshed instance. Otherwise, consider using the
* non-blocking {@link #maybeRefresh()}.
*/
- public final void maybeRefreshBlocking() throws IOException, InterruptedException {
+ public final void maybeRefreshBlocking() throws IOException {
ensureOpen();
// Ensure only 1 thread does refresh at once
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java Thu Jun 28 17:51:38 2012
@@ -1,7 +1,5 @@
package org.apache.lucene.search;
-import java.io.IOException;
-
import org.apache.lucene.index.Term;
import org.apache.lucene.util.ToStringUtils;
@@ -53,7 +51,7 @@ public class RegexpQuery extends Automat
* A provider that provides no named automata
*/
private static AutomatonProvider defaultProvider = new AutomatonProvider() {
- public Automaton getAutomaton(String name) throws IOException {
+ public Automaton getAutomaton(String name) {
return null;
}
};
Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java?rev=1355088&r1=1355087&r2=1355088&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java Thu Jun 28 17:51:38 2012
@@ -126,7 +126,7 @@ public abstract class ScoringRewrite<Q e
private BoostAttribute boostAtt;
@Override
- public void setNextEnum(TermsEnum termsEnum) throws IOException {
+ public void setNextEnum(TermsEnum termsEnum) {
this.termsEnum = termsEnum;
this.boostAtt = termsEnum.attributes().addAttribute(BoostAttribute.class);
}