You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/08/09 20:54:43 UTC
svn commit: r1617004 [4/11] - 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/ana...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java Sat Aug 9 18:54:35 2014
@@ -66,7 +66,7 @@ public class TestIndexFileDeleter extend
for(;i<45;i++) {
addDoc(writer, i);
}
- writer.shutdown();
+ writer.close();
// Delete one doc so we get a .del file:
writer = new IndexWriter(
@@ -77,7 +77,7 @@ public class TestIndexFileDeleter extend
);
Term searchTerm = new Term("id", "7");
writer.deleteDocuments(searchTerm);
- writer.shutdown();
+ writer.close();
// Now, artificially create an extra .del file & extra
// .s0 file:
@@ -127,7 +127,7 @@ public class TestIndexFileDeleter extend
// files and nothing more:
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
.setOpenMode(OpenMode.APPEND));
- writer.shutdown();
+ writer.close();
String[] files2 = dir.listAll();
dir.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java Sat Aug 9 18:54:35 2014
@@ -38,9 +38,9 @@ public class TestIndexReaderClose extend
final int iters = 1000 + 1 + random().nextInt(20);
for (int j = 0; j < iters; j++) {
Directory dir = newDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random(), TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random(), new MockAnalyzer(random())));
writer.commit();
- writer.shutdown();
+ writer.close();
DirectoryReader open = DirectoryReader.open(dir);
final boolean throwOnClose = !rarely();
AtomicReader wrap = SlowCompositeReaderWrapper.wrap(open);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Sat Aug 9 18:54:35 2014
@@ -83,11 +83,9 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.SetOnce;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.ThreadInterruptedException;
-import org.apache.lucene.util.Version;
import org.apache.lucene.util.automaton.Automata;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
import org.apache.lucene.util.automaton.Automaton;
-import org.apache.lucene.util.packed.PackedInts;
import org.junit.Test;
public class TestIndexWriter extends LuceneTestCase {
@@ -114,7 +112,7 @@ public class TestIndexWriter extends Luc
addDocWithIndex(writer,i);
}
assertEquals(100, writer.maxDoc());
- writer.shutdown();
+ writer.close();
// delete 40 documents
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
@@ -122,7 +120,7 @@ public class TestIndexWriter extends Luc
for (i = 0; i < 40; i++) {
writer.deleteDocuments(new Term("id", ""+i));
}
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(dir);
assertEquals(60, reader.numDocs());
@@ -134,7 +132,7 @@ public class TestIndexWriter extends Luc
writer.forceMerge(1);
assertEquals(60, writer.maxDoc());
assertEquals(60, writer.numDocs());
- writer.shutdown();
+ writer.close();
// check that the index reader gives the same numbers.
reader = DirectoryReader.open(dir);
@@ -148,7 +146,7 @@ public class TestIndexWriter extends Luc
.setOpenMode(OpenMode.CREATE));
assertEquals(0, writer.maxDoc());
assertEquals(0, writer.numDocs());
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -171,7 +169,7 @@ public class TestIndexWriter extends Luc
public static void assertNoUnreferencedFiles(Directory dir, String message) throws IOException {
String[] startFiles = dir.listAll();
- new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))).rollback();
+ new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random()))).rollback();
String[] endFiles = dir.listAll();
Arrays.sort(startFiles);
@@ -202,7 +200,7 @@ public class TestIndexWriter extends Luc
// add one document & close writer
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
addDoc(writer);
- writer.shutdown();
+ writer.close();
// now open reader:
IndexReader reader = DirectoryReader.open(dir);
@@ -213,7 +211,7 @@ public class TestIndexWriter extends Luc
.setOpenMode(OpenMode.CREATE));
assertEquals("should be zero documents", writer.maxDoc(), 0);
addDoc(writer);
- writer.shutdown();
+ writer.close();
assertEquals("should be one document", reader.numDocs(), 1);
IndexReader reader2 = DirectoryReader.open(dir);
@@ -233,7 +231,7 @@ public class TestIndexWriter extends Luc
addDoc(writer);
// close
- writer.shutdown();
+ writer.close();
try {
addDoc(writer);
fail("did not hit AlreadyClosedException");
@@ -249,7 +247,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
writer.commit();
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
assertEquals(0, reader.maxDoc());
@@ -259,7 +257,7 @@ public class TestIndexWriter extends Luc
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
.setOpenMode(OpenMode.APPEND));
writer.commit();
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(dir);
assertEquals(0, reader.maxDoc());
@@ -282,7 +280,7 @@ public class TestIndexWriter extends Luc
doc.add(newField("f"+j, "aaa", storedTextType));
writer.addDocument(doc);
}
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
assertEquals(100, reader.maxDoc());
@@ -318,7 +316,7 @@ public class TestIndexWriter extends Luc
assertTrue(numFile > lastNumFile);
lastNumFile = numFile;
}
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -374,7 +372,7 @@ public class TestIndexWriter extends Luc
assertTrue(flushCount > lastFlushCount);
}
}
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -435,7 +433,7 @@ public class TestIndexWriter extends Luc
assertTrue(flushCount > lastFlushCount);
}
}
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -478,7 +476,7 @@ public class TestIndexWriter extends Luc
writer.addDocument(doc);
}
}
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader);
@@ -508,7 +506,7 @@ public class TestIndexWriter extends Luc
doc.add(f);
writer.addDocument(doc);
}
- writer.shutdown();
+ writer.close();
Term searchTerm = new Term("field", "aaa");
@@ -533,7 +531,7 @@ public class TestIndexWriter extends Luc
doc.add(f);
writer.addDocument(doc);
}
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
@@ -565,7 +563,7 @@ public class TestIndexWriter extends Luc
customType.setStoreTermVectorOffsets(true);
doc.add(newField("field", b.toString(), customType));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
assertEquals(1, reader.maxDoc());
@@ -609,7 +607,7 @@ public class TestIndexWriter extends Luc
for (int i = 0; i < 100; i++) {
addDoc(writer);
}
- writer.shutdown();
+ writer.close();
Term searchTerm = new Term("content", "aaa");
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader);
@@ -619,7 +617,7 @@ public class TestIndexWriter extends Luc
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
.setOpenMode(OpenMode.CREATE));
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -640,7 +638,7 @@ public class TestIndexWriter extends Luc
for(int i=0;i<19;i++)
writer.addDocument(doc);
writer.flush(false, true);
- writer.shutdown();
+ writer.close();
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
// Since we flushed w/o allowing merging we should now
@@ -666,7 +664,7 @@ public class TestIndexWriter extends Luc
System.out.println("\nTEST: now add empty doc");
}
writer.addDocument(new Document());
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
assertEquals(2, reader.numDocs());
reader.close();
@@ -689,7 +687,7 @@ public class TestIndexWriter extends Luc
customType.setStoreTermVectors(true);
document.add(newField("tvtest", "", customType));
iw.addDocument(document);
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -710,7 +708,7 @@ public class TestIndexWriter extends Luc
Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
for(int i=0;i<4;i++)
iw.addDocument(document);
- iw.shutdown();
+ iw.close();
dir.close();
} finally {
Thread.currentThread().setPriority(pri);
@@ -751,14 +749,14 @@ public class TestIndexWriter extends Luc
for(int j=0;j<4;j++)
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
if (0 == i % 4) {
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
//LogMergePolicy lmp2 = (LogMergePolicy) writer.getConfig().getMergePolicy();
//lmp2.setNoCFSRatio(0.0);
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
}
}
dir.close();
@@ -777,7 +775,7 @@ public class TestIndexWriter extends Luc
b.append(" x");
doc.add(newTextField("field", b.toString(), Field.Store.NO));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
Term t = new Term("field", "x");
@@ -795,7 +793,7 @@ public class TestIndexWriter extends Luc
Document doc = new Document();
doc.add(newTextField("", "a b c", Field.Store.NO));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -805,7 +803,7 @@ public class TestIndexWriter extends Luc
Document doc = new Document();
doc.add(newTextField("", "a b c", Field.Store.NO));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
AtomicReader subreader = getOnlySegmentReader(reader);
TermsEnum te = subreader.fields().terms("").iterator(null);
@@ -826,7 +824,7 @@ public class TestIndexWriter extends Luc
doc.add(newStringField("", "b", Field.Store.NO));
doc.add(newStringField("", "c", Field.Store.NO));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
AtomicReader subreader = getOnlySegmentReader(reader);
TermsEnum te = subreader.fields().terms("").iterator(null);
@@ -879,7 +877,7 @@ public class TestIndexWriter extends Luc
w.commit();
assertTrue(w.beforeWasCalled);
assertTrue(w.afterWasCalled);
- w.shutdown();
+ w.close();
IndexReader ir = DirectoryReader.open(dir);
assertEquals(0, ir.numDocs());
@@ -918,7 +916,7 @@ public class TestIndexWriter extends Luc
} catch (IllegalArgumentException iea) {
// expected
}
- w.shutdown();
+ w.close();
dir.close();
}
@@ -937,7 +935,7 @@ public class TestIndexWriter extends Luc
doc.add(f);
doc.add(f2);
w.addDocument(doc);
- w.shutdown();
+ w.close();
IndexReader r = DirectoryReader.open(dir);
Terms tpv = r.getTermVectors(0).terms("field");
@@ -982,11 +980,11 @@ public class TestIndexWriter extends Luc
Directory dir2 = newDirectory();
IndexWriter writer2 = new IndexWriter(dir2, newIndexWriterConfig(new MockAnalyzer(random())));
writer2.addDocument(doc);
- writer2.shutdown();
+ writer2.close();
IndexReader r1 = DirectoryReader.open(dir2);
writer.addIndexes(r1, r1);
- writer.shutdown();
+ writer.close();
IndexReader r3 = DirectoryReader.open(dir);
assertEquals(5, r3.numDocs());
@@ -1013,8 +1011,7 @@ public class TestIndexWriter extends Luc
// make a little directory for addIndexes
// LUCENE-2239: won't work with NIOFS/MMAP
adder = new MockDirectoryWrapper(random, new RAMDirectory());
- IndexWriterConfig conf = newIndexWriterConfig(random,
- TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ IndexWriterConfig conf = newIndexWriterConfig(random, new MockAnalyzer(random));
IndexWriter w = new IndexWriter(adder, conf);
Document doc = new Document();
doc.add(newStringField(random, "id", "500", Field.Store.NO));
@@ -1047,7 +1044,7 @@ public class TestIndexWriter extends Luc
}
w.addDocument(doc);
w.deleteDocuments(new Term("id", "500"));
- w.shutdown();
+ w.close();
}
@Override
@@ -1055,7 +1052,7 @@ public class TestIndexWriter extends Luc
// LUCENE-2239: won't work with NIOFS/MMAP
MockDirectoryWrapper dir = new MockDirectoryWrapper(random, new RAMDirectory());
- // When interrupt arrives in w.shutdown(), this can
+ // When interrupt arrives in w.close(), this can
// lead to double-write of files:
dir.setPreventDoubleWrite(false);
@@ -1072,14 +1069,14 @@ public class TestIndexWriter extends Luc
// until this one successfully closes:
// w.rollback();
try {
- w.shutdown();
+ w.close();
} catch (AlreadyClosedException ace) {
// OK
}
w = null;
}
IndexWriterConfig conf = newIndexWriterConfig(random,
- TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(2);
+ new MockAnalyzer(random)).setMaxBufferedDocs(2);
w = new IndexWriter(dir, conf);
Document doc = new Document();
@@ -1131,7 +1128,7 @@ public class TestIndexWriter extends Luc
w.forceMerge(1);
}
}
- w.shutdown();
+ w.close();
w = null;
DirectoryReader.open(dir).close();
@@ -1337,7 +1334,7 @@ public class TestIndexWriter extends Luc
w.addDocument(doc);
w.commit();
w.forceMerge(1); // force segment merge.
- w.shutdown();
+ w.close();
IndexReader ir = DirectoryReader.open(dir);
StoredDocument doc2 = ir.document(0);
@@ -1373,7 +1370,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
writer.addDocument(new Document());
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -1463,7 +1460,7 @@ public class TestIndexWriter extends Luc
}
//assertTrue(files.contains("_2.cfs"));
- w.shutdown();
+ w.close();
r2.close();
dir.close();
@@ -1506,7 +1503,7 @@ public class TestIndexWriter extends Luc
writer.deleteUnusedFiles();
assertEquals(1, DirectoryReader.listCommits(dir).size());
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -1515,7 +1512,7 @@ public class TestIndexWriter extends Luc
// then IndexWriter ctor succeeds. Previously (LUCENE-2386) it failed
// when listAll() was called in IndexFileDeleter.
Directory dir = newFSDirectory(createTempDir("emptyFSDirNoLock"), NoLockFactory.getNoLockFactory());
- new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))).shutdown();
+ new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))).close();
dir.close();
}
@@ -1599,7 +1596,7 @@ public class TestIndexWriter extends Luc
.setMaxBufferedDocs(2)
.setOpenMode(OpenMode.CREATE));
- w2.shutdown();
+ w2.close();
// If we don't do that, the test fails on Windows
w.rollback();
@@ -1637,7 +1634,7 @@ public class TestIndexWriter extends Luc
indexWriter.addDocument(doc);
}
- indexWriter.shutdown();
+ indexWriter.close();
TestUtil.checkIndex(dir);
@@ -1727,7 +1724,7 @@ public class TestIndexWriter extends Luc
w.forceMerge(1);
IndexReader reader = w.getReader();
- w.shutdown();
+ w.close();
// Make sure all terms < max size were indexed
assertEquals(1, reader.docFreq(new Term("content", "abc")));
@@ -1765,7 +1762,7 @@ public class TestIndexWriter extends Luc
w.addDocument(doc);
reader = w.getReader();
- w.shutdown();
+ w.close();
assertEquals(1, reader.docFreq(new Term("content", bigTerm)));
reader.close();
@@ -1775,7 +1772,7 @@ public class TestIndexWriter extends Luc
public void testDeleteAllNRTLeftoverFiles() throws Exception {
Directory d = new MockDirectoryWrapper(random(), new RAMDirectory());
- IndexWriter w = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter w = new IndexWriter(d, new IndexWriterConfig(new MockAnalyzer(random())));
Document doc = new Document();
for(int i = 0; i < 20; i++) {
for(int j = 0; j < 100; ++j) {
@@ -1791,13 +1788,13 @@ public class TestIndexWriter extends Luc
assertTrue(d.listAll().length <= 2);
}
- w.shutdown();
+ w.close();
d.close();
}
public void testNRTReaderVersion() throws Exception {
Directory d = new MockDirectoryWrapper(random(), new RAMDirectory());
- IndexWriter w = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter w = new IndexWriter(d, new IndexWriterConfig(new MockAnalyzer(random())));
Document doc = new Document();
doc.add(newStringField("id", "0", Field.Store.YES));
w.addDocument(doc);
@@ -1813,7 +1810,7 @@ public class TestIndexWriter extends Luc
w.deleteDocuments(new Term("id", "0"));
r = w.getReader();
- w.shutdown();
+ w.close();
long version3 = r.getVersion();
r.close();
assert(version3 > version2);
@@ -1835,14 +1832,14 @@ public class TestIndexWriter extends Luc
} catch (LockObtainFailedException lofe) {
// expected
}
- w1.shutdown();
+ w1.close();
d.close();
}
public void testChangeIndexOptions() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ new IndexWriterConfig(new MockAnalyzer(random())));
FieldType docsAndFreqs = new FieldType(TextField.TYPE_NOT_STORED);
docsAndFreqs.setIndexOptions(IndexOptions.DOCS_AND_FREQS);
@@ -1858,20 +1855,20 @@ public class TestIndexWriter extends Luc
doc = new Document();
doc.add(new Field("field", "a b c", docsOnly));
w.addDocument(doc);
- w.shutdown();
+ w.close();
dir.close();
}
public void testOnlyUpdateDocuments() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ new IndexWriterConfig(new MockAnalyzer(random())));
final List<Document> docs = new ArrayList<>();
docs.add(new Document());
w.updateDocuments(new Term("foo", "bar"),
docs);
- w.shutdown();
+ w.close();
dir.close();
}
@@ -1879,17 +1876,17 @@ public class TestIndexWriter extends Luc
public void testPrepareCommitThenClose() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ new IndexWriterConfig(new MockAnalyzer(random())));
w.prepareCommit();
try {
- w.shutdown();
+ w.close();
fail("should have hit exception");
} catch (IllegalStateException ise) {
// expected
}
w.commit();
- w.shutdown();
+ w.close();
IndexReader r = DirectoryReader.open(dir);
assertEquals(0, r.maxDoc());
r.close();
@@ -1900,7 +1897,7 @@ public class TestIndexWriter extends Luc
public void testPrepareCommitThenRollback() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ new IndexWriterConfig(new MockAnalyzer(random())));
w.prepareCommit();
w.rollback();
@@ -1912,7 +1909,7 @@ public class TestIndexWriter extends Luc
public void testPrepareCommitThenRollback2() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ new IndexWriterConfig(new MockAnalyzer(random())));
w.commit();
w.addDocument(new Document());
@@ -1956,7 +1953,7 @@ public class TestIndexWriter extends Luc
doc.add(f2);
doc.add(f);
w.addDocument(doc);
- w.shutdown();
+ w.close();
dir.close();
}
@@ -1968,14 +1965,14 @@ public class TestIndexWriter extends Luc
IndexWriter iw = new IndexWriter(dir,
newIndexWriterConfig(new MockAnalyzer(random())));
iw.addDocument(new Document());
- iw.shutdown();
+ iw.close();
try {
// Create my own random file:
IndexOutput out = dir.createOutput("myrandomfile", newIOContext(random()));
out.writeByte((byte) 42);
out.close();
- new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))).shutdown();
+ new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))).close();
assertTrue(slowFileExists(dir, "myrandomfile"));
} finally {
@@ -2000,7 +1997,7 @@ public class TestIndexWriter extends Luc
doc.add(new TextField("body", "test of gaps", Field.Store.NO));
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
PhraseQuery pq = new PhraseQuery();
pq.add(new Term("body", "just"), 0);
@@ -2031,7 +2028,7 @@ public class TestIndexWriter extends Luc
doc.add(new TextField("body", "test of gaps", Field.Store.NO));
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
PhraseQuery pq = new PhraseQuery();
pq.add(new Term("body", "just"), 0);
@@ -2045,7 +2042,7 @@ public class TestIndexWriter extends Luc
// LUCENE-4398
public void testRotatingFieldNames() throws Exception {
Directory dir = newFSDirectory(createTempDir("TestIndexWriter.testChangingFields"));
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
iwc.setRAMBufferSizeMB(0.2);
iwc.setMaxBufferedDocs(-1);
IndexWriter w = new IndexWriter(dir, iwc);
@@ -2084,7 +2081,7 @@ public class TestIndexWriter extends Luc
upto = 0;
}
}
- w.shutdown();
+ w.close();
dir.close();
}
@@ -2126,7 +2123,7 @@ public class TestIndexWriter extends Luc
"value2", r.getIndexCommit().getUserData().get("key"));
r.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -2138,13 +2135,13 @@ public class TestIndexWriter extends Luc
put("key", "value");
}});
assertEquals("value", writer.getCommitData().get("key"));
- writer.shutdown();
+ writer.close();
// validate that it's also visible when opening a new IndexWriter
writer = new IndexWriter(dir, newIndexWriterConfig(null)
.setOpenMode(OpenMode.APPEND));
assertEquals("value", writer.getCommitData().get("key"));
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -2170,7 +2167,7 @@ public class TestIndexWriter extends Luc
IndexReader ir = iw.getReader();
assertEquals(3, ir.numDocs());
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -2192,7 +2189,7 @@ public class TestIndexWriter extends Luc
IndexReader ir = iw.getReader();
assertEquals(3, ir.numDocs());
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -2214,7 +2211,7 @@ public class TestIndexWriter extends Luc
IndexReader ir = iw.getReader();
assertEquals(3, ir.numDocs());
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -2246,7 +2243,7 @@ public class TestIndexWriter extends Luc
IndexReader ir = iw.getReader();
assertEquals(3, ir.numDocs());
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -2277,7 +2274,7 @@ public class TestIndexWriter extends Luc
IndexReader ir = iw.getReader();
assertEquals(3, ir.numDocs());
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -2338,7 +2335,7 @@ public class TestIndexWriter extends Luc
}
}
assertTrue(liveIds.isEmpty());
- w.shutdown();
+ w.close();
IOUtils.close(reader, dir);
}
@@ -2390,7 +2387,7 @@ public class TestIndexWriter extends Luc
}
}
assertTrue(liveIds.isEmpty());
- w.shutdown();
+ w.close();
IOUtils.close(reader, dir);
}
@@ -2422,7 +2419,7 @@ public class TestIndexWriter extends Luc
assertNotNull(e.getMessage());
assertEquals("boom", e.getMessage());
}
- w.shutdown();
+ w.close();
IOUtils.close(dir);
}
@@ -2482,7 +2479,7 @@ public class TestIndexWriter extends Luc
try {
if ((i & 1) == 0) {
- new IndexWriter(dir, iwc).shutdown();
+ new IndexWriter(dir, iwc).close();
} else {
new IndexWriter(dir, iwc).rollback();
}
@@ -2547,14 +2544,14 @@ public class TestIndexWriter extends Luc
writer.waitForMerges();
writer.commit();
assertFalse(writer.hasUncommittedChanges());
- writer.shutdown();
+ writer.close();
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
assertFalse(writer.hasUncommittedChanges());
writer.addDocument(doc);
assertTrue(writer.hasUncommittedChanges());
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -2582,14 +2579,14 @@ public class TestIndexWriter extends Luc
}
evilWriter.deleteDocuments(new MatchAllDocsQuery());
evilWriter.forceMerge(1);
- evilWriter.shutdown();
+ evilWriter.close();
dir.close();
}
// LUCENE-5239
public void testDeleteSameTermAcrossFields() throws Exception {
Directory dir = newDirectory();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
IndexWriter w = new IndexWriter(dir, iwc);
Document doc = new Document();
doc.add(new TextField("a", "foo", Field.Store.NO));
@@ -2601,7 +2598,7 @@ public class TestIndexWriter extends Luc
w.deleteDocuments(new Term("a", "xxx"));
w.deleteDocuments(new Term("b", "foo"));
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
// Make sure document was not (incorrectly) deleted:
assertEquals(1, r.numDocs());
@@ -2628,7 +2625,7 @@ public class TestIndexWriter extends Luc
}
iwriter.commit();
assertFalse(iwriter.hasUncommittedChanges());
- iwriter.shutdown();
+ iwriter.close();
directory.close();
}
@@ -2668,35 +2665,13 @@ public class TestIndexWriter extends Luc
dir.close();
}
- public void testUncommittedChanges() throws IOException {
- Directory dir = newDirectory();
- // If version is < 50 IW.close should throw an exception
- // on uncommitted changes:
- IndexWriterConfig iwc = newIndexWriterConfig(random(), Version.LUCENE_4_8, new MockAnalyzer(random()));
- IndexWriter w = new IndexWriter(dir, iwc);
- Document doc = new Document();
- doc.add(new SortedDocValuesField("dv", new BytesRef("foo!")));
- w.addDocument(doc);
- try {
- w.close();
- fail("didn't hit exception");
- } catch (RuntimeException re) {
- // expected
- assertTrue(re.getMessage().contains("this writer is closed, but some pending changes or running merges were discarded"));
- }
- w.rollback();
- dir.close();
- }
-
public void testCloseWhileMergeIsRunning() throws IOException {
Directory dir = newDirectory();
final CountDownLatch mergeStarted = new CountDownLatch(1);
final CountDownLatch closeStarted = new CountDownLatch(1);
- // If version is < 50 IW.close should throw an exception
- // on still-running merges:
- IndexWriterConfig iwc = newIndexWriterConfig(random(), Version.LUCENE_4_8, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = newIndexWriterConfig(random(), new MockAnalyzer(random())).setCommitOnClose(false);
LogDocMergePolicy mp = new LogDocMergePolicy();
mp.setMergeFactor(2);
iwc.setMergePolicy(mp);
@@ -2742,17 +2717,7 @@ public class TestIndexWriter extends Luc
w.commit();
w.addDocument(doc);
w.commit();
- try {
- w.close();
- fail("didn't hit exception");
- } catch (RuntimeException re) {
- // expected
- if (VERBOSE) {
- System.out.println("GOT: " + re.getMessage());
- }
- assertTrue(re.getMessage().contains("this writer is closed, but some pending changes or running merges were discarded"));
- }
- w.rollback();
+ w.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java Sat Aug 9 18:54:35 2014
@@ -46,7 +46,7 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 14; i++) {
TestIndexWriter.addDoc(writer);
}
- writer.shutdown();
+ writer.close();
Term searchTerm = new Term("content", "aaa");
DirectoryReader reader = DirectoryReader.open(dir);
@@ -71,7 +71,7 @@ public class TestIndexWriterCommit exten
}
// Now, close the writer:
- writer.shutdown();
+ writer.close();
assertFalse("reader should not be current now", reader.isCurrent());
IndexReader r = DirectoryReader.open(dir);
@@ -98,7 +98,7 @@ public class TestIndexWriterCommit exten
for (int i = 0; i < 14; i++) {
TestIndexWriter.addDoc(writer);
}
- writer.shutdown();
+ writer.close();
Term searchTerm = new Term("content", "aaa");
IndexReader reader = DirectoryReader.open(dir);
@@ -156,7 +156,7 @@ public class TestIndexWriterCommit exten
r.close();
}
- writer.shutdown();
+ writer.close();
IndexReader r = DirectoryReader.open(dir);
searcher = newSearcher(r);
hits = searcher.search(new TermQuery(searchTerm), null, 1000).scoreDocs;
@@ -215,7 +215,7 @@ public class TestIndexWriterCommit exten
for(int j=0;j<30;j++) {
TestIndexWriter.addDocWithIndex(writer, j);
}
- writer.shutdown();
+ writer.close();
dir.resetMaxUsedSizeInBytes();
dir.setTrackDiskUsage(true);
@@ -236,7 +236,7 @@ public class TestIndexWriterCommit exten
long midDiskUsage = dir.getMaxUsedSizeInBytes();
dir.resetMaxUsedSizeInBytes();
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
DirectoryReader.open(dir).close();
@@ -278,7 +278,7 @@ public class TestIndexWriterCommit exten
for(int j=0;j<17;j++) {
TestIndexWriter.addDocWithIndex(writer, j);
}
- writer.shutdown();
+ writer.close();
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
.setOpenMode(OpenMode.APPEND));
@@ -309,7 +309,7 @@ public class TestIndexWriterCommit exten
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
.setOpenMode(OpenMode.APPEND));
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
if (VERBOSE) {
System.out.println("TEST: writer closed");
@@ -378,7 +378,7 @@ public class TestIndexWriterCommit exten
threads[i].join();
}
assertFalse(failed.get());
- w.shutdown();
+ w.close();
dir.close();
}
@@ -418,7 +418,7 @@ public class TestIndexWriterCommit exten
reader = DirectoryReader.open(dir);
assertEquals(40, reader.numDocs());
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -440,7 +440,7 @@ public class TestIndexWriterCommit exten
w.addDocument(doc);
commitData.put("tag", "second");
w.setCommitData(commitData);
- w.shutdown();
+ w.close();
// open "first" with IndexWriter
IndexCommit commit = null;
@@ -463,7 +463,7 @@ public class TestIndexWriterCommit exten
w.addDocument(doc);
commitData.put("tag", "third");
w.setCommitData(commitData);
- w.shutdown();
+ w.close();
// make sure "second" commit is still there
commit = null;
@@ -492,7 +492,7 @@ public class TestIndexWriterCommit exten
// that's expected !
}
// No changes still should generate a commit, because it's a new index.
- writer.shutdown();
+ writer.close();
assertEquals("expected 1 commits!", 1, DirectoryReader.listCommits(dir).size());
dir.close();
}
@@ -549,7 +549,7 @@ public class TestIndexWriterCommit exten
reader = DirectoryReader.open(dir);
assertEquals(40, reader.numDocs());
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -606,7 +606,7 @@ public class TestIndexWriterCommit exten
reader = DirectoryReader.open(dir);
assertEquals(17, reader.numDocs());
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -617,7 +617,7 @@ public class TestIndexWriterCommit exten
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
writer.prepareCommit();
writer.commit();
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
assertEquals(0, reader.numDocs());
@@ -632,7 +632,7 @@ public class TestIndexWriterCommit exten
.setMaxBufferedDocs(2));
for(int j=0;j<17;j++)
TestIndexWriter.addDoc(w);
- w.shutdown();
+ w.close();
DirectoryReader r = DirectoryReader.open(dir);
// commit(Map) never called for this index
@@ -646,7 +646,7 @@ public class TestIndexWriterCommit exten
Map<String,String> data = new HashMap<>();
data.put("label", "test1");
w.setCommitData(data);
- w.shutdown();
+ w.close();
r = DirectoryReader.open(dir);
assertEquals("test1", r.getIndexCommit().getUserData().get("label"));
@@ -654,7 +654,7 @@ public class TestIndexWriterCommit exten
w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
w.forceMerge(1);
- w.shutdown();
+ w.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Sat Aug 9 18:54:35 2014
@@ -20,14 +20,11 @@ package org.apache.lucene.index;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.FieldInfosFormat;
-import org.apache.lucene.codecs.StoredFieldsFormat;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.index.DocumentsWriterPerThread.IndexingChain;
@@ -58,7 +55,7 @@ public class TestIndexWriterConfig exten
@Test
public void testDefaults() throws Exception {
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()));
assertEquals(MockAnalyzer.class, conf.getAnalyzer().getClass());
assertNull(conf.getIndexCommit());
assertEquals(KeepOnlyLastCommitDeletionPolicy.class, conf.getIndexDeletionPolicy().getClass());
@@ -144,7 +141,7 @@ public class TestIndexWriterConfig exten
Directory dir = newDirectory();
// test that IWC cannot be reused across two IWs
IndexWriterConfig conf = newIndexWriterConfig(null);
- new RandomIndexWriter(random(), dir, conf).shutdown();
+ new RandomIndexWriter(random(), dir, conf).close();
// this should fail
try {
@@ -193,7 +190,7 @@ public class TestIndexWriterConfig exten
@Test
public void testToString() throws Exception {
- String str = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).toString();
+ String str = new IndexWriterConfig(new MockAnalyzer(random())).toString();
for (Field f : IndexWriterConfig.class.getDeclaredFields()) {
int modifiers = f.getModifiers();
if (Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers)) {
@@ -213,7 +210,7 @@ public class TestIndexWriterConfig exten
@Test
public void testInvalidValues() throws Exception {
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()));
// Test IndexDeletionPolicy
assertEquals(KeepOnlyLastCommitDeletionPolicy.class, conf.getIndexDeletionPolicy().getClass());
@@ -321,7 +318,7 @@ public class TestIndexWriterConfig exten
public void testLiveChangeToCFS() throws Exception {
Directory dir = newDirectory();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
iwc.setMergePolicy(newLogMergePolicy(true));
// Start false:
iwc.setUseCompoundFile(false);
@@ -353,7 +350,7 @@ public class TestIndexWriterConfig exten
w.forceMerge(1);
w.commit();
assertTrue("Expected CFS after merge", w.newestSegment().info.getUseCompoundFile());
- w.shutdown();
+ w.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Sat Aug 9 18:54:35 2014
@@ -89,7 +89,7 @@ public class TestIndexWriterDelete exten
hitCount = getHitCount(dir, term);
assertEquals(0, hitCount);
- modifier.shutdown();
+ modifier.close();
dir.close();
}
@@ -124,7 +124,7 @@ public class TestIndexWriterDelete exten
reader = DirectoryReader.open(dir);
assertEquals(0, reader.numDocs());
reader.close();
- modifier.shutdown();
+ modifier.close();
dir.close();
}
@@ -138,7 +138,7 @@ public class TestIndexWriterDelete exten
writer.deleteDocuments(new Term("foobar", "1"));
writer.deleteDocuments(new Term("foobar", "1"));
assertEquals(3, writer.getFlushDeletesCount());
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -179,7 +179,7 @@ public class TestIndexWriterDelete exten
int hitCount = getHitCount(dir, new Term("id", String.valueOf(id)));
assertEquals(1, hitCount);
reader.close();
- modifier.shutdown();
+ modifier.close();
dir.close();
}
}
@@ -213,7 +213,7 @@ public class TestIndexWriterDelete exten
IndexReader reader = DirectoryReader.open(dir);
assertEquals(5, reader.numDocs());
- modifier.shutdown();
+ modifier.close();
reader.close();
dir.close();
}
@@ -257,7 +257,7 @@ public class TestIndexWriterDelete exten
assertEquals(2, reader.numDocs());
reader.close();
- modifier.shutdown();
+ modifier.close();
dir.close();
}
@@ -303,7 +303,7 @@ public class TestIndexWriterDelete exten
assertEquals(2, reader.numDocs());
reader.close();
- modifier.shutdown();
+ modifier.close();
dir.close();
}
@@ -360,7 +360,7 @@ public class TestIndexWriterDelete exten
thread.join();
}
- modifier.shutdown();
+ modifier.close();
DirectoryReader reader = DirectoryReader.open(dir);
assertEquals(reader.maxDoc(), 0);
assertEquals(reader.numDocs(), 0);
@@ -507,7 +507,7 @@ public class TestIndexWriterDelete exten
d.add(new NumericDocValuesField("dv", i));
writer.addDocument(d);
}
- writer.shutdown();
+ writer.close();
long diskUsage = startDir.sizeInBytes();
long diskFree = diskUsage + 10;
@@ -593,7 +593,7 @@ public class TestIndexWriterDelete exten
}
docId += 12;
}
- modifier.shutdown();
+ modifier.close();
}
success = true;
if (0 == x) {
@@ -858,7 +858,7 @@ public class TestIndexWriterDelete exten
// Make sure the delete was successfully flushed:
assertEquals(0, hitCount);
- modifier.shutdown();
+ modifier.close();
dir.close();
}
@@ -915,14 +915,14 @@ public class TestIndexWriterDelete exten
}
}
- modifier.shutdown();
+ modifier.close();
TestIndexWriter.assertNoUnreferencedFiles(dir, "docsWriter.abort() failed to delete unreferenced files");
dir.close();
}
public void testDeleteNullQuery() throws IOException {
Directory dir = newDirectory();
- IndexWriter modifier = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)));
+ IndexWriter modifier = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)));
for (int i = 0; i < 5; i++) {
addDoc(modifier, i, 2*i);
@@ -931,7 +931,7 @@ public class TestIndexWriterDelete exten
modifier.deleteDocuments(new TermQuery(new Term("nada", "nada")));
modifier.commit();
assertEquals(5, modifier.numDocs());
- modifier.shutdown();
+ modifier.close();
dir.close();
}
@@ -963,7 +963,7 @@ public class TestIndexWriterDelete exten
r.close();
}
- w.shutdown();
+ w.close();
dir.close();
}
@@ -1014,7 +1014,7 @@ public class TestIndexWriterDelete exten
}
assertTrue("flush happened too quickly during " + (doIndexing ? "indexing" : "deleting") + " count=" + count, count > 2500);
}
- w.shutdown();
+ w.close();
dir.close();
}
@@ -1063,7 +1063,7 @@ public class TestIndexWriterDelete exten
fail("delete's were not applied");
}
}
- w.shutdown();
+ w.close();
dir.close();
}
@@ -1106,7 +1106,7 @@ public class TestIndexWriterDelete exten
fail("delete's were not applied at count=" + flushAtDelCount);
}
}
- w.shutdown();
+ w.close();
dir.close();
}
@@ -1158,14 +1158,14 @@ public class TestIndexWriterDelete exten
}
closing.set(true);
assertTrue(sawAfterFlush.get());
- w.shutdown();
+ w.close();
dir.close();
}
// LUCENE-4455
public void testDeletesCheckIndexOutput() throws Exception {
Directory dir = newDirectory();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
iwc.setMaxBufferedDocs(2);
IndexWriter w = new IndexWriter(dir, iwc);
Document doc = new Document();
@@ -1181,7 +1181,7 @@ public class TestIndexWriterDelete exten
w.deleteDocuments(new Term("field", "0"));
w.commit();
assertEquals(1, w.getSegmentCount());
- w.shutdown();
+ w.close();
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
CheckIndex checker = new CheckIndex(dir);
@@ -1192,10 +1192,10 @@ public class TestIndexWriterDelete exten
// Segment should have deletions:
assertTrue(s.contains("has deletions"));
- iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ iwc = new IndexWriterConfig(new MockAnalyzer(random()));
w = new IndexWriter(dir, iwc);
w.forceMerge(1);
- w.shutdown();
+ w.close();
bos = new ByteArrayOutputStream(1024);
checker.setInfoStream(new PrintStream(bos, false, IOUtils.UTF_8), false);
@@ -1210,22 +1210,22 @@ public class TestIndexWriterDelete exten
Directory d = newDirectory();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
IndexWriter w = new IndexWriter(d, iwc);
Document doc = new Document();
w.addDocument(doc);
w.addDocument(doc);
w.addDocument(doc);
- w.shutdown();
+ w.close();
- iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ iwc = new IndexWriterConfig(new MockAnalyzer(random()));
iwc.setOpenMode(IndexWriterConfig.OpenMode.APPEND);
w = new IndexWriter(d, iwc);
IndexReader r = DirectoryReader.open(w, false);
assertTrue(w.tryDeleteDocument(r, 1));
assertTrue(w.tryDeleteDocument(r.leaves().get(0).reader(), 0));
r.close();
- w.shutdown();
+ w.close();
r = DirectoryReader.open(d);
assertEquals(2, r.numDeletedDocs());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Sat Aug 9 18:54:35 2014
@@ -271,7 +271,7 @@ public class TestIndexWriterExceptions e
writer.commit();
try {
- writer.shutdown();
+ writer.close();
} catch (Throwable t) {
System.out.println("exception during close:");
t.printStackTrace(System.out);
@@ -318,7 +318,7 @@ public class TestIndexWriterExceptions e
writer.commit();
try {
- writer.shutdown();
+ writer.close();
} catch (Throwable t) {
System.out.println("exception during close:");
t.printStackTrace(System.out);
@@ -385,7 +385,7 @@ public class TestIndexWriterExceptions e
} catch (RuntimeException re) {
// expected
}
- w.shutdown();
+ w.close();
dir.close();
}
@@ -418,7 +418,7 @@ public class TestIndexWriterExceptions e
// expected
}
w.addDocument(doc);
- w.shutdown();
+ w.close();
dir.close();
}
@@ -459,7 +459,7 @@ public class TestIndexWriterExceptions e
((ConcurrentMergeScheduler) w.getConfig().getMergeScheduler()).sync();
assertTrue(testPoint.failed);
- w.shutdown();
+ w.close();
dir.close();
}
@@ -515,7 +515,7 @@ public class TestIndexWriterExceptions e
doc.add(newTextField("content", "aa bb cc dd", Field.Store.NO));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
final Term t = new Term("content", "aa");
assertEquals(3, reader.docFreq(t));
@@ -600,7 +600,7 @@ public class TestIndexWriterExceptions e
}
}
assertTrue(hitError);
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
assertEquals(198, reader.docFreq(new Term("content", "aa")));
reader.close();
@@ -652,7 +652,7 @@ public class TestIndexWriterExceptions e
writer.addDocument(doc);
writer.addDocument(doc);
}
- writer.shutdown();
+ writer.close();
if (VERBOSE) {
System.out.println("TEST: open reader");
@@ -684,7 +684,7 @@ public class TestIndexWriterExceptions e
for(int j=0;j<17;j++)
writer.addDocument(doc);
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(dir);
int expected = 19+(1-i)*2;
@@ -767,7 +767,7 @@ public class TestIndexWriterExceptions e
for(int t=0;t<NUM_THREAD;t++)
threads[t].join();
- writer.shutdown();
+ writer.close();
}
IndexReader reader = DirectoryReader.open(dir);
@@ -796,7 +796,7 @@ public class TestIndexWriterExceptions e
for(int j=0;j<17;j++)
writer.addDocument(doc);
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(dir);
expected += 17-NUM_THREAD*NUM_ITER;
@@ -871,7 +871,7 @@ public class TestIndexWriterExceptions e
((ConcurrentMergeScheduler) writer.getConfig().getMergeScheduler()).sync();
assertTrue(failure.didFail);
failure.clearDoFail();
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
assertEquals(23, reader.numDocs());
@@ -945,7 +945,7 @@ public class TestIndexWriterExceptions e
w.addDocument(doc);
dir.failOn(failure);
try {
- w.shutdown();
+ w.close();
fail();
} catch (IOException ioe) {
fail("expected only RuntimeException");
@@ -969,7 +969,7 @@ public class TestIndexWriterExceptions e
IndexWriter w = new IndexWriter(startDir, conf);
for(int i=0;i<27;i++)
addDoc(w);
- w.shutdown();
+ w.close();
int iter = TEST_NIGHTLY ? 200 : 10;
for(int i=0;i<iter;i++) {
@@ -989,7 +989,7 @@ public class TestIndexWriterExceptions e
fail("forceMerge threw IOException without root cause");
}
dir.setRandomIOExceptionRate(0);
- w.shutdown();
+ w.close();
dir.close();
}
startDir.close();
@@ -1005,7 +1005,7 @@ public class TestIndexWriterExceptions e
.setInfoStream(new InfoStream() {
@Override
public void message(String component, final String message) {
- if (message.startsWith("now flush at shutdown") && thrown.compareAndSet(false, true)) {
+ if (message.startsWith("now flush at close") && thrown.compareAndSet(false, true)) {
throw new OutOfMemoryError("fake OOME at " + message);
}
}
@@ -1020,13 +1020,13 @@ public class TestIndexWriterExceptions e
}));
try {
- writer.shutdown();
+ writer.close();
fail("OutOfMemoryError expected");
}
catch (final OutOfMemoryError expected) {}
// throws IllegalStateEx w/o bug fix
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -1077,7 +1077,7 @@ public class TestIndexWriterExceptions e
}
// close
- writer.shutdown();
+ writer.close();
long gen = SegmentInfos.getLastCommitGeneration(dir);
assertTrue("segment generation should be > 0 but got " + gen, gen > 0);
@@ -1101,7 +1101,7 @@ public class TestIndexWriterExceptions e
reader.close();
// should remove the corrumpted segments_N
- new IndexWriter(dir, newIndexWriterConfig(null)).shutdown();
+ new IndexWriter(dir, newIndexWriterConfig(null)).close();
dir.close();
}
@@ -1122,7 +1122,7 @@ public class TestIndexWriterExceptions e
}
// close
- writer.shutdown();
+ writer.close();
long gen = SegmentInfos.getLastCommitGeneration(dir);
assertTrue("segment generation should be > 0 but got " + gen, gen > 0);
@@ -1178,7 +1178,7 @@ public class TestIndexWriterExceptions e
}
// close
- writer.shutdown();
+ writer.close();
long gen = SegmentInfos.getLastCommitGeneration(dir);
assertTrue("segment generation should be > 0 but got " + gen, gen > 0);
@@ -1226,7 +1226,7 @@ public class TestIndexWriterExceptions e
}
// close
- writer.shutdown();
+ writer.close();
long gen = SegmentInfos.getLastCommitGeneration(dir);
assertTrue("segment generation should be > 0 but got " + gen, gen > 0);
@@ -1269,7 +1269,7 @@ public class TestIndexWriterExceptions e
}
// close
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -1324,7 +1324,7 @@ public class TestIndexWriterExceptions e
document = new Document();
document.add(new TextField("field", "a field", Field.Store.YES));
w.addDocument(document);
- w.shutdown();
+ w.close();
IndexReader reader = DirectoryReader.open(dir);
assertTrue(reader.numDocs() > 0);
SegmentInfos sis = new SegmentInfos();
@@ -1409,7 +1409,7 @@ public class TestIndexWriterExceptions e
}
final IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
final IndexSearcher s = newSearcher(r);
PhraseQuery pq = new PhraseQuery();
@@ -1490,7 +1490,7 @@ public class TestIndexWriterExceptions e
}
final IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
final IndexSearcher s = newSearcher(r);
PhraseQuery pq = new PhraseQuery();
@@ -1510,7 +1510,7 @@ public class TestIndexWriterExceptions e
public void testNullStoredField() throws Exception {
Directory dir = newDirectory();
Analyzer analyzer = new MockAnalyzer(random());
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(analyzer));
// add good document
Document doc = new Document();
iw.addDocument(doc);
@@ -1521,7 +1521,7 @@ public class TestIndexWriterExceptions e
iw.addDocument(doc);
fail("didn't get expected exception");
} catch (IllegalArgumentException expected) {}
- iw.shutdown();
+ iw.close();
// make sure we see our good doc
DirectoryReader r = DirectoryReader.open(dir);
assertEquals(1, r.numDocs());
@@ -1533,7 +1533,7 @@ public class TestIndexWriterExceptions e
public void testNullStoredFieldReuse() throws Exception {
Directory dir = newDirectory();
Analyzer analyzer = new MockAnalyzer(random());
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(analyzer));
// add good document
Document doc = new Document();
Field theField = new StoredField("foo", "hello", StoredField.TYPE);
@@ -1545,7 +1545,7 @@ public class TestIndexWriterExceptions e
iw.addDocument(doc);
fail("didn't get expected exception");
} catch (IllegalArgumentException expected) {}
- iw.shutdown();
+ iw.close();
// make sure we see our good doc
DirectoryReader r = DirectoryReader.open(dir);
assertEquals(1, r.numDocs());
@@ -1557,7 +1557,7 @@ public class TestIndexWriterExceptions e
public void testNullStoredBytesField() throws Exception {
Directory dir = newDirectory();
Analyzer analyzer = new MockAnalyzer(random());
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(analyzer));
// add good document
Document doc = new Document();
iw.addDocument(doc);
@@ -1570,7 +1570,7 @@ public class TestIndexWriterExceptions e
iw.addDocument(doc);
fail("didn't get expected exception");
} catch (NullPointerException expected) {}
- iw.shutdown();
+ iw.close();
// make sure we see our good doc
DirectoryReader r = DirectoryReader.open(dir);
assertEquals(1, r.numDocs());
@@ -1582,7 +1582,7 @@ public class TestIndexWriterExceptions e
public void testNullStoredBytesFieldReuse() throws Exception {
Directory dir = newDirectory();
Analyzer analyzer = new MockAnalyzer(random());
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(analyzer));
// add good document
Document doc = new Document();
Field theField = new StoredField("foo", new BytesRef("hello").bytes);
@@ -1595,7 +1595,7 @@ public class TestIndexWriterExceptions e
iw.addDocument(doc);
fail("didn't get expected exception");
} catch (NullPointerException expected) {}
- iw.shutdown();
+ iw.close();
// make sure we see our good doc
DirectoryReader r = DirectoryReader.open(dir);
assertEquals(1, r.numDocs());
@@ -1607,7 +1607,7 @@ public class TestIndexWriterExceptions e
public void testNullStoredBytesRefField() throws Exception {
Directory dir = newDirectory();
Analyzer analyzer = new MockAnalyzer(random());
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(analyzer));
// add good document
Document doc = new Document();
iw.addDocument(doc);
@@ -1620,7 +1620,7 @@ public class TestIndexWriterExceptions e
iw.addDocument(doc);
fail("didn't get expected exception");
} catch (IllegalArgumentException expected) {}
- iw.shutdown();
+ iw.close();
// make sure we see our good doc
DirectoryReader r = DirectoryReader.open(dir);
assertEquals(1, r.numDocs());
@@ -1632,7 +1632,7 @@ public class TestIndexWriterExceptions e
public void testNullStoredBytesRefFieldReuse() throws Exception {
Directory dir = newDirectory();
Analyzer analyzer = new MockAnalyzer(random());
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(analyzer));
// add good document
Document doc = new Document();
Field theField = new StoredField("foo", new BytesRef("hello"));
@@ -1645,7 +1645,7 @@ public class TestIndexWriterExceptions e
iw.addDocument(doc);
fail("didn't get expected exception");
} catch (IllegalArgumentException expected) {}
- iw.shutdown();
+ iw.close();
// make sure we see our good doc
DirectoryReader r = DirectoryReader.open(dir);
assertEquals(1, r.numDocs());
@@ -1666,7 +1666,7 @@ public class TestIndexWriterExceptions e
return -2;
}
};
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(analyzer));
// add good document
Document doc = new Document();
iw.addDocument(doc);
@@ -1676,7 +1676,7 @@ public class TestIndexWriterExceptions e
iw.addDocument(doc);
fail("didn't get expected exception");
} catch (IllegalArgumentException expected) {}
- iw.shutdown();
+ iw.close();
// make sure we see our good doc
DirectoryReader r = DirectoryReader.open(dir);
@@ -1709,7 +1709,7 @@ public class TestIndexWriterExceptions e
Directory d = new MockDirectoryWrapper(random(), uoe);
IndexWriter iw = new IndexWriter(d, newIndexWriterConfig(null));
iw.addDocument(new Document());
- iw.shutdown();
+ iw.close();
uoe.doFail = true;
try {
new IndexWriter(d, newIndexWriterConfig(null));
@@ -1740,7 +1740,7 @@ public class TestIndexWriterExceptions e
} catch (IllegalArgumentException expected) {
// expected exception
}
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -1759,13 +1759,13 @@ public class TestIndexWriterExceptions e
Field field = new TextField("foo", overflowingTokenStream);
doc.add(field);
iw.addDocument(doc);
- iw.shutdown();
+ iw.close();
dir.close();
}
public void testBoostOmitNorms() throws Exception {
Directory dir = newDirectory();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
iwc.setMergePolicy(newLogMergePolicy());
IndexWriter iw = new IndexWriter(dir, iwc);
Document doc = new Document();
@@ -1824,7 +1824,7 @@ public class TestIndexWriterExceptions e
assertEquals(1, ir.numDocs());
assertEquals("sometext", ir.document(0).get("field1"));
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -1857,7 +1857,7 @@ public class TestIndexWriterExceptions e
dir.failOn(failure);
// Create an index with one document
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()));
IndexWriter iw = new IndexWriter(dir, iwc);
Document doc = new Document();
doc.add(new StringField("foo", "bar", Field.Store.NO));
@@ -1866,12 +1866,12 @@ public class TestIndexWriterExceptions e
DirectoryReader ir = DirectoryReader.open(dir);
assertEquals(1, ir.numDocs());
ir.close();
- iw.shutdown();
+ iw.close();
// Open and close the index a few times
for (int i = 0; i < 10; i++) {
failure.setDoFail();
- iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ iwc = new IndexWriterConfig(new MockAnalyzer(random()));
try {
iw = new IndexWriter(dir, iwc);
} catch (CorruptIndexException ex) {
@@ -1881,7 +1881,7 @@ public class TestIndexWriterExceptions e
continue;
}
failure.clearDoFail();
- iw.shutdown();
+ iw.close();
ir = DirectoryReader.open(dir);
assertEquals("lost document after iteration: " + i, 1, ir.numDocs());
ir.close();
@@ -2047,7 +2047,7 @@ public class TestIndexWriterExceptions e
}
doClose = true;
w.commit();
- w.shutdown();
+ w.close();
w = null;
}
@@ -2058,7 +2058,7 @@ public class TestIndexWriterExceptions e
if (ioe instanceof FakeIOException || (ioe.getCause() != null && ioe.getCause() instanceof FakeIOException)) {
// expected
if (VERBOSE) {
- System.out.println("TEST: w.shutdown() hit expected IOE");
+ System.out.println("TEST: w.close() hit expected IOE");
}
} else {
throw ioe;
@@ -2073,7 +2073,7 @@ public class TestIndexWriterExceptions e
System.out.println(" now 2nd close writer");
}
try {
- w.shutdown();
+ w.close();
} catch (AlreadyClosedException ace) {
// OK
}
@@ -2120,7 +2120,7 @@ public class TestIndexWriterExceptions e
if (VERBOSE) {
System.out.println("TEST: close writer");
}
- w.shutdown();
+ w.close();
w = null;
}
@@ -2128,7 +2128,7 @@ public class TestIndexWriterExceptions e
}
if (w != null) {
- w.shutdown();
+ w.close();
}
// Final verify:
@@ -2163,7 +2163,7 @@ public class TestIndexWriterExceptions e
};
Directory dir = newMockDirectory(); // we want to ensure we don't leak any locks or file handles
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, null);
+ IndexWriterConfig iwc = new IndexWriterConfig(null);
iwc.setInfoStream(evilInfoStream);
IndexWriter iw = new IndexWriter(dir, iwc);
Document doc = new Document();
@@ -2232,7 +2232,7 @@ public class TestIndexWriterExceptions e
}
});
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, null);
+ IndexWriterConfig iwc = new IndexWriterConfig(null);
IndexWriter iw = new IndexWriter(dir, iwc);
Document doc = new Document();
for (int i = 0; i < 10; i++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java Sat Aug 9 18:54:35 2014
@@ -200,7 +200,7 @@ public class TestIndexWriterExceptions2
}
try {
- iw.shutdown();
+ iw.close();
} catch (Exception e) {
if (e.getMessage() != null && e.getMessage().startsWith("Fake IOException")) {
exceptionStream.println("\nTEST: got expected fake exc:" + e.getMessage());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java Sat Aug 9 18:54:35 2014
@@ -46,7 +46,7 @@ public class TestIndexWriterForceMerge e
.setMergePolicy(ldmp));
for(int j=0;j<numDocs;j++)
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
SegmentInfos sis = new SegmentInfos();
sis.read(dir);
@@ -57,7 +57,7 @@ public class TestIndexWriterForceMerge e
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(ldmp));
writer.forceMerge(3);
- writer.shutdown();
+ writer.close();
sis = new SegmentInfos();
sis.read(dir);
@@ -110,7 +110,7 @@ public class TestIndexWriterForceMerge e
else
assertEquals("seg: " + segCount, 7, optSegCount);
}
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -136,7 +136,7 @@ public class TestIndexWriterForceMerge e
// we see the doc stores get merged
writer.commit();
TestIndexWriter.addDocWithIndex(writer, 500);
- writer.shutdown();
+ writer.close();
if (VERBOSE) {
System.out.println("TEST: start disk usage");
@@ -157,7 +157,7 @@ public class TestIndexWriterForceMerge e
.setOpenMode(OpenMode.APPEND)
.setMergePolicy(newLogMergePolicy()));
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
long maxDiskUsage = dir.getMaxUsedSizeInBytes();
assertTrue("forceMerge used too much temporary space: starting usage was " + startDiskUsage + " bytes; max temp usage was " + maxDiskUsage + " but should have been " + (4*startDiskUsage) + " (= 4X starting usage)",
maxDiskUsage <= 4*startDiskUsage);
@@ -166,7 +166,7 @@ public class TestIndexWriterForceMerge e
// Test calling forceMerge(1, false) whereby forceMerge is kicked
// off but we don't wait for it to finish (but
- // writer.shutdown()) does wait
+ // writer.close()) does wait
public void testBackgroundForceMerge() throws IOException {
Directory dir = newDirectory();
@@ -185,7 +185,7 @@ public class TestIndexWriterForceMerge e
writer.forceMerge(1, false);
if (0 == pass) {
- writer.shutdown();
+ writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
assertEquals(1, reader.leaves().size());
reader.close();
@@ -194,7 +194,7 @@ public class TestIndexWriterForceMerge e
// NOT included in the merging
writer.addDocument(doc);
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
assertTrue(reader.leaves().size() > 1);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java Sat Aug 9 18:54:35 2014
@@ -38,10 +38,10 @@ public class TestIndexWriterLockRelease
public void testIndexWriterLockRelease() throws IOException {
Directory dir = newFSDirectory(createTempDir("testLockRelease"));
try {
- new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
+ new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
} catch (FileNotFoundException | NoSuchFileException e) {
try {
- new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
+ new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
} catch (FileNotFoundException | NoSuchFileException e1) {
}
} finally {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java Sat Aug 9 18:54:35 2014
@@ -28,7 +28,6 @@ import org.apache.lucene.search.SortFiel
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.LuceneTestCase.Monster;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TimeUnits;
@@ -41,7 +40,7 @@ public class TestIndexWriterMaxDocs exte
@Monster("takes a long time")
public void testExactlyAtTrueLimit() throws Exception {
Directory dir = newFSDirectory(createTempDir("2BDocs3"));
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(null));
Document doc = new Document();
doc.add(newStringField("field", "text", Field.Store.NO));
for (int i = 0; i < IndexWriter.MAX_DOCS; i++) {
@@ -73,7 +72,7 @@ public class TestIndexWriterMaxDocs exte
iw.forceMerge(1);
}
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -81,7 +80,7 @@ public class TestIndexWriterMaxDocs exte
setIndexWriterMaxDocs(10);
try {
Directory dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
for(int i=0;i<10;i++) {
w.addDocument(new Document());
}
@@ -104,7 +103,7 @@ public class TestIndexWriterMaxDocs exte
setIndexWriterMaxDocs(10);
try {
Directory dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
for(int i=0;i<10;i++) {
w.addDocument(new Document());
}
@@ -127,7 +126,7 @@ public class TestIndexWriterMaxDocs exte
setIndexWriterMaxDocs(10);
try {
Directory dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
for(int i=0;i<10;i++) {
w.addDocument(new Document());
}
@@ -150,7 +149,7 @@ public class TestIndexWriterMaxDocs exte
setIndexWriterMaxDocs(10);
try {
Directory dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
for(int i=0;i<10;i++) {
w.addDocument(new Document());
}
@@ -173,7 +172,7 @@ public class TestIndexWriterMaxDocs exte
setIndexWriterMaxDocs(10);
try {
Directory dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
for(int i=0;i<10;i++) {
Document doc = new Document();
doc.add(newStringField("id", ""+i, Field.Store.NO));
@@ -213,7 +212,7 @@ public class TestIndexWriterMaxDocs exte
setIndexWriterMaxDocs(10);
try {
Directory dir = newDirectory();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, null);
+ IndexWriterConfig iwc = new IndexWriterConfig(null);
iwc.setMergePolicy(NoMergePolicy.INSTANCE);
IndexWriter w = new IndexWriter(dir, iwc);
for(int i=0;i<10;i++) {
@@ -258,14 +257,14 @@ public class TestIndexWriterMaxDocs exte
setIndexWriterMaxDocs(10);
try {
Directory dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
for(int i=0;i<10;i++) {
w.addDocument(new Document());
}
- w.shutdown();
+ w.close();
Directory dir2 = newDirectory();
- IndexWriter w2 = new IndexWriter(dir2, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w2 = new IndexWriter(dir2, new IndexWriterConfig(null));
w2.addDocument(new Document());
try {
w2.addIndexes(new Directory[] {dir});
@@ -294,19 +293,19 @@ public class TestIndexWriterMaxDocs exte
public void testMultiReaderExactLimit() throws Exception {
Directory dir = newDirectory();
Document doc = new Document();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
for (int i = 0; i < 100000; i++) {
w.addDocument(doc);
}
- w.shutdown();
+ w.close();
int remainder = IndexWriter.MAX_DOCS % 100000;
Directory dir2 = newDirectory();
- w = new IndexWriter(dir2, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ w = new IndexWriter(dir2, new IndexWriterConfig(null));
for (int i = 0; i < remainder; i++) {
w.addDocument(doc);
}
- w.shutdown();
+ w.close();
int copies = IndexWriter.MAX_DOCS / 100000;
@@ -329,11 +328,11 @@ public class TestIndexWriterMaxDocs exte
public void testMultiReaderBeyondLimit() throws Exception {
Directory dir = newDirectory();
Document doc = new Document();
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(null));
for (int i = 0; i < 100000; i++) {
w.addDocument(doc);
}
- w.shutdown();
+ w.close();
int remainder = IndexWriter.MAX_DOCS % 100000;
@@ -341,11 +340,11 @@ public class TestIndexWriterMaxDocs exte
remainder++;
Directory dir2 = newDirectory();
- w = new IndexWriter(dir2, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ w = new IndexWriter(dir2, new IndexWriterConfig(null));
for (int i = 0; i < remainder; i++) {
w.addDocument(doc);
}
- w.shutdown();
+ w.close();
int copies = IndexWriter.MAX_DOCS / 100000;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java Sat Aug 9 18:54:35 2014
@@ -42,7 +42,7 @@ public class TestIndexWriterMergePolicy
checkInvariants(writer);
}
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -64,7 +64,7 @@ public class TestIndexWriterMergePolicy
}
assertTrue(noOverMerge);
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -81,7 +81,7 @@ public class TestIndexWriterMergePolicy
for (int i = 0; i < 100; i++) {
addDoc(writer);
- writer.shutdown();
+ writer.close();
mp = new LogDocMergePolicy();
mp.setMergeFactor(10);
@@ -93,7 +93,7 @@ public class TestIndexWriterMergePolicy
checkInvariants(writer);
}
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -123,7 +123,7 @@ public class TestIndexWriterMergePolicy
}
checkInvariants(writer);
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -143,7 +143,7 @@ public class TestIndexWriterMergePolicy
addDoc(writer);
checkInvariants(writer);
}
- writer.shutdown();
+ writer.close();
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
.setOpenMode(OpenMode.APPEND)
@@ -152,7 +152,7 @@ public class TestIndexWriterMergePolicy
.setMergeScheduler(new SerialMergeScheduler()));
}
- writer.shutdown();
+ writer.close();
LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMergeFactor(10);
writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
@@ -176,7 +176,7 @@ public class TestIndexWriterMergePolicy
writer.commit();
checkInvariants(writer);
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -194,7 +194,7 @@ public class TestIndexWriterMergePolicy
addDoc(writer);
checkInvariants(writer);
}
- writer.shutdown();
+ writer.close();
// delete some docs without merging
writer = new IndexWriter(
@@ -203,7 +203,7 @@ public class TestIndexWriterMergePolicy
.setMergePolicy(NoMergePolicy.INSTANCE)
);
writer.deleteDocuments(new Term("content", "aaa"));
- writer.shutdown();
+ writer.close();
ldmp = new LogDocMergePolicy();
ldmp.setMergeFactor(5);
@@ -223,7 +223,7 @@ public class TestIndexWriterMergePolicy
checkInvariants(writer);
assertEquals(10, writer.maxDoc());
- writer.shutdown();
+ writer.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Sat Aug 9 18:54:35 2014
@@ -67,7 +67,7 @@ public class TestIndexWriterMerging exte
);
writer.addIndexes(indexA, indexB);
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
fail = verifyIndex(merged, 0);
@@ -115,7 +115,7 @@ public class TestIndexWriterMerging exte
writer.addDocument(temp);
}
- writer.shutdown();
+ writer.close();
}
// LUCENE-325: test forceMergeDeletes, when 2 singular merges
@@ -146,19 +146,19 @@ public class TestIndexWriterMerging exte
idField.setStringValue("" + i);
writer.addDocument(document);
}
- writer.shutdown();
+ writer.close();
IndexReader ir = DirectoryReader.open(dir);
assertEquals(10, ir.maxDoc());
assertEquals(10, ir.numDocs());
ir.close();
- IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(NoMergePolicy.INSTANCE);
writer = new IndexWriter(dir, dontMergeConfig);
writer.deleteDocuments(new Term("id", "0"));
writer.deleteDocuments(new Term("id", "7"));
- writer.shutdown();
+ writer.close();
ir = DirectoryReader.open(dir);
assertEquals(8, ir.numDocs());
@@ -170,7 +170,7 @@ public class TestIndexWriterMerging exte
assertEquals(10, writer.maxDoc());
writer.forceMergeDeletes();
assertEquals(8, writer.numDocs());
- writer.shutdown();
+ writer.close();
ir = DirectoryReader.open(dir);
assertEquals(8, ir.maxDoc());
assertEquals(8, ir.numDocs());
@@ -210,20 +210,20 @@ public class TestIndexWriterMerging exte
idField.setStringValue("" + i);
writer.addDocument(document);
}
- writer.shutdown();
+ writer.close();
IndexReader ir = DirectoryReader.open(dir);
assertEquals(98, ir.maxDoc());
assertEquals(98, ir.numDocs());
ir.close();
- IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(NoMergePolicy.INSTANCE);
writer = new IndexWriter(dir, dontMergeConfig);
for(int i=0;i<98;i+=2) {
writer.deleteDocuments(new Term("id", "" + i));
}
- writer.shutdown();
+ writer.close();
ir = DirectoryReader.open(dir);
assertEquals(49, ir.numDocs());
@@ -236,7 +236,7 @@ public class TestIndexWriterMerging exte
);
assertEquals(49, writer.numDocs());
writer.forceMergeDeletes();
- writer.shutdown();
+ writer.close();
ir = DirectoryReader.open(dir);
assertEquals(49, ir.maxDoc());
assertEquals(49, ir.numDocs());
@@ -276,20 +276,20 @@ public class TestIndexWriterMerging exte
idField.setStringValue("" + i);
writer.addDocument(document);
}
- writer.shutdown();
+ writer.close();
IndexReader ir = DirectoryReader.open(dir);
assertEquals(98, ir.maxDoc());
assertEquals(98, ir.numDocs());
ir.close();
- IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(NoMergePolicy.INSTANCE);
writer = new IndexWriter(dir, dontMergeConfig);
for(int i=0;i<98;i+=2) {
writer.deleteDocuments(new Term("id", "" + i));
}
- writer.shutdown();
+ writer.close();
ir = DirectoryReader.open(dir);
assertEquals(49, ir.numDocs());
ir.close();
@@ -300,7 +300,7 @@ public class TestIndexWriterMerging exte
.setMergePolicy(newLogMergePolicy(3))
);
writer.forceMergeDeletes(false);
- writer.shutdown();
+ writer.close();
ir = DirectoryReader.open(dir);
assertEquals(49, ir.maxDoc());
assertEquals(49, ir.numDocs());
@@ -349,7 +349,7 @@ public class TestIndexWriterMerging exte
document.add(newField("tvtest", "a b c", customType));
for(int i=0;i<177;i++)
iw.addDocument(document);
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -375,7 +375,8 @@ public class TestIndexWriterMerging exte
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random())).
setOpenMode(OpenMode.CREATE).
setMaxBufferedDocs(2).
- setMergePolicy(newLogMergePolicy());
+ setMergePolicy(newLogMergePolicy()).
+ setCommitOnClose(false);
if (pass == 2) {
conf.setMergeScheduler(new SerialMergeScheduler());
}
@@ -449,9 +450,10 @@ public class TestIndexWriterMerging exte
// Reopen
writer = new IndexWriter(directory, newIndexWriterConfig(new MockAnalyzer(random()))
.setOpenMode(OpenMode.APPEND)
- .setMergePolicy(newLogMergePolicy()));
+ .setMergePolicy(newLogMergePolicy())
+ .setCommitOnClose(false));
}
- writer.shutdown();
+ writer.close();
}
directory.close();