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 [2/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/java/org/apache/lucene/index/IndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java Sat Aug 9 18:54:35 2014
@@ -28,7 +28,6 @@ import org.apache.lucene.util.InfoStream
import org.apache.lucene.util.PrintStreamInfoStream;
import org.apache.lucene.util.SetOnce;
import org.apache.lucene.util.SetOnce.AlreadySetException;
-import org.apache.lucene.util.Version;
/**
* Holds all the configuration that is used to create an {@link IndexWriter}.
@@ -115,6 +114,9 @@ public final class IndexWriterConfig ext
* merging segments (set to <code>false</code>). You can set this
* to <code>true</code> for additional safety. */
public final static boolean DEFAULT_CHECK_INTEGRITY_AT_MERGE = false;
+
+ /** Default value for whether calls to {@link IndexWriter#close()} include a commit. */
+ public final static boolean DEFAULT_COMMIT_ON_CLOSE = true;
/**
* Sets the default (for any instance) maximum time to wait for a write lock
@@ -150,8 +152,7 @@ public final class IndexWriterConfig ext
}
/**
- * Creates a new config that with defaults that match the specified
- * {@link Version} as well as the default {@link
+ * Creates a new config that with the default {@link
* Analyzer}. By default, {@link TieredMergePolicy} is used
* for merging;
* Note that {@link TieredMergePolicy} is free to select
@@ -160,8 +161,8 @@ public final class IndexWriterConfig ext
* should switch to {@link LogByteSizeMergePolicy} or
* {@link LogDocMergePolicy}.
*/
- public IndexWriterConfig(Version matchVersion, Analyzer analyzer) {
- super(analyzer, matchVersion);
+ public IndexWriterConfig(Analyzer analyzer) {
+ super(analyzer);
}
/** Specifies {@link OpenMode} of the index.
@@ -520,6 +521,15 @@ public final class IndexWriterConfig ext
return (IndexWriterConfig) super.setUseCompoundFile(useCompoundFile);
}
+ /**
+ * Sets if calls {@link IndexWriter#close()} should first commit
+ * before closing. Use <code>true</code> to match behavior of Lucene 4.x.
+ */
+ public IndexWriterConfig setCommitOnClose(boolean commitOnClose) {
+ this.commitOnClose = commitOnClose;
+ return this;
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder(super.toString());
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java Sat Aug 9 18:54:35 2014
@@ -25,7 +25,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.InfoStream;
-import org.apache.lucene.util.Version;
/**
* Holds all the configuration used by {@link IndexWriter} with few setters for
@@ -92,19 +91,18 @@ public class LiveIndexWriterConfig {
* segment, after which the segment is forced to flush. */
protected volatile int perThreadHardLimitMB;
- /** {@link Version} that {@link IndexWriter} should emulate. */
- protected final Version matchVersion;
-
/** True if segment flushes should use compound file format */
protected volatile boolean useCompoundFile = IndexWriterConfig.DEFAULT_USE_COMPOUND_FILE_SYSTEM;
/** True if merging should check integrity of segments before merge */
protected volatile boolean checkIntegrityAtMerge = IndexWriterConfig.DEFAULT_CHECK_INTEGRITY_AT_MERGE;
+ /** True if calls to {@link IndexWriter#close()} should first do a commit. */
+ protected boolean commitOnClose = IndexWriterConfig.DEFAULT_COMMIT_ON_CLOSE;
+
// used by IndexWriterConfig
- LiveIndexWriterConfig(Analyzer analyzer, Version matchVersion) {
+ LiveIndexWriterConfig(Analyzer analyzer) {
this.analyzer = analyzer;
- this.matchVersion = matchVersion;
ramBufferSizeMB = IndexWriterConfig.DEFAULT_RAM_BUFFER_SIZE_MB;
maxBufferedDocs = IndexWriterConfig.DEFAULT_MAX_BUFFERED_DOCS;
maxBufferedDeleteTerms = IndexWriterConfig.DEFAULT_MAX_BUFFERED_DELETE_TERMS;
@@ -465,11 +463,17 @@ public class LiveIndexWriterConfig {
public boolean getCheckIntegrityAtMerge() {
return checkIntegrityAtMerge;
}
-
+
+ /**
+ * Returns <code>true</code> if {@link IndexWriter#close()} should first commit before closing.
+ */
+ public boolean getCommitOnClose() {
+ return commitOnClose;
+ }
+
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- sb.append("matchVersion=").append(matchVersion).append("\n");
sb.append("analyzer=").append(analyzer == null ? "null" : analyzer.getClass().getName()).append("\n");
sb.append("ramBufferSizeMB=").append(getRAMBufferSizeMB()).append("\n");
sb.append("maxBufferedDocs=").append(getMaxBufferedDocs()).append("\n");
@@ -491,12 +495,7 @@ public class LiveIndexWriterConfig {
sb.append("perThreadHardLimitMB=").append(getRAMPerThreadHardLimitMB()).append("\n");
sb.append("useCompoundFile=").append(getUseCompoundFile()).append("\n");
sb.append("checkIntegrityAtMerge=").append(getCheckIntegrityAtMerge()).append("\n");
+ sb.append("commitOnClose=").append(getCommitOnClose()).append("\n");
return sb.toString();
}
-
- /** Returns the {@code matchVersion} that was provided to
- * the constructor. */
- public Version getMatchVersion() {
- return matchVersion;
- }
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Sat Aug 9 18:54:35 2014
@@ -112,7 +112,7 @@ public class IndexSearcher {
/** Runs searches for each segment separately, using the
* provided ExecutorService. IndexSearcher will not
- * shutdown/awaitTermination this ExecutorService on
+ * close/awaitTermination this ExecutorService on
* close; you must do so, eventually, on your own. NOTE:
* if you are using {@link NIOFSDirectory}, do not use
* the shutdownNow method of ExecutorService as this uses
@@ -130,7 +130,7 @@ public class IndexSearcher {
* <p>
* Given a non-<code>null</code> {@link ExecutorService} this method runs
* searches for each segment separately, using the provided ExecutorService.
- * IndexSearcher will not shutdown/awaitTermination this ExecutorService on
+ * IndexSearcher will not close/awaitTermination this ExecutorService on
* close; you must do so, eventually, on your own. NOTE: if you are using
* {@link NIOFSDirectory}, do not use the shutdownNow method of
* ExecutorService as this uses Thread.interrupt under-the-hood which can
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestDemo.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestDemo.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestDemo.java Sat Aug 9 18:54:35 2014
@@ -53,7 +53,7 @@ public class TestDemo extends LuceneTest
String text = "This is the text to be indexed. " + longTerm;
doc.add(newTextField("fieldname", text, Field.Store.YES));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java Sat Aug 9 18:54:35 2014
@@ -130,7 +130,7 @@ public class TestExternalCodecs extends
}
r.close();
- w.shutdown();
+ w.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java Sat Aug 9 18:54:35 2014
@@ -103,7 +103,7 @@ public class TestMergeSchedulerExternal
writer.addDocument(doc);
((MyMergeScheduler) writer.getConfig().getMergeScheduler()).sync();
- writer.shutdown();
+ writer.close();
assertTrue(mergeThreadCreated);
assertTrue(mergeCalled);
@@ -134,7 +134,7 @@ public class TestMergeSchedulerExternal
// compiles. But ensure that it can be used as well, e.g., no other hidden
// dependencies or something. Therefore, don't use any random API !
Directory dir = new RAMDirectory();
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, null);
+ IndexWriterConfig conf = new IndexWriterConfig(null);
conf.setMergeScheduler(new ReportingMergeScheduler());
IndexWriter writer = new IndexWriter(dir, conf);
writer.addDocument(new Document());
@@ -142,7 +142,7 @@ public class TestMergeSchedulerExternal
writer.addDocument(new Document());
writer.commit(); // trigger flush
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestSearch.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestSearch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestSearch.java Sat Aug 9 18:54:35 2014
@@ -50,7 +50,7 @@ public class TestSearch extends LuceneTe
d.add(newTextField("foo", "bar", Field.Store.YES));
writer.addDocument(d);
} finally {
- writer.shutdown();
+ writer.close();
}
IndexReader reader = DirectoryReader.open(directory);
@@ -130,7 +130,7 @@ public class TestSearch extends LuceneTe
d.add(new IntField("id", j, Field.Store.NO));
writer.addDocument(d);
}
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(directory);
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java Sat Aug 9 18:54:35 2014
@@ -85,7 +85,7 @@ public class TestSearchForDuplicates ext
d.add(new NumericDocValuesField(ID_FIELD, j));
writer.addDocument(d);
}
- writer.shutdown();
+ writer.close();
// try a search without OR
IndexReader reader = DirectoryReader.open(directory);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java Sat Aug 9 18:54:35 2014
@@ -97,7 +97,7 @@ public class TestCachingTokenFilter exte
assertEquals(1, termPositions.freq());
assertEquals(2, termPositions.nextPosition());
reader.close();
- writer.shutdown();
+ writer.close();
// 3) reset stream and consume tokens again
stream.reset();
checkTokens(stream);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java Sat Aug 9 18:54:35 2014
@@ -448,7 +448,7 @@ public class TestGraphTokenizers extends
final String s = a.toDot();
Writer w = new OutputStreamWriter(new FileOutputStream("/x/tmp/out.dot"));
w.write(s);
- w.shutdown();
+ w.close();
System.out.println("TEST: saved to /x/tmp/out.dot");
}
*/
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java Sat Aug 9 18:54:35 2014
@@ -329,7 +329,7 @@ public class TestMockAnalyzer extends Ba
assertEquals(1 + endOffset + offsetGap, dpe.endOffset());
assertEquals(null, te.next());
reader.close();
- writer.shutdown();
+ writer.close();
writer.w.getDirectory().close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java Sat Aug 9 18:54:35 2014
@@ -89,7 +89,7 @@ public class TestCompressingStoredFields
}
// Only one .fdt and one .fdx files must have been found
assertEquals(2, counter);
- iw.shutdown();
+ iw.close();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java Sat Aug 9 18:54:35 2014
@@ -69,7 +69,7 @@ public class TestCompressingTermVectorsF
// expected exception
}
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsReader.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestLucene40PostingsReader.java Sat Aug 9 18:54:35 2014
@@ -98,7 +98,7 @@ public class TestLucene40PostingsReader
// delete 1-100% of docs
iw.deleteDocuments(new Term("title", terms[random().nextInt(terms.length)]));
}
- iw.shutdown();
+ iw.close();
dir.close(); // checkindex
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java Sat Aug 9 18:54:35 2014
@@ -116,7 +116,7 @@ public class TestReuseDocsEnum extends L
}
assertEquals(1, enums.size());
}
- writer.shutdown();
+ writer.close();
IOUtils.close(open, dir);
}
@@ -161,7 +161,7 @@ public class TestReuseDocsEnum extends L
}
assertEquals(terms.size(), enums.size());
}
- writer.shutdown();
+ writer.close();
IOUtils.close(firstReader, secondReader, dir);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat2.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat2.java Sat Aug 9 18:54:35 2014
@@ -52,14 +52,14 @@ public class TestBlockPostingsFormat2 ex
@Override
public void tearDown() throws Exception {
- iw.shutdown();
+ iw.close();
TestUtil.checkIndex(dir); // for some extra coverage, checkIndex before we forceMerge
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat()));
iwc.setOpenMode(OpenMode.APPEND);
IndexWriter iw = new IndexWriter(dir, iwc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
dir.close(); // just force a checkindex for now
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestBlockPostingsFormat3.java Sat Aug 9 18:54:35 2014
@@ -53,7 +53,6 @@ import org.apache.lucene.util.English;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.automaton.AutomatonTestUtil;
import org.apache.lucene.util.automaton.CompiledAutomaton;
import org.apache.lucene.util.automaton.RegExp;
@@ -134,7 +133,7 @@ public class TestBlockPostingsFormat3 ex
field8.setStringValue(stringValue);
iw.addDocument(doc);
}
- iw.shutdown();
+ iw.close();
verify(dir);
TestUtil.checkIndex(dir); // for some extra coverage, checkIndex before we forceMerge
iwc = newIndexWriterConfig(analyzer);
@@ -142,7 +141,7 @@ public class TestBlockPostingsFormat3 ex
iwc.setOpenMode(OpenMode.APPEND);
IndexWriter iw2 = new IndexWriter(dir, iwc);
iw2.forceMerge(1);
- iw2.shutdown();
+ iw2.close();
verify(dir);
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41PostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41PostingsFormat.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41PostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene41/TestLucene41PostingsFormat.java Sat Aug 9 18:54:35 2014
@@ -45,7 +45,7 @@ public class TestLucene41PostingsFormat
/** Make sure the final sub-block(s) are not skipped. */
public void testFinalBlock() throws Exception {
Directory d = newDirectory();
- IndexWriter w = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter w = new IndexWriter(d, new IndexWriterConfig(new MockAnalyzer(random())));
for(int i=0;i<25;i++) {
Document doc = new Document();
doc.add(newStringField("field", Character.toString((char) (97+i)), Field.Store.NO));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java Sat Aug 9 18:54:35 2014
@@ -47,7 +47,6 @@ import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
/**
* Basic tests of PerFieldDocValuesFormat
@@ -100,7 +99,7 @@ public class TestPerFieldDocValuesFormat
doc.add(new NumericDocValuesField("dv1", 5));
doc.add(new BinaryDocValuesField("dv2", new BytesRef("hello world")));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java Sat Aug 9 18:54:35 2014
@@ -110,7 +110,7 @@ public class TestPerFieldPostingsFormat2
TestUtil.checkIndex(dir);
writer.forceMerge(1);
assertEquals(30, writer.maxDoc());
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -138,7 +138,7 @@ public class TestPerFieldPostingsFormat2
}
addDocs3(writer, 10);
writer.commit();
- writer.shutdown();
+ writer.close();
assertQuery(new Term("content", "ccc"), dir, 10);
assertQuery(new Term("content", "aaa"), dir, 10);
@@ -179,7 +179,7 @@ public class TestPerFieldPostingsFormat2
}
writer.forceMerge(1);
assertEquals(40, writer.maxDoc());
- writer.shutdown();
+ writer.close();
assertQuery(new Term("content", "ccc"), dir, 10);
assertQuery(new Term("content", "bbb"), dir, 20);
assertQuery(new Term("content", "aaa"), dir, 10);
@@ -242,7 +242,7 @@ public class TestPerFieldPostingsFormat2
for (int i = 0; i < numRounds; i++) {
int num = TestUtil.nextInt(random(), 30, 60);
IndexWriterConfig config = newIndexWriterConfig(random(),
- TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ new MockAnalyzer(random()));
config.setOpenMode(OpenMode.CREATE_OR_APPEND);
IndexWriter writer = newWriter(dir, config);
for (int j = 0; j < docsPerRound; j++) {
@@ -262,7 +262,7 @@ public class TestPerFieldPostingsFormat2
}
writer.commit();
assertEquals((i + 1) * docsPerRound, writer.maxDoc());
- writer.shutdown();
+ writer.close();
}
dir.close();
}
@@ -319,7 +319,7 @@ public class TestPerFieldPostingsFormat2
dateField.setStringValue(Integer.toString(random().nextInt(100)));
iw.addDocument(doc);
}
- iw.shutdown();
+ iw.close();
dir.close(); // checkindex
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java Sat Aug 9 18:54:35 2014
@@ -3,7 +3,6 @@ package org.apache.lucene.document;
import java.nio.charset.StandardCharsets;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.store.Directory;
@@ -72,7 +71,7 @@ public class TestBinaryDocument extends
String stringFldStoredTest = docFromReader.get("stringStored");
assertTrue(stringFldStoredTest.equals(binaryValStored));
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
}
@@ -101,7 +100,7 @@ public class TestBinaryDocument extends
assertTrue(binaryFldCompressedTest.equals(binaryValCompressed));
assertTrue(CompressionTools.decompressString(docFromReader.getBinaryValue("stringCompressed")).equals(binaryValCompressed));
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestDocument.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestDocument.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestDocument.java Sat Aug 9 18:54:35 2014
@@ -221,7 +221,7 @@ public class TestDocument extends Lucene
assertEquals(1, hits.length);
doAssert(searcher.doc(hits[0].doc));
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
}
@@ -253,7 +253,7 @@ public class TestDocument extends Lucene
assertEquals(1, hits.length);
doAssert(searcher.doc(hits[0].doc));
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
}
@@ -344,7 +344,7 @@ public class TestDocument extends Lucene
else if (f.stringValue().equals("id3")) result |= 4;
else fail("unexpected id field");
}
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
assertEquals("did not see all IDs", 7, result);
@@ -381,7 +381,7 @@ public class TestDocument extends Lucene
assertNull(sdoc.get("somethingElse"));
assertArrayEquals(new String[] { "5", "4" }, sdoc.getValues("int"));
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java Sat Aug 9 18:54:35 2014
@@ -45,7 +45,7 @@ public class Test2BBinaryDocValues exten
}
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -71,7 +71,7 @@ public class Test2BBinaryDocValues exten
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
System.out.println("verifying...");
System.out.flush();
@@ -104,7 +104,7 @@ public class Test2BBinaryDocValues exten
}
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -130,7 +130,7 @@ public class Test2BBinaryDocValues exten
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
System.out.println("verifying...");
System.out.flush();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java Sat Aug 9 18:54:35 2014
@@ -42,7 +42,7 @@ public class Test2BNumericDocValues exte
}
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -63,7 +63,7 @@ public class Test2BNumericDocValues exte
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
System.out.println("verifying...");
System.out.flush();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java Sat Aug 9 18:54:35 2014
@@ -28,12 +28,9 @@ import org.apache.lucene.document.TextFi
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.TimeUnits;
-import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.LuceneTestCase.Monster;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
-import org.junit.Ignore;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
@@ -53,7 +50,7 @@ public class Test2BPositions extends Luc
}
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -80,7 +77,7 @@ public class Test2BPositions extends Luc
}
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java Sat Aug 9 18:54:35 2014
@@ -29,9 +29,7 @@ import org.apache.lucene.store.BaseDirec
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
-import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.TimeUnits;
-import org.apache.lucene.util.TestUtil;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
@@ -50,7 +48,7 @@ public class Test2BPostings extends Luce
((MockDirectoryWrapper)dir).setThrottling(MockDirectoryWrapper.Throttling.NEVER);
}
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -80,7 +78,7 @@ public class Test2BPostings extends Luce
}
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java Sat Aug 9 18:54:35 2014
@@ -30,7 +30,6 @@ import org.apache.lucene.index.FieldInfo
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.util.LuceneTestCase.Monster;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
@@ -54,7 +53,7 @@ public class Test2BPostingsBytes extends
}
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -85,7 +84,7 @@ public class Test2BPostingsBytes extends
w.addDocument(doc);
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
DirectoryReader oneThousand = DirectoryReader.open(dir);
IndexReader subReaders[] = new IndexReader[1000];
@@ -96,10 +95,10 @@ public class Test2BPostingsBytes extends
((MockDirectoryWrapper)dir2).setThrottling(MockDirectoryWrapper.Throttling.NEVER);
}
IndexWriter w2 = new IndexWriter(dir2,
- new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ new IndexWriterConfig(null));
w2.addIndexes(mr);
w2.forceMerge(1);
- w2.shutdown();
+ w2.close();
oneThousand.close();
DirectoryReader oneMillion = DirectoryReader.open(dir2);
@@ -111,10 +110,10 @@ public class Test2BPostingsBytes extends
((MockDirectoryWrapper)dir3).setThrottling(MockDirectoryWrapper.Throttling.NEVER);
}
IndexWriter w3 = new IndexWriter(dir3,
- new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ new IndexWriterConfig(null));
w3.addIndexes(mr);
w3.forceMerge(1);
- w3.shutdown();
+ w3.close();
oneMillion.close();
dir.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java Sat Aug 9 18:54:35 2014
@@ -17,8 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.util.Random;
-
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.SortedDocValuesField;
@@ -45,7 +43,7 @@ public class Test2BSortedDocValues exten
}
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -69,7 +67,7 @@ public class Test2BSortedDocValues exten
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
System.out.println("verifying...");
System.out.flush();
@@ -100,7 +98,7 @@ public class Test2BSortedDocValues exten
}
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -126,7 +124,7 @@ public class Test2BSortedDocValues exten
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
System.out.println("verifying...");
System.out.flush();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java Sat Aug 9 18:54:35 2014
@@ -181,7 +181,7 @@ public class Test2BTerms extends LuceneT
if (true) {
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -218,7 +218,7 @@ public class Test2BTerms extends LuceneT
System.out.println("TEST: full merge");
w.forceMerge(1);
System.out.println("TEST: close writer");
- w.shutdown();
+ w.close();
}
System.out.println("TEST: open reader");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java Sat Aug 9 18:54:35 2014
@@ -25,9 +25,7 @@ import org.apache.lucene.store.MMapDirec
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.TimeUnits;
-import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
@@ -46,7 +44,7 @@ public class Test4GBStoredFields extends
dir.setThrottling(MockDirectoryWrapper.Throttling.NEVER);
IndexWriter w = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setRAMBufferSizeMB(256.0)
.setMergeScheduler(new ConcurrentMergeScheduler())
@@ -81,7 +79,7 @@ public class Test4GBStoredFields extends
}
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
if (VERBOSE) {
boolean found = false;
for (String file : dir.listAll()) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java Sat Aug 9 18:54:35 2014
@@ -64,7 +64,7 @@ public class TestAddIndexes extends Luce
// add 100 documents
addDocs(writer, 100);
assertEquals(100, writer.maxDoc());
- writer.shutdown();
+ writer.close();
TestUtil.checkIndex(dir);
writer = newWriter(
@@ -76,20 +76,20 @@ public class TestAddIndexes extends Luce
// add 40 documents in separate files
addDocs(writer, 40);
assertEquals(40, writer.maxDoc());
- writer.shutdown();
+ writer.close();
writer = newWriter(aux2, newIndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
// add 50 documents in compound files
addDocs2(writer, 50);
assertEquals(50, writer.maxDoc());
- writer.shutdown();
+ writer.close();
// test doc count before segments are merged
writer = newWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
assertEquals(100, writer.maxDoc());
writer.addIndexes(aux, aux2);
assertEquals(190, writer.maxDoc());
- writer.shutdown();
+ writer.close();
TestUtil.checkIndex(dir);
// make sure the old index is correct
@@ -104,14 +104,14 @@ public class TestAddIndexes extends Luce
// add 40 documents
addDocs(writer, 40);
assertEquals(40, writer.maxDoc());
- writer.shutdown();
+ writer.close();
// test doc count before segments are merged
writer = newWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
assertEquals(190, writer.maxDoc());
writer.addIndexes(aux3);
assertEquals(230, writer.maxDoc());
- writer.shutdown();
+ writer.close();
// make sure the new index is correct
verifyNumDocs(dir, 230);
@@ -123,7 +123,7 @@ public class TestAddIndexes extends Luce
// now fully merge it.
writer = newWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
// make sure the new index is correct
verifyNumDocs(dir, 230);
@@ -136,13 +136,13 @@ public class TestAddIndexes extends Luce
Directory aux4 = newDirectory();
writer = newWriter(aux4, newIndexWriterConfig(new MockAnalyzer(random())));
addDocs2(writer, 1);
- writer.shutdown();
+ writer.close();
writer = newWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
assertEquals(230, writer.maxDoc());
writer.addIndexes(aux4);
assertEquals(231, writer.maxDoc());
- writer.shutdown();
+ writer.close();
verifyNumDocs(dir, 231);
@@ -185,7 +185,7 @@ public class TestAddIndexes extends Luce
verifyTermDocs(dir, new Term("content", "aaa"), 1030);
verifyTermDocs(dir, new Term("content", "bbb"), 9);
- writer.shutdown();
+ writer.close();
dir.close();
aux.close();
}
@@ -223,7 +223,7 @@ public class TestAddIndexes extends Luce
verifyTermDocs(dir, new Term("content", "aaa"), 1030);
verifyTermDocs(dir, new Term("content", "bbb"), 9);
- writer.shutdown();
+ writer.close();
dir.close();
aux.close();
}
@@ -261,7 +261,7 @@ public class TestAddIndexes extends Luce
verifyTermDocs(dir, new Term("content", "aaa"), 1030);
verifyTermDocs(dir, new Term("content", "bbb"), 9);
- writer.shutdown();
+ writer.close();
dir.close();
aux.close();
}
@@ -279,7 +279,7 @@ public class TestAddIndexes extends Luce
// add 100 documents
addDocs(writer, 100);
assertEquals(100, writer.maxDoc());
- writer.shutdown();
+ writer.close();
writer = newWriter(
aux,
@@ -290,7 +290,7 @@ public class TestAddIndexes extends Luce
);
// add 140 documents in separate files
addDocs(writer, 40);
- writer.shutdown();
+ writer.close();
writer = newWriter(
aux,
newIndexWriterConfig(new MockAnalyzer(random())).
@@ -299,7 +299,7 @@ public class TestAddIndexes extends Luce
setMergePolicy(newLogMergePolicy(false))
);
addDocs(writer, 100);
- writer.shutdown();
+ writer.close();
writer = newWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
try {
@@ -310,7 +310,7 @@ public class TestAddIndexes extends Luce
catch (IllegalArgumentException e) {
assertEquals(100, writer.maxDoc());
}
- writer.shutdown();
+ writer.close();
// make sure the index is correct
verifyNumDocs(dir, 100);
@@ -341,7 +341,7 @@ public class TestAddIndexes extends Luce
writer.addIndexes(aux);
assertEquals(1040, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
- writer.shutdown();
+ writer.close();
// make sure the index is correct
verifyNumDocs(dir, 1040);
@@ -370,7 +370,7 @@ public class TestAddIndexes extends Luce
writer.addIndexes(aux);
assertEquals(1032, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
- writer.shutdown();
+ writer.close();
// make sure the index is correct
verifyNumDocs(dir, 1032);
@@ -398,7 +398,7 @@ public class TestAddIndexes extends Luce
writer.addIndexes(aux, new MockDirectoryWrapper(random(), new RAMDirectory(aux, newIOContext(random()))));
assertEquals(1060, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
- writer.shutdown();
+ writer.close();
// make sure the index is correct
verifyNumDocs(dir, 1060);
@@ -415,13 +415,13 @@ public class TestAddIndexes extends Luce
setUpDirs(dir, aux, true);
- IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(NoMergePolicy.INSTANCE);
IndexWriter writer = new IndexWriter(aux, dontMergeConfig);
for (int i = 0; i < 20; i++) {
writer.deleteDocuments(new Term("id", "" + i));
}
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(aux);
assertEquals(10, reader.numDocs());
reader.close();
@@ -440,7 +440,7 @@ public class TestAddIndexes extends Luce
writer.addIndexes(aux, new MockDirectoryWrapper(random(), new RAMDirectory(aux, newIOContext(random()))));
assertEquals(1020, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
- writer.shutdown();
+ writer.close();
dir.close();
aux.close();
}
@@ -465,26 +465,26 @@ public class TestAddIndexes extends Luce
writer.addIndexes(aux);
assertEquals(30, writer.maxDoc());
assertEquals(3, writer.getSegmentCount());
- writer.shutdown();
+ writer.close();
- IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(NoMergePolicy.INSTANCE);
writer = new IndexWriter(aux, dontMergeConfig);
for (int i = 0; i < 27; i++) {
writer.deleteDocuments(new Term("id", "" + i));
}
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(aux);
assertEquals(3, reader.numDocs());
reader.close();
- dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ dontMergeConfig = new IndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(NoMergePolicy.INSTANCE);
writer = new IndexWriter(aux2, dontMergeConfig);
for (int i = 0; i < 8; i++) {
writer.deleteDocuments(new Term("id", "" + i));
}
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(aux2);
assertEquals(22, reader.numDocs());
reader.close();
@@ -500,7 +500,7 @@ public class TestAddIndexes extends Luce
writer.addIndexes(aux, aux2);
assertEquals(1040, writer.maxDoc());
assertEquals(1000, writer.getDocCount(0));
- writer.shutdown();
+ writer.close();
dir.close();
aux.close();
aux2.close();
@@ -563,7 +563,7 @@ public class TestAddIndexes extends Luce
}
assertEquals(1000, writer.maxDoc());
assertEquals(1, writer.getSegmentCount());
- writer.shutdown();
+ writer.close();
writer = newWriter(
aux,
@@ -579,7 +579,7 @@ public class TestAddIndexes extends Luce
} else {
addDocs(writer, 10);
}
- writer.shutdown();
+ writer.close();
writer = newWriter(
aux,
newIndexWriterConfig(new MockAnalyzer(random())).
@@ -590,7 +590,7 @@ public class TestAddIndexes extends Luce
}
assertEquals(30, writer.maxDoc());
assertEquals(3, writer.getSegmentCount());
- writer.shutdown();
+ writer.close();
}
// LUCENE-1270
@@ -622,7 +622,7 @@ public class TestAddIndexes extends Luce
doc2.add(newField("content", "aaa bbb ccc ddd eee fff ggg hhh iii", customType2));
for(int i=0;i<10;i++)
writer.addDocument(doc2);
- writer.shutdown();
+ writer.close();
Directory dir2 = newDirectory();
lmp = new LogByteSizeMergePolicy();
@@ -632,7 +632,7 @@ public class TestAddIndexes extends Luce
writer = new IndexWriter(dir2, newIndexWriterConfig(new MockAnalyzer(random()))
.setMergeScheduler(new SerialMergeScheduler()).setMergePolicy(lmp));
writer.addIndexes(dir);
- writer.shutdown();
+ writer.close();
dir.close();
dir2.close();
}
@@ -661,15 +661,14 @@ public class TestAddIndexes extends Luce
public RunAddIndexesThreads(int numCopy) throws Throwable {
NUM_COPY = numCopy;
dir = new MockDirectoryWrapper(random(), new RAMDirectory());
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(2));
for (int i = 0; i < NUM_INIT_DOCS; i++)
addDoc(writer);
- writer.shutdown();
+ writer.close();
dir2 = newDirectory();
- writer2 = new IndexWriter(dir2, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ writer2 = new IndexWriter(dir2, new IndexWriterConfig(new MockAnalyzer(random())));
writer2.commit();
@@ -719,7 +718,7 @@ public class TestAddIndexes extends Luce
if (doWait == false) {
writer2.abortMerges();
}
- //writer2.shutdown();
+ //writer2.close();
writer2.rollback();
}
@@ -976,10 +975,10 @@ public class TestAddIndexes extends Luce
Document doc = new Document();
doc.add(new StringField("id", "myid", Field.Store.NO));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
}
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dirs[0], conf);
// Now delete the document
@@ -992,7 +991,7 @@ public class TestAddIndexes extends Luce
}
writer.commit();
assertEquals("Documents from the incoming index should not have been deleted", 1, writer.numDocs());
- writer.shutdown();
+ writer.close();
for (Directory dir : dirs) {
dir.close();
@@ -1025,7 +1024,7 @@ public class TestAddIndexes extends Luce
addDocsWithID(writer, 100, 0);
assertEquals(100, writer.maxDoc());
writer.commit();
- writer.shutdown();
+ writer.close();
TestUtil.checkIndex(dir);
writer = newWriter(
@@ -1040,7 +1039,7 @@ public class TestAddIndexes extends Luce
addDocs(writer, 40);
assertEquals(40, writer.maxDoc());
writer.commit();
- writer.shutdown();
+ writer.close();
writer = newWriter(
aux2,
@@ -1052,7 +1051,7 @@ public class TestAddIndexes extends Luce
addDocs2(writer, 50);
assertEquals(50, writer.maxDoc());
writer.commit();
- writer.shutdown();
+ writer.close();
// test doc count before segments are merged
writer = newWriter(
@@ -1064,7 +1063,7 @@ public class TestAddIndexes extends Luce
assertEquals(100, writer.maxDoc());
writer.addIndexes(aux, aux2);
assertEquals(190, writer.maxDoc());
- writer.shutdown();
+ writer.close();
dir.close();
aux.close();
@@ -1094,26 +1093,26 @@ public class TestAddIndexes extends Luce
Directory[] dirs = new Directory[2];
for (int i = 0; i < dirs.length; i++) {
dirs[i] = new RAMDirectory();
- IndexWriter w = new IndexWriter(dirs[i], new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter w = new IndexWriter(dirs[i], new IndexWriterConfig(new MockAnalyzer(random())));
Document d = new Document();
FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setStoreTermVectors(true);
d.add(new Field("c", "v", customType));
w.addDocument(d);
- w.shutdown();
+ w.close();
}
IndexReader[] readers = new IndexReader[] { DirectoryReader.open(dirs[0]), DirectoryReader.open(dirs[1]) };
Directory dir = new MockDirectoryWrapper(random(), new RAMDirectory());
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy(true));
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy(true));
MergePolicy lmp = conf.getMergePolicy();
// Force creation of CFS:
lmp.setNoCFSRatio(1.0);
lmp.setMaxCFSSegmentSizeMB(Double.POSITIVE_INFINITY);
IndexWriter w3 = new IndexWriter(dir, conf);
w3.addIndexes(readers);
- w3.shutdown();
+ w3.close();
// we should now see segments_X,
// segments.gen,_Y.cfs,_Y.cfe, _Z.si
assertEquals("Only one compound segment should exist, but got: " + Arrays.toString(dir.listAll()), 5, dir.listAll().length);
@@ -1143,7 +1142,7 @@ public class TestAddIndexes extends Luce
customType.setIndexed(true);
doc.add(newField("foo", "bar", customType));
w.addDocument(doc);
- w.shutdown();
+ w.close();
}
{
@@ -1157,7 +1156,7 @@ public class TestAddIndexes extends Luce
} catch (IllegalArgumentException ex) {
// expected
}
- w.shutdown();
+ w.close();
IndexReader open = DirectoryReader.open(dir);
assertEquals(0, open.numDocs());
open.close();
@@ -1182,7 +1181,7 @@ public class TestAddIndexes extends Luce
doc.add(newStringField("id", "1", Field.Store.YES));
w.addDocument(doc);
IndexReader r1 = w.getReader();
- w.shutdown();
+ w.close();
Directory d2 = newDirectory();
w = new RandomIndexWriter(random(), d2);
@@ -1191,7 +1190,7 @@ public class TestAddIndexes extends Luce
doc.add(newStringField("id", "2", Field.Store.YES));
w.addDocument(doc);
IndexReader r2 = w.getReader();
- w.shutdown();
+ w.close();
Directory d3 = newDirectory();
w = new RandomIndexWriter(random(), d3);
@@ -1202,7 +1201,7 @@ public class TestAddIndexes extends Luce
d2.close();
IndexReader r3 = w.getReader();
- w.shutdown();
+ w.close();
assertEquals(2, r3.numDocs());
for(int docID=0;docID<2;docID++) {
StoredDocument d = r3.document(docID);
@@ -1221,7 +1220,7 @@ public class TestAddIndexes extends Luce
RandomIndexWriter w = new RandomIndexWriter(random(), d1);
MultiReader empty = new MultiReader();
w.addIndexes(empty);
- w.shutdown();
+ w.close();
DirectoryReader dr = DirectoryReader.open(d1);
for (AtomicReaderContext ctx : dr.leaves()) {
assertTrue("empty segments should be dropped by addIndexes", ctx.reader().maxDoc() > 0);
@@ -1239,11 +1238,11 @@ public class TestAddIndexes extends Luce
RandomIndexWriter w = new RandomIndexWriter(random(), src);
w.addDocument(new Document());
IndexReader allDeletedReader = new AllDeletedFilterReader(w.getReader().leaves().get(0).reader());
- w.shutdown();
+ w.close();
w = new RandomIndexWriter(random(), dest);
w.addIndexes(allDeletedReader);
- w.shutdown();
+ w.close();
DirectoryReader dr = DirectoryReader.open(src);
for (AtomicReaderContext ctx : dr.leaves()) {
assertTrue("empty segments should be dropped by addIndexes", ctx.reader().maxDoc() > 0);
@@ -1275,8 +1274,8 @@ public class TestAddIndexes extends Luce
// expected
}
- w1.shutdown();
- w2.shutdown();
+ w1.close();
+ w2.close();
IOUtils.close(src, dest);
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java Sat Aug 9 18:54:35 2014
@@ -60,7 +60,7 @@ public class TestAllFilesHaveChecksumFoo
riw.deleteDocuments(new Term("id", Integer.toString(i)));
}
}
- riw.shutdown();
+ riw.close();
checkHeaders(dir);
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java Sat Aug 9 18:54:35 2014
@@ -61,7 +61,7 @@ public class TestAllFilesHaveCodecHeader
// riw.deleteDocuments(new Term("id", Integer.toString(i)));
// }
}
- riw.shutdown();
+ riw.close();
checkHeaders(dir);
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java Sat Aug 9 18:54:35 2014
@@ -108,8 +108,7 @@ public class TestAtomicUpdate extends Lu
TimedThread[] threads = new TimedThread[4];
- IndexWriterConfig conf = new IndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(7);
((TieredMergePolicy) conf.getMergePolicy()).setMaxMergeAtOnce(3);
IndexWriter writer = RandomIndexWriter.mockIndexWriter(directory, conf, random());
@@ -151,7 +150,7 @@ public class TestAtomicUpdate extends Lu
searcherThread1.join();
searcherThread2.join();
- writer.shutdown();
+ writer.close();
assertTrue("hit unexpected exception in indexer", !indexerThread.failed);
assertTrue("hit unexpected exception in indexer2", !indexerThread2.failed);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Sat Aug 9 18:54:35 2014
@@ -146,7 +146,7 @@ public class TestBackwardsCompatibility
analyzer.setMaxTokenLength(TestUtil.nextInt(random(), 1, IndexWriter.MAX_TERM_LENGTH));
// TODO: remove randomness
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer)
+ IndexWriterConfig conf = new IndexWriterConfig(analyzer)
.setMergePolicy(mp);
conf.setCodec(Codec.forName("Lucene40"));
IndexWriter writer = new IndexWriter(dir, conf);
@@ -154,7 +154,7 @@ public class TestBackwardsCompatibility
for(int i=0;i<50;i++) {
writer.addDocument(docs.nextDoc());
}
- writer.shutdown();
+ writer.close();
dir.close();
// Gives you time to copy the index out!: (there is also
@@ -182,7 +182,7 @@ public class TestBackwardsCompatibility
TestUtil.rm(indexDir);
Directory dir = newFSDirectory(indexDir);
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()))
.setUseCompoundFile(false).setMergePolicy(NoMergePolicy.INSTANCE);
IndexWriter writer = new IndexWriter(dir, conf);
// create an index w/ few doc-values fields, some with updates and some without
@@ -217,7 +217,7 @@ public class TestBackwardsCompatibility
updateNumeric(writer, "22", "ndv1", "ndv1_c", 200L); // update the field again
writer.commit();
- writer.shutdown();
+ writer.close();
dir.close();
}*/
@@ -273,9 +273,8 @@ public class TestBackwardsCompatibility
final boolean streamType = random().nextBoolean();
final int choice = TestUtil.nextInt(random(), 0, 2);
switch (choice) {
- case 0: return new IndexUpgrader(dir, TEST_VERSION_CURRENT);
- case 1: return new IndexUpgrader(dir, TEST_VERSION_CURRENT,
- streamType ? null : InfoStream.NO_OUTPUT, false);
+ case 0: return new IndexUpgrader(dir);
+ case 1: return new IndexUpgrader(dir, streamType ? null : InfoStream.NO_OUTPUT, false);
case 2: return new IndexUpgrader(dir, newIndexWriterConfig(null), false);
default: fail("case statement didn't get updated when random bounds changed");
}
@@ -330,7 +329,7 @@ public class TestBackwardsCompatibility
}
try {
- writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
+ writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setCommitOnClose(false));
fail("IndexWriter creation should not pass for "+unsupportedNames[i]);
} catch (IndexFormatTooOldException e) {
// pass
@@ -347,7 +346,11 @@ public class TestBackwardsCompatibility
// IndexFormatTooOldException, and we don't want to mask the fail()
// above, so close without waiting for merges.
if (writer != null) {
- writer.shutdown(false);
+ try {
+ writer.commit();
+ } finally {
+ writer.close();
+ }
}
writer = null;
}
@@ -370,10 +373,9 @@ public class TestBackwardsCompatibility
System.out.println("\nTEST: index=" + name);
}
Directory dir = newDirectory(oldIndexDirs.get(name));
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())));
w.forceMerge(1);
- w.shutdown();
+ w.close();
dir.close();
}
@@ -390,7 +392,7 @@ public class TestBackwardsCompatibility
if (VERBOSE) {
System.out.println("\nTEST: done adding indices; now close");
}
- w.shutdown();
+ w.close();
targetDir.close();
}
@@ -403,7 +405,7 @@ public class TestBackwardsCompatibility
Directory targetDir = newDirectory();
IndexWriter w = new IndexWriter(targetDir, newIndexWriterConfig(new MockAnalyzer(random())));
w.addIndexes(reader);
- w.shutdown();
+ w.close();
reader.close();
targetDir.close();
@@ -617,7 +619,7 @@ public class TestBackwardsCompatibility
expected = 45;
}
assertEquals("wrong doc count", expected, writer.numDocs());
- writer.shutdown();
+ writer.close();
// make sure searching sees right # hits
IndexReader reader = DirectoryReader.open(dir);
@@ -633,7 +635,7 @@ public class TestBackwardsCompatibility
.setOpenMode(OpenMode.APPEND)
.setMergePolicy(newLogMergePolicy()));
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
@@ -659,7 +661,7 @@ public class TestBackwardsCompatibility
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random))
.setOpenMode(OpenMode.APPEND));
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
@@ -678,7 +680,7 @@ public class TestBackwardsCompatibility
mp.setNoCFSRatio(doCFS ? 1.0 : 0.0);
mp.setMaxCFSSegmentSizeMB(Double.POSITIVE_INFINITY);
// TODO: remove randomness
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(10).setMergePolicy(mp);
IndexWriter writer = new IndexWriter(dir, conf);
@@ -689,23 +691,23 @@ public class TestBackwardsCompatibility
if (fullyMerged) {
writer.forceMerge(1);
}
- writer.shutdown();
+ writer.close();
if (!fullyMerged) {
// open fresh writer so we get no prx file in the added segment
mp = new LogByteSizeMergePolicy();
mp.setNoCFSRatio(doCFS ? 1.0 : 0.0);
// TODO: remove randomness
- conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ conf = new IndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(10).setMergePolicy(mp);
writer = new IndexWriter(dir, conf);
addNoProxDoc(writer);
- writer.shutdown();
+ writer.close();
writer = new IndexWriter(dir, conf.setMergePolicy(NoMergePolicy.INSTANCE));
Term searchTerm = new Term("id", "7");
writer.deleteDocuments(searchTerm);
- writer.shutdown();
+ writer.close();
}
dir.close();
@@ -842,7 +844,7 @@ public class TestBackwardsCompatibility
Directory currentDir = newDirectory();
RandomIndexWriter riw = new RandomIndexWriter(random(), currentDir);
riw.addDocument(new Document());
- riw.shutdown();
+ riw.close();
DirectoryReader ir = DirectoryReader.open(currentDir);
SegmentReader air = (SegmentReader)ir.leaves().get(0).reader();
String currentVersion = air.getSegmentInfo().info.getVersion();
@@ -1015,24 +1017,32 @@ public class TestBackwardsCompatibility
for (int i = 0; i < 3; i++) {
// only use Log- or TieredMergePolicy, to make document addition predictable and not suddenly merge:
MergePolicy mp = random().nextBoolean() ? newLogMergePolicy() : newTieredMergePolicy();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
- .setMergePolicy(mp);
+ IndexWriterConfig iwc = new IndexWriterConfig(new MockAnalyzer(random()))
+ .setMergePolicy(mp).setCommitOnClose(false);
IndexWriter w = new IndexWriter(ramDir, iwc);
// add few more docs:
for(int j = 0; j < RANDOM_MULTIPLIER * random().nextInt(30); j++) {
addDoc(w, id++);
}
- w.shutdown(false);
+ try {
+ w.commit();
+ } finally {
+ w.close();
+ }
}
// add dummy segments (which are all in current
// version) to single segment index
MergePolicy mp = random().nextBoolean() ? newLogMergePolicy() : newTieredMergePolicy();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, null)
- .setMergePolicy(mp);
+ IndexWriterConfig iwc = new IndexWriterConfig(null)
+ .setMergePolicy(mp).setCommitOnClose(false);
IndexWriter w = new IndexWriter(dir, iwc);
w.addIndexes(ramDir);
- w.shutdown(false);
+ try {
+ w.commit();
+ } finally {
+ w.close();
+ }
// determine count of segments in modified index
final int origSegCount = getNumberOfSegments(dir);
@@ -1096,7 +1106,7 @@ public class TestBackwardsCompatibility
verifyDocValues(dir);
// update fields and verify index
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dir, conf);
updateNumeric(writer, "1", "ndv1", "ndv1_c", 300L);
updateNumeric(writer, "1", "ndv2", "ndv2_c", 300L);
@@ -1110,7 +1120,7 @@ public class TestBackwardsCompatibility
writer.commit();
verifyDocValues(dir);
- writer.shutdown();
+ writer.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java Sat Aug 9 18:54:35 2014
@@ -48,7 +48,7 @@ public class TestBagOfPositions extends
final int maxTermsPerDoc = TestUtil.nextInt(random(), 10, 20);
boolean isSimpleText = "SimpleText".equals(TestUtil.getPostingsFormat("field"));
- IndexWriterConfig iwc = newIndexWriterConfig(random(), TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = newIndexWriterConfig(random(), new MockAnalyzer(random()));
if ((isSimpleText || iwc.getMergePolicy() instanceof MockRandomMergePolicy) && (TEST_NIGHTLY || RANDOM_MULTIPLIER > 1)) {
// Otherwise test can take way too long (> 2 hours)
@@ -148,7 +148,7 @@ public class TestBagOfPositions extends
// from a docsAndPositionsEnum.
}
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java Sat Aug 9 18:54:35 2014
@@ -33,7 +33,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
/**
* Simple test that adds numeric terms, where each term has the
@@ -48,7 +47,7 @@ public class TestBagOfPostings extends L
boolean isSimpleText = "SimpleText".equals(TestUtil.getPostingsFormat("field"));
- IndexWriterConfig iwc = newIndexWriterConfig(random(), TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig iwc = newIndexWriterConfig(random(), new MockAnalyzer(random()));
if ((isSimpleText || iwc.getMergePolicy() instanceof MockRandomMergePolicy) && (TEST_NIGHTLY || RANDOM_MULTIPLIER > 1)) {
// Otherwise test can take way too long (> 2 hours)
@@ -140,7 +139,7 @@ public class TestBagOfPostings extends L
// from a docsAndPositionsEnum.
}
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
}