You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/04/08 17:34:58 UTC
svn commit: r1585759 [5/9] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
lucene/analysis/common/src/test/org/apache/lucene/anal...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java Tue Apr 8 15:34:50 2014
@@ -78,7 +78,7 @@ public class TestPayloadsOnVectors exten
assertEquals(0, de.nextDoc());
assertEquals(0, de.nextPosition());
assertEquals(new BytesRef("test"), de.getPayload());
- writer.close();
+ writer.shutdown();
reader.close();
dir.close();
}
@@ -122,7 +122,7 @@ public class TestPayloadsOnVectors exten
assertEquals(0, de.nextDoc());
assertEquals(3, de.nextPosition());
assertEquals(new BytesRef("test"), de.getPayload());
- writer.close();
+ writer.shutdown();
reader.close();
dir.close();
}
@@ -143,7 +143,7 @@ public class TestPayloadsOnVectors exten
} catch (IllegalArgumentException expected) {
// expected
}
- writer.close();
+ writer.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java Tue Apr 8 15:34:50 2014
@@ -160,7 +160,7 @@ public class TestPerSegmentDeletes exten
**/
// System.out.println("segdels2:"+writer.docWriter.segmentDeletes.toString());
//System.out.println("close");
- writer.close();
+ writer.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java Tue Apr 8 15:34:50 2014
@@ -55,7 +55,7 @@ public class TestPersistentSnapshotDelet
assertNull(psdp.getLastSaveFile());
prepareIndexAndSnapshots(psdp, writer, numSnapshots);
assertNotNull(psdp.getLastSaveFile());
- writer.close();
+ writer.shutdown();
// Make sure only 1 save file exists:
int count = 0;
@@ -88,7 +88,7 @@ public class TestPersistentSnapshotDelet
assertEquals(numSnapshots+1, psdp.getSnapshotCount());
assertSnapshotExists(dir, psdp, numSnapshots+1, false);
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -142,7 +142,7 @@ public class TestPersistentSnapshotDelet
}
}
assertEquals(0, psdp.getSnapshotCount());
- writer.close();
+ writer.shutdown();
assertEquals(1, DirectoryReader.listCommits(dir).size());
dir.close();
}
@@ -153,7 +153,7 @@ public class TestPersistentSnapshotDelet
IndexWriter writer = new IndexWriter(dir, getConfig(random(), getDeletionPolicy(dir)));
PersistentSnapshotDeletionPolicy psdp = (PersistentSnapshotDeletionPolicy) writer.getConfig().getIndexDeletionPolicy();
prepareIndexAndSnapshots(psdp, writer, 1);
- writer.close();
+ writer.shutdown();
psdp.release(snapshots.get(0));
@@ -169,7 +169,7 @@ public class TestPersistentSnapshotDelet
IndexWriter writer = new IndexWriter(dir, getConfig(random(), getDeletionPolicy(dir)));
PersistentSnapshotDeletionPolicy psdp = (PersistentSnapshotDeletionPolicy) writer.getConfig().getIndexDeletionPolicy();
prepareIndexAndSnapshots(psdp, writer, 1);
- writer.close();
+ writer.shutdown();
psdp.release(snapshots.get(0).getGeneration());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Tue Apr 8 15:34:50 2014
@@ -80,7 +80,7 @@ public class TestPostingsOffsets extends
w.addDocument(doc);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
DocsAndPositionsEnum dp = MultiFields.getTermPositionsEnum(r, null, "content", new BytesRef("a"));
assertNotNull(dp);
@@ -149,7 +149,7 @@ public class TestPostingsOffsets extends
}
IndexReader reader = w.getReader();
- w.close();
+ w.shutdown();
String terms[] = { "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "hundred" };
@@ -285,7 +285,7 @@ public class TestPostingsOffsets extends
w.addDocument(doc);
}
final DirectoryReader r = w.getReader();
- w.close();
+ w.shutdown();
final String[] terms = new String[] {"a", "b", "c", "d"};
for(AtomicReaderContext ctx : r.leaves()) {
@@ -382,7 +382,7 @@ public class TestPostingsOffsets extends
assertEquals(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS, fis.fieldInfo("foo").getIndexOptions());
slow.close();
ir.close();
- riw.close();
+ riw.shutdown();
dir.close();
}
@@ -398,7 +398,7 @@ public class TestPostingsOffsets extends
doc.add(new Field("content3", "here is more content with aaa aaa aaa", customType3));
doc.add(new Field("content3", "here is more content with aaa aaa aaa", customType3));
iw.addDocument(doc);
- iw.close();
+ iw.shutdown();
dir.close(); // checkindex
}
@@ -467,7 +467,7 @@ public class TestPostingsOffsets extends
Field field = new Field("foo", tokenStream, ft);
doc.add(field);
iw.addDocument(doc);
- iw.close();
+ iw.shutdown();
dir.close();
}
// TODO: more tests with other possibilities
@@ -487,10 +487,11 @@ public class TestPostingsOffsets extends
Document doc = new Document();
doc.add(new Field("body", new CannedTokenStream(tokens), ft));
riw.addDocument(doc);
+ riw.shutdown();
success = true;
} finally {
if (success) {
- IOUtils.close(riw, dir);
+ IOUtils.close(dir);
} else {
IOUtils.closeWhileHandlingException(riw, dir);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java Tue Apr 8 15:34:50 2014
@@ -52,7 +52,7 @@ public class TestReaderClosed extends Lu
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
}
public void test() throws Exception {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollback.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollback.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollback.java Tue Apr 8 15:34:50 2014
@@ -34,7 +34,7 @@ public class TestRollback extends Lucene
doc.add(newStringField("pk", Integer.toString(i), Field.Store.YES));
rw.addDocument(doc);
}
- rw.close();
+ rw.shutdown();
// If buffer size is small enough to cause a flush, errors ensue...
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2).setOpenMode(IndexWriterConfig.OpenMode.APPEND));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java Tue Apr 8 15:34:50 2014
@@ -131,7 +131,7 @@ public class TestRollingUpdates extends
w.commit();
assertEquals(SIZE, w.numDocs());
- w.close();
+ w.shutdown();
TestIndexWriter.assertNoUnreferencedFiles(dir, "leftover files after rolling updates");
@@ -174,7 +174,7 @@ public class TestRollingUpdates extends
threads[i].join();
}
- w.close();
+ w.shutdown();
}
IndexReader open = DirectoryReader.open(dir);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java Tue Apr 8 15:34:50 2014
@@ -40,7 +40,7 @@ public class TestSameTokenSamePosition e
Document doc = new Document();
doc.add(new TextField("eng", new BugReproTokenStream()));
riw.addDocument(doc);
- riw.close();
+ riw.shutdown();
dir.close();
}
@@ -55,7 +55,7 @@ public class TestSameTokenSamePosition e
doc.add(new TextField("eng", new BugReproTokenStream()));
riw.addDocument(doc);
}
- riw.close();
+ riw.shutdown();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Tue Apr 8 15:34:50 2014
@@ -116,7 +116,7 @@ public class TestSegmentTermDocs extends
// assure that we deal with a single segment
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
IndexReader reader = DirectoryReader.open(dir);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Tue Apr 8 15:34:50 2014
@@ -59,7 +59,7 @@ public class TestSegmentTermEnum extends
addDoc(writer, "aaa bbb");
}
- writer.close();
+ writer.shutdown();
// verify document frequency of terms in an multi segment index
verifyDocFreq();
@@ -67,7 +67,7 @@ public class TestSegmentTermEnum extends
// merge segments
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
// verify document frequency of terms in a single segment index
verifyDocFreq();
@@ -77,7 +77,7 @@ public class TestSegmentTermEnum extends
{
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setCodec(TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat())));
addDoc(writer, "aaa bbb");
- writer.close();
+ writer.shutdown();
SegmentReader reader = getOnlySegmentReader(DirectoryReader.open(dir));
TermsEnum terms = reader.fields().terms("content").iterator(null);
assertNotNull(terms.next());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java Tue Apr 8 15:34:50 2014
@@ -64,7 +64,7 @@ public class TestSizeBoundedForceMerge e
int numDocs = i == 7 ? 30 : 1;
addDocs(writer, numDocs);
}
- writer.close();
+ writer.shutdown();
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
@@ -77,7 +77,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
// Should only be 3 segments in the index, because one of them exceeds the size limit
sis = new SegmentInfos();
@@ -101,7 +101,7 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 3);
addDocs(writer, 3);
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -110,7 +110,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
// Should only be 3 segments in the index, because one of them exceeds the size limit
SegmentInfos sis = new SegmentInfos();
@@ -129,7 +129,7 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 3);
addDocs(writer, 5);
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -138,7 +138,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
@@ -156,7 +156,7 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 3);
addDocs(writer, 3);
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -165,7 +165,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
@@ -183,7 +183,7 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 3);
addDocs(writer, 3);
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -192,7 +192,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
@@ -209,7 +209,7 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 3);
addDocs(writer, 3);
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -218,7 +218,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
@@ -236,7 +236,7 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 3);
addDocs(writer, 5);
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -245,7 +245,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
@@ -266,7 +266,7 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 3);
addDocs(writer, 3);
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -276,7 +276,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
// Should only be 4 segments in the index, because of the merge factor and
// max merge docs settings.
@@ -297,7 +297,7 @@ public class TestSizeBoundedForceMerge e
// delete the last document, so that the last segment is merged.
writer.deleteDocuments(new Term("id", "10"));
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -306,7 +306,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
// Verify that the last segment does not have deletions.
SegmentInfos sis = new SegmentInfos();
@@ -323,7 +323,7 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 3, true);
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -332,7 +332,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
// Verify that the last segment does not have deletions.
SegmentInfos sis = new SegmentInfos();
@@ -351,7 +351,7 @@ public class TestSizeBoundedForceMerge e
// delete the last document
writer.deleteDocuments(new Term("id", "4"));
- writer.close();
+ writer.shutdown();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -360,7 +360,7 @@ public class TestSizeBoundedForceMerge e
writer = new IndexWriter(dir, conf);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
// Verify that the last segment does not have deletions.
SegmentInfos sis = new SegmentInfos();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java Tue Apr 8 15:34:50 2014
@@ -177,7 +177,7 @@ public class TestSnapshotDeletionPolicy
// Make sure we don't have any leftover files in the
// directory:
- writer.close();
+ writer.shutdown();
TestIndexWriter.assertNoUnreferencedFiles(dir, "some files were not deleted but should have been");
}
@@ -254,7 +254,7 @@ public class TestSnapshotDeletionPolicy
IndexWriter writer = new IndexWriter(dir, getConfig(random(), getDeletionPolicy()));
SnapshotDeletionPolicy sdp = (SnapshotDeletionPolicy) writer.getConfig().getIndexDeletionPolicy();
prepareIndexAndSnapshots(sdp, writer, numSnapshots);
- writer.close();
+ writer.shutdown();
assertEquals(numSnapshots, sdp.getSnapshots().size());
assertEquals(numSnapshots, sdp.getSnapshotCount());
@@ -267,7 +267,7 @@ public class TestSnapshotDeletionPolicy
sdp = getDeletionPolicy();
writer = new IndexWriter(dir, getConfig(random(), sdp));
writer.deleteUnusedFiles();
- writer.close();
+ writer.shutdown();
assertEquals("no snapshots should exist", 1, DirectoryReader.listCommits(dir).size());
dir.close();
}
@@ -314,7 +314,7 @@ public class TestSnapshotDeletionPolicy
writer.deleteUnusedFiles();
}
assertEquals(1, DirectoryReader.listCommits(dir).size());
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -326,7 +326,7 @@ public class TestSnapshotDeletionPolicy
SnapshotDeletionPolicy sdp = getDeletionPolicy();
IndexWriter writer = new IndexWriter(dir, getConfig(random(), sdp));
prepareIndexAndSnapshots(sdp, writer, numSnapshots);
- writer.close();
+ writer.shutdown();
// now open the writer on "snapshot0" - make sure it succeeds
writer = new IndexWriter(dir, getConfig(random(), sdp).setIndexCommit(snapshots.get(0)));
@@ -334,7 +334,7 @@ public class TestSnapshotDeletionPolicy
writer.commit();
writer.deleteUnusedFiles();
assertSnapshotExists(dir, sdp, numSnapshots - 1, false);
- writer.close();
+ writer.shutdown();
// but 'snapshot1' files will still exist (need to release snapshot before they can be deleted).
String segFileName = snapshots.get(1).getSegmentsFileName();
@@ -359,7 +359,7 @@ public class TestSnapshotDeletionPolicy
String segFileName = snapshots.get(0).getSegmentsFileName();
sdp.release(snapshots.get(0));
writer.deleteUnusedFiles();
- writer.close();
+ writer.shutdown();
assertFalse("segments file should not be found in dirctory: " + segFileName, slowFileExists(dir, segFileName));
dir.close();
}
@@ -386,7 +386,7 @@ public class TestSnapshotDeletionPolicy
writer.deleteUnusedFiles();
checkSnapshotExists(dir, s2);
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -403,11 +403,11 @@ public class TestSnapshotDeletionPolicy
// create another commit, not snapshotted.
writer.addDocument(new Document());
- writer.close();
+ writer.shutdown();
// open a new writer w/ KeepOnlyLastCommit policy, so it will delete "s1"
// commit.
- new IndexWriter(dir, getConfig(random(), null)).close();
+ new IndexWriter(dir, getConfig(random(), null)).shutdown();
assertFalse("snapshotted commit should not exist", slowFileExists(dir, s1.getSegmentsFileName()));
dir.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java Tue Apr 8 15:34:50 2014
@@ -90,7 +90,7 @@ public class TestStressAdvance extends L
testOne(de, bDocIDs);
}
- w.close();
+ w.shutdown();
r.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java Tue Apr 8 15:34:50 2014
@@ -149,7 +149,7 @@ public class TestStressIndexing extends
for(int i=0;i<numThread;i++)
threads[i].join();
- modifier.close();
+ modifier.shutdown();
for(int i=0;i<numThread;i++)
assertTrue(! threads[i].failed);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java Tue Apr 8 15:34:50 2014
@@ -66,7 +66,7 @@ public class TestStressIndexing2 extends
dw.writer.commit();
verifyEquals(random(), reader, dir, "id");
reader.close();
- dw.writer.close();
+ dw.writer.shutdown();
dir.close();
}
@@ -178,7 +178,7 @@ public class TestStressIndexing2 extends
}
// w.forceMerge(1);
- //w.close();
+ //w.shutdown();
for (int i=0; i<threads.length; i++) {
IndexingThread th = threads[i];
@@ -223,7 +223,7 @@ public class TestStressIndexing2 extends
}
//w.forceMerge(1);
- w.close();
+ w.shutdown();
for (int i=0; i<threads.length; i++) {
IndexingThread th = threads[i];
@@ -259,7 +259,7 @@ public class TestStressIndexing2 extends
// System.out.println("indexing "+d1);
}
- w.close();
+ w.shutdown();
}
public void verifyEquals(Random r, DirectoryReader r1, Directory dir2, String idField) throws Throwable {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java Tue Apr 8 15:34:50 2014
@@ -390,7 +390,7 @@ public class TestStressNRT extends Lucen
thread.join();
}
- writer.close();
+ writer.shutdown();
if (VERBOSE) {
System.out.println("TEST: close reader=" + reader);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java Tue Apr 8 15:34:50 2014
@@ -63,7 +63,7 @@ public class TestSumDocFreq extends Luce
writer.deleteDocuments(new Term("id", "" + random().nextInt(numDocs)));
}
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
ir = DirectoryReader.open(dir);
assertSumDocFreq(ir);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Tue Apr 8 15:34:50 2014
@@ -124,7 +124,7 @@ public class TestTermVectorsReader exten
}
writer.commit();
seg = writer.newestSegment();
- writer.close();
+ writer.shutdown();
fieldInfos = SegmentReader.readFieldInfos(seg);
}
@@ -386,7 +386,7 @@ public class TestTermVectorsReader exten
assertEquals("cannot index term vector payloads when term vectors are not indexed (field=\"field\")", iae.getMessage());
}
- w.close();
+ w.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java Tue Apr 8 15:34:50 2014
@@ -55,7 +55,7 @@ public class TestTermVectorsWriter exten
doc.add(f2);
doc.add(f);
w.addDocument(doc);
- w.close();
+ w.shutdown();
IndexReader r = DirectoryReader.open(dir);
Terms vector = r.getTermVectors(0).terms("field");
@@ -111,7 +111,7 @@ public class TestTermVectorsWriter exten
doc.add(f);
doc.add(f);
w.addDocument(doc);
- w.close();
+ w.shutdown();
IndexReader r = DirectoryReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
@@ -146,7 +146,7 @@ public class TestTermVectorsWriter exten
doc.add(f);
doc.add(f);
w.addDocument(doc);
- w.close();
+ w.shutdown();
IndexReader r = DirectoryReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
@@ -186,7 +186,7 @@ public class TestTermVectorsWriter exten
doc.add(f);
w.addDocument(doc);
}
- w.close();
+ w.shutdown();
IndexReader r = DirectoryReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
@@ -222,7 +222,7 @@ public class TestTermVectorsWriter exten
doc.add(f);
doc.add(f);
w.addDocument(doc);
- w.close();
+ w.shutdown();
IndexReader r = DirectoryReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
@@ -259,7 +259,7 @@ public class TestTermVectorsWriter exten
doc.add(f);
doc.add(f2);
w.addDocument(doc);
- w.close();
+ w.shutdown();
IndexReader r = DirectoryReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
@@ -304,7 +304,7 @@ public class TestTermVectorsWriter exten
doc.add(f);
doc.add(f2);
w.addDocument(doc);
- w.close();
+ w.shutdown();
IndexReader r = DirectoryReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
@@ -347,7 +347,7 @@ public class TestTermVectorsWriter exten
doc.add(f2);
w.addDocument(doc);
- w.close();
+ w.shutdown();
IndexReader r = DirectoryReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
@@ -404,7 +404,7 @@ public class TestTermVectorsWriter exten
document.add(termVectorField);
writer.addDocument(document);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
IndexReader reader = DirectoryReader.open(dir);
for(int i=0;i<reader.numDocs();i++) {
@@ -422,7 +422,7 @@ public class TestTermVectorsWriter exten
Directory[] indexDirs = {new MockDirectoryWrapper(random(), new RAMDirectory(dir, newIOContext(random())))};
writer.addIndexes(indexDirs);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
}
dir.close();
}
@@ -458,7 +458,7 @@ public class TestTermVectorsWriter exten
document.add(termVectorField);
writer.addDocument(document);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
IndexReader reader = DirectoryReader.open(dir);
assertNull(reader.getTermVectors(0));
@@ -492,7 +492,7 @@ public class TestTermVectorsWriter exten
document.add(termVectorField);
for(int i=0;i<10;i++)
writer.addDocument(document);
- writer.close();
+ writer.shutdown();
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT,
new MockAnalyzer(random())).setMaxBufferedDocs(2)
@@ -503,7 +503,7 @@ public class TestTermVectorsWriter exten
writer.addDocument(document);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
IndexReader reader = DirectoryReader.open(dir);
for(int i=0;i<10;i++) {
@@ -540,7 +540,7 @@ public class TestTermVectorsWriter exten
iw.commit();
iw.forceMerge(1);
- iw.close();
+ iw.shutdown();
dir.close();
}
@@ -572,7 +572,7 @@ public class TestTermVectorsWriter exten
iw.commit();
iw.forceMerge(1);
- iw.close();
+ iw.shutdown();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java Tue Apr 8 15:34:50 2014
@@ -100,7 +100,7 @@ public class TestTermdocPerf extends Luc
}
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java Tue Apr 8 15:34:50 2014
@@ -52,7 +52,7 @@ public class TestTermsEnum extends Lucen
w.addDocument(docs.nextDoc());
}
final IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
final List<BytesRef> terms = new ArrayList<>();
final TermsEnum termsEnum = MultiFields.getTerms(r, "body").iterator(null);
@@ -224,7 +224,7 @@ public class TestTermsEnum extends Lucen
}
final IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
// NOTE: intentional insanity!!
final FieldCache.Ints docIDToID = FieldCache.DEFAULT.getInts(SlowCompositeReaderWrapper.wrap(r), "id", false);
@@ -374,7 +374,7 @@ public class TestTermsEnum extends Lucen
close();
}
r = w.getReader();
- w.close();
+ w.shutdown();
return r;
}
@@ -513,7 +513,7 @@ public class TestTermsEnum extends Lucen
w.deleteDocuments(new Term("field", "one"));
w.forceMerge(1);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
assertEquals(1, r.numDocs());
assertEquals(1, r.maxDoc());
Terms terms = MultiFields.getTerms(r, "field");
@@ -741,7 +741,7 @@ public class TestTermsEnum extends Lucen
w.forceMerge(1);
DirectoryReader r = w.getReader();
- w.close();
+ w.shutdown();
AtomicReader sub = getOnlySegmentReader(r);
Terms terms = sub.fields().terms("field");
Automaton automaton = new RegExp(".*", RegExp.NONE).toAutomaton();
@@ -795,7 +795,7 @@ public class TestTermsEnum extends Lucen
w.forceMerge(1);
DirectoryReader r = w.getReader();
- w.close();
+ w.shutdown();
AtomicReader sub = getOnlySegmentReader(r);
Terms terms = sub.fields().terms("field");
@@ -849,7 +849,7 @@ public class TestTermsEnum extends Lucen
w.forceMerge(1);
DirectoryReader r = w.getReader();
- w.close();
+ w.shutdown();
AtomicReader sub = getOnlySegmentReader(r);
Terms terms = sub.fields().terms("field");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java Tue Apr 8 15:34:50 2014
@@ -72,7 +72,7 @@ public class TestTermsEnum2 extends Luce
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java Tue Apr 8 15:34:50 2014
@@ -124,7 +124,7 @@ public class TestThreadedForceMerge exte
assertEquals("index=" + writer.segString() + " numDocs=" + writer.numDocs() + " maxDoc=" + writer.maxDoc() + " config=" + writer.getConfig(), expectedDocCount, writer.numDocs());
assertEquals("index=" + writer.segString() + " numDocs=" + writer.numDocs() + " maxDoc=" + writer.maxDoc() + " config=" + writer.getConfig(), expectedDocCount, writer.maxDoc());
- writer.close();
+ writer.shutdown();
writer = new IndexWriter(directory, newIndexWriterConfig(
TEST_VERSION_CURRENT, ANALYZER).setOpenMode(
OpenMode.APPEND).setMaxBufferedDocs(2));
@@ -134,7 +134,7 @@ public class TestThreadedForceMerge exte
assertEquals(expectedDocCount, reader.numDocs());
reader.close();
}
- writer.close();
+ writer.shutdown();
}
/*
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java Tue Apr 8 15:34:50 2014
@@ -63,7 +63,7 @@ public class TestTieredMergePolicy exten
w.forceMergeDeletes();
assertEquals(60, w.maxDoc());
assertEquals(60, w.numDocs());
- w.close();
+ w.shutdown();
dir.close();
}
@@ -104,7 +104,7 @@ public class TestTieredMergePolicy exten
w.forceMerge(targetCount);
assertEquals(targetCount, w.getSegmentCount());
- w.close();
+ w.shutdown();
dir.close();
}
}
@@ -152,7 +152,7 @@ public class TestTieredMergePolicy exten
assertEquals(numDocs-1, r.numDocs());
r.close();
- w.close();
+ w.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java Tue Apr 8 15:34:50 2014
@@ -72,7 +72,7 @@ public class TestTransactionRollback ext
Map<String,String> data = new HashMap<>();
data.put("index", "Rolled back to 1-"+id);
w.setCommitData(data);
- w.close();
+ w.shutdown();
}
public void testRepeatedRollBacks() throws Exception {
@@ -146,7 +146,7 @@ public class TestTransactionRollback ext
}
}
- w.close();
+ w.shutdown();
}
@Override
@@ -213,7 +213,7 @@ public class TestTransactionRollback ext
// Unless you specify a prior commit point, rollback
// should not work:
new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))
- .setIndexDeletionPolicy(new DeleteLastCommitPolicy())).close();
+ .setIndexDeletionPolicy(new DeleteLastCommitPolicy())).shutdown();
IndexReader r = DirectoryReader.open(dir);
assertEquals(100, r.numDocs());
r.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java Tue Apr 8 15:34:50 2014
@@ -146,8 +146,8 @@ public class TestTransactions extends Lu
TestTransactions.doFail = false;
}
- writer1.close();
- writer2.close();
+ writer1.shutdown();
+ writer2.shutdown();
}
public void update(IndexWriter writer) throws IOException {
@@ -219,7 +219,7 @@ public class TestTransactions extends Lu
d.add(newTextField("contents", English.intToEnglish(n), Field.Store.NO));
writer.addDocument(d);
}
- writer.close();
+ writer.shutdown();
}
public void testTransactions() throws Throwable {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java Tue Apr 8 15:34:50 2014
@@ -65,7 +65,7 @@ public class TestTryDelete extends Lucen
}
writer.commit();
- writer.close();
+ writer.shutdown();
return directory;
}
@@ -153,7 +153,7 @@ public class TestTryDelete extends Lucen
assertEquals(0, topDocs.totalHits);
- writer.close();
+ writer.shutdown();
searcher = new IndexSearcher(DirectoryReader.open(directory));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Tue Apr 8 15:34:50 2014
@@ -58,7 +58,7 @@ public class TestUniqueTermCount extends
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Tue Apr 8 15:34:50 2014
@@ -176,7 +176,7 @@ public class BaseTestRangeFilter extends
// exceedingly rare (Yonik calculates 1 in ~429,000)
// times) that this loop requires more than one try:
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
return ir;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java Tue Apr 8 15:34:50 2014
@@ -92,7 +92,7 @@ public class FuzzyTermOnShortTermsTest e
writer.addDocument(d);
}
- writer.close();
+ writer.shutdown();
return directory;
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java Tue Apr 8 15:34:50 2014
@@ -65,7 +65,7 @@ public class TestAutomatonQuery extends
writer.addDocument(doc);
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java Tue Apr 8 15:34:50 2014
@@ -80,7 +80,7 @@ public class TestAutomatonQueryUnicode e
writer.addDocument(doc);
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java Tue Apr 8 15:34:50 2014
@@ -64,7 +64,7 @@ public class TestBoolean2 extends Lucene
doc.add(newTextField(field, docFields[i], Field.Store.NO));
writer.addDocument(doc);
}
- writer.close();
+ writer.shutdown();
littleReader = DirectoryReader.open(directory);
searcher = newSearcher(littleReader);
// this is intentionally using the baseline sim, because it compares against bigSearcher (which uses a random one)
@@ -87,7 +87,7 @@ public class TestBoolean2 extends Lucene
RandomIndexWriter w = new RandomIndexWriter(random(), dir2);
w.addIndexes(copy);
docCount = w.maxDoc();
- w.close();
+ w.shutdown();
mulFactor *= 2;
} while(docCount < 3000);
@@ -106,7 +106,7 @@ public class TestBoolean2 extends Lucene
}
reader = w.getReader();
bigSearcher = newSearcher(reader);
- w.close();
+ w.shutdown();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Tue Apr 8 15:34:50 2014
@@ -71,7 +71,7 @@ public class TestBooleanMinShouldMatch e
r = w.getReader();
s = newSearcher(r);
- w.close();
+ w.shutdown();
//System.out.println("Set up " + getName());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java Tue Apr 8 15:34:50 2014
@@ -149,7 +149,7 @@ public class TestBooleanOr extends Lucen
reader = writer.getReader();
//
searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
}
@Override
@@ -173,7 +173,7 @@ public class TestBooleanOr extends Lucen
riw.forceMerge(1);
IndexReader r = riw.getReader();
- riw.close();
+ riw.shutdown();
IndexSearcher s = newSearcher(r);
BooleanQuery bq = new BooleanQuery();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Tue Apr 8 15:34:50 2014
@@ -138,7 +138,7 @@ public class TestBooleanQuery extends Lu
assertEquals(1, s.search(dmq, 10).totalHits);
r.close();
- w.close();
+ w.shutdown();
dir.close();
}
@@ -149,7 +149,7 @@ public class TestBooleanQuery extends Lu
doc1.add(newTextField("field", "foo bar", Field.Store.NO));
iw1.addDocument(doc1);
IndexReader reader1 = iw1.getReader();
- iw1.close();
+ iw1.shutdown();
Directory dir2 = newDirectory();
RandomIndexWriter iw2 = new RandomIndexWriter(random(), dir2);
@@ -157,7 +157,7 @@ public class TestBooleanQuery extends Lu
doc2.add(newTextField("field", "foo baz", Field.Store.NO));
iw2.addDocument(doc2);
IndexReader reader2 = iw2.getReader();
- iw2.close();
+ iw2.shutdown();
BooleanQuery query = new BooleanQuery(); // Query: +foo -ba*
query.add(new TermQuery(new Term("field", "foo")), BooleanClause.Occur.MUST);
@@ -212,7 +212,7 @@ public class TestBooleanQuery extends Lu
w.forceMerge(1);
final IndexReader r = w.getReader();
final IndexSearcher s = newSearcher(r);
- w.close();
+ w.shutdown();
for(int iter=0;iter<10*RANDOM_MULTIPLIER;iter++) {
if (VERBOSE) {
@@ -304,7 +304,7 @@ public class TestBooleanQuery extends Lu
Document d = new Document();
d.add(new TextField(FIELD, "clockwork orange", Field.Store.YES));
writer.addDocument(d);
- writer.close();
+ writer.shutdown();
IndexReader indexReader = DirectoryReader.open(directory);
IndexSearcher searcher = newSearcher(indexReader);
@@ -334,7 +334,7 @@ public class TestBooleanQuery extends Lu
doc.add(newTextField("field", "some text here", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = new IndexSearcher(r) {
@Override
protected void search(List<AtomicReaderContext> leaves, Weight weight, Collector collector) throws IOException {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java Tue Apr 8 15:34:50 2014
@@ -60,7 +60,7 @@ public class TestBooleanQueryVisitSubsco
writer.addDocument(doc("solr", "solr is a very popular search server and is using lucene"));
writer.addDocument(doc("nutch", "nutch is an internet search engine with web crawler and is using lucene and hadoop"));
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java Tue Apr 8 15:34:50 2014
@@ -50,7 +50,7 @@ public class TestBooleanScorer extends L
writer.addDocument(doc);
}
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
BooleanQuery booleanQuery1 = new BooleanQuery();
booleanQuery1.add(new TermQuery(new Term(FIELD, "1")), BooleanClause.Occur.SHOULD);
@@ -77,7 +77,7 @@ public class TestBooleanScorer extends L
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
writer.commit();
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
BooleanWeight weight = (BooleanWeight) new BooleanQuery().createWeight(searcher);
BulkScorer[] scorers = new BulkScorer[] {new BulkScorer() {
@@ -137,7 +137,7 @@ public class TestBooleanScorer extends L
doc.add(new TextField("field", "33", Field.Store.NO));
w.addDocument(doc);
final IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
// we don't wrap with AssertingIndexSearcher in order to have the original scorer in setScorer.
final IndexSearcher s = newSearcher(r, true, false);
@@ -236,7 +236,7 @@ public class TestBooleanScorer extends L
doc.add(newTextField("field", "doctors are people who prescribe medicines of which they know little, to cure diseases of which they know less, in human beings of whom they know nothing", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
BooleanQuery q1 = new BooleanQuery();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Tue Apr 8 15:34:50 2014
@@ -66,7 +66,8 @@ public class TestCachingWrapperFilter ex
@Override
public void tearDown() throws Exception {
- IOUtils.close(iw, ir, dir);
+ iw.shutdown();
+ IOUtils.close(ir, dir);
super.tearDown();
}
@@ -143,7 +144,7 @@ public class TestCachingWrapperFilter ex
public void testCachingWorks() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- writer.close();
+ writer.shutdown();
IndexReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
@@ -169,7 +170,7 @@ public class TestCachingWrapperFilter ex
public void testNullDocIdSet() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- writer.close();
+ writer.shutdown();
IndexReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
@@ -192,7 +193,7 @@ public class TestCachingWrapperFilter ex
public void testNullDocIdSetIterator() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- writer.close();
+ writer.shutdown();
IndexReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
@@ -244,7 +245,7 @@ public class TestCachingWrapperFilter ex
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
writer.addDocument(new Document());
- writer.close();
+ writer.shutdown();
IndexReader reader = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dir));
@@ -403,7 +404,7 @@ public class TestCachingWrapperFilter ex
assertTrue(oldReader != null);
reader.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java Tue Apr 8 15:34:50 2014
@@ -57,7 +57,7 @@ public class TestConjunctions extends Lu
writer.addDocument(doc("solr", "solr is a very popular search server and is using lucene"));
writer.addDocument(doc("nutch", "nutch is an internet search engine with web crawler and is using lucene and hadoop"));
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
searcher = newSearcher(reader);
searcher.setSimilarity(new TFSimilarity());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java Tue Apr 8 15:34:50 2014
@@ -90,7 +90,7 @@ public class TestConstantScoreQuery exte
writer.addDocument(doc);
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
// we don't wrap with AssertingIndexSearcher in order to have the original scorer in setScorer.
searcher = newSearcher(reader, true, false);
@@ -137,7 +137,7 @@ public class TestConstantScoreQuery exte
doc.add(newStringField("field", "b", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
Filter filterB = new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "b"))));
Query query = new ConstantScoreQuery(filterB);
@@ -163,7 +163,7 @@ public class TestConstantScoreQuery exte
doc.add(newStringField("field", "a", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
Filter filter = new QueryWrapperFilter(AssertingQuery.wrap(random(), new TermQuery(new Term("field", "a"))));
IndexSearcher s = newSearcher(r);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java Tue Apr 8 15:34:50 2014
@@ -371,7 +371,8 @@ public class TestControlledRealTimeReope
}
thread.close();
thread.join();
- IOUtils.close(manager, _writer, d);
+ _writer.shutdown();
+ IOUtils.close(manager, d);
}
public static class LatchedIndexWriter extends IndexWriter {
@@ -425,7 +426,7 @@ public class TestControlledRealTimeReope
} catch (IllegalStateException ise) {
// expected
}
- w.close();
+ w.shutdown();
other.close();
dir.close();
}
@@ -452,7 +453,7 @@ public class TestControlledRealTimeReope
sm.maybeRefreshBlocking();
assertTrue(afterRefreshCalled.get());
sm.close();
- iw.close();
+ iw.shutdown();
dir.close();
}
@@ -531,7 +532,7 @@ public class TestControlledRealTimeReope
controlledRealTimeReopenThread.close();
sm.close();
- iw.close();
+ iw.shutdown();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Tue Apr 8 15:34:50 2014
@@ -68,7 +68,7 @@ public class TestCustomSearcherSort exte
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
query = new TermQuery(new Term("content", "test"));
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java Tue Apr 8 15:34:50 2014
@@ -52,7 +52,7 @@ public class TestDateFilter extends Luce
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(reader);
// filter that should preserve matches
@@ -115,7 +115,7 @@ public class TestDateFilter extends Luce
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(reader);
// filter that should preserve matches
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java Tue Apr 8 15:34:50 2014
@@ -63,7 +63,7 @@ public class TestDateSort extends Lucene
writer.addDocument(createDocument("Document 5", 1192209943000L));
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Tue Apr 8 15:34:50 2014
@@ -159,7 +159,7 @@ public class TestDisjunctionMaxQuery ext
}
r = SlowCompositeReaderWrapper.wrap(writer.getReader());
- writer.close();
+ writer.shutdown();
s = newSearcher(r);
s.setSimilarity(sim);
}
@@ -488,7 +488,7 @@ public class TestDisjunctionMaxQuery ext
Document d = new Document();
d.add(new TextField(FIELD, "clockwork orange", Field.Store.YES));
writer.addDocument(d);
- writer.close();
+ writer.shutdown();
IndexReader indexReader = DirectoryReader.open(directory);
IndexSearcher searcher = newSearcher(indexReader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java Tue Apr 8 15:34:50 2014
@@ -52,7 +52,7 @@ public class TestDocBoost extends Lucene
writer.addDocument(d2);
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
final float[] scores = new float[4];
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java Tue Apr 8 15:34:50 2014
@@ -110,7 +110,7 @@ public class TestDocIdSet extends Lucene
doc.add(newStringField("c", "val", Field.Store.NO));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
// First verify the document is searchable.
IndexSearcher searcher = newSearcher(reader);
@@ -136,7 +136,7 @@ public class TestDocIdSet extends Lucene
doc.add(newStringField("c", "val", Field.Store.NO));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
// First verify the document is searchable.
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java Tue Apr 8 15:34:50 2014
@@ -89,7 +89,7 @@ public class TestDocTermOrdsRangeFilter
reader = writer.getReader();
searcher1 = newSearcher(reader);
searcher2 = newSearcher(reader);
- writer.close();
+ writer.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java Tue Apr 8 15:34:50 2014
@@ -91,7 +91,7 @@ public class TestDocTermOrdsRewriteMetho
reader = writer.getReader();
searcher1 = newSearcher(reader);
searcher2 = newSearcher(reader);
- writer.close();
+ writer.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java Tue Apr 8 15:34:50 2014
@@ -62,7 +62,7 @@ public class TestDocValuesScoring extend
dvField.setFloatValue(4f); // boost x4
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
// no boosting
IndexSearcher searcher1 = newSearcher(ir, false);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java Tue Apr 8 15:34:50 2014
@@ -48,7 +48,7 @@ public class TestEarlyTermination extend
@Override
public void tearDown() throws Exception {
super.tearDown();
- writer.close();
+ writer.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java Tue Apr 8 15:34:50 2014
@@ -52,7 +52,7 @@ public class TestElevationComparator ext
writer.addDocument(adoc(new String[] {"id", "z", "title", "boosted boosted boosted","str_s", "z"}));
IndexReader r = DirectoryReader.open(writer, true);
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(r);
searcher.setSimilarity(new DefaultSimilarity());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java Tue Apr 8 15:34:50 2014
@@ -80,7 +80,7 @@ public class TestExplanations extends Lu
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java Tue Apr 8 15:34:50 2014
@@ -123,7 +123,7 @@ public class TestFieldCache extends Luce
}
IndexReader r = writer.getReader();
reader = SlowCompositeReaderWrapper.wrap(r);
- writer.close();
+ writer.shutdown();
}
@AfterClass
@@ -304,7 +304,7 @@ public class TestFieldCache extends Luce
public void testEmptyIndex() throws Exception {
Directory dir = newDirectory();
IndexWriter writer= new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(500));
- writer.close();
+ writer.shutdown();
IndexReader r = DirectoryReader.open(dir);
AtomicReader reader = SlowCompositeReaderWrapper.wrap(r);
FieldCache.DEFAULT.getTerms(reader, "foobar", true);
@@ -451,7 +451,7 @@ public class TestFieldCache extends Luce
}
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
AtomicReader ar = getOnlySegmentReader(ir);
BytesRef scratch = new BytesRef();
@@ -584,7 +584,7 @@ public class TestFieldCache extends Luce
Document doc = new Document();
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
AtomicReader ar = getOnlySegmentReader(ir);
@@ -643,7 +643,7 @@ public class TestFieldCache extends Luce
doc.add(new StoredField("bogusbits", "bogus"));
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
AtomicReader ar = getOnlySegmentReader(ir);
@@ -728,7 +728,7 @@ public class TestFieldCache extends Luce
assertEquals(values[i], longs.get(i));
}
reader.close();
- iw.close();
+ iw.shutdown();
dir.close();
}
@@ -774,7 +774,7 @@ public class TestFieldCache extends Luce
assertEquals(values[i], ints.get(i));
}
reader.close();
- iw.close();
+ iw.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Tue Apr 8 15:34:50 2014
@@ -448,7 +448,7 @@ public class TestFieldCacheRangeFilter e
BytesRef term0 = new BytesRef();
NumericUtils.intToPrefixCoded(0, 0, term0);
writer.deleteDocuments(new Term("id_int", term0));
- writer.close();
+ writer.shutdown();
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher search = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java Tue Apr 8 15:34:50 2014
@@ -45,7 +45,7 @@ public class TestFieldCacheTermsFilter e
w.addDocument(doc);
}
IndexReader reader = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher searcher = newSearcher(reader);
int numDocs = reader.numDocs();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java Tue Apr 8 15:34:50 2014
@@ -108,7 +108,7 @@ public class TestFieldValueFilter extend
writer.deleteDocuments(new Term("id", "" + docID));
docStates[docID] = 2;
}
- writer.close();
+ writer.shutdown();
return docStates;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java Tue Apr 8 15:34:50 2014
@@ -87,7 +87,7 @@ public class TestFilteredQuery extends L
writer.forceMerge(1);
reader = writer.getReader();
- writer.close ();
+ writer.shutdown();
searcher = newSearcher(reader);
@@ -415,7 +415,7 @@ public class TestFilteredQuery extends L
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(reader);
Query query = new FilteredQuery(new TermQuery(new Term("field", "0")),
@@ -471,9 +471,8 @@ public class TestFilteredQuery extends L
}, FilteredQuery.QUERY_FIRST_FILTER_STRATEGY);
TopDocs search = searcher.search(query, 10);
- assertEquals(totalDocsWithZero, search.totalHits);
- IOUtils.close(reader, writer, directory);
-
+ assertEquals(totalDocsWithZero, search.totalHits);
+ IOUtils.close(reader, directory);
}
/*
@@ -495,7 +494,7 @@ public class TestFilteredQuery extends L
writer.addDocument (doc);
}
IndexReader reader = writer.getReader();
- writer.close ();
+ writer.shutdown();
final boolean queryFirst = random().nextBoolean();
IndexSearcher searcher = newSearcher(reader);
Query query = new FilteredQuery(new TermQuery(new Term("field", "0")), new Filter() {
@@ -551,8 +550,7 @@ public class TestFilteredQuery extends L
TopDocs search = searcher.search(query, 10);
assertEquals(totalDocsWithZero, search.totalHits);
- IOUtils.close(reader, writer, directory);
-
+ IOUtils.close(reader, directory);
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java Tue Apr 8 15:34:50 2014
@@ -51,11 +51,9 @@ public class TestFilteredSearch extends
searchFiltered(writer, directory, filter, enforceSingleSegment);
// run the test on more than one segment
enforceSingleSegment = false;
- writer.close();
writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(10).setMergePolicy(newLogMergePolicy()));
// we index 60 docs - this will create 6 segments
searchFiltered(writer, directory, filter, enforceSingleSegment);
- writer.close();
directory.close();
}
@@ -68,7 +66,7 @@ public class TestFilteredSearch extends
if (fullMerge) {
writer.forceMerge(1);
}
- writer.close();
+ writer.shutdown();
BooleanQuery booleanQuery = new BooleanQuery();
booleanQuery.add(new TermQuery(new Term(FIELD, "36")), BooleanClause.Occur.SHOULD);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java Tue Apr 8 15:34:50 2014
@@ -51,7 +51,7 @@ public class TestFuzzyQuery extends Luce
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
FuzzyQuery query = new FuzzyQuery(new Term("field", "aaaaa"), FuzzyQuery.defaultMaxEdits, 0);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
@@ -214,7 +214,7 @@ public class TestFuzzyQuery extends Luce
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
FuzzyQuery query = new FuzzyQuery(new Term("field", "WEBER"), 2, 1);
//query.setRewriteMethod(FuzzyQuery.SCORING_BOOLEAN_QUERY_REWRITE);
@@ -260,8 +260,8 @@ public class TestFuzzyQuery extends Luce
mr.close();
ir1.close();
ir2.close();
- writer.close();
- writer2.close();
+ writer.shutdown();
+ writer2.shutdown();
directory.close();
directory2.close();
}
@@ -276,7 +276,7 @@ public class TestFuzzyQuery extends Luce
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
FuzzyQuery query = new FuzzyQuery(new Term("field", "lucene"));
query.setRewriteMethod(new MultiTermQuery.TopTermsBoostOnlyBooleanQueryRewrite(50));
@@ -314,7 +314,7 @@ public class TestFuzzyQuery extends Luce
addDoc("Brute willis", w);
addDoc("B. willis", w);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
Query q = new FuzzyQuery(new Term("field", "giga"), 0);
@@ -335,7 +335,7 @@ public class TestFuzzyQuery extends Luce
addDoc("working", w);
IndexReader reader = w.getReader();
IndexSearcher searcher = newSearcher(reader);
- w.close();
+ w.shutdown();
FuzzyQuery q = new FuzzyQuery(new Term("field", "fouba"), 2);
ScoreDoc[] hits = searcher.search(q, 10).scoreDocs;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java Tue Apr 8 15:34:50 2014
@@ -51,7 +51,7 @@ public class TestIndexSearcher extends L
iw.addDocument(doc);
}
reader = iw.getReader();
- iw.close();
+ iw.shutdown();
}
@Override
@@ -126,7 +126,7 @@ public class TestIndexSearcher extends L
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
w.addDocument(new Document());
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = new IndexSearcher(r);
try {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java Tue Apr 8 15:34:50 2014
@@ -170,7 +170,7 @@ public class TestLiveFieldValues extends
rt.close();
mgr.close();
- w.close();
+ w.shutdown();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java Tue Apr 8 15:34:50 2014
@@ -83,7 +83,7 @@ public class TestMatchAllDocsQuery exten
hits = is.search(new MatchAllDocsQuery(), null, 1000).scoreDocs;
assertEquals(2, hits.length);
- iw.close();
+ iw.shutdown();
ir.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java Tue Apr 8 15:34:50 2014
@@ -82,7 +82,7 @@ public class TestMinShouldMatch2 extends
iw.addDocument(doc);
}
iw.forceMerge(1);
- iw.close();
+ iw.shutdown();
r = DirectoryReader.open(dir);
reader = getOnlySegmentReader(r);
searcher = new IndexSearcher(reader);