Index: lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java =================================================================== --- lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java (revision 1354694) +++ lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java (working copy) @@ -174,7 +174,7 @@ return iwConf; } - public static IndexWriter configureWriter(Config config, PerfRunData runData, OpenMode mode, IndexCommit commit) throws CorruptIndexException, LockObtainFailedException, IOException { + public static IndexWriter configureWriter(Config config, PerfRunData runData, OpenMode mode, IndexCommit commit) throws IOException { IndexWriterConfig iwc = createWriterConfig(config, runData, mode, commit); String infoStreamVal = config.get("writer.info.stream", null); if (infoStreamVal != null) { Index: lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java =================================================================== --- lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java (revision 1353781) +++ lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java (working copy) @@ -57,9 +57,8 @@ * @param groupField The field to group by * @param sortWithinGroup The sort within each group * @return an AbstractAllGroupHeadsCollector 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 @@ * the total number of expected unique groups. Be aware that the heap usage is * 4 bytes * initialSize. * @return an AbstractAllGroupHeadsCollector 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 @@ 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(); @@ -409,7 +407,7 @@ 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]; Index: lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java =================================================================== --- lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java (revision 1353781) +++ lucene/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java (working copy) @@ -68,7 +68,7 @@ * @throws IOException If I/O related errors occur */ @SuppressWarnings("unchecked") - public static > DVAllGroupHeadsCollector create(String groupField, Sort sortWithinGroup, DocValues.Type type, boolean diskResident) throws IOException { + public static > DVAllGroupHeadsCollector create(String groupField, Sort sortWithinGroup, DocValues.Type type, boolean diskResident) { switch (type) { case VAR_INTS: case FIXED_INTS_8: @@ -162,7 +162,7 @@ private final Sort sortWithinGroup; private final Map, 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, GroupHead>(); @@ -218,7 +218,7 @@ 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 +244,7 @@ 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 +266,7 @@ 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 +287,7 @@ 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); } Index: lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java =================================================================== --- lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (revision 1353781) +++ lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (working copy) @@ -180,11 +180,11 @@ */ private static final class FakeDeleteIndexReader extends BaseCompositeReader { - public FakeDeleteIndexReader(IndexReader reader) throws IOException { + public FakeDeleteIndexReader(IndexReader reader) { super(initSubReaders(reader)); } - private static FakeDeleteAtomicIndexReader[] initSubReaders(IndexReader reader) throws IOException { + private static FakeDeleteAtomicIndexReader[] initSubReaders(IndexReader reader) { final List leaves = reader.getTopReaderContext().leaves(); final FakeDeleteAtomicIndexReader[] subs = new FakeDeleteAtomicIndexReader[leaves.size()]; int i = 0; Index: lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java =================================================================== --- lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java (revision 1353781) +++ lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java (working copy) @@ -335,7 +335,7 @@ } } - private OneMerge findOneSegmentToExpunge(SegmentInfos infos, int maxNumSegments) throws IOException { + private OneMerge findOneSegmentToExpunge(SegmentInfos infos, int maxNumSegments) { int expungeCandidate = -1; int maxDelCount = 0; Index: lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (revision 1353781) +++ lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (working copy) @@ -282,7 +282,7 @@ } } - public synchronized void clearCrash() throws IOException { + public synchronized void clearCrash() { crashed = false; openLocks.clear(); } @@ -617,7 +617,7 @@ * checkIndex() or not. It might mask real problems, where we silently * don't checkindex at all. instead we look for a segments file. */ - private boolean indexPossiblyExists(Directory d) throws IOException { + private boolean indexPossiblyExists(Directory d) { String files[]; try { files = d.listAll(); Index: lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (revision 1353781) +++ lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (working copy) @@ -755,7 +755,7 @@ * some features of Windows, such as not allowing open files to be * overwritten. */ - public static MockDirectoryWrapper newDirectory() throws IOException { + public static MockDirectoryWrapper newDirectory() { return newDirectory(random()); } @@ -763,7 +763,7 @@ * Returns a new Directory instance, using the specified random. * See {@link #newDirectory()} for more information. */ - public static MockDirectoryWrapper newDirectory(Random r) throws IOException { + public static MockDirectoryWrapper newDirectory(Random r) { Directory impl = newDirectoryImpl(r, TEST_DIRECTORY); MockDirectoryWrapper dir = new MockDirectoryWrapper(r, maybeNRTWrap(r, impl)); closeAfterSuite(new CloseableDirectory(dir, suiteFailureMarker)); @@ -785,12 +785,12 @@ } /** Returns a new FSDirectory instance over the given file, which must be a folder. */ - public static MockDirectoryWrapper newFSDirectory(File f) throws IOException { + public static MockDirectoryWrapper newFSDirectory(File f) { return newFSDirectory(f, null); } /** Returns a new FSDirectory instance over the given file, which must be a folder. */ - public static MockDirectoryWrapper newFSDirectory(File f, LockFactory lf) throws IOException { + public static MockDirectoryWrapper newFSDirectory(File f, LockFactory lf) { String fsdirClass = TEST_DIRECTORY; if (fsdirClass.equals("random")) { fsdirClass = RandomPicks.randomFrom(random(), FS_DIRECTORIES); Index: lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java (revision 1353781) +++ lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java (working copy) @@ -185,8 +185,7 @@ } /** Tests that a Hits has an expected order of documents */ - public static void checkDocIds(String mes, int[] results, ScoreDoc[] hits) - throws IOException { + public static void checkDocIds(String mes, int[] results, ScoreDoc[] hits) { Assert.assertEquals(mes + " nr of hits", hits.length, results.length); for (int i = 0; i < results.length; i++) { Assert.assertEquals(mes + " doc nrs for hit " + i, results[i], hits[i].doc); @@ -200,15 +199,14 @@ Query query, ScoreDoc[] hits1, ScoreDoc[] hits2, - int[] results) - throws IOException { + int[] results) { checkDocIds("hits1", results, hits1); checkDocIds("hits2", results, hits2); checkEqual(query, hits1, hits2); } - public static void checkEqual(Query query, ScoreDoc[] hits1, ScoreDoc[] hits2) throws IOException { + public static void checkEqual(Query query, ScoreDoc[] hits1, ScoreDoc[] hits2) { final float scoreTolerance = 1.0e-6f; if (hits1.length != hits2.length) { Assert.fail("Unequal lengths: hits1="+hits1.length+",hits2="+hits2.length); @@ -231,7 +229,7 @@ } } - public static String hits2str(ScoreDoc[] hits1, ScoreDoc[] hits2, int start, int end) throws IOException { + public static String hits2str(ScoreDoc[] hits1, ScoreDoc[] hits2, int start, int end) { StringBuilder sb = new StringBuilder(); int len1=hits1==null ? 0 : hits1.length; int len2=hits2==null ? 0 : hits2.length; @@ -422,7 +420,7 @@ * @see ExplanationAsserter */ public static class ExplanationAssertingSearcher extends IndexSearcher { - public ExplanationAssertingSearcher(IndexReader r) throws IOException { + public ExplanationAssertingSearcher(IndexReader r) { super(r); } protected void checkExplanations(Query q) throws IOException { Index: lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java (revision 1353781) +++ lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java (working copy) @@ -141,7 +141,7 @@ public static class FCInvisibleMultiReader extends MultiReader { private final Object cacheKey = new Object(); - public FCInvisibleMultiReader(IndexReader... readers) throws IOException { + public FCInvisibleMultiReader(IndexReader... readers) { super(readers); } Index: lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (revision 1353781) +++ lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (working copy) @@ -326,28 +326,28 @@ maybeCommit(); } - public void addIndexes(Directory... dirs) throws CorruptIndexException, IOException { + public void addIndexes(Directory... dirs) throws IOException { w.addIndexes(dirs); } - public void addIndexes(IndexReader... readers) throws CorruptIndexException, IOException { + public void addIndexes(IndexReader... readers) throws IOException { w.addIndexes(readers); } - public void deleteDocuments(Term term) throws CorruptIndexException, IOException { + public void deleteDocuments(Term term) throws IOException { w.deleteDocuments(term); } - public void deleteDocuments(Query q) throws CorruptIndexException, IOException { + public void deleteDocuments(Query q) throws IOException { w.deleteDocuments(q); } - public void commit() throws CorruptIndexException, IOException { + public void commit() throws IOException { w.commit(); switchDoDocValues(); } - public int numDocs() throws IOException { + public int numDocs() { return w.numDocs(); } Index: lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (revision 1353781) +++ lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (working copy) @@ -54,9 +54,7 @@ this.minR = minR; this.maxR = maxR; this.allowNegativeRandomInts = allowNegativeRandomInts; - try { - index = newDirectory(random); - } catch (IOException e) { throw new RuntimeException(e); } + index = newDirectory(random); } } Index: lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java =================================================================== --- lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java (working copy) @@ -105,7 +105,7 @@ * @param port the port {@link LockVerifyServer} is listening on */ - public VerifyingLockFactory(byte id, LockFactory lf, String host, int port) throws IOException { + public VerifyingLockFactory(byte id, LockFactory lf, String host, int port) { this.id = id; this.lf = lf; this.host = host; Index: lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java =================================================================== --- lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java (working copy) @@ -117,7 +117,7 @@ channel = file.getChannel(); } - public NIOFSIndexInput(String sliceDescription, File path, Descriptor file, FileChannel fc, long off, long length, int bufferSize, int chunkSize) throws IOException { + public NIOFSIndexInput(String sliceDescription, File path, Descriptor file, FileChannel fc, long off, long length, int bufferSize, int chunkSize) { super("NIOFSIndexInput(" + sliceDescription + " in path=\"" + path + "\" slice=" + off + ":" + (off+length) + ")", file, off, length, bufferSize, chunkSize); channel = fc; isClone = true; Index: lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java =================================================================== --- lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java (working copy) @@ -60,7 +60,7 @@ * directory itself. Be sure to create one instance for each directory * your create! */ - public SimpleFSLockFactory() throws IOException { + public SimpleFSLockFactory() { this((File) null); } @@ -68,7 +68,7 @@ * Instantiate using the provided directory (as a File instance). * @param lockDir where lock files should be created. */ - public SimpleFSLockFactory(File lockDir) throws IOException { + public SimpleFSLockFactory(File lockDir) { setLockDir(lockDir); } @@ -76,7 +76,7 @@ * Instantiate using the provided directory name (String). * @param lockDirName where lock files should be created. */ - public SimpleFSLockFactory(String lockDirName) throws IOException { + public SimpleFSLockFactory(String lockDirName) { setLockDir(new File(lockDirName)); } Index: lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java =================================================================== --- lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java (working copy) @@ -124,7 +124,7 @@ this.end = file.length; } - public SimpleFSIndexInput(String resourceDesc, Descriptor file, long off, long length, int bufferSize, int chunkSize) throws IOException { + public SimpleFSIndexInput(String resourceDesc, Descriptor file, long off, long length, int bufferSize, int chunkSize) { super(resourceDesc, bufferSize); this.file = file; this.chunkSize = chunkSize; Index: lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java =================================================================== --- lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java (working copy) @@ -147,7 +147,7 @@ } } - private final void switchCurrentBuffer() throws IOException { + private final void switchCurrentBuffer() { if (currentBufferIndex == file.numBuffers()) { currentBuffer = file.addBuffer(BUFFER_SIZE); } else { Index: lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/store/CompoundFileWriter.java (working copy) @@ -78,7 +78,7 @@ * @throws NullPointerException * if dir or name is null */ - CompoundFileWriter(Directory dir, String name) throws IOException { + CompoundFileWriter(Directory dir, String name) { if (dir == null) throw new NullPointerException("directory cannot be null"); if (name == null) Index: lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (working copy) @@ -2351,7 +2351,7 @@ // } } - void rewind() throws IOException { + void rewind() { // Force reload: fp = fpOrig; Index: lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java (working copy) @@ -89,8 +89,7 @@ private final int blockSize; private final IntsRef bulkResult = new IntsRef(); - public Reader(final IndexInput in, final int[] pending, final BlockReader blockReader) - throws IOException { + public Reader(final IndexInput in, final int[] pending, final BlockReader blockReader) { this.in = in; this.pending = pending; this.blockSize = pending.length; Index: lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java (working copy) @@ -92,15 +92,14 @@ private final BlockReader blockReader; private final IntsRef bulkResult = new IntsRef(); - public Reader(final IndexInput in, final int[] pending, final BlockReader blockReader) - throws IOException { + public Reader(final IndexInput in, final int[] pending, final BlockReader blockReader) { this.in = in; this.pending = pending; bulkResult.ints = pending; this.blockReader = blockReader; } - void seek(final long fp, final int upto) throws IOException { + void seek(final long fp, final int upto) { // TODO: should we do this in real-time, not lazy? pendingFP = fp; pendingUpto = upto; Index: lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (working copy) @@ -647,7 +647,7 @@ fstEnum = new BytesRefFSTEnum(fst); } - private void decodeMetaData() throws IOException { + private void decodeMetaData() { if (!didDecode) { buffer.reset(current.output.bytes, 0, current.output.length); docFreq = buffer.readVInt(); Index: lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsAndPositionsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsAndPositionsEnum.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/MappingMultiDocsAndPositionsEnum.java (working copy) @@ -42,7 +42,7 @@ int doc = -1; private MergeState mergeState; - MappingMultiDocsAndPositionsEnum reset(MultiDocsAndPositionsEnum postingsEnum) throws IOException { + MappingMultiDocsAndPositionsEnum reset(MultiDocsAndPositionsEnum postingsEnum) { this.numSubs = postingsEnum.getNumSubs(); this.subs = postingsEnum.getSubs(); upto = -1; Index: lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsWriter.java (working copy) @@ -92,7 +92,7 @@ /** If the total number of positions (summed across all docs * for this term) is <= maxPositions, then the postings are * inlined into terms dict */ - public PulsingPostingsWriter(int maxPositions, PostingsWriterBase wrappedPostingsWriter) throws IOException { + public PulsingPostingsWriter(int maxPositions, PostingsWriterBase wrappedPostingsWriter) { pending = new Position[maxPositions]; for(int i=0;in */ - public abstract void visitDocument(int n, StoredFieldVisitor visitor) throws CorruptIndexException, IOException; + public abstract void visitDocument(int n, StoredFieldVisitor visitor) throws IOException; public abstract StoredFieldsReader clone(); } Index: lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java (working copy) @@ -85,7 +85,7 @@ private final SegmentWriteState segmentWriteState; - public FieldsWriter(SegmentWriteState state) throws IOException { + public FieldsWriter(SegmentWriteState state) { segmentWriteState = state; } Index: lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java (working copy) @@ -136,7 +136,7 @@ indexStream.seek(HEADER_LENGTH_IDX + docID * 8L); } - public final void visitDocument(int n, StoredFieldVisitor visitor) throws CorruptIndexException, IOException { + public final void visitDocument(int n, StoredFieldVisitor visitor) throws IOException { seekIndex(n); fieldsStream.seek(indexStream.readLong()); Index: lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java (revision 1354694) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsWriter.java (working copy) @@ -255,7 +255,7 @@ private int copyFieldsWithDeletions(MergeState mergeState, final MergeState.IndexReaderAndLiveDocs reader, final Lucene40StoredFieldsReader matchingFieldsReader, int rawDocLengths[]) - throws IOException, MergeAbortedException, CorruptIndexException { + throws IOException { int docCount = 0; final int maxDoc = reader.reader.maxDoc(); final Bits liveDocs = reader.liveDocs; @@ -309,7 +309,7 @@ private int copyFieldsNoDeletions(MergeState mergeState, final MergeState.IndexReaderAndLiveDocs reader, final Lucene40StoredFieldsReader matchingFieldsReader, int rawDocLengths[]) - throws IOException, MergeAbortedException, CorruptIndexException { + throws IOException { final int maxDoc = reader.reader.maxDoc(); int docCount = 0; if (matchingFieldsReader != null) { Index: lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java (revision 1354694) +++ lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java (working copy) @@ -96,7 +96,7 @@ } public Lucene40TermVectorsReader(Directory d, SegmentInfo si, FieldInfos fieldInfos, IOContext context) - throws CorruptIndexException, IOException { + throws IOException { final String segment = si.name; final int size = si.getDocCount(); @@ -365,7 +365,7 @@ private int[] endOffsets; // NOTE: tvf is pre-positioned by caller - public TVTermsEnum() throws IOException { + public TVTermsEnum() { this.origTVF = Lucene40TermVectorsReader.this.tvf; tvf = (IndexInput) origTVF.clone(); } Index: lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocConsumer.java (working copy) @@ -32,8 +32,7 @@ protected final PerDocWriteState state; protected final String segmentSuffix; - public SimpleTextPerDocConsumer(PerDocWriteState state, String segmentSuffix) - throws IOException { + public SimpleTextPerDocConsumer(PerDocWriteState state, String segmentSuffix) { this.state = state; this.segmentSuffix = segmentSuffix; } Index: lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (working copy) @@ -204,7 +204,7 @@ SimpleTextUtil.readLine(in, scratch); } - private int parseIntAt(int offset) throws IOException { + private int parseIntAt(int offset) { UnicodeUtil.UTF8toUTF16(scratch.bytes, scratch.offset+offset, scratch.length-offset, scratchUTF16); return ArrayUtil.parseInt(scratchUTF16.chars, 0, scratchUTF16.length); } @@ -217,7 +217,7 @@ private class SimpleTVFields extends Fields { private final SortedMap fields; - SimpleTVFields(SortedMap fields) throws IOException { + SimpleTVFields(SortedMap fields) { this.fields = fields; } Index: lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (working copy) @@ -95,8 +95,7 @@ public static class SimpleTextNormsPerDocConsumer extends SimpleTextPerDocConsumer { - public SimpleTextNormsPerDocConsumer(PerDocWriteState state) - throws IOException { + public SimpleTextNormsPerDocConsumer(PerDocWriteState state) { super(state, NORMS_SEG_SUFFIX); } Index: lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (revision 1354694) +++ lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (working copy) @@ -88,7 +88,7 @@ } @Override - public void visitDocument(int n, StoredFieldVisitor visitor) throws CorruptIndexException, IOException { + public void visitDocument(int n, StoredFieldVisitor visitor) throws IOException { in.seek(offsets.get(n)); readLine(); assert StringHelper.startsWith(scratch, NUM); @@ -181,7 +181,7 @@ SimpleTextUtil.readLine(in, scratch); } - private int parseIntAt(int offset) throws IOException { + private int parseIntAt(int offset) { UnicodeUtil.UTF8toUTF16(scratch.bytes, scratch.offset+offset, scratch.length-offset, scratchUTF16); return ArrayUtil.parseInt(scratchUTF16.chars, 0, scratchUTF16.length); } Index: lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java (working copy) @@ -99,7 +99,7 @@ } } - private int parseIntAt(BytesRef bytes, int offset, CharsRef scratch) throws IOException { + private int parseIntAt(BytesRef bytes, int offset, CharsRef scratch) { UnicodeUtil.UTF8toUTF16(bytes.bytes, bytes.offset+offset, bytes.length-offset, scratch); return ArrayUtil.parseInt(scratch.chars, 0, scratch.length); } Index: lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (working copy) @@ -105,7 +105,7 @@ private boolean ended; private final BytesRefFSTEnum>> fstEnum; - public SimpleTextTermsEnum(FST>> fst, IndexOptions indexOptions) throws IOException { + public SimpleTextTermsEnum(FST>> fst, IndexOptions indexOptions) { this.indexOptions = indexOptions; fstEnum = new BytesRefFSTEnum>>(fst); } Index: lucene/core/src/java/org/apache/lucene/search/TermScorer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/TermScorer.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/TermScorer.java (working copy) @@ -39,7 +39,7 @@ * The Similarity.ExactSimScorer implementation * to be used for score computations. */ - TermScorer(Weight weight, DocsEnum td, Similarity.ExactSimScorer docScorer) throws IOException { + TermScorer(Weight weight, DocsEnum td, Similarity.ExactSimScorer docScorer) { super(weight); this.docScorer = docScorer; this.docsEnum = td; Index: lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java (working copy) @@ -337,8 +337,7 @@ 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++) Index: lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java (working copy) @@ -42,7 +42,7 @@ * The Similarity.ExactSimScorer 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; Index: lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java (working copy) @@ -172,7 +172,7 @@ 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; Index: lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java (working copy) @@ -285,7 +285,7 @@ } } - private void addToList(SpansCell cell) throws IOException { + private void addToList(SpansCell cell) { if (last != null) { // add next to end of list last.next = cell; } else @@ -301,7 +301,7 @@ last.next = null; } - private void queueToList() throws IOException { + private void queueToList() { last = first = null; while (queue.top() != null) { addToList(queue.pop()); Index: lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java (working copy) @@ -37,7 +37,7 @@ protected int count; protected int position; - public TermSpans(DocsAndPositionsEnum postings, Term term) throws IOException { + public TermSpans(DocsAndPositionsEnum postings, Term term) { this.postings = postings; this.term = term; doc = -1; Index: lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java (working copy) @@ -32,7 +32,7 @@ private final DocsAndFreqs lead; ConjunctionTermScorer(Weight weight, float coord, - DocsAndFreqs[] docsAndFreqs) throws IOException { + DocsAndFreqs[] docsAndFreqs) { super(weight); this.coord = coord; this.docsAndFreqs = docsAndFreqs; Index: lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java (working copy) @@ -181,8 +181,7 @@ 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"); } Index: lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java (working copy) @@ -51,7 +51,7 @@ final FieldValueHitQueue queue; public OneComparatorNonScoringCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); this.queue = queue; comparator = queue.getComparators()[0]; @@ -114,7 +114,7 @@ OneComparatorNonScoringCollector { public OutOfOrderOneComparatorNonScoringCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); } @@ -161,7 +161,7 @@ Scorer scorer; public OneComparatorScoringNoMaxScoreCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); } @@ -221,8 +221,7 @@ OneComparatorScoringNoMaxScoreCollector { public OutOfOrderOneComparatorScoringNoMaxScoreCollector( - FieldValueHitQueue queue, int numHits, boolean fillFields) - throws IOException { + FieldValueHitQueue queue, int numHits, boolean fillFields) { super(queue, numHits, fillFields); } @@ -275,7 +274,7 @@ Scorer scorer; public OneComparatorScoringMaxScoreCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); // Must set maxScore to NEG_INF, or otherwise Math.max always returns NaN. maxScore = Float.NEGATIVE_INFINITY; @@ -335,7 +334,7 @@ OneComparatorScoringMaxScoreCollector { public OutOfOrderOneComparatorScoringMaxScoreCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); } @@ -386,7 +385,7 @@ final int[] reverseMul; final FieldValueHitQueue queue; public MultiComparatorNonScoringCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); this.queue = queue; comparators = queue.getComparators(); @@ -472,7 +471,7 @@ MultiComparatorNonScoringCollector { public OutOfOrderMultiComparatorNonScoringCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); } @@ -541,7 +540,7 @@ Scorer scorer; public MultiComparatorScoringMaxScoreCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); // Must set maxScore to NEG_INF, or otherwise Math.max always returns NaN. maxScore = Float.NEGATIVE_INFINITY; @@ -620,7 +619,7 @@ extends MultiComparatorScoringMaxScoreCollector { public OutOfOrderMultiComparatorScoringMaxScoreCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); } @@ -693,7 +692,7 @@ Scorer scorer; public MultiComparatorScoringNoMaxScoreCollector(FieldValueHitQueue queue, - int numHits, boolean fillFields) throws IOException { + int numHits, boolean fillFields) { super(queue, numHits, fillFields); } @@ -771,8 +770,7 @@ extends MultiComparatorScoringNoMaxScoreCollector { public OutOfOrderMultiComparatorScoringNoMaxScoreCollector( - FieldValueHitQueue queue, int numHits, boolean fillFields) - throws IOException { + FieldValueHitQueue queue, int numHits, boolean fillFields) { super(queue, numHits, fillFields); } @@ -860,8 +858,7 @@ public PagingFieldCollector( FieldValueHitQueue queue, FieldDoc after, int numHits, boolean fillFields, - boolean trackDocScores, boolean trackMaxScore) - throws IOException { + boolean trackDocScores, boolean trackMaxScore) { super(queue, numHits, fillFields); this.queue = queue; this.trackDocScores = trackDocScores; Index: lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java (working copy) @@ -38,7 +38,7 @@ 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; Index: lucene/core/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/MatchOnlyConjunctionTermsScorer.java (working copy) @@ -22,7 +22,7 @@ /** 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); } Index: lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java (working copy) @@ -55,7 +55,7 @@ * 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 Index: lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java (working copy) @@ -415,7 +415,7 @@ private final LinkedList rangeBounds = new LinkedList(); private final Comparator termComp; - NumericRangeTermsEnum(final TermsEnum tenum) throws IOException { + NumericRangeTermsEnum(final TermsEnum tenum) { super(tenum); switch (dataType) { case LONG: Index: lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java =================================================================== --- lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java (working copy) @@ -89,7 +89,7 @@ // for assert: private BytesRef lastTerm; - private boolean compareToLastTerm(BytesRef t) throws IOException { + private boolean compareToLastTerm(BytesRef t) { if (lastTerm == null && t != null) { lastTerm = BytesRef.deepCopyOf(t); } else if (t == null) { Index: lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java (working copy) @@ -175,7 +175,7 @@ /** Subclass inits w/ this, but be sure you then call * uninvert, only once */ - protected DocTermOrds(String field, int maxTermDocFreq, int indexIntervalBits) throws IOException { + protected DocTermOrds(String field, int maxTermDocFreq, int indexIntervalBits) { //System.out.println("DTO init field=" + field + " maxTDFreq=" + maxTermDocFreq); this.field = field; this.maxTermDocFreq = maxTermDocFreq; Index: lucene/core/src/java/org/apache/lucene/index/SegmentReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (revision 1354694) +++ lucene/core/src/java/org/apache/lucene/index/SegmentReader.java (working copy) @@ -89,7 +89,7 @@ // 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(); Index: lucene/core/src/java/org/apache/lucene/index/MergePolicy.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MergePolicy.java (revision 1354694) +++ lucene/core/src/java/org/apache/lucene/index/MergePolicy.java (working copy) @@ -299,7 +299,7 @@ * 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 MergeSpecification findForcedMerges( SegmentInfos segmentInfos, int maxSegmentCount, Map segmentsToMerge) - throws CorruptIndexException, IOException; + throws IOException; /** * Determine what set of merge operations is necessary in order to expunge all @@ -334,7 +334,7 @@ * 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. Index: lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/MultiDocsEnum.java (working copy) @@ -42,7 +42,7 @@ 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]; Index: lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java (working copy) @@ -348,7 +348,7 @@ } @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); } Index: lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java (working copy) @@ -75,7 +75,7 @@ *

* @param compiled CompiledAutomaton */ - public AutomatonTermsEnum(TermsEnum tenum, CompiledAutomaton compiled) throws IOException { + public AutomatonTermsEnum(TermsEnum tenum, CompiledAutomaton compiled) { super(tenum); this.finite = compiled.finite; this.runAutomaton = compiled.runAutomaton; Index: lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java (working copy) @@ -51,7 +51,7 @@ 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 @@ return reader.docValues(field); } - public boolean stopLoadingOnNull(AtomicReader reader, String field) throws IOException { + public boolean stopLoadingOnNull(AtomicReader reader, String field) { return false; } } Index: lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java (working copy) @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import java.io.IOException; + import java.util.ArrayList; import java.util.IdentityHashMap; import java.util.List; @@ -570,21 +570,13 @@ try { for (DocumentsWriterPerThread dwpt : flushQueue) { doAfterFlush(dwpt); - try { - dwpt.abort(); - } catch (IOException ex) { - // continue - } + dwpt.abort(); } for (BlockedFlush blockedFlush : blockedFlushes) { flushingWriters .put(blockedFlush.dwpt, Long.valueOf(blockedFlush.bytes)); doAfterFlush(blockedFlush.dwpt); - try { - blockedFlush.dwpt.abort(); - } catch (IOException ex) { - // continue - } + blockedFlush.dwpt.abort(); } } finally { fullFlush = false; Index: lucene/core/src/java/org/apache/lucene/index/StoredFieldsConsumer.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/StoredFieldsConsumer.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/StoredFieldsConsumer.java (working copy) @@ -126,7 +126,7 @@ 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]; Index: lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/SortedBytesMergeUtils.java (working copy) @@ -218,7 +218,7 @@ 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(); Index: lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (working copy) @@ -38,7 +38,7 @@ /** 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 @@ /** 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 @@ } @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 @@ } @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 @@ } } - 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 @@ 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 @@ 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 @@ }.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 @@ } @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 Index: lucene/core/src/java/org/apache/lucene/index/MultiReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/MultiReader.java (working copy) @@ -45,7 +45,7 @@ *

Note that all subreaders are closed if this Multireader is closed.

* @param subReaders set of (sub)readers */ - public MultiReader(IndexReader... subReaders) throws IOException { + public MultiReader(IndexReader... subReaders) { this(subReaders, true); } @@ -55,7 +55,7 @@ * @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) { Index: lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/MultiFieldsEnum.java (working copy) @@ -110,7 +110,7 @@ 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; Index: lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java (working copy) @@ -326,7 +326,7 @@ * instances) found in this field and serialize them * into a single RAM segment. */ void flush(String fieldName, FieldsConsumer consumer, final SegmentWriteState state) - throws CorruptIndexException, IOException { + throws IOException { if (!fieldInfo.isIndexed()) { return; // nothing to flush, don't bother the codec with the unindexed field Index: lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java (working copy) @@ -420,7 +420,7 @@ */ @Override public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos) - throws CorruptIndexException, IOException { + throws IOException { final List segments = segmentInfos.asList(); final int numSegments = segments.size(); Index: lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/MultiDocsAndPositionsEnum.java (working copy) @@ -46,7 +46,7 @@ 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 doc) throws CorruptIndexException, IOException { + public void addDocument(Iterable doc) throws IOException { addDocument(doc, analyzer); } @@ -1078,7 +1078,7 @@ * @throws CorruptIndexException if the index is corrupt * @throws IOException if there is a low-level IO error */ - public void addDocument(Iterable doc, Analyzer analyzer) throws CorruptIndexException, IOException { + public void addDocument(Iterable doc, Analyzer analyzer) throws IOException { updateDocument(null, doc, analyzer); } @@ -1123,7 +1123,7 @@ * * @lucene.experimental */ - public void addDocuments(Iterable> docs) throws CorruptIndexException, IOException { + public void addDocuments(Iterable> docs) throws IOException { addDocuments(docs, analyzer); } @@ -1138,7 +1138,7 @@ * * @lucene.experimental */ - public void addDocuments(Iterable> docs, Analyzer analyzer) throws CorruptIndexException, IOException { + public void addDocuments(Iterable> docs, Analyzer analyzer) throws IOException { updateDocuments(null, docs, analyzer); } @@ -1155,7 +1155,7 @@ * * @lucene.experimental */ - public void updateDocuments(Term delTerm, Iterable> docs) throws CorruptIndexException, IOException { + public void updateDocuments(Term delTerm, Iterable> docs) throws IOException { updateDocuments(delTerm, docs, analyzer); } @@ -1173,7 +1173,7 @@ * * @lucene.experimental */ - public void updateDocuments(Term delTerm, Iterable> docs, Analyzer analyzer) throws CorruptIndexException, IOException { + public void updateDocuments(Term delTerm, Iterable> docs, Analyzer analyzer) throws IOException { ensureOpen(); try { boolean success = false; @@ -1207,7 +1207,7 @@ * @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); @@ -1230,7 +1230,7 @@ * @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); @@ -1250,7 +1250,7 @@ * @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); @@ -1272,7 +1272,7 @@ * @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); @@ -1298,7 +1298,7 @@ * @throws CorruptIndexException if the index is corrupt * @throws IOException if there is a low-level IO error */ - public void updateDocument(Term term, Iterable doc) throws CorruptIndexException, IOException { + public void updateDocument(Term term, Iterable doc) throws IOException { ensureOpen(); updateDocument(term, doc, getAnalyzer()); } @@ -1322,7 +1322,7 @@ * @throws IOException if there is a low-level IO error */ public void updateDocument(Term term, Iterable doc, Analyzer analyzer) - throws CorruptIndexException, IOException { + throws IOException { ensureOpen(); try { boolean success = false; @@ -1463,7 +1463,7 @@ * @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); } @@ -1477,7 +1477,7 @@ * you should immediately close the writer. See above for details.

*/ - public void forceMerge(int maxNumSegments, boolean doWait) throws CorruptIndexException, IOException { + public void forceMerge(int maxNumSegments, boolean doWait) throws IOException { ensureOpen(); if (maxNumSegments < 1) @@ -1588,7 +1588,7 @@ * {@link MergePolicy.MergeAbortedException}. */ public void forceMergeDeletes(boolean doWait) - throws CorruptIndexException, IOException { + throws IOException { ensureOpen(); flush(true, true); @@ -1673,7 +1673,7 @@ * you should immediately close the writer. See above for details.

*/ - public void forceMergeDeletes() throws CorruptIndexException, IOException { + public void forceMergeDeletes() throws IOException { forceMergeDeletes(true); } @@ -1691,18 +1691,18 @@ * you should immediately close the writer. See above for details.

*/ - 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) { @@ -1920,7 +1920,7 @@ } } - private synchronized void finishMerges(boolean waitForMerges) throws IOException { + private synchronized void finishMerges(boolean waitForMerges) { if (!waitForMerges) { stopMerges = true; @@ -2086,7 +2086,7 @@ return newSegment; } - synchronized void publishFrozenDeletes(FrozenBufferedDeletes packet) throws IOException { + synchronized void publishFrozenDeletes(FrozenBufferedDeletes packet) { assert packet != null && packet.any(); synchronized (bufferedDeletesStream) { bufferedDeletesStream.push(packet); @@ -2195,7 +2195,7 @@ * @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); @@ -2279,7 +2279,7 @@ * @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; @@ -2467,7 +2467,7 @@ * href="#OOME">above for details.

* * @see #prepareCommit(Map) */ - public final void prepareCommit() throws CorruptIndexException, IOException { + public final void prepareCommit() throws IOException { ensureOpen(); prepareCommit(null); } @@ -2502,7 +2502,7 @@ * only "stick" if there are actually changes in the * index to commit. */ - public final void prepareCommit(Map commitUserData) throws CorruptIndexException, IOException { + public final void prepareCommit(Map commitUserData) throws IOException { ensureOpen(false); synchronized(commitLock) { @@ -2633,7 +2633,7 @@ * @see #prepareCommit * @see #commit(Map) */ - public final void commit() throws CorruptIndexException, IOException { + public final void commit() throws IOException { commit(null); } @@ -2646,14 +2646,14 @@ * you should immediately close the writer. See above for details.

*/ - public final void commit(Map commitUserData) throws CorruptIndexException, IOException { + public final void commit(Map commitUserData) throws IOException { ensureOpen(); commitInternal(commitUserData); } - private final void commitInternal(Map commitUserData) throws CorruptIndexException, IOException { + private final void commitInternal(Map commitUserData) throws IOException { if (infoStream.isEnabled("IW")) { infoStream.message("IW", "commit: start"); @@ -2681,7 +2681,7 @@ } } - private synchronized final void finishCommit() throws CorruptIndexException, IOException { + private synchronized final void finishCommit() throws IOException { if (pendingCommit != null) { try { @@ -2727,7 +2727,7 @@ * 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 @@ -2743,7 +2743,7 @@ } } - 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"); } @@ -2850,7 +2850,7 @@ 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); @@ -3356,7 +3356,7 @@ /** 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. @@ -3660,12 +3660,12 @@ } /** @lucene.internal */ - public synchronized String segString() throws IOException { + public synchronized String segString() { return segString(segmentInfos); } /** @lucene.internal */ - public synchronized String segString(Iterable infos) throws IOException { + public synchronized String segString(Iterable infos) { final StringBuilder buffer = new StringBuilder(); for(final SegmentInfoPerCommit info : infos) { if (buffer.length() > 0) { @@ -3677,7 +3677,7 @@ } /** @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()); } Index: lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java (revision 1354694) +++ lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java (working copy) @@ -67,7 +67,7 @@ * cloned and not protected for modification, the subclass is responsible * to do this. */ - protected BaseCompositeReader(R[] subReaders) throws IOException { + protected BaseCompositeReader(R[] subReaders) { this.subReaders = subReaders; this.subReadersList = Collections.unmodifiableList(Arrays.asList(subReaders)); starts = new int[subReaders.length + 1]; // build starts array @@ -112,7 +112,7 @@ } @Override - public final void document(int docID, StoredFieldVisitor visitor) throws CorruptIndexException, IOException { + public final void document(int docID, StoredFieldVisitor visitor) throws IOException { ensureOpen(); final int i = readerIndex(docID); // find subreader num subReaders[i].document(docID - starts[i], visitor); // dispatch to subreader Index: lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java (working copy) @@ -30,9 +30,9 @@ /** Run the merges provided by {@link IndexWriter#getNextMerge()}. */ public abstract void merge(IndexWriter writer) - throws CorruptIndexException, IOException; + throws IOException; /** Close this MergeScheduler. */ public abstract void close() - throws CorruptIndexException, IOException; + throws IOException; } Index: lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (working copy) @@ -157,7 +157,7 @@ * modify it. */ - public Set files() throws IOException { + public Set files() { if (setFiles == null) { throw new IllegalStateException("files were not computed yet"); } Index: lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java (working copy) @@ -185,7 +185,7 @@ ParallelFields() { } - void addField(String fieldName, Terms terms) throws IOException { + void addField(String fieldName, Terms terms) { fields.put(fieldName, terms); } @@ -249,7 +249,7 @@ } @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); Index: lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java (working copy) @@ -42,5 +42,5 @@ public void close() {} @Override - public void merge(IndexWriter writer) throws CorruptIndexException, IOException {} + public void merge(IndexWriter writer) throws IOException {} } Index: lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java (working copy) @@ -122,7 +122,7 @@ * @throws IOException if there is a low-level IO error */ public IndexFileDeleter(Directory directory, IndexDeletionPolicy policy, SegmentInfos segmentInfos, - InfoStream infoStream, IndexWriter writer) throws CorruptIndexException, IOException { + InfoStream infoStream, IndexWriter writer) throws IOException { this.infoStream = infoStream; this.writer = writer; @@ -469,14 +469,14 @@ } } - void incRef(Collection files) throws IOException { + void incRef(Collection files) { assert locked(); for(final String file : files) { incRef(file); } } - void incRef(String fileName) throws IOException { + void incRef(String fileName) { assert locked(); RefCount rc = getRefCount(fileName); if (infoStream.isEnabled("IFD")) { Index: lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java (working copy) @@ -59,7 +59,7 @@ * @throws CorruptIndexException if the index is corrupt * @throws IOException if there is a low-level IO error */ - public static DirectoryReader open(final Directory directory) throws CorruptIndexException, IOException { + public static DirectoryReader open(final Directory directory) throws IOException { return StandardDirectoryReader.open(directory, null, DEFAULT_TERMS_INDEX_DIVISOR); } @@ -79,7 +79,7 @@ * @throws CorruptIndexException if the index is corrupt * @throws IOException if there is a low-level IO error */ - public static DirectoryReader open(final Directory directory, int termInfosIndexDivisor) throws CorruptIndexException, IOException { + public static DirectoryReader open(final Directory directory, int termInfosIndexDivisor) throws IOException { return StandardDirectoryReader.open(directory, null, termInfosIndexDivisor); } @@ -112,7 +112,7 @@ * @throws CorruptIndexException if the index is corrupt * @throws IOException if there is a low-level IO error */ - public static DirectoryReader open(final IndexCommit commit) throws CorruptIndexException, IOException { + public static DirectoryReader open(final IndexCommit commit) throws IOException { return StandardDirectoryReader.open(commit.getDirectory(), commit, DEFAULT_TERMS_INDEX_DIVISOR); } @@ -132,7 +132,7 @@ * @throws CorruptIndexException if the index is corrupt * @throws IOException if there is a low-level IO error */ - public static DirectoryReader open(final IndexCommit commit, int termInfosIndexDivisor) throws CorruptIndexException, IOException { + public static DirectoryReader open(final IndexCommit commit, int termInfosIndexDivisor) throws IOException { return StandardDirectoryReader.open(commit.getDirectory(), commit, termInfosIndexDivisor); } @@ -311,9 +311,8 @@ * Returns true if an index exists at the specified directory. * @param directory the directory to check for an index * @return true if an index exists; false otherwise - * @throws IOException if there is a problem with accessing the index */ - public static boolean indexExists(Directory directory) throws IOException { + public static boolean indexExists(Directory directory) { try { new SegmentInfos().read(directory); return true; @@ -331,7 +330,7 @@ * Subclasses of {@code DirectoryReader} should take care to not allow * modification of this internal array, e.g. {@link #doOpenIfChanged()}. */ - protected DirectoryReader(Directory directory, AtomicReader[] segmentReaders) throws CorruptIndexException, IOException { + protected DirectoryReader(Directory directory, AtomicReader[] segmentReaders) { super(segmentReaders); this.directory = directory; } @@ -353,7 +352,7 @@ * @return null if there are no changes; else, a new * DirectoryReader instance. */ - protected abstract DirectoryReader doOpenIfChanged() throws CorruptIndexException, IOException; + protected abstract DirectoryReader doOpenIfChanged() throws IOException; /** Implement this method to support {@link #openIfChanged(DirectoryReader,IndexCommit)}. * If this reader does not support reopen from a specific {@link IndexCommit}, @@ -363,7 +362,7 @@ * @return null if there are no changes; else, a new * DirectoryReader instance. */ - protected abstract DirectoryReader doOpenIfChanged(final IndexCommit commit) throws CorruptIndexException, IOException; + protected abstract DirectoryReader doOpenIfChanged(final IndexCommit commit) throws IOException; /** Implement this method to support {@link #openIfChanged(DirectoryReader,IndexWriter,boolean)}. * If this reader does not support reopen from {@link IndexWriter}, @@ -373,7 +372,7 @@ * @return null if there are no changes; else, a new * DirectoryReader instance. */ - protected abstract DirectoryReader doOpenIfChanged(IndexWriter writer, boolean applyAllDeletes) throws CorruptIndexException, IOException; + protected abstract DirectoryReader doOpenIfChanged(IndexWriter writer, boolean applyAllDeletes) throws IOException; /** * Version number when this IndexReader was opened. @@ -410,13 +409,13 @@ * @throws CorruptIndexException if the index is corrupt * @throws IOException if there is a low-level IO error */ - public abstract boolean isCurrent() throws CorruptIndexException, IOException; + public abstract boolean isCurrent() throws IOException; /** * Expert: return the IndexCommit that this reader has opened. *

* @lucene.experimental */ - public abstract IndexCommit getIndexCommit() throws CorruptIndexException, IOException; + public abstract IndexCommit getIndexCommit() throws IOException; } Index: lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (working copy) @@ -135,7 +135,7 @@ * updating the index files) and must discard all * currently buffered docs. This resets our state, * discarding any docs added since last flush. */ - void abort() throws IOException { + void abort() { hasAborted = aborting = true; try { if (infoStream.isEnabled("DWPT")) { @@ -352,7 +352,7 @@ return docCount; } - private void finishDocument(Term delTerm) throws IOException { + private void finishDocument(Term delTerm) { /* * here we actually finish the document in two steps 1. push the delete into * the queue and update our slice. 2. increment the DWPT private document @@ -412,7 +412,7 @@ } /** Reset after a flush */ - private void doAfterFlush() throws IOException { + private void doAfterFlush() { segmentInfo = null; consumer.doAfterFlush(); directory.getCreatedFiles().clear(); Index: lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (working copy) @@ -623,8 +623,7 @@ 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; Index: lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java (working copy) @@ -55,16 +55,16 @@ @Override public MergeSpecification findMerges(SegmentInfos segmentInfos) - throws CorruptIndexException, IOException { return null; } + throws IOException { return null; } @Override public MergeSpecification findForcedMerges(SegmentInfos segmentInfos, int maxSegmentCount, Map segmentsToMerge) - throws CorruptIndexException, IOException { return null; } + throws IOException { return null; } @Override public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos) - throws CorruptIndexException, IOException { return null; } + throws IOException { return null; } @Override public boolean useCompoundFile(SegmentInfos segments, SegmentInfoPerCommit newSegment) { return useCompoundFile; } Index: lucene/core/src/java/org/apache/lucene/index/IndexReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/IndexReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/IndexReader.java (working copy) @@ -316,7 +316,7 @@ * simply want to load all fields, use {@link * #document(int)}. If you want to load a subset, use * {@link DocumentStoredFieldVisitor}. */ - public abstract void document(int docID, StoredFieldVisitor visitor) throws CorruptIndexException, IOException; + public abstract void document(int docID, StoredFieldVisitor visitor) throws IOException; /** * Returns the stored fields of the nth @@ -340,7 +340,7 @@ // TODO: we need a separate StoredField, so that the // Document returned here contains that class not // IndexableField - public final Document document(int docID) throws CorruptIndexException, IOException { + public final Document document(int docID) throws IOException { final DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(); document(docID, visitor); return visitor.getDocument(); @@ -351,7 +351,7 @@ * fields. Note that this is simply sugar for {@link * DocumentStoredFieldVisitor#DocumentStoredFieldVisitor(Set)}. */ - public final Document document(int docID, Set fieldsToLoad) throws CorruptIndexException, IOException { + public final Document document(int docID, Set fieldsToLoad) throws IOException { final DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(fieldsToLoad); document(docID, visitor); return visitor.getDocument(); Index: lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java (working copy) @@ -134,7 +134,7 @@ final Codec codec; DocumentsWriter(Codec codec, LiveIndexWriterConfig config, Directory directory, IndexWriter writer, FieldNumbers globalFieldNumbers, - BufferedDeletesStream bufferedDeletesStream) throws IOException { + BufferedDeletesStream bufferedDeletesStream) { this.codec = codec; this.directory = directory; this.indexWriter = writer; @@ -200,7 +200,7 @@ * updating the index files) and must discard all * currently buffered docs. This resets our state, * discarding any docs added since last flush. */ - synchronized void abort() throws IOException { + synchronized void abort() { boolean success = false; synchronized (this) { deleteQueue.clear(); @@ -219,8 +219,6 @@ if (perThread.isActive()) { // we might be closed try { perThread.dwpt.abort(); - } catch (IOException ex) { - // continue } finally { perThread.dwpt.checkAndResetHasAborted(); flushControl.doOnAbort(perThread); @@ -276,7 +274,7 @@ flushControl.setClosed(); } - private boolean preUpdate() throws CorruptIndexException, IOException { + private boolean preUpdate() throws IOException { ensureOpen(); boolean maybeMerge = false; if (flushControl.anyStalledThreads() || flushControl.numQueuedFlushes() > 0) { @@ -325,7 +323,7 @@ } boolean updateDocuments(final Iterable> docs, final Analyzer analyzer, - final Term delTerm) throws CorruptIndexException, IOException { + final Term delTerm) throws IOException { boolean maybeMerge = preUpdate(); final ThreadState perThread = flushControl.obtainAndLock(); @@ -356,7 +354,7 @@ } boolean updateDocument(final Iterable doc, final Analyzer analyzer, - final Term delTerm) throws CorruptIndexException, IOException { + final Term delTerm) throws IOException { boolean maybeMerge = preUpdate(); Index: lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (working copy) @@ -382,7 +382,8 @@ writer.merge(merge); } - /** Create and return a new MergeThread */ + /** Create and return a new MergeThread + * @throws IOException */ protected synchronized MergeThread getMergeThread(IndexWriter writer, MergePolicy.OneMerge merge) throws IOException { final MergeThread thread = new MergeThread(writer, merge); thread.setThreadPriority(mergeThreadPriority); @@ -398,7 +399,7 @@ MergePolicy.OneMerge runningMerge; private volatile boolean done; - public MergeThread(IndexWriter writer, MergePolicy.OneMerge startMerge) throws IOException { + public MergeThread(IndexWriter writer, MergePolicy.OneMerge startMerge) { this.tWriter = writer; this.startMerge = startMerge; } Index: lucene/core/src/java/org/apache/lucene/util/PagedBytes.java =================================================================== --- lucene/core/src/java/org/apache/lucene/util/PagedBytes.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/util/PagedBytes.java (working copy) @@ -288,7 +288,7 @@ } /** Copy BytesRef in */ - public void copy(BytesRef bytes) throws IOException { + public void copy(BytesRef bytes) { int byteCount = bytes.length; int bytesUpto = bytes.offset; while (byteCount > 0) { @@ -318,7 +318,7 @@ /** Copy BytesRef in, setting BytesRef out to the result. * Do not use this if you will use freeze(true). * This only supports bytes.length <= blockSize */ - public void copy(BytesRef bytes, BytesRef out) throws IOException { + public void copy(BytesRef bytes, BytesRef out) { int left = blockSize - upto; if (bytes.length > left || currentBlock==null) { if (currentBlock != null) { @@ -374,7 +374,7 @@ /** Copy bytes in, writing the length as a 1 or 2 byte * vInt prefix. */ - public long copyUsingLengthPrefix(BytesRef bytes) throws IOException { + public long copyUsingLengthPrefix(BytesRef bytes) { if (bytes.length >= 32768) { throw new IllegalArgumentException("max length is 32767 (got " + bytes.length + ")"); } Index: lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlockReaderIterator.java =================================================================== --- lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlockReaderIterator.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlockReaderIterator.java (working copy) @@ -29,8 +29,7 @@ private final long mask; private int position; - Packed64SingleBlockReaderIterator(int valueCount, int bitsPerValue, IndexInput in) - throws IOException { + Packed64SingleBlockReaderIterator(int valueCount, int bitsPerValue, IndexInput in) { super(valueCount, bitsPerValue, in); pending = 0; shift = 64; Index: lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java =================================================================== --- lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java (working copy) @@ -29,8 +29,7 @@ // masks[n-1] masks for bottom n bits private final long[] masks; - public PackedReaderIterator(int valueCount, int bitsPerValue, IndexInput in) - throws IOException { + public PackedReaderIterator(int valueCount, int bitsPerValue, IndexInput in) { super(valueCount, bitsPerValue, in); masks = new long[bitsPerValue]; Index: lucene/core/src/java/org/apache/lucene/util/packed/DirectPackedReader.java =================================================================== --- lucene/core/src/java/org/apache/lucene/util/packed/DirectPackedReader.java (revision 1353781) +++ lucene/core/src/java/org/apache/lucene/util/packed/DirectPackedReader.java (working copy) @@ -32,8 +32,7 @@ // masks[n-1] masks for bottom n bits private final long[] masks; - public DirectPackedReader(int bitsPerValue, int valueCount, IndexInput in) - throws IOException { + public DirectPackedReader(int bitsPerValue, int valueCount, IndexInput in) { super(valueCount, bitsPerValue); this.in = in; Index: lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java =================================================================== --- lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java (revision 1353781) +++ lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java (working copy) @@ -348,7 +348,7 @@ return map; } - void add( Query query, IndexReader reader ) throws IOException { + void add( Query query, IndexReader reader ) { if( query instanceof TermQuery ){ addTerm( ((TermQuery)query).getTerm(), query.getBoost() ); } Index: lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java =================================================================== --- lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java (revision 1353781) +++ lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java (working copy) @@ -74,7 +74,7 @@ private BytesRef seekTerm; private int upto = 0; - SeekingTermSetTermsEnum(TermsEnum tenum, BytesRefHash terms) throws IOException { + SeekingTermSetTermsEnum(TermsEnum tenum, BytesRefHash terms) { super(tenum); this.terms = terms; Index: lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java =================================================================== --- lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (revision 1353781) +++ lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java (working copy) @@ -290,7 +290,7 @@ // constructor private CustomScorer(CustomScoreProvider provider, CustomWeight w, float qWeight, - Scorer subQueryScorer, Scorer[] valSrcScorers) throws IOException { + Scorer subQueryScorer, Scorer[] valSrcScorers) { super(w); this.qWeight = qWeight; this.subQueryScorer = subQueryScorer; Index: lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java (revision 1353781) +++ lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java (working copy) @@ -73,7 +73,7 @@ * 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; Index: lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (revision 1353781) +++ lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (working copy) @@ -96,8 +96,7 @@ * @throws IOException * */ - public CategoryDocumentBuilder(TaxonomyWriter taxonomyWriter) - throws IOException { + public CategoryDocumentBuilder(TaxonomyWriter taxonomyWriter) { this(taxonomyWriter, new DefaultFacetIndexingParams()); } @@ -114,7 +113,7 @@ * @throws IOException */ public CategoryDocumentBuilder(TaxonomyWriter taxonomyWriter, - FacetIndexingParams params) throws IOException { + FacetIndexingParams params) { this.taxonomyWriter = taxonomyWriter; this.indexingParams = params; this.categoriesMap = new HashMap>(); Index: lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsCategoryTokenizer.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsCategoryTokenizer.java (revision 1353781) +++ lucene/facet/src/java/org/apache/lucene/facet/enhancements/EnhancementsCategoryTokenizer.java (working copy) @@ -62,7 +62,7 @@ * @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)]; Index: lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java (revision 1353781) +++ lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java (working copy) @@ -147,7 +147,7 @@ * 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()... Index: lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java =================================================================== --- lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java (revision 1353781) +++ lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java (working copy) @@ -205,7 +205,7 @@ /** * refills buffers with new data from the current token. */ - private void refill() throws IOException { + private void refill() { // compact buffers to keep them smallish if they become large // just a safety check, but technically we only need the last codepoint if (bufferLen > 64) {