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 [9/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/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Sat Aug 9 18:54:35 2014
@@ -101,7 +101,7 @@ public class TokenSourcesTest extends Lu
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
assertEquals(1, indexReader.numDocs());
@@ -146,7 +146,7 @@ public class TokenSourcesTest extends Lu
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -190,7 +190,7 @@ public class TokenSourcesTest extends Lu
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -234,7 +234,7 @@ public class TokenSourcesTest extends Lu
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -278,7 +278,7 @@ public class TokenSourcesTest extends Lu
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -332,7 +332,7 @@ public class TokenSourcesTest extends Lu
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
assertEquals(1, reader.numDocs());
for(int i=0;i<2;i++) {
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java Sat Aug 9 18:54:35 2014
@@ -81,7 +81,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -133,7 +133,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -185,7 +185,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -237,7 +237,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -298,7 +298,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -408,7 +408,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -461,7 +461,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -504,7 +504,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -545,7 +545,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -587,7 +587,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -628,7 +628,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -670,7 +670,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -712,7 +712,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -755,7 +755,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -797,7 +797,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java Sat Aug 9 18:54:35 2014
@@ -71,7 +71,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -139,7 +139,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
@@ -174,7 +174,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -209,7 +209,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -246,7 +246,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(40);
@@ -284,7 +284,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -321,7 +321,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -358,7 +358,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -396,7 +396,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -441,7 +441,7 @@ public class TestPostingsHighlighter ext
document.add(body);
iw.addDocument(document);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PhraseQuery query = new PhraseQuery();
query.add(new Term("body", "buddhist"));
@@ -471,7 +471,7 @@ public class TestPostingsHighlighter ext
document.add(body);
iw.addDocument(document);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PhraseQuery query = new PhraseQuery();
query.add(new Term("body", "curious"));
@@ -501,7 +501,7 @@ public class TestPostingsHighlighter ext
document.add(body);
iw.addDocument(document);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
BooleanQuery query = new BooleanQuery();
query.add(new TermQuery(new Term("body", "porter")), BooleanClause.Occur.SHOULD);
@@ -534,7 +534,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -560,7 +560,7 @@ public class TestPostingsHighlighter ext
document.add(body);
iw.addDocument(document);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
BooleanQuery query = new BooleanQuery();
query.add(new TermQuery(new Term("body", "terms")), BooleanClause.Occur.SHOULD);
@@ -593,7 +593,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(10000) {
@@ -631,7 +631,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -667,7 +667,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
@@ -715,7 +715,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -746,7 +746,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -782,7 +782,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(10000) {
@@ -818,7 +818,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -851,7 +851,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -887,7 +887,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -930,7 +930,7 @@ public class TestPostingsHighlighter ext
}
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -973,7 +973,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -1005,7 +1005,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -1048,7 +1048,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -1086,7 +1086,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java Sat Aug 9 18:54:35 2014
@@ -87,7 +87,7 @@ public class TestPostingsHighlighterRank
for (int i = 0; i < numDocs; i++) {
checkDocument(searcher, i, maxTopN);
}
- iw.shutdown();
+ iw.close();
ir.close();
dir.close();
}
@@ -262,7 +262,7 @@ public class TestPostingsHighlighterRank
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(10000) {
@@ -301,7 +301,7 @@ public class TestPostingsHighlighterRank
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(10000) {
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Sat Aug 9 18:54:35 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.search.vectorh
*/
import java.io.IOException;
-import java.io.Reader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -349,8 +348,7 @@ public abstract class AbstractTestCase e
// make 1 doc with multi valued field
protected void make1dmfIndex( Analyzer analyzer, String... values ) throws Exception {
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, analyzer).setOpenMode(OpenMode.CREATE));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(analyzer).setOpenMode(OpenMode.CREATE));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setStoreTermVectors(true);
@@ -360,15 +358,14 @@ public abstract class AbstractTestCase e
doc.add( new Field( F, value, customType) );
}
writer.addDocument( doc );
- writer.shutdown();
+ writer.close();
if (reader != null) reader.close();
reader = DirectoryReader.open(dir);
}
// make 1 doc with multi valued & not analyzed field
protected void make1dmfIndexNA( String... values ) throws Exception {
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, analyzerK).setOpenMode(OpenMode.CREATE));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(analyzerK).setOpenMode(OpenMode.CREATE));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setStoreTermVectors(true);
@@ -379,7 +376,7 @@ public abstract class AbstractTestCase e
//doc.add( new Field( F, value, Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
}
writer.addDocument( doc );
- writer.shutdown();
+ writer.close();
if (reader != null) reader.close();
reader = DirectoryReader.open(dir);
}
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java Sat Aug 9 18:54:35 2014
@@ -83,7 +83,7 @@ public class FastVectorHighlighterTest e
bestFragments = highlighter.getBestFragments(fieldQuery, reader, docId, "field", 30, 1);
assertEquals("a test where <b>foo</b> is highlighed", bestFragments[0]);
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -128,7 +128,7 @@ public class FastVectorHighlighterTest e
assertEquals("first browser war it lost virtually all of its share to <b>Internet Explorer</b> Netscape was discontinued and support for all Netscape browsers", bestFragments[0]);
}
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -256,7 +256,7 @@ public class FastVectorHighlighterTest e
bestFragments[0]);
}
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -301,7 +301,7 @@ public class FastVectorHighlighterTest e
assertEquals( "junk junk junk junk junk junk junk junk <b>highlight words together</b> junk junk junk junk junk junk junk junk", fragment );
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -344,7 +344,7 @@ public class FastVectorHighlighterTest e
assertEquals("Hello this is a piece of <b>text</b> that is <b>very</b> <b>long</b> and contains too much preamble and the meat is really here which says kennedy has been shot", bestFragments[0]);
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -503,7 +503,7 @@ public class FastVectorHighlighterTest e
}
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -566,7 +566,7 @@ public class FastVectorHighlighterTest e
assertEquals("<b>Test: http://www.facebook.com</b>", bestFragments[0]);
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -648,7 +648,7 @@ public class FastVectorHighlighterTest e
assertEquals( expected, bestFragments[ 0 ] );
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Sat Aug 9 18:54:35 2014
@@ -148,8 +148,7 @@ public class SimpleFragmentsBuilderTest
}
protected void makeUnstoredIndex() throws Exception {
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, analyzerW).setOpenMode(OpenMode.CREATE));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(analyzerW).setOpenMode(OpenMode.CREATE));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
@@ -158,7 +157,7 @@ public class SimpleFragmentsBuilderTest
doc.add( new Field( F, "aaa", customType) );
//doc.add( new Field( F, "aaa", Store.NO, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS ) );
writer.addDocument( doc );
- writer.shutdown();
+ writer.close();
if (reader != null) reader.close();
reader = DirectoryReader.open(dir);
}
@@ -268,7 +267,7 @@ public class SimpleFragmentsBuilderTest
documents.add(document);
}
writer.addDocuments(documents);
- writer.shutdown();
+ writer.close();
IndexReader reader = DirectoryReader.open(dir);
try {
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Sat Aug 9 18:54:35 2014
@@ -66,7 +66,7 @@ public class TestBlockJoin extends Lucen
public void testEmptyChildFilter() throws Exception {
final Directory dir = newDirectory();
- final IndexWriterConfig config = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ final IndexWriterConfig config = new IndexWriterConfig(new MockAnalyzer(random()));
config.setMergePolicy(NoMergePolicy.INSTANCE);
// we don't want to merge - since we rely on certain segment setup
final IndexWriter w = new IndexWriter(dir, config);
@@ -92,7 +92,7 @@ public class TestBlockJoin extends Lucen
}
IndexReader r = DirectoryReader.open(w, random().nextBoolean());
- w.shutdown();
+ w.close();
assertTrue(r.leaves().size() > 1);
IndexSearcher s = new IndexSearcher(r);
Filter parentsFilter = new FixedBitSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
@@ -143,7 +143,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
@@ -230,7 +230,7 @@ public class TestBlockJoin extends Lucen
}
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
MultiTermQuery qc = NumericRangeQuery.newIntRange("year", 2007, 2007, true, true);
@@ -295,7 +295,7 @@ public class TestBlockJoin extends Lucen
addSkillless(w);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
@@ -369,7 +369,7 @@ public class TestBlockJoin extends Lucen
final Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(new MatchAllDocsQuery(), new QueryWrapperFilter(new MatchAllDocsQuery()), ScoreMode.Avg);
@@ -424,7 +424,7 @@ public class TestBlockJoin extends Lucen
s.getIndexReader().close();
w.deleteDocuments(new Term("skill", "java"));
- w.shutdown();
+ w.close();
s = newSearcher(DirectoryReader.open(dir));
topDocs = s.search(q, 10);
@@ -614,9 +614,9 @@ public class TestBlockJoin extends Lucen
}
final IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
final IndexReader joinR = joinW.getReader();
- joinW.shutdown();
+ joinW.close();
if (VERBOSE) {
System.out.println("TEST: reader=" + r);
@@ -1060,7 +1060,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
@@ -1141,7 +1141,7 @@ public class TestBlockJoin extends Lucen
parentDoc.add(newStringField("parent", "1", Field.Store.NO));
w.addDocuments(Arrays.asList(childDoc, parentDoc));
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
Query tq = new TermQuery(new Term("child", "1"));
Filter parentFilter = new FixedBitSetCachingWrapperFilter(
@@ -1175,7 +1175,7 @@ public class TestBlockJoin extends Lucen
// Need single seg:
w.forceMerge(1);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
Query tq = new TermQuery(new Term("child", "2"));
Filter parentFilter = new FixedBitSetCachingWrapperFilter(
@@ -1208,7 +1208,7 @@ public class TestBlockJoin extends Lucen
addSkillless(w);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = new IndexSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
@@ -1312,7 +1312,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
Query childQuery = new TermQuery(new Term("childText", "text"));
Filter parentsFilter = new FixedBitSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("isParent", "yes"))));
@@ -1376,7 +1376,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
// never matches:
Query childQuery = new TermQuery(new Term("childText", "bogus"));
@@ -1441,7 +1441,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
// illegally matches parent:
Query childQuery = new TermQuery(new Term("parentText", "text"));
@@ -1493,7 +1493,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(Arrays.asList(childDoc, parentDoc));
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java Sat Aug 9 18:54:35 2014
@@ -26,7 +26,6 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.NoMergePolicy;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.CachingWrapperFilter;
import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.FilteredQuery;
@@ -231,7 +230,7 @@ public class TestBlockJoinSorting extend
w.addDocument(document);
IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(w.w, false));
- w.shutdown();
+ w.close();
Filter parentFilter = new QueryWrapperFilter(new TermQuery(new Term("__type", "parent")));
Filter childFilter = new QueryWrapperFilter(new PrefixQuery(new Term("field2")));
ToParentBlockJoinQuery query = new ToParentBlockJoinQuery(
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java Sat Aug 9 18:54:35 2014
@@ -62,7 +62,7 @@ public class TestBlockJoinValidation ext
@Before
public void before() throws Exception {
directory = newDirectory();
- final IndexWriterConfig config = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ final IndexWriterConfig config = new IndexWriterConfig(new MockAnalyzer(random()));
final IndexWriter indexWriter = new IndexWriter(directory, config);
for (int i = 0; i < AMOUNT_OF_SEGMENTS; i++) {
List<Document> segmentDocs = createDocsForSegment(i);
@@ -70,7 +70,7 @@ public class TestBlockJoinValidation ext
indexWriter.commit();
}
indexReader = DirectoryReader.open(indexWriter, random().nextBoolean());
- indexWriter.shutdown();
+ indexWriter.close();
indexSearcher = new IndexSearcher(indexReader);
parentsFilter = new FixedBitSetCachingWrapperFilter(new QueryWrapperFilter(new WildcardQuery(new Term("parent", "*"))));
}
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Sat Aug 9 18:54:35 2014
@@ -50,10 +50,8 @@ import org.apache.lucene.index.SortedSet
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
@@ -141,7 +139,7 @@ public class TestJoinUtil extends Lucene
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
- w.shutdown();
+ w.close();
// Search for product
Query joinQuery =
@@ -208,7 +206,7 @@ public class TestJoinUtil extends Lucene
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
- w.shutdown();
+ w.close();
// Search for product
Query joinQuery =
@@ -281,7 +279,7 @@ public class TestJoinUtil extends Lucene
w.forceMerge(1);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
- w.shutdown();
+ w.close();
// Search for product
Query joinQuery =
@@ -378,7 +376,7 @@ public class TestJoinUtil extends Lucene
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
- w.shutdown();
+ w.close();
// Search for movie via subtitle
Query joinQuery =
@@ -445,7 +443,7 @@ public class TestJoinUtil extends Lucene
IndexIterationContext context = createContext(numberOfDocumentsToIndex, w, multipleValuesPerDocument, scoreDocsInOrder);
IndexReader topLevelReader = w.getReader();
- w.shutdown();
+ w.close();
for (int searchIter = 1; searchIter <= maxSearchIter; searchIter++) {
if (VERBOSE) {
System.out.println("searchIter=" + searchIter);
Modified: lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Sat Aug 9 18:54:35 2014
@@ -73,7 +73,6 @@ import org.apache.lucene.util.ByteBlockP
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LineFileDocs;
-import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.RecyclingByteBlockAllocator;
import org.apache.lucene.util.TestUtil;
@@ -149,14 +148,14 @@ public class MemoryIndexTest extends Bas
Directory ramdir = new RAMDirectory();
Analyzer analyzer = randomAnalyzer();
IndexWriter writer = new IndexWriter(ramdir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodec(TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat())));
+ new IndexWriterConfig(analyzer).setCodec(TestUtil.alwaysPostingsFormat(new Lucene41PostingsFormat())));
Document doc = new Document();
Field field1 = newTextField("foo", fooField.toString(), Field.Store.NO);
Field field2 = newTextField("term", termField.toString(), Field.Store.NO);
doc.add(field1);
doc.add(field2);
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
memory.addField("foo", fooField.toString(), analyzer);
memory.addField("term", termField.toString(), analyzer);
@@ -430,7 +429,7 @@ public class MemoryIndexTest extends Bas
Directory dir = newDirectory();
MockAnalyzer mockAnalyzer = new MockAnalyzer(random());
mockAnalyzer.setMaxTokenLength(TestUtil.nextInt(random(), 1, IndexWriter.MAX_TERM_LENGTH));
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random(), TEST_VERSION_CURRENT, mockAnalyzer));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random(), mockAnalyzer));
Document nextDoc = lineFileDocs.nextDoc();
Document doc = new Document();
for (Field field : nextDoc.getFields()) {
@@ -443,7 +442,7 @@ public class MemoryIndexTest extends Bas
}
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
for (IndexableField field : doc.indexableFields()) {
memory.addField(field.name(), ((Field)field).stringValue(), mockAnalyzer);
}
@@ -486,10 +485,10 @@ public class MemoryIndexTest extends Bas
doc.add(new Field(field_name, "foo bar foo bar foo", type));
Directory dir = newDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random(), TEST_VERSION_CURRENT, mockAnalyzer));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random(), mockAnalyzer));
writer.updateDocument(new Term("id", "1"), doc);
writer.commit();
- writer.shutdown();
+ writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
//Index document in Memory index
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Sat Aug 9 18:54:35 2014
@@ -95,15 +95,13 @@ public class MultiPassIndexSplitter {
}
}
}
- IndexWriter w = new IndexWriter(outputs[i], new IndexWriterConfig(
- version,
- null)
+ IndexWriter w = new IndexWriter(outputs[i], new IndexWriterConfig(null)
.setOpenMode(OpenMode.CREATE));
System.err.println("Writing part " + (i + 1) + " ...");
// pass the subreaders directly, as our wrapper's numDocs/hasDeletetions are not up-to-date
final List<? extends FakeDeleteAtomicIndexReader> sr = input.getSequentialSubReaders();
w.addIndexes(sr.toArray(new IndexReader[sr.size()])); // TODO: maybe take List<IR> here?
- w.shutdown();
+ w.close();
}
System.err.println("Done.");
}
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java Sat Aug 9 18:54:35 2014
@@ -29,7 +29,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.Version;
/**
* Split an index based on a {@link Filter}.
@@ -47,12 +46,12 @@ public class PKIndexSplitter {
* Split an index based on a {@link Filter}. All documents that match the filter
* are sent to dir1, remaining ones to dir2.
*/
- public PKIndexSplitter(Version version, Directory input, Directory dir1, Directory dir2, Filter docsInFirstIndex) {
- this(input, dir1, dir2, docsInFirstIndex, newDefaultConfig(version), newDefaultConfig(version));
+ public PKIndexSplitter(Directory input, Directory dir1, Directory dir2, Filter docsInFirstIndex) {
+ this(input, dir1, dir2, docsInFirstIndex, newDefaultConfig(), newDefaultConfig());
}
- private static IndexWriterConfig newDefaultConfig(Version version) {
- return new IndexWriterConfig(version, null).setOpenMode(OpenMode.CREATE);
+ private static IndexWriterConfig newDefaultConfig() {
+ return new IndexWriterConfig(null).setOpenMode(OpenMode.CREATE);
}
public PKIndexSplitter(Directory input, Directory dir1,
@@ -70,8 +69,8 @@ public class PKIndexSplitter {
* and a 'middle' term. If the middle term is present, it's
* sent to dir2.
*/
- public PKIndexSplitter(Version version, Directory input, Directory dir1, Directory dir2, Term midTerm) {
- this(version, input, dir1, dir2,
+ public PKIndexSplitter(Directory input, Directory dir1, Directory dir2, Term midTerm) {
+ this(input, dir1, dir2,
new TermRangeFilter(midTerm.field(), null, midTerm.bytes(), true, false));
}
@@ -112,7 +111,7 @@ public class PKIndexSplitter {
success = true;
} finally {
if (success) {
- w.shutdown();
+ w.close();
} else {
IOUtils.closeWhileHandlingException(w);
}
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java Sat Aug 9 18:54:35 2014
@@ -21,7 +21,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.util.Version;
import java.io.File;
import java.io.IOException;
@@ -38,8 +37,7 @@ public class IndexMergeTool {
}
FSDirectory mergedIndex = FSDirectory.open(new File(args[0]));
- IndexWriter writer = new IndexWriter(mergedIndex, new IndexWriterConfig(
- Version.LUCENE_CURRENT, null)
+ IndexWriter writer = new IndexWriter(mergedIndex, new IndexWriterConfig(null)
.setOpenMode(OpenMode.CREATE));
Directory[] indexes = new Directory[args.length - 1];
@@ -52,7 +50,7 @@ public class IndexMergeTool {
System.out.println("Full merge...");
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
System.out.println("Done.");
}
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/document/TestLazyDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/document/TestLazyDocument.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/document/TestLazyDocument.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/document/TestLazyDocument.java Sat Aug 9 18:54:35 2014
@@ -71,7 +71,7 @@ public class TestLazyDocument extends Lu
writer.addDocument(d);
}
} finally {
- writer.shutdown();
+ writer.close();
}
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java Sat Aug 9 18:54:35 2014
@@ -24,7 +24,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
public class TestIndexSplitter extends LuceneTestCase {
public void test() throws Exception {
@@ -42,7 +41,7 @@ public class TestIndexSplitter extends L
mergePolicy.setMaxCFSSegmentSizeMB(Double.POSITIVE_INFINITY);
IndexWriter iw = new IndexWriter(
fsDir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).
+ new IndexWriterConfig(new MockAnalyzer(random())).
setOpenMode(OpenMode.CREATE).
setMergePolicy(mergePolicy)
);
@@ -64,7 +63,7 @@ public class TestIndexSplitter extends L
DirectoryReader iwReader = iw.getReader();
assertEquals(3, iwReader.leaves().size());
iwReader.close();
- iw.shutdown();
+ iw.close();
// we should have 2 segments now
IndexSplitter is = new IndexSplitter(dir);
String splitSegName = is.infos.info(1).info.name;
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Sat Aug 9 18:54:35 2014
@@ -44,7 +44,7 @@ public class TestMultiPassIndexSplitter
}
w.commit();
w.deleteDocuments(new Term("id", "" + (NUM_DOCS-1)));
- w.shutdown();
+ w.close();
input = DirectoryReader.open(dir);
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java Sat Aug 9 18:54:35 2014
@@ -48,7 +48,7 @@ public class TestPKIndexSplitter extends
w.addDocument(doc);
if (x%3==0) w.commit();
}
- w.shutdown();
+ w.close();
final Term midTerm = new Term("id", format.format(11));
@@ -59,7 +59,7 @@ public class TestPKIndexSplitter extends
.setOpenMode(OpenMode.APPEND).setMergePolicy(NoMergePolicy.INSTANCE));
w.deleteDocuments(midTerm);
w.deleteDocuments(new Term("id", format.format(2)));
- w.shutdown();
+ w.close();
checkSplitting(dir, midTerm, 10, 8);
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/IndexSortingTest.java Sat Aug 9 18:54:35 2014
@@ -70,7 +70,7 @@ public class IndexSortingTest extends So
IndexWriter writer = new IndexWriter(target, newIndexWriterConfig(null));
reader = SortingAtomicReader.wrap(reader, sorter);
writer.addIndexes(reader);
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java Sat Aug 9 18:54:35 2014
@@ -225,7 +225,7 @@ public abstract class SorterTestBase ext
writer.deleteDocuments(new Term(ID_FIELD, id.toString()));
}
}
- writer.shutdown();
+ writer.close();
}
@BeforeClass
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestBlockJoinSorter.java Sat Aug 9 18:54:35 2014
@@ -86,7 +86,7 @@ public class TestBlockJoinSorter extends
}
writer.forceMerge(1);
final DirectoryReader indexReader = writer.getReader();
- writer.shutdown();
+ writer.close();
final AtomicReader reader = getOnlySegmentReader(indexReader);
final Filter parentsFilter = new FixedBitSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("parent", "true"))));
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestEarlyTermination.java Sat Aug 9 18:54:35 2014
@@ -107,7 +107,7 @@ public class TestEarlyTermination extend
private void closeIndex() throws IOException {
reader.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java Sat Aug 9 18:54:35 2014
@@ -145,8 +145,8 @@ public class TestSortingMergePolicy exte
iw1.forceMerge(1);
iw2.forceMerge(1);
- iw1.shutdown();
- iw2.shutdown();
+ iw1.close();
+ iw2.close();
reader = DirectoryReader.open(dir1);
sortedReader = DirectoryReader.open(dir2);
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java Sat Aug 9 18:54:35 2014
@@ -42,7 +42,7 @@ public class TestHighFreqTerms extends L
public static void setUpClass() throws Exception {
dir = newDirectory();
writer = new IndexWriter(dir, newIndexWriterConfig(random(),
- TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))
.setMaxBufferedDocs(2));
indexDocs(writer);
reader = DirectoryReader.open(dir);
@@ -227,7 +227,7 @@ public class TestHighFreqTerms extends L
}
doc.add(newTextField(rnd, "different_field", content, Field.Store.YES));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java Sat Aug 9 18:54:35 2014
@@ -80,7 +80,7 @@ public class TestDocTermOrds extends Luc
w.addDocument(doc);
final IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
final AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
final DocTermOrds dto = new DocTermOrds(ar, ar.getLiveDocs(), "field");
@@ -167,7 +167,7 @@ public class TestDocTermOrds extends Luc
}
final DirectoryReader r = w.getReader();
- w.shutdown();
+ w.close();
if (VERBOSE) {
System.out.println("TEST: reader=" + r);
@@ -264,7 +264,7 @@ public class TestDocTermOrds extends Luc
}
final DirectoryReader r = w.getReader();
- w.shutdown();
+ w.close();
if (VERBOSE) {
System.out.println("TEST: reader=" + r);
@@ -419,7 +419,7 @@ public class TestDocTermOrds extends Luc
v.setDocument(1);
assertEquals(1, v.nextOrd());
- iw.shutdown();
+ iw.close();
r1.close();
r2.close();
dir.close();
@@ -439,7 +439,7 @@ public class TestDocTermOrds extends Luc
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
DirectoryReader ir = DirectoryReader.open(dir);
AtomicReader ar = getOnlySegmentReader(ir);
@@ -480,7 +480,7 @@ public class TestDocTermOrds extends Luc
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
DirectoryReader ir = DirectoryReader.open(dir);
AtomicReader ar = getOnlySegmentReader(ir);
@@ -530,7 +530,7 @@ public class TestDocTermOrds extends Luc
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
AtomicReader ar = getOnlySegmentReader(ireader);
SortedSetDocValues dv = FieldCache.DEFAULT.getDocTermOrds(ar, "field", null);
@@ -614,7 +614,7 @@ public class TestDocTermOrds extends Luc
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
DirectoryReader ir = DirectoryReader.open(dir);
AtomicReader ar = getOnlySegmentReader(ir);
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java Sat Aug 9 18:54:35 2014
@@ -119,7 +119,7 @@ public class TestFieldCache extends Luce
}
IndexReader r = writer.getReader();
reader = SlowCompositeReaderWrapper.wrap(r);
- writer.shutdown();
+ writer.close();
}
@AfterClass
@@ -290,7 +290,7 @@ public class TestFieldCache extends Luce
public void testEmptyIndex() throws Exception {
Directory dir = newDirectory();
IndexWriter writer= new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setMaxBufferedDocs(500));
- writer.shutdown();
+ writer.close();
IndexReader r = DirectoryReader.open(dir);
AtomicReader reader = SlowCompositeReaderWrapper.wrap(r);
FieldCache.DEFAULT.getTerms(reader, "foobar", true);
@@ -436,7 +436,7 @@ public class TestFieldCache extends Luce
}
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
AtomicReader ar = getOnlySegmentReader(ir);
// Binary type: can be retrieved via getTerms()
@@ -567,7 +567,7 @@ public class TestFieldCache extends Luce
Document doc = new Document();
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
AtomicReader ar = getOnlySegmentReader(ir);
@@ -625,7 +625,7 @@ public class TestFieldCache extends Luce
doc.add(new StoredField("bogusbits", "bogus"));
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
AtomicReader ar = getOnlySegmentReader(ir);
@@ -709,7 +709,7 @@ public class TestFieldCache extends Luce
assertEquals(values[i], longs.get(i));
}
reader.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -755,7 +755,7 @@ public class TestFieldCache extends Luce
assertEquals(values[i], ints.get(i));
}
reader.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java Sat Aug 9 18:54:35 2014
@@ -66,7 +66,7 @@ public class TestFieldCacheReopen extend
r2.close();
assertTrue(ints == ints2);
- writer.shutdown();
+ writer.close();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java Sat Aug 9 18:54:35 2014
@@ -69,8 +69,8 @@ public class TestFieldCacheSanityChecker
wB.addDocument(doc);
}
}
- wA.shutdown();
- wB.shutdown();
+ wA.close();
+ wB.close();
DirectoryReader rA = DirectoryReader.open(dirA);
readerA = SlowCompositeReaderWrapper.wrap(rA);
readerAclone = SlowCompositeReaderWrapper.wrap(rA);
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java Sat Aug 9 18:54:35 2014
@@ -77,7 +77,7 @@ public class TestFieldCacheSort extends
Type type = sortType == SortField.Type.STRING ? Type.SORTED : Type.BINARY;
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", type));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", sortType));
@@ -116,7 +116,7 @@ public class TestFieldCacheSort extends
Type type = sortType == SortField.Type.STRING ? Type.SORTED : Type.BINARY;
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", type));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", sortType));
@@ -153,7 +153,7 @@ public class TestFieldCacheSort extends
Type type = sortType == SortField.Type.STRING ? Type.SORTED : Type.BINARY;
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", type));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", sortType, true));
@@ -192,7 +192,7 @@ public class TestFieldCacheSort extends
Type type = sortType == SortField.Type.STRING ? Type.SORTED : Type.BINARY;
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", type));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sf = new SortField("value", sortType);
@@ -233,7 +233,7 @@ public class TestFieldCacheSort extends
Type type = sortType == SortField.Type.STRING ? Type.SORTED : Type.BINARY;
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", type));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sf = new SortField("value", sortType, true);
@@ -274,7 +274,7 @@ public class TestFieldCacheSort extends
Type type = sortType == SortField.Type.STRING ? Type.SORTED : Type.BINARY;
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", type));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sf = new SortField("value", sortType);
@@ -316,7 +316,7 @@ public class TestFieldCacheSort extends
Type type = sortType == SortField.Type.STRING ? Type.SORTED : Type.BINARY;
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", type));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sf = new SortField("value", sortType, true);
@@ -345,7 +345,7 @@ public class TestFieldCacheSort extends
doc.add(newStringField("value", "bar", Field.Store.NO));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(SortField.FIELD_DOC);
@@ -371,7 +371,7 @@ public class TestFieldCacheSort extends
doc.add(newStringField("value", "bar", Field.Store.NO));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField(null, SortField.Type.DOC, true));
@@ -397,7 +397,7 @@ public class TestFieldCacheSort extends
doc.add(newTextField("value", "foo foo foo foo foo", Field.Store.NO));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort();
@@ -427,7 +427,7 @@ public class TestFieldCacheSort extends
doc.add(newTextField("value", "foo foo foo foo foo", Field.Store.NO));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField(null, SortField.Type.SCORE, true));
@@ -460,7 +460,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.INTEGER));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
@@ -490,7 +490,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.INTEGER));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
@@ -520,7 +520,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.INTEGER));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortField("value", SortField.Type.INT);
@@ -553,7 +553,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.INTEGER));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT, true));
@@ -584,7 +584,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.LONG));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
@@ -614,7 +614,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.LONG));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
@@ -644,7 +644,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.LONG));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortField("value", SortField.Type.LONG);
@@ -677,7 +677,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.LONG));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG, true));
@@ -708,7 +708,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.FLOAT));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
@@ -738,7 +738,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.FLOAT));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
@@ -768,7 +768,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.FLOAT));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortField("value", SortField.Type.FLOAT);
@@ -801,7 +801,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.FLOAT));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT, true));
@@ -835,7 +835,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.DOUBLE));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
@@ -865,7 +865,7 @@ public class TestFieldCacheSort extends
doc = new Document();
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.DOUBLE));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
@@ -902,7 +902,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.DOUBLE));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
@@ -936,7 +936,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.DOUBLE));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortField("value", SortField.Type.DOUBLE);
@@ -973,7 +973,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.DOUBLE));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE, true));
@@ -1004,7 +1004,7 @@ public class TestFieldCacheSort extends
IndexReader r = UninvertingReader.wrap(DirectoryReader.open(w, true),
Collections.singletonMap("f", Type.SORTED));
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
TopDocs hits = s.search(new TermQuery(new Term("t", "1")), null, 10, new Sort(new SortField("f", SortField.Type.STRING)));
assertEquals(2, hits.totalHits);
@@ -1027,7 +1027,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
}
writer.forceMerge(1); // enforce one segment to have a higher unique term count in all cases
- writer.shutdown();
+ writer.close();
Sort sort = new Sort(
new SortField("string", SortField.Type.STRING),
SortField.FIELD_DOC);
@@ -1045,7 +1045,7 @@ public class TestFieldCacheSort extends
public void testMaxScore() throws Exception {
Directory d = newDirectory();
// Not RIW because we need exactly 2 segs:
- IndexWriter w = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter w = new IndexWriter(d, new IndexWriterConfig(new MockAnalyzer(random())));
int id = 0;
for(int seg=0;seg<2;seg++) {
for(int docIDX=0;docIDX<10;docIDX++) {
@@ -1065,7 +1065,7 @@ public class TestFieldCacheSort extends
IndexReader r = UninvertingReader.wrap(DirectoryReader.open(w, true),
Collections.singletonMap("id", Type.INTEGER));
- w.shutdown();
+ w.close();
Query q = new TermQuery(new Term("body", "text"));
IndexSearcher s = newSearcher(r);
float maxScore = s.search(q , 10).getMaxScore();
@@ -1117,7 +1117,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.SORTED));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING));
@@ -1139,7 +1139,7 @@ public class TestFieldCacheSort extends
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
Collections.singletonMap("value", Type.SORTED));
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING));
@@ -1172,7 +1172,7 @@ public class TestFieldCacheSort extends
mappings.put("value", Type.SORTED);
IndexReader ir = UninvertingReader.wrap(writer.getReader(), mappings);
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
// tievalue, then value
@@ -1199,7 +1199,7 @@ public class TestFieldCacheSort extends
doc.add(newStringField("value", "foo", Field.Store.NO));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(SortField.FIELD_SCORE);
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java Sat Aug 9 18:54:35 2014
@@ -132,7 +132,7 @@ public class TestFieldCacheSortRandom ex
mapping.put("stringdv", Type.SORTED);
mapping.put("id", Type.INTEGER);
final IndexReader r = UninvertingReader.wrap(writer.getReader(), mapping);
- writer.shutdown();
+ writer.close();
if (VERBOSE) {
System.out.println(" reader=" + r);
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java Sat Aug 9 18:54:35 2014
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.lucene42.Lucene42DocValuesFormat;
import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Document;
@@ -193,7 +192,7 @@ public class TestFieldCacheVsDocValues e
return;
}
}
- w.shutdown();
+ w.close();
AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
@@ -264,7 +263,7 @@ public class TestFieldCacheVsDocValues e
}
DirectoryReader r = DirectoryReader.open(w, true);
- w.shutdown();
+ w.close();
AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
@@ -318,7 +317,7 @@ public class TestFieldCacheVsDocValues e
int id = random().nextInt(numDocs);
writer.deleteDocuments(new Term("id", Integer.toString(id)));
}
- writer.shutdown();
+ writer.close();
// compare
DirectoryReader ir = DirectoryReader.open(dir);
@@ -334,7 +333,7 @@ public class TestFieldCacheVsDocValues e
private void doTestSortedSetVsUninvertedField(int minLength, int maxLength) throws Exception {
Directory dir = newDirectory();
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
+ IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()));
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, conf);
// index some docs
@@ -403,7 +402,7 @@ public class TestFieldCacheVsDocValues e
assertEquals(ir.maxDoc(), expected, actual);
ir.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -451,7 +450,7 @@ public class TestFieldCacheVsDocValues e
// 256 values
writer.forceMerge(numDocs / 256);
- writer.shutdown();
+ writer.close();
// compare
DirectoryReader ir = DirectoryReader.open(dir);
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java Sat Aug 9 18:54:35 2014
@@ -69,7 +69,7 @@ public class TestFieldCacheWithThreads e
w.forceMerge(1);
final IndexReader r = DirectoryReader.open(w, true);
- w.shutdown();
+ w.close();
assertEquals(1, r.leaves().size());
final AtomicReader ar = r.leaves().get(0).reader();
@@ -179,7 +179,7 @@ public class TestFieldCacheWithThreads e
writer.forceMerge(1);
final DirectoryReader r = writer.getReader();
- writer.shutdown();
+ writer.close();
final AtomicReader sr = getOnlySegmentReader(r);
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java Sat Aug 9 18:54:35 2014
@@ -102,7 +102,7 @@ public class TestNumericTerms32 extends
map.put("field8", Type.INTEGER);
reader = UninvertingReader.wrap(writer.getReader(), map);
searcher=newSearcher(reader);
- writer.shutdown();
+ writer.close();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java Sat Aug 9 18:54:35 2014
@@ -107,7 +107,7 @@ public class TestNumericTerms64 extends
map.put("field8", Type.LONG);
reader = UninvertingReader.wrap(writer.getReader(), map);
searcher=newSearcher(reader);
- writer.shutdown();
+ writer.close();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java Sat Aug 9 18:54:35 2014
@@ -51,7 +51,7 @@ public class TestUninvertingReader exten
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
DirectoryReader ir = UninvertingReader.wrap(DirectoryReader.open(dir),
Collections.singletonMap("foo", Type.SORTED_SET_INTEGER));
@@ -92,7 +92,7 @@ public class TestUninvertingReader exten
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
DirectoryReader ir = UninvertingReader.wrap(DirectoryReader.open(dir),
Collections.singletonMap("foo", Type.SORTED_SET_FLOAT));
@@ -134,7 +134,7 @@ public class TestUninvertingReader exten
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
DirectoryReader ir = UninvertingReader.wrap(DirectoryReader.open(dir),
Collections.singletonMap("foo", Type.SORTED_SET_LONG));
@@ -175,7 +175,7 @@ public class TestUninvertingReader exten
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
DirectoryReader ir = UninvertingReader.wrap(DirectoryReader.open(dir),
Collections.singletonMap("foo", Type.SORTED_SET_DOUBLE));
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java Sat Aug 9 18:54:35 2014
@@ -57,7 +57,7 @@ public class BooleanFilterTest extends L
addDoc(writer, "admin", "020", "20050101", "Maybe");
addDoc(writer, "admin guest", "030", "20050101", "N");
reader = SlowCompositeReaderWrapper.wrap(writer.getReader());
- writer.shutdown();
+ writer.close();
}
@Override
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java Sat Aug 9 18:54:35 2014
@@ -73,7 +73,7 @@ public class ChainedFilterTest extends L
cal.add(Calendar.DATE, 1);
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
@@ -194,7 +194,7 @@ public class ChainedFilterTest extends L
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java Sat Aug 9 18:54:35 2014
@@ -127,7 +127,7 @@ public class CommonTermsQueryTest extend
}
r.close();
- w.shutdown();
+ w.close();
dir.close();
}
@@ -322,7 +322,7 @@ public class CommonTermsQueryTest extend
r.document(search.scoreDocs[1].doc).get("id"))));
}
r.close();
- w.shutdown();
+ w.close();
dir.close();
}
@@ -396,7 +396,7 @@ public class CommonTermsQueryTest extend
assertEquals("0", r.document(search.scoreDocs[2].doc).get("id"));
}
r.close();
- w.shutdown();
+ w.close();
dir.close();
}
@@ -498,7 +498,7 @@ public class CommonTermsQueryTest extend
} finally {
reader.close();
wrapper.close();
- w.shutdown();
+ w.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java Sat Aug 9 18:54:35 2014
@@ -62,7 +62,7 @@ public class TermFilterTest extends Luce
IndexReader reader = SlowCompositeReaderWrapper.wrap(w.getReader());
assertTrue(reader.getContext() instanceof AtomicReaderContext);
AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
- w.shutdown();
+ w.close();
DocIdSet idSet = termFilter(fieldName, "value1").getDocIdSet(context, context.reader().getLiveDocs());
assertNotNull("must not be null", idSet);
@@ -94,7 +94,7 @@ public class TermFilterTest extends Luce
w.addDocument(doc);
}
IndexReader reader = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher searcher = newSearcher(reader);