You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/04/08 17:34:58 UTC
svn commit: r1585759 [8/9] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
lucene/analysis/common/src/test/org/apache/lucene/anal...
Modified: lucene/dev/trunk/lucene/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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -87,7 +87,7 @@ public class TestPostingsHighlighterRank
for (int i = 0; i < numDocs; i++) {
checkDocument(searcher, i, maxTopN);
}
- iw.close();
+ iw.shutdown();
ir.close();
dir.close();
}
@@ -262,7 +262,7 @@ public class TestPostingsHighlighterRank
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter(10000) {
@@ -301,7 +301,7 @@ public class TestPostingsHighlighterRank
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -360,7 +360,7 @@ public abstract class AbstractTestCase e
doc.add( new Field( F, value, customType) );
}
writer.addDocument( doc );
- writer.close();
+ writer.shutdown();
if (reader != null) reader.close();
reader = DirectoryReader.open(dir);
}
@@ -379,7 +379,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.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 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.close();
+ writer.shutdown();
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.close();
+ writer.shutdown();
dir.close();
}
@@ -256,7 +256,7 @@ public class FastVectorHighlighterTest e
bestFragments[0]);
}
reader.close();
- writer.close();
+ writer.shutdown();
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.close();
+ writer.shutdown();
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.close();
+ writer.shutdown();
dir.close();
}
@@ -503,7 +503,7 @@ public class FastVectorHighlighterTest e
}
reader.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -566,7 +566,7 @@ public class FastVectorHighlighterTest e
assertEquals("<b>Test: http://www.facebook.com</b>", bestFragments[0]);
reader.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -648,7 +648,7 @@ public class FastVectorHighlighterTest e
assertEquals( expected, bestFragments[ 0 ] );
reader.close();
- writer.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -158,7 +158,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.close();
+ writer.shutdown();
if (reader != null) reader.close();
reader = DirectoryReader.open(dir);
}
@@ -269,7 +269,7 @@ public class SimpleFragmentsBuilderTest
documents.add(document);
}
writer.addDocuments(documents);
- writer.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -90,7 +90,7 @@ public class TestBlockJoin extends Lucen
}
IndexReader r = DirectoryReader.open(w, random().nextBoolean());
- w.close();
+ w.shutdown();
assertTrue(r.leaves().size() > 1);
IndexSearcher s = new IndexSearcher(r);
Filter parentsFilter = new FixedBitSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("docType", "resume"))));
@@ -141,7 +141,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
@@ -228,7 +228,7 @@ public class TestBlockJoin extends Lucen
}
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
MultiTermQuery qc = NumericRangeQuery.newIntRange("year", 2007, 2007, true, true);
@@ -293,7 +293,7 @@ public class TestBlockJoin extends Lucen
addSkillless(w);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
@@ -367,7 +367,7 @@ public class TestBlockJoin extends Lucen
final Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
ToParentBlockJoinQuery q = new ToParentBlockJoinQuery(new MatchAllDocsQuery(), new QueryWrapperFilter(new MatchAllDocsQuery()), ScoreMode.Avg);
@@ -423,7 +423,7 @@ public class TestBlockJoin extends Lucen
s.getIndexReader().close();
w.deleteDocuments(new Term("skill", "java"));
- w.close();
+ w.shutdown();
s = newSearcher(DirectoryReader.open(dir));
topDocs = s.search(q, 10);
@@ -596,9 +596,9 @@ public class TestBlockJoin extends Lucen
}
final IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
final IndexReader joinR = joinW.getReader();
- joinW.close();
+ joinW.shutdown();
if (VERBOSE) {
System.out.println("TEST: reader=" + r);
@@ -1035,7 +1035,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
@@ -1116,7 +1116,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.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
Query tq = new TermQuery(new Term("child", "1"));
Filter parentFilter = new FixedBitSetCachingWrapperFilter(
@@ -1150,7 +1150,7 @@ public class TestBlockJoin extends Lucen
// Need single seg:
w.forceMerge(1);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
Query tq = new TermQuery(new Term("child", "2"));
Filter parentFilter = new FixedBitSetCachingWrapperFilter(
@@ -1183,7 +1183,7 @@ public class TestBlockJoin extends Lucen
addSkillless(w);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher s = new IndexSearcher(r);
// Create a filter that defines "parent" documents in the index - in this case resumes
@@ -1287,7 +1287,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
Query childQuery = new TermQuery(new Term("childText", "text"));
Filter parentsFilter = new FixedBitSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("isParent", "yes"))));
@@ -1351,7 +1351,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
// never matches:
Query childQuery = new TermQuery(new Term("childText", "bogus"));
@@ -1416,7 +1416,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(docs);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
// illegally matches parent:
Query childQuery = new TermQuery(new Term("parentText", "text"));
@@ -1468,7 +1468,7 @@ public class TestBlockJoin extends Lucen
w.addDocuments(Arrays.asList(childDoc, parentDoc));
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -209,7 +209,7 @@ public class TestBlockJoinSorting extend
w.addDocument(document);
IndexSearcher searcher = new IndexSearcher(DirectoryReader.open(w.w, false));
- w.close();
+ w.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -70,7 +70,7 @@ public class TestBlockJoinValidation ext
indexWriter.commit();
}
indexReader = DirectoryReader.open(indexWriter, random().nextBoolean());
- indexWriter.close();
+ indexWriter.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -128,7 +128,7 @@ public class TestJoinUtil extends Lucene
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
- w.close();
+ w.shutdown();
// Search for product
Query joinQuery =
@@ -214,7 +214,7 @@ public class TestJoinUtil extends Lucene
w.forceMerge(1);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
- w.close();
+ w.shutdown();
// Search for product
Query joinQuery =
@@ -302,7 +302,7 @@ public class TestJoinUtil extends Lucene
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
- w.close();
+ w.shutdown();
// Search for movie via subtitle
Query joinQuery =
@@ -369,7 +369,7 @@ public class TestJoinUtil extends Lucene
IndexIterationContext context = createContext(numberOfDocumentsToIndex, w, multipleValuesPerDocument, scoreDocsInOrder);
IndexReader topLevelReader = w.getReader();
- w.close();
+ w.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -156,7 +156,7 @@ public class MemoryIndexTest extends Bas
doc.add(field1);
doc.add(field2);
writer.addDocument(doc);
- writer.close();
+ writer.shutdown();
memory.addField("foo", fooField.toString(), analyzer);
memory.addField("term", termField.toString(), analyzer);
@@ -451,7 +451,7 @@ public class MemoryIndexTest extends Bas
}
writer.addDocument(doc);
- writer.close();
+ writer.shutdown();
for (IndexableField field : doc.indexableFields()) {
memory.addField(field.name(), ((Field)field).stringValue(), mockAnalyzer);
}
@@ -497,7 +497,7 @@ public class MemoryIndexTest extends Bas
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random(), TEST_VERSION_CURRENT, mockAnalyzer));
writer.updateDocument(new Term("id", "1"), doc);
writer.commit();
- writer.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -103,7 +103,7 @@ public class MultiPassIndexSplitter {
// 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.close();
+ w.shutdown();
}
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -112,7 +112,7 @@ public class PKIndexSplitter {
success = true;
} finally {
if (success) {
- IOUtils.close(w);
+ w.shutdown();
} 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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -52,7 +52,7 @@ public class IndexMergeTool {
System.out.println("Full merge...");
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -75,7 +75,7 @@ public class TestLazyDocument extends Lu
writer.addDocument(d);
}
} finally {
- writer.close();
+ writer.shutdown();
}
}
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -64,7 +64,7 @@ public class TestIndexSplitter extends L
DirectoryReader iwReader = iw.getReader();
assertEquals(3, iwReader.leaves().size());
iwReader.close();
- iw.close();
+ iw.shutdown();
// 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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -43,7 +43,7 @@ public class TestMultiPassIndexSplitter
}
w.commit();
w.deleteDocuments(new Term("id", "" + (NUM_DOCS-1)));
- w.close();
+ w.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -49,7 +49,7 @@ public class TestPKIndexSplitter extends
w.addDocument(doc);
if (x%3==0) w.commit();
}
- w.close();
+ w.shutdown();
final Term midTerm = new Term("id", format.format(11));
@@ -61,7 +61,7 @@ public class TestPKIndexSplitter extends
.setOpenMode(OpenMode.APPEND).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
w.deleteDocuments(midTerm);
w.deleteDocuments(new Term("id", format.format(2)));
- w.close();
+ w.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -70,7 +70,7 @@ public class IndexSortingTest extends So
IndexWriter writer = new IndexWriter(target, newIndexWriterConfig(TEST_VERSION_CURRENT, null));
reader = SortingAtomicReader.wrap(reader, sorter);
writer.addIndexes(reader);
- writer.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -218,7 +218,7 @@ public abstract class SorterTestBase ext
writer.deleteDocuments(new Term(ID_FIELD, id.toString()));
}
}
- writer.close();
+ writer.shutdown();
}
@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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -86,7 +86,7 @@ public class TestBlockJoinSorter extends
}
writer.forceMerge(1);
final DirectoryReader indexReader = writer.getReader();
- writer.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -100,7 +100,7 @@ public class TestEarlyTermination extend
@Override
public void tearDown() throws Exception {
reader.close();
- iw.close();
+ iw.shutdown();
dir.close();
super.tearDown();
}
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -141,8 +141,8 @@ public class TestSortingMergePolicy exte
iw1.forceMerge(1);
iw2.forceMerge(1);
- iw1.close();
- iw2.close();
+ iw1.shutdown();
+ iw2.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -227,7 +227,7 @@ public class TestHighFreqTerms extends L
}
doc.add(newTextField(rnd, "different_field", content, Field.Store.YES));
writer.addDocument(doc);
- writer.close();
+ writer.shutdown();
}
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 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.close();
+ writer.shutdown();
}
@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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -73,7 +73,7 @@ public class ChainedFilterTest extends L
cal.add(Calendar.DATE, 1);
}
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
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.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -127,7 +127,7 @@ public class CommonTermsQueryTest extend
}
r.close();
- w.close();
+ w.shutdown();
dir.close();
}
@@ -322,7 +322,7 @@ public class CommonTermsQueryTest extend
r.document(search.scoreDocs[1].doc).get("id"))));
}
r.close();
- w.close();
+ w.shutdown();
dir.close();
}
@@ -396,7 +396,7 @@ public class CommonTermsQueryTest extend
assertEquals("0", r.document(search.scoreDocs[2].doc).get("id"));
}
r.close();
- w.close();
+ w.shutdown();
dir.close();
}
@@ -498,7 +498,7 @@ public class CommonTermsQueryTest extend
} finally {
reader.close();
wrapper.close();
- w.close();
+ w.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 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.close();
+ w.shutdown();
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.close();
+ w.shutdown();
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java Tue Apr 8 15:34:50 2014
@@ -77,7 +77,7 @@ public class TermsFilterTest extends Luc
IndexReader reader = SlowCompositeReaderWrapper.wrap(w.getReader());
assertTrue(reader.getContext() instanceof AtomicReaderContext);
AtomicReaderContext context = (AtomicReaderContext) reader.getContext();
- w.close();
+ w.shutdown();
List<Term> terms = new ArrayList<>();
terms.add(new Term(fieldName, "19"));
@@ -108,7 +108,7 @@ public class TermsFilterTest extends Luc
doc.add(newStringField(fieldName, "content1", Field.Store.YES));
w1.addDocument(doc);
IndexReader reader1 = w1.getReader();
- w1.close();
+ w1.shutdown();
fieldName = "field2";
Directory rd2 = newDirectory();
@@ -117,7 +117,7 @@ public class TermsFilterTest extends Luc
doc.add(newStringField(fieldName, "content2", Field.Store.YES));
w2.addDocument(doc);
IndexReader reader2 = w2.getReader();
- w2.close();
+ w2.shutdown();
TermsFilter tf = new TermsFilter(new Term(fieldName, "content1"));
MultiReader multi = new MultiReader(reader1, reader2);
@@ -155,7 +155,7 @@ public class TermsFilterTest extends Luc
w.forceMerge(1);
IndexReader reader = w.getReader();
- w.close();
+ w.shutdown();
assertEquals(1, reader.leaves().size());
@@ -194,7 +194,7 @@ public class TermsFilterTest extends Luc
}
w.forceMerge(1);
IndexReader reader = w.getReader();
- w.close();
+ w.shutdown();
assertEquals(1, reader.leaves().size());
AtomicReaderContext context = reader.leaves().get(0);
TermsFilter tf = new TermsFilter(new ArrayList<>(terms));
@@ -220,7 +220,7 @@ public class TermsFilterTest extends Luc
w.addDocument(doc);
}
IndexReader reader = w.getReader();
- w.close();
+ w.shutdown();
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java Tue Apr 8 15:34:50 2014
@@ -135,7 +135,7 @@ public abstract class FunctionTestSetup
}
iw.forceMerge(1);
}
- iw.close();
+ iw.shutdown();
if (VERBOSE) {
System.out.println("TEST: setUp done close");
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java Tue Apr 8 15:34:50 2014
@@ -60,7 +60,7 @@ public class TestBoostedQuery extends Lu
iw.addDocument(document);
ir = iw.getReader();
is = newSearcher(ir);
- iw.close();
+ iw.shutdown();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java Tue Apr 8 15:34:50 2014
@@ -91,7 +91,7 @@ public class TestDocValuesFieldSources e
iw.commit();
}
}
- iw.close();
+ iw.shutdown();
DirectoryReader rd = DirectoryReader.open(d);
for (AtomicReaderContext leave : rd.leaves()) {
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java Tue Apr 8 15:34:50 2014
@@ -59,7 +59,7 @@ public class TestFunctionQuerySort exten
// Open index
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(reader);
// Get ValueSource from FieldCache
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java Tue Apr 8 15:34:50 2014
@@ -66,7 +66,7 @@ public class TestLongNormValueSource ext
reader = iw.getReader();
searcher = newSearcher(reader);
- iw.close();
+ iw.shutdown();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java Tue Apr 8 15:34:50 2014
@@ -127,7 +127,7 @@ public class TestValueSources extends Lu
reader = iw.getReader();
searcher = newSearcher(reader);
- iw.close();
+ iw.shutdown();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java Tue Apr 8 15:34:50 2014
@@ -55,7 +55,7 @@ public class TestMoreLikeThis extends Lu
addDoc(writer, "lucene release");
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java Tue Apr 8 15:34:50 2014
@@ -281,7 +281,7 @@ public class TestAnalyzingQueryParser ex
Field field = new Field(FIELD, content, fieldType);
doc.add(field);
writer.addDocument(doc);
- writer.close();
+ writer.shutdown();
DirectoryReader ir = DirectoryReader.open(ramDir);
IndexSearcher is = new IndexSearcher(ir);
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java Tue Apr 8 15:34:50 2014
@@ -290,7 +290,7 @@ public class TestMultiFieldQueryParser e
Document doc = new Document();
doc.add(newTextField("body", "blah the footest blah", Field.Store.NO));
iw.addDocument(doc);
- iw.close();
+ iw.shutdown();
MultiFieldQueryParser mfqp =
new MultiFieldQueryParser(TEST_VERSION_CURRENT, new String[] {"body"}, analyzer);
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java Tue Apr 8 15:34:50 2014
@@ -154,7 +154,7 @@ public class TestComplexPhraseQuery exte
doc.add(newTextField("role", docsContent[i].role, Field.Store.YES));
w.addDocument(doc);
}
- w.close();
+ w.shutdown();
reader = DirectoryReader.open(rd);
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java Tue Apr 8 15:34:50 2014
@@ -324,7 +324,7 @@ public class TestMultiFieldQPHelper exte
Document doc = new Document();
doc.add(newTextField("body", "blah the footest blah", Field.Store.NO));
iw.addDocument(doc);
- iw.close();
+ iw.shutdown();
StandardQueryParser mfqp = new StandardQueryParser();
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java Tue Apr 8 15:34:50 2014
@@ -247,7 +247,7 @@ public class TestNumericQueryParser exte
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java Tue Apr 8 15:34:50 2014
@@ -1321,7 +1321,7 @@ public class TestQPHelper extends Lucene
assertTrue(q instanceof MultiPhraseQuery);
assertEquals(1, s.search(q, 10).totalHits);
r.close();
- w.close();
+ w.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java Tue Apr 8 15:34:50 2014
@@ -48,7 +48,7 @@ public class SingleFieldTestDb {
d.add(new TextField(fieldName, docs[j], Field.Store.NO));
writer.addDocument(d);
}
- writer.close();
+ writer.shutdown();
} catch (java.io.IOException ioe) {
throw new Error(ioe);
}
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java Tue Apr 8 15:34:50 2014
@@ -1094,7 +1094,7 @@ public abstract class QueryParserTestBas
doc.add(newTextField("field", "the wizard of ozzy", Field.Store.NO));
w.addDocument(doc);
IndexReader r = DirectoryReader.open(w, true);
- w.close();
+ w.shutdown();
IndexSearcher s = newSearcher(r);
Query q = getQuery("\"wizard of ozzy\"",a);
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Tue Apr 8 15:34:50 2014
@@ -80,7 +80,7 @@ public class TestParser extends LuceneTe
line = d.readLine();
}
d.close();
- writer.close();
+ writer.shutdown();
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java Tue Apr 8 15:34:50 2014
@@ -150,7 +150,7 @@ public class TestQueryTemplateManager ex
w.addDocument(getDocumentFromString(docFieldValue));
}
w.forceMerge(1);
- w.close();
+ w.shutdown();
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java Tue Apr 8 15:34:50 2014
@@ -76,7 +76,7 @@ public class TestNumericRangeFilterBuild
}
finally {
writer.commit();
- writer.close();
+ writer.shutdown();
ramDir.close();
}
}
Modified: lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java (original)
+++ lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java Tue Apr 8 15:34:50 2014
@@ -209,8 +209,9 @@ public class IndexAndTaxonomyReplication
@After
@Override
public void tearDown() throws Exception {
- IOUtils.close(client, callback, publishIndexWriter, publishTaxoWriter, replicator, publishIndexDir, publishTaxoDir,
- handlerIndexDir, handlerTaxoDir);
+ publishIndexWriter.shutdown();
+ IOUtils.close(client, callback, publishTaxoWriter, replicator, publishIndexDir, publishTaxoDir,
+ handlerIndexDir, handlerTaxoDir);
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java (original)
+++ lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java Tue Apr 8 15:34:50 2014
@@ -62,7 +62,8 @@ public class IndexAndTaxonomyRevisionTes
} catch (IllegalStateException e) {
// expected
} finally {
- IOUtils.close(indexWriter, taxoWriter, taxoDir, indexDir);
+ indexWriter.shutdown();
+ IOUtils.close(taxoWriter, taxoDir, indexDir);
}
}
@@ -92,6 +93,7 @@ public class IndexAndTaxonomyRevisionTes
assertNotNull(new IndexAndTaxonomyRevision(indexWriter, taxoWriter));
rev1.release(); // this release should trigger the delete of segments_1
assertFalse(slowFileExists(indexDir, IndexFileNames.SEGMENTS + "_1"));
+ indexWriter.shutdown();
} finally {
IOUtils.close(indexWriter, taxoWriter, taxoDir, indexDir);
}
@@ -117,6 +119,7 @@ public class IndexAndTaxonomyRevisionTes
String lastFile = files.get(files.size() - 1).fileName;
assertTrue(lastFile.startsWith(IndexFileNames.SEGMENTS) && !lastFile.equals(IndexFileNames.SEGMENTS_GEN));
}
+ indexWriter.shutdown();
} finally {
IOUtils.close(indexWriter, taxoWriter, taxoDir, indexDir);
}
@@ -161,6 +164,7 @@ public class IndexAndTaxonomyRevisionTes
IOUtils.close(src, in);
}
}
+ indexWriter.shutdown();
} finally {
IOUtils.close(indexWriter, taxoWriter, taxoDir, indexDir);
}
Modified: lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java (original)
+++ lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java Tue Apr 8 15:34:50 2014
@@ -150,7 +150,8 @@ public class IndexReplicationClientTest
@After
@Override
public void tearDown() throws Exception {
- IOUtils.close(client, callback, publishWriter, replicator, publishDir, handlerDir);
+ publishWriter.shutdown();
+ IOUtils.close(client, callback, replicator, publishDir, handlerDir);
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java (original)
+++ lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java Tue Apr 8 15:34:50 2014
@@ -47,7 +47,8 @@ public class IndexRevisionTest extends R
} catch (IllegalArgumentException e) {
// expected
} finally {
- IOUtils.close(writer, dir);
+ writer.shutdown();
+ IOUtils.close(dir);
}
}
@@ -63,7 +64,8 @@ public class IndexRevisionTest extends R
} catch (IllegalStateException e) {
// expected
} finally {
- IOUtils.close(writer, dir);
+ writer.shutdown();
+ IOUtils.close(dir);
}
}
@@ -87,8 +89,9 @@ public class IndexRevisionTest extends R
assertNotNull(new IndexRevision(writer));
rev1.release(); // this release should trigger the delete of segments_1
assertFalse(slowFileExists(dir, IndexFileNames.SEGMENTS + "_1"));
+ writer.shutdown();
} finally {
- IOUtils.close(writer, dir);
+ IOUtils.close(dir);
}
}
@@ -108,8 +111,9 @@ public class IndexRevisionTest extends R
List<RevisionFile> files = sourceFiles.values().iterator().next();
String lastFile = files.get(files.size() - 1).fileName;
assertTrue(lastFile.startsWith(IndexFileNames.SEGMENTS) && !lastFile.equals(IndexFileNames.SEGMENTS_GEN));
+ writer.shutdown();
} finally {
- IOUtils.close(writer, dir);
+ IOUtils.close(dir);
}
}
@@ -147,8 +151,9 @@ public class IndexRevisionTest extends R
assertArrayEquals(srcBytes, inBytes);
IOUtils.close(src, in);
}
+ writer.shutdown();
} finally {
- IOUtils.close(writer, dir);
+ IOUtils.close(dir);
}
}
Modified: lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java (original)
+++ lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java Tue Apr 8 15:34:50 2014
@@ -59,7 +59,8 @@ public class LocalReplicatorTest extends
@After
@Override
public void tearDown() throws Exception {
- IOUtils.close(replicator, sourceWriter, sourceDir);
+ sourceWriter.shutdown();
+ IOUtils.close(replicator, sourceDir);
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java (original)
+++ lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java Tue Apr 8 15:34:50 2014
@@ -57,8 +57,9 @@ public class SessionTokenTest extends Re
List<RevisionFile> files1 = session1.sourceFiles.values().iterator().next();
List<RevisionFile> files2 = session2.sourceFiles.values().iterator().next();
assertEquals(files1, files2);
-
- IOUtils.close(writer, dir);
+
+ writer.shutdown();
+ IOUtils.close(dir);
}
}
Modified: lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java (original)
+++ lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java Tue Apr 8 15:34:50 2014
@@ -83,7 +83,8 @@ public class HttpReplicatorTest extends
@Override
public void tearDown() throws Exception {
stopHttpServer(server);
- IOUtils.close(reader, writer, handlerIndexDir, serverIndexDir);
+ writer.rollback();
+ IOUtils.close(reader, handlerIndexDir, serverIndexDir);
System.clearProperty("org.eclipse.jetty.LEVEL");
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java Tue Apr 8 15:34:50 2014
@@ -61,7 +61,7 @@ public class DuplicateFilterTest extends
writer.forceMerge(1);
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java Tue Apr 8 15:34:50 2014
@@ -57,7 +57,7 @@ public class FuzzyLikeThisQueryTest exte
addDoc(writer, "jonny smith", "5");
addDoc(writer, "johnathon smythe", "6");
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java Tue Apr 8 15:34:50 2014
@@ -62,7 +62,7 @@ public class TestSlowCollationMethods ex
}
splitDoc = TestUtil.randomUnicodeString(random());
reader = iw.getReader();
- iw.close();
+ iw.shutdown();
searcher = newSearcher(reader);
}
@@ -168,7 +168,7 @@ public class TestSlowCollationMethods ex
iw.addDocument(doc);
}
IndexReader reader = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java Tue Apr 8 15:34:50 2014
@@ -58,7 +58,7 @@ public class TestSlowFuzzyQuery extends
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
SlowFuzzyQuery query = new SlowFuzzyQuery(new Term("field", "aaaaa"), SlowFuzzyQuery.defaultMinSimilarity, 0);
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
@@ -206,7 +206,7 @@ public class TestSlowFuzzyQuery extends
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
SlowFuzzyQuery query;
@@ -229,7 +229,7 @@ public class TestSlowFuzzyQuery extends
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
SlowFuzzyQuery query;
// not similar enough:
@@ -345,8 +345,8 @@ public class TestSlowFuzzyQuery extends
mr.close();
ir1.close();
ir2.close();
- writer.close();
- writer2.close();
+ writer.shutdown();
+ writer2.shutdown();
directory.close();
directory2.close();
}
@@ -359,7 +359,7 @@ public class TestSlowFuzzyQuery extends
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
Query query;
// term not over 10 chars, so optimization shortcuts
@@ -396,7 +396,7 @@ public class TestSlowFuzzyQuery extends
IndexReader reader = writer.getReader();
IndexSearcher searcher = newSearcher(reader);
- writer.close();
+ writer.shutdown();
SlowFuzzyQuery query = new SlowFuzzyQuery(new Term("field", "lucene"));
query.setRewriteMethod(new MultiTermQuery.TopTermsBoostOnlyBooleanQueryRewrite(50));
@@ -433,7 +433,7 @@ public class TestSlowFuzzyQuery extends
addDoc("Brute willis", w);
addDoc("B. willis", w);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
Query q = new SlowFuzzyQuery(new Term("field", "giga"), 0.9f);
@@ -454,7 +454,7 @@ public class TestSlowFuzzyQuery extends
addDoc("working", w);
IndexReader reader = w.getReader();
IndexSearcher searcher = newSearcher(reader);
- w.close();
+ w.shutdown();
SlowFuzzyQuery q = new SlowFuzzyQuery(new Term("field", "fouba"), 2);
ScoreDoc[] hits = searcher.search(q, 10).scoreDocs;
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java Tue Apr 8 15:34:50 2014
@@ -110,7 +110,7 @@ public class TestSlowFuzzyQuery2 extends
// otherwise scores are different!
searcher.setSimilarity(new DefaultSimilarity());
- writer.close();
+ writer.shutdown();
String line;
while ((line = reader.readLine()) != null) {
String params[] = line.split(",");
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortField.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortField.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortField.java Tue Apr 8 15:34:50 2014
@@ -49,7 +49,7 @@ public class TestSortedSetSortField exte
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", false));
@@ -78,7 +78,7 @@ public class TestSortedSetSortField exte
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", true));
@@ -109,7 +109,7 @@ public class TestSortedSetSortField exte
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortedSetSortField("value", false);
@@ -144,7 +144,7 @@ public class TestSortedSetSortField exte
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortedSetSortField("value", false);
@@ -175,7 +175,7 @@ public class TestSortedSetSortField exte
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", false));
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortFieldDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortFieldDocValues.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortFieldDocValues.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortFieldDocValues.java Tue Apr 8 15:34:50 2014
@@ -62,7 +62,7 @@ public class TestSortedSetSortFieldDocVa
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", false));
@@ -92,7 +92,7 @@ public class TestSortedSetSortFieldDocVa
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", true));
@@ -124,7 +124,7 @@ public class TestSortedSetSortFieldDocVa
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortedSetSortField("value", false);
@@ -160,7 +160,7 @@ public class TestSortedSetSortFieldDocVa
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortedSetSortField("value", false);
@@ -192,7 +192,7 @@ public class TestSortedSetSortFieldDocVa
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", false));
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortFieldSelectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortFieldSelectors.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortFieldSelectors.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSortedSetSortFieldSelectors.java Tue Apr 8 15:34:50 2014
@@ -86,7 +86,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -117,7 +117,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -151,7 +151,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -189,7 +189,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -223,7 +223,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -255,7 +255,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -287,7 +287,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -322,7 +322,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -361,7 +361,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -394,7 +394,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -426,7 +426,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -458,7 +458,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -493,7 +493,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -532,7 +532,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -565,7 +565,7 @@ public class TestSortedSetSortFieldSelec
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.close();
+ writer.shutdown();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java Tue Apr 8 15:34:50 2014
@@ -50,7 +50,7 @@ public class TestRegexQuery extends Luce
doc.add(newTextField(FN, "the quick brown fox jumps over the lazy dog", Field.Store.NO));
writer.addDocument(doc);
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java Tue Apr 8 15:34:50 2014
@@ -66,7 +66,7 @@ public class TestSpanRegexQuery extends
doc.add(newTextField("field", "first auto update", Field.Store.NO));
writer.addDocument(doc);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
IndexReader reader = DirectoryReader.open(directory);
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java Tue Apr 8 15:34:50 2014
@@ -117,7 +117,7 @@ public class SpatialExample extends Luce
indexWriter.addDocument(newSampleDocument(
20, ctx.makePoint(0.1,0.1), ctx.makePoint(0, 0)));
- indexWriter.close();
+ indexWriter.shutdown();
}
private Document newSampleDocument(int id, Shape... shapes) {
Modified: lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java Tue Apr 8 15:34:50 2014
@@ -83,7 +83,8 @@ public abstract class SpatialTestCase ex
@Override
@After
public void tearDown() throws Exception {
- IOUtils.close(indexWriter,indexReader,directory);
+ indexWriter.shutdown();
+ IOUtils.close(indexReader,directory);
super.tearDown();
}
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java Tue Apr 8 15:34:50 2014
@@ -173,7 +173,7 @@ public class SpellChecker implements jav
IndexWriter writer = new IndexWriter(spellIndexDir,
new IndexWriterConfig(Version.LUCENE_CURRENT,
null));
- writer.close();
+ writer.shutdown();
}
swapSearcher(spellIndexDir);
}
@@ -460,7 +460,7 @@ public class SpellChecker implements jav
Version.LUCENE_CURRENT,
null)
.setOpenMode(OpenMode.CREATE));
- writer.close();
+ writer.shutdown();
swapSearcher(dir);
}
}
@@ -542,7 +542,7 @@ public class SpellChecker implements jav
writer.forceMerge(1);
}
// close writer
- writer.close();
+ writer.shutdown();
// TODO: this isn't that great, maybe in the future SpellChecker should take
// IWC in its ctor / keep its writer open?
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java Tue Apr 8 15:34:50 2014
@@ -207,11 +207,10 @@ public class AnalyzingInfixSuggester ext
}
if (writer != null) {
- writer.close();
+ writer.shutdown();
writer = null;
}
- AtomicReader r = null;
boolean success = false;
try {
// First pass: build a temporary normal Lucene index,
@@ -238,10 +237,8 @@ public class AnalyzingInfixSuggester ext
searcherMgr = new SearcherManager(writer, true, null);
success = true;
} finally {
- if (success) {
- IOUtils.close(r);
- } else {
- IOUtils.closeWhileHandlingException(writer, r);
+ if (success == false) {
+ writer.rollback();
writer = null;
}
}
@@ -640,7 +637,7 @@ public class AnalyzingInfixSuggester ext
searcherMgr = null;
}
if (writer != null) {
- writer.close();
+ writer.shutdown();
dir.close();
writer = null;
}
Modified: lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java Tue Apr 8 15:34:50 2014
@@ -379,13 +379,17 @@ public class FreeTextSuggester extends L
pw.close();
*/
+ // Writer was only temporary, to count up bigrams,
+ // which we transferred to the FST, so now we
+ // rollback:
+ writer.rollback();
success = true;
} finally {
try {
if (success) {
- IOUtils.close(writer, reader);
+ IOUtils.close(reader);
} else {
- IOUtils.closeWhileHandlingException(writer, reader);
+ IOUtils.closeWhileHandlingException(reader, writer);
}
} finally {
for(String file : dir.listAll()) {
Modified: lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java Tue Apr 8 15:34:50 2014
@@ -56,7 +56,7 @@ public class TestDirectSpellChecker exte
}
ir.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
public void testSimpleExamples() throws Exception {
@@ -122,7 +122,7 @@ public class TestDirectSpellChecker exte
assertEquals("thousand", similar[0].string);
ir.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -188,7 +188,7 @@ public class TestDirectSpellChecker exte
assertEquals(2, similar.length);
ir.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -211,7 +211,7 @@ public class TestDirectSpellChecker exte
SuggestMode.SUGGEST_WHEN_NOT_IN_INDEX);
assertEquals(0, similar.length);
ir.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -236,7 +236,7 @@ public class TestDirectSpellChecker exte
assertEquals(1, similar.length);
assertEquals("five", similar[0].string);
ir.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -261,7 +261,7 @@ public class TestDirectSpellChecker exte
assertEquals(1, similar.length);
assertEquals("seventeen", similar[0].string);
ir.close();
- writer.close();
+ writer.shutdown();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (original)
+++ lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java Tue Apr 8 15:34:50 2014
@@ -74,7 +74,7 @@ public class TestLuceneDictionary extend
writer.addDocument(doc);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
}
@Override