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 [7/9] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
lucene/analysis/common/src/test/org/apache/lucene/anal...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java Tue Apr 8 15:34:50 2014
@@ -271,7 +271,7 @@ public class TestBufferedIndexInput exte
hits = searcher.search(new TermQuery(aaa), null, 1000).scoreDocs;
dir.tweakBufferSizes();
assertEquals(35, hits.length);
- writer.close();
+ writer.shutdown();
reader.close();
} finally {
TestUtil.rm(indexDir);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java Tue Apr 8 15:34:50 2014
@@ -77,7 +77,7 @@ public class TestFileSwitchDirectory ext
assertFalse(fileExtensions.contains(ext));
}
reader.close();
- writer.close();
+ writer.shutdown();
files = fsd.listAll();
for(int i=0;i<files.length;i++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java Tue Apr 8 15:34:50 2014
@@ -71,7 +71,7 @@ public class TestLockFactory extends Luc
lock.lockAttempts > 0);
}
- writer.close();
+ writer.shutdown();
}
// Verify: we can use the NoLockFactory with RAMDirectory w/ no
@@ -96,9 +96,9 @@ public class TestLockFactory extends Luc
fail("Should not have hit an IOException with no locking");
}
- writer.close();
+ writer.shutdown();
if (writer2 != null) {
- writer2.close();
+ writer2.shutdown();
}
}
@@ -120,9 +120,9 @@ public class TestLockFactory extends Luc
} catch (IOException e) {
}
- writer.close();
+ writer.shutdown();
if (writer2 != null) {
- writer2.close();
+ writer2.shutdown();
}
}
@@ -155,7 +155,7 @@ public class TestLockFactory extends Luc
// First create a 1 doc index:
IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
addDoc(w);
- w.close();
+ w.shutdown();
WriterThread writer = new WriterThread(100, dir);
SearcherThread searcher = new SearcherThread(100, dir);
@@ -319,7 +319,7 @@ public class TestLockFactory extends Luc
break;
}
try {
- writer.close();
+ writer.shutdown();
} catch (IOException e) {
hitException = true;
System.out.println("Stress Test Index Writer: close hit unexpected exception: " + e.toString());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java Tue Apr 8 15:34:50 2014
@@ -34,7 +34,7 @@ public class TestMockDirectoryWrapper ex
} catch (Exception expected) {
assertTrue(expected.getMessage().contains("there are still open locks"));
}
- iw.close();
+ iw.shutdown();
dir.close();
}
@@ -48,7 +48,7 @@ public class TestMockDirectoryWrapper ex
} catch (Exception expected) {
assertTrue(expected.getMessage().contains("there are still open locks"));
}
- iw.close();
+ iw.shutdown();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java Tue Apr 8 15:34:50 2014
@@ -318,7 +318,7 @@ public class TestMultiMMap extends Lucen
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
int numAsserts = atLeast(100);
for (int i = 0; i < numAsserts; i++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java Tue Apr 8 15:34:50 2014
@@ -85,7 +85,7 @@ public class TestNRTCachingDirectory ext
}
// Close should force cache to clear since all files are sync'd
- w.close();
+ w.shutdown();
final String[] cachedFiles = cachedDir.listCachedFiles();
for(String file : cachedFiles) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java Tue Apr 8 15:34:50 2014
@@ -63,7 +63,7 @@ public class TestRAMDirectory extends Lu
writer.addDocument(doc);
}
assertEquals(docsToAdd, writer.maxDoc());
- writer.close();
+ writer.shutdown();
dir.close();
}
@@ -136,7 +136,7 @@ public class TestRAMDirectory extends Lu
writer.forceMerge(1);
assertEquals(ramDir.sizeInBytes(), ramDir.getRecomputedSizeInBytes());
- writer.close();
+ writer.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java Tue Apr 8 15:34:50 2014
@@ -89,7 +89,7 @@ public class TestWindowsMMap extends Luc
}
reader.close();
- writer.close();
+ writer.shutdown();
rmDir(dirPath);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java Tue Apr 8 15:34:50 2014
@@ -69,8 +69,8 @@ public class TestFieldCacheSanityChecker
wB.addDocument(doc);
}
}
- wA.close();
- wB.close();
+ wA.shutdown();
+ wB.shutdown();
DirectoryReader rA = DirectoryReader.open(dirA);
readerA = SlowCompositeReaderWrapper.wrap(rA);
readerAclone = SlowCompositeReaderWrapper.wrap(rA);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Tue Apr 8 15:34:50 2014
@@ -321,7 +321,7 @@ public class TestFSTs extends LuceneTest
docCount++;
}
IndexReader r = DirectoryReader.open(writer, true);
- writer.close();
+ writer.shutdown();
final PositiveIntOutputs outputs = PositiveIntOutputs.getSingleton();
final boolean doRewrite = random().nextBoolean();
@@ -779,14 +779,14 @@ public class TestFSTs extends LuceneTest
System.out.println("DOT before rewrite");
Writer w = new OutputStreamWriter(new FileOutputStream("/mnt/scratch/before.dot"));
Util.toDot(fst, w, false, false);
- w.close();
+ w.shutdown();
final FST<Object> rewrite = new FST<Object>(fst, 1, 100);
System.out.println("DOT after rewrite");
w = new OutputStreamWriter(new FileOutputStream("/mnt/scratch/after.dot"));
Util.toDot(rewrite, w, false, false);
- w.close();
+ w.shutdown();
}
*/
@@ -885,7 +885,7 @@ public class TestFSTs extends LuceneTest
// turn writer into reader:
final IndexReader r = w.getReader();
final IndexSearcher s = newSearcher(r);
- w.close();
+ w.shutdown();
final List<String> allIDsList = new ArrayList<>(allIDs);
final List<String> sortedAllIDsList = new ArrayList<>(allIDsList);
@@ -1009,7 +1009,7 @@ public class TestFSTs extends LuceneTest
System.out.println("TEST: got reader=" + r);
}
IndexSearcher s = newSearcher(r);
- w.close();
+ w.shutdown();
final List<String> allTermsList = new ArrayList<>(allTerms);
Collections.shuffle(allTermsList, random());
@@ -1237,7 +1237,7 @@ public class TestFSTs extends LuceneTest
final FST<Long> fst = builder.finish();
//Writer w = new OutputStreamWriter(new FileOutputStream("out.dot"));
//Util.toDot(fst, w, false, false);
- //w.close();
+ //w.shutdown();
Util.TopResults<Long> res = Util.shortestPaths(fst,
fst.getFirstArc(new FST.Arc<Long>()),
@@ -1332,7 +1332,7 @@ public class TestFSTs extends LuceneTest
final FST<Pair<Long,Long>> fst = builder.finish();
//Writer w = new OutputStreamWriter(new FileOutputStream("out.dot"));
//Util.toDot(fst, w, false, false);
- //w.close();
+ //w.shutdown();
Util.TopResults<Pair<Long,Long>> res = Util.shortestPaths(fst,
fst.getFirstArc(new FST.Arc<Pair<Long,Long>>()),
@@ -1392,7 +1392,7 @@ public class TestFSTs extends LuceneTest
//System.out.println("SAVE out.dot");
//Writer w = new OutputStreamWriter(new FileOutputStream("out.dot"));
//Util.toDot(fst, w, false, false);
- //w.close();
+ //w.shutdown();
BytesReader reader = fst.getBytesReader();
@@ -1514,7 +1514,7 @@ public class TestFSTs extends LuceneTest
//System.out.println("SAVE out.dot");
//Writer w = new OutputStreamWriter(new FileOutputStream("out.dot"));
//Util.toDot(fst, w, false, false);
- //w.close();
+ //w.shutdown();
BytesReader reader = fst.getBytesReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java Tue Apr 8 15:34:50 2014
@@ -44,7 +44,7 @@ public class TestFailIfUnreferencedFiles
dir.setAssertNoUnrefencedFilesOnClose(true);
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
iw.addDocument(new Document());
- iw.close();
+ iw.shutdown();
IndexOutput output = dir.createOutput("_hello.world", IOContext.DEFAULT);
output.writeString("i am unreferenced!");
output.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailOnFieldCacheInsanity.java Tue Apr 8 15:34:50 2014
@@ -48,7 +48,7 @@ public class TestFailOnFieldCacheInsanit
w.addDocument(doc);
w.forceMerge(1);
r = w.getReader();
- w.close();
+ w.shutdown();
subR = r.leaves().get(0).reader();
}
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java Tue Apr 8 15:34:50 2014
@@ -118,7 +118,7 @@ public class IndexFiles {
//
// writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
Date end = new Date();
System.out.println(end.getTime() - start.getTime() + " total milliseconds");
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java Tue Apr 8 15:34:50 2014
@@ -86,7 +86,7 @@ public class AssociationsFacetsExample {
doc.add(new FloatAssociationFacetField(0.34f, "genre", "software"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- indexWriter.close();
+ indexWriter.shutdown();
taxoWriter.close();
}
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java Tue Apr 8 15:34:50 2014
@@ -109,7 +109,7 @@ public class DistanceFacetsExample imple
// Open near-real-time searcher
searcher = new IndexSearcher(DirectoryReader.open(writer, true));
- writer.close();
+ writer.shutdown();
}
private ValueSource getDistanceValueSource() {
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java Tue Apr 8 15:34:50 2014
@@ -76,7 +76,7 @@ public class ExpressionAggregationFacets
doc.add(new FacetField("A", "C"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- indexWriter.close();
+ indexWriter.shutdown();
taxoWriter.close();
}
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java Tue Apr 8 15:34:50 2014
@@ -87,7 +87,7 @@ public class MultiCategoryListsFacetsExa
doc.add(new FacetField("Publish Date", "1999", "5", "5"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- indexWriter.close();
+ indexWriter.shutdown();
taxoWriter.close();
}
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java Tue Apr 8 15:34:50 2014
@@ -77,7 +77,7 @@ public class RangeFacetsExample implemen
// Open near-real-time searcher
searcher = new IndexSearcher(DirectoryReader.open(indexWriter, true));
- indexWriter.close();
+ indexWriter.shutdown();
}
private FacetsConfig getConfig() {
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java Tue Apr 8 15:34:50 2014
@@ -88,7 +88,7 @@ public class SimpleFacetsExample {
doc.add(new FacetField("Publish Date", "1999", "5", "5"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- indexWriter.close();
+ indexWriter.shutdown();
taxoWriter.close();
}
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java Tue Apr 8 15:34:50 2014
@@ -82,7 +82,7 @@ public class SimpleSortedSetFacetsExampl
doc.add(new SortedSetDocValuesFacetField("Publish Year", "1999"));
indexWriter.addDocument(config.build(doc));
- indexWriter.close();
+ indexWriter.shutdown();
}
/** User runs a query and counts facets. */
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java Tue Apr 8 15:34:50 2014
@@ -155,7 +155,7 @@ public class FormBasedXmlQueryDemo exten
}
line = br.readLine();
}
- writer.close();
+ writer.shutdown();
//open searcher
// this example never closes it reader!
Modified: lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java Tue Apr 8 15:34:50 2014
@@ -75,7 +75,7 @@ public class TestDemoExpressions extend
reader = iw.getReader();
searcher = new IndexSearcher(reader);
- iw.close();
+ iw.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java Tue Apr 8 15:34:50 2014
@@ -65,7 +65,7 @@ public class TestExpressionRescorer exte
reader = iw.getReader();
searcher = new IndexSearcher(reader);
- iw.close();
+ iw.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java Tue Apr 8 15:34:50 2014
@@ -81,7 +81,7 @@ public class TestExpressionSorts extends
iw.addDocument(document);
}
reader = iw.getReader();
- iw.close();
+ iw.shutdown();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java Tue Apr 8 15:34:50 2014
@@ -70,7 +70,7 @@ public class TestExpressionValueSource e
iw.forceMerge(1);
reader = iw.getReader();
- iw.close();
+ iw.shutdown();
}
@Override
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Tue Apr 8 15:34:50 2014
@@ -340,12 +340,12 @@ public class DirectoryTaxonomyWriter imp
public synchronized void close() throws IOException {
if (!isClosed) {
commit();
+ indexWriter.shutdown();
doClose();
}
}
private void doClose() throws IOException {
- indexWriter.close();
isClosed = true;
closeResources();
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java Tue Apr 8 15:34:50 2014
@@ -110,7 +110,7 @@ public class TestDrillDownQuery extends
taxoWriter.close();
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
taxo = new DirectoryTaxonomyReader(taxoDir);
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java Tue Apr 8 15:34:50 2014
@@ -242,7 +242,8 @@ public class TestDrillSideways extends F
assertEquals(0, r.hits.totalHits);
assertNull(r.facets.getTopChildren(10, "Publish Date"));
assertNull(r.facets.getTopChildren(10, "Author"));
- IOUtils.close(searcher.getIndexReader(), taxoReader, writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(searcher.getIndexReader(), taxoReader, taxoWriter, dir, taxoDir);
}
public void testSometimesInvalidDrillDown() throws Exception {
@@ -296,7 +297,8 @@ public class TestDrillSideways extends F
// published once:
assertEquals("dim=Author path=[] value=2 childCount=2\n Bob (1)\n Lisa (1)\n", r.facets.getTopChildren(10, "Author").toString());
- IOUtils.close(searcher.getIndexReader(), taxoReader, writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(searcher.getIndexReader(), taxoReader, taxoWriter, dir, taxoDir);
}
public void testMultipleRequestsPerDim() throws Exception {
@@ -351,7 +353,8 @@ public class TestDrillSideways extends F
assertEquals("dim=dim path=[] value=6 childCount=4\n a (3)\n b (1)\n c (1)\n d (1)\n", r.facets.getTopChildren(10, "dim").toString());
assertEquals("dim=dim path=[a] value=3 childCount=3\n x (1)\n y (1)\n z (1)\n", r.facets.getTopChildren(10, "dim", "a").toString());
- IOUtils.close(searcher.getIndexReader(), taxoReader, writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(searcher.getIndexReader(), taxoReader, taxoWriter, dir, taxoDir);
}
private static class Doc implements Comparable<Doc> {
@@ -755,7 +758,8 @@ public class TestDrillSideways extends F
}
}
- IOUtils.close(r, tr, w, tw, d, td);
+ w.shutdown();
+ IOUtils.close(r, tr, tw, d, td);
}
private static class Counters {
@@ -1061,8 +1065,9 @@ public class TestDrillSideways extends F
r = ds.search(ddq, null, null, 10, new Sort(new SortField("foo", SortField.Type.INT)), false, false); // this used to fail on IllegalArgEx
assertEquals(0, r.hits.totalHits);
-
- IOUtils.close(writer, taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
+
+ writer.shutdown();
+ IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java Tue Apr 8 15:34:50 2014
@@ -68,7 +68,8 @@ public class TestFacetsConfig extends Fa
// these two addDocument() used to fail
indexWriter.addDocument(doc);
indexWriter.addDocument(doc);
- IOUtils.close(indexWriter, taxoWriter);
+ indexWriter.shutdown();
+ IOUtils.close(taxoWriter);
DirectoryReader indexReader = DirectoryReader.open(indexDir);
DirectoryTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java Tue Apr 8 15:34:50 2014
@@ -91,7 +91,8 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$facets", ir);
- IOUtils.close(tr, ir, iw, tw, indexDir, taxoDir);
+ iw.shutdown();
+ IOUtils.close(tr, ir, tw, indexDir, taxoDir);
}
@Test
@@ -130,7 +131,8 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$facets", ir);
assertOrdinalsExist("$author", ir);
- IOUtils.close(tr, ir, iw, tw, indexDir, taxoDir);
+ iw.shutdown();
+ IOUtils.close(tr, ir, tw, indexDir, taxoDir);
}
@Test
@@ -173,7 +175,8 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$music", ir);
assertOrdinalsExist("$music", ir);
- IOUtils.close(tr, ir, iw, tw, indexDir, taxoDir);
+ iw.shutdown();
+ IOUtils.close(tr, ir, tw, indexDir, taxoDir);
}
private void assertOrdinalsExist(String field, IndexReader ir) throws IOException {
@@ -224,7 +227,8 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$bands", ir);
assertOrdinalsExist("$composers", ir);
- IOUtils.close(tr, ir, iw, tw, indexDir, taxoDir);
+ iw.shutdown();
+ IOUtils.close(tr, ir, tw, indexDir, taxoDir);
}
@Test
@@ -267,8 +271,8 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$music", ir);
assertOrdinalsExist("$literature", ir);
- IOUtils.close(tr, ir, iw, tw);
- IOUtils.close(indexDir, taxoDir);
+ iw.shutdown();
+ IOUtils.close(tr, ir, iw, tw, indexDir, taxoDir);
}
private void assertCorrectResults(Facets facets) throws IOException {
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java Tue Apr 8 15:34:50 2014
@@ -58,7 +58,8 @@ public class TestRandomSamplingFacetsCol
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- IOUtils.close(writer, taxoWriter);
+ writer.shutdown();
+ IOUtils.close(taxoWriter);
// Test empty results
RandomSamplingFacetsCollector collectRandomZeroResults = new RandomSamplingFacetsCollector(numDocs / 10, random.nextLong());
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java Tue Apr 8 15:34:50 2014
@@ -88,7 +88,7 @@ public class TestRangeFacetCounts extend
w.addDocument(doc);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
@@ -152,7 +152,7 @@ public class TestRangeFacetCounts extend
w.addDocument(doc);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
@@ -188,7 +188,7 @@ public class TestRangeFacetCounts extend
w.addDocument(doc);
IndexReader r = w.getReader();
- w.close();
+ w.shutdown();
FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
@@ -306,7 +306,8 @@ public class TestRangeFacetCounts extend
assertEquals("dim=dim path=[] value=11 childCount=2\n b (8)\n a (3)\n", dsr.facets.getTopChildren(10, "dim").toString());
assertEquals("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n",
dsr.facets.getTopChildren(10, "field").toString());
- IOUtils.close(tw, tr, td, w, r, d);
+ w.shutdown();
+ IOUtils.close(tw, tr, td, r, d);
}
public void testBasicDouble() throws Exception {
@@ -335,8 +336,8 @@ public class TestRangeFacetCounts extend
assertEquals("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n",
facets.getTopChildren(10, "field").toString());
-
- IOUtils.close(w, r, d);
+ w.shutdown();
+ IOUtils.close(r, d);
}
public void testBasicFloat() throws Exception {
@@ -366,8 +367,8 @@ public class TestRangeFacetCounts extend
assertEquals("dim=field path=[] value=21 childCount=5\n less than 10 (10)\n less than or equal to 10 (11)\n over 90 (9)\n 90 or above (10)\n over 1000 (0)\n",
facets.getTopChildren(10, "field").toString());
-
- IOUtils.close(w, r, d);
+ w.shutdown();
+ IOUtils.close(r, d);
}
public void testRandomLongs() throws Exception {
@@ -514,7 +515,8 @@ public class TestRangeFacetCounts extend
}
}
- IOUtils.close(w, r, dir);
+ w.shutdown();
+ IOUtils.close(r, dir);
}
public void testRandomFloats() throws Exception {
@@ -672,7 +674,8 @@ public class TestRangeFacetCounts extend
}
}
- IOUtils.close(w, r, dir);
+ w.shutdown();
+ IOUtils.close(r, dir);
}
public void testRandomDoubles() throws Exception {
@@ -815,7 +818,8 @@ public class TestRangeFacetCounts extend
}
}
- IOUtils.close(w, r, dir);
+ w.shutdown();
+ IOUtils.close(r, dir);
}
// LUCENE-5178
@@ -852,7 +856,8 @@ public class TestRangeFacetCounts extend
assertEquals("dim=field path=[] value=16 childCount=5\n less than 10 (8)\n less than or equal to 10 (8)\n over 90 (8)\n 90 or above (8)\n over 1000 (0)\n",
facets.getTopChildren(10, "field").toString());
- IOUtils.close(w, r, d);
+ w.shutdown();
+ IOUtils.close(r, d);
}
public void testCustomDoublesValueSource() throws Exception {
@@ -965,6 +970,7 @@ public class TestRangeFacetCounts extend
assertEquals("dim=field path=[] value=3 childCount=6\n < 1 (0)\n < 2 (1)\n < 5 (3)\n < 10 (3)\n < 20 (3)\n < 50 (3)\n",
dsr.facets.getTopChildren(10, "field").toString());
- IOUtils.close(r, writer, dir);
+ writer.shutdown();
+ IOUtils.close(r, dir);
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java Tue Apr 8 15:34:50 2014
@@ -92,7 +92,8 @@ public class TestSortedSetDocValuesFacet
TopDocs hits = searcher.search(q, 1);
assertEquals(1, hits.totalHits);
- IOUtils.close(writer, searcher.getIndexReader(), dir);
+ writer.shutdown();
+ IOUtils.close(searcher.getIndexReader(), dir);
}
// LUCENE-5090
@@ -134,7 +135,7 @@ public class TestSortedSetDocValuesFacet
}
r.close();
- writer.close();
+ writer.shutdown();
searcher.getIndexReader().close();
dir.close();
}
@@ -173,7 +174,7 @@ public class TestSortedSetDocValuesFacet
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.close();
+ writer.shutdown();
// Per-top-reader state:
SortedSetDocValuesReaderState state = new DefaultSortedSetDocValuesReaderState(searcher.getIndexReader());
@@ -218,7 +219,7 @@ public class TestSortedSetDocValuesFacet
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.close();
+ writer.shutdown();
// Per-top-reader state:
SortedSetDocValuesReaderState state = new DefaultSortedSetDocValuesReaderState(searcher.getIndexReader());
@@ -265,7 +266,8 @@ public class TestSortedSetDocValuesFacet
// Ask for top 10 labels for any dims that have counts:
assertEquals("dim=a path=[] value=2 childCount=2\n foo1 (1)\n foo2 (1)\n", facets.getTopChildren(10, "a").toString());
- IOUtils.close(writer, searcher.getIndexReader(), dir);
+ writer.shutdown();
+ IOUtils.close(searcher.getIndexReader(), dir);
}
@@ -353,6 +355,7 @@ public class TestSortedSetDocValuesFacet
assertEquals(expected, actual);
}
- IOUtils.close(w, searcher.getIndexReader(), indexDir, taxoDir);
+ w.shutdown();
+ IOUtils.close(searcher.getIndexReader(), indexDir, taxoDir);
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestCachedOrdinalsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestCachedOrdinalsReader.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestCachedOrdinalsReader.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestCachedOrdinalsReader.java Tue Apr 8 15:34:50 2014
@@ -80,7 +80,8 @@ public class TestCachedOrdinalsReader ex
assertEquals(ramBytesUsed, ordsReader.ramBytesUsed());
}
}
-
- IOUtils.close(writer, taxoWriter, reader, indexDir, taxoDir);
+
+ writer.shutdown();
+ IOUtils.close(taxoWriter, reader, indexDir, taxoDir);
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java Tue Apr 8 15:34:50 2014
@@ -203,7 +203,8 @@ public class TestSearcherTaxonomyManager
System.out.println("TEST: now stop");
}
- IOUtils.close(mgr, tw, w, taxoDir, dir);
+ w.shutdown();
+ IOUtils.close(mgr, tw, taxoDir, dir);
}
public void testDirectory() throws Exception {
@@ -255,7 +256,8 @@ public class TestSearcherTaxonomyManager
System.out.println("TEST: now stop");
}
- IOUtils.close(mgr, tw, w, taxoDir, indexDir);
+ w.shutdown();
+ IOUtils.close(mgr, tw, taxoDir, indexDir);
}
public void testReplaceTaxonomyNRT() throws Exception {
@@ -280,7 +282,8 @@ public class TestSearcherTaxonomyManager
// expected
}
- IOUtils.close(mgr, tw, w, taxoDir, dir);
+ w.shutdown();
+ IOUtils.close(mgr, tw, taxoDir, dir);
}
public void testReplaceTaxonomyDirectory() throws Exception {
@@ -318,7 +321,8 @@ public class TestSearcherTaxonomyManager
mgr.release(pair);
}
- IOUtils.close(mgr, tw, w, taxoDir, indexDir);
+ w.shutdown();
+ IOUtils.close(mgr, tw, taxoDir, indexDir);
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java Tue Apr 8 15:34:50 2014
@@ -86,7 +86,7 @@ public class TestTaxonomyFacetAssociatio
taxoWriter.close();
reader = writer.getReader();
- writer.close();
+ writer.shutdown();
taxoReader = new DirectoryTaxonomyReader(taxoDir);
}
@@ -182,7 +182,8 @@ public class TestTaxonomyFacetAssociatio
} catch (IllegalArgumentException exc) {
// expected
}
- IOUtils.close(writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, dir, taxoDir);
}
public void testNoHierarchy() throws Exception {
@@ -202,7 +203,8 @@ public class TestTaxonomyFacetAssociatio
} catch (IllegalArgumentException exc) {
// expected
}
- IOUtils.close(writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, dir, taxoDir);
}
public void testRequireDimCount() throws Exception {
@@ -222,7 +224,8 @@ public class TestTaxonomyFacetAssociatio
} catch (IllegalArgumentException exc) {
// expected
}
- IOUtils.close(writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, dir, taxoDir);
}
public void testIntSumAssociationDrillDown() throws Exception {
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java Tue Apr 8 15:34:50 2014
@@ -141,7 +141,8 @@ public class TestTaxonomyFacetCounts ext
assertTrue(result.indexOf(" /2012") != -1);
assertTrue(result.indexOf(" /20") != -1);
- IOUtils.close(writer, taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
}
// LUCENE-5333
@@ -198,7 +199,8 @@ public class TestTaxonomyFacetCounts ext
assertEquals("dim=b path=[] value=2 childCount=2\n bar1 (1)\n bar2 (1)\n", results.get(1).toString());
assertEquals("dim=c path=[] value=1 childCount=1\n baz1 (1)\n", results.get(2).toString());
- IOUtils.close(writer, taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
}
public void testWrongIndexFieldName() throws Exception {
@@ -256,7 +258,8 @@ public class TestTaxonomyFacetCounts ext
// expected
}
- IOUtils.close(writer, taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
}
public void testReallyNoNormsForDrillDown() throws Exception {
@@ -280,7 +283,8 @@ public class TestTaxonomyFacetCounts ext
doc.add(newTextField("field", "text", Field.Store.NO));
doc.add(new FacetField("a", "path"));
writer.addDocument(config.build(taxoWriter, doc));
- IOUtils.close(writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, dir, taxoDir);
}
public void testMultiValuedHierarchy() throws Exception {
@@ -325,7 +329,8 @@ public class TestTaxonomyFacetCounts ext
assertEquals(1, result.labelValues.length);
assertEquals(1, result.labelValues[0].value.intValue());
- IOUtils.close(writer, taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
}
public void testLabelWithDelimiter() throws Exception {
@@ -358,7 +363,8 @@ public class TestTaxonomyFacetCounts ext
FacetResult result = facets.getTopChildren(10, "dim");
assertEquals("dim=dim path=[] value=-1 childCount=2\n test\u001Fone (1)\n test\u001Etwo (1)\n", result.toString());
- IOUtils.close(writer, taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
}
public void testRequireDimCount() throws Exception {
@@ -407,7 +413,8 @@ public class TestTaxonomyFacetCounts ext
}
assertEquals(1, facets.getSpecificValue("dim2"));
assertEquals(1, facets.getSpecificValue("dim3"));
- IOUtils.close(writer, taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
}
// LUCENE-4583: make sure if we require > 32 KB for one
@@ -456,8 +463,9 @@ public class TestTaxonomyFacetCounts ext
assertEquals(1, labelValue.value.intValue());
}
assertEquals(numLabels, allLabels.size());
-
- IOUtils.close(searcher.getIndexReader(), taxoWriter, writer, taxoReader, dir, taxoDir);
+
+ writer.shutdown();
+ IOUtils.close(searcher.getIndexReader(), taxoWriter, taxoReader, dir, taxoDir);
}
// Make sure we catch when app didn't declare field as
@@ -478,7 +486,8 @@ public class TestTaxonomyFacetCounts ext
} catch (IllegalArgumentException iae) {
// expected
}
- IOUtils.close(writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, dir, taxoDir);
}
// Make sure we catch when app didn't declare field as
@@ -500,7 +509,8 @@ public class TestTaxonomyFacetCounts ext
} catch (IllegalArgumentException iae) {
// expected
}
- IOUtils.close(writer, taxoWriter, dir, taxoDir);
+ writer.shutdown();
+ IOUtils.close(taxoWriter, dir, taxoDir);
}
public void testSeparateIndexedFields() throws Exception {
@@ -529,7 +539,8 @@ public class TestTaxonomyFacetCounts ext
Facets facets2 = getTaxonomyFacetCounts(taxoReader, config, sfc, "$b");
assertEquals(r.maxDoc(), facets1.getTopChildren(10, "a").value.intValue());
assertEquals(r.maxDoc(), facets2.getTopChildren(10, "b").value.intValue());
- IOUtils.close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
public void testCountRoot() throws Exception {
@@ -556,8 +567,9 @@ public class TestTaxonomyFacetCounts ext
for (FacetResult result : facets.getAllDims(10)) {
assertEquals(r.numDocs(), result.value.intValue());
}
-
- IOUtils.close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
public void testGetFacetResultsTwice() throws Exception {
@@ -584,8 +596,9 @@ public class TestTaxonomyFacetCounts ext
List<FacetResult> res1 = facets.getAllDims(10);
List<FacetResult> res2 = facets.getAllDims(10);
assertEquals("calling getFacetResults twice should return the .equals()=true result", res1, res2);
-
- IOUtils.close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
public void testChildCount() throws Exception {
@@ -611,7 +624,8 @@ public class TestTaxonomyFacetCounts ext
assertEquals(10, facets.getTopChildren(2, "a").childCount);
- IOUtils.close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
private void indexTwoDocs(TaxonomyWriter taxoWriter, IndexWriter indexWriter, FacetsConfig config, boolean withContent) throws Exception {
@@ -649,7 +663,8 @@ public class TestTaxonomyFacetCounts ext
indexTwoDocs(taxoWriter, indexWriter, null, true); // 5th segment, with content, no categories
indexTwoDocs(taxoWriter, indexWriter, config, true); // 6th segment, with content, with categories
indexTwoDocs(taxoWriter, indexWriter, null, true); // 7th segment, with content, no categories
- IOUtils.close(indexWriter, taxoWriter);
+ indexWriter.shutdown();
+ IOUtils.close(taxoWriter);
DirectoryReader indexReader = DirectoryReader.open(indexDir);
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
@@ -753,6 +768,7 @@ public class TestTaxonomyFacetCounts ext
assertEquals(expected, actual);
}
- IOUtils.close(w, tw, searcher.getIndexReader(), tr, indexDir, taxoDir);
+ w.shutdown();
+ IOUtils.close(tw, searcher.getIndexReader(), tr, indexDir, taxoDir);
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java Tue Apr 8 15:34:50 2014
@@ -260,8 +260,9 @@ public class TestTaxonomyFacetCounts2 ex
// segment w/ categories and some content
indexDocsWithFacetsAndSomeTerms(indexWriter, taxoWriter, allExpectedCounts);
-
- IOUtils.close(indexWriter, taxoWriter);
+
+ indexWriter.shutdown();
+ IOUtils.close(taxoWriter);
}
@Test
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java Tue Apr 8 15:34:50 2014
@@ -106,7 +106,7 @@ public class TestTaxonomyFacetSumValueSo
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.close();
+ writer.shutdown();
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
@@ -172,7 +172,7 @@ public class TestTaxonomyFacetSumValueSo
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.close();
+ writer.shutdown();
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
@@ -215,7 +215,7 @@ public class TestTaxonomyFacetSumValueSo
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.close();
+ writer.shutdown();
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
@@ -278,8 +278,9 @@ public class TestTaxonomyFacetSumValueSo
int expected = (int) (td.getMaxScore() * td.totalHits);
assertEquals(expected, facets.getSpecificValue("dim", "a").intValue());
-
- IOUtils.close(iw, taxoWriter, taxoReader, taxoDir, r, indexDir);
+
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
public void testNoScore() throws Exception {
@@ -303,8 +304,9 @@ public class TestTaxonomyFacetSumValueSo
newSearcher(r).search(new MatchAllDocsQuery(), sfc);
Facets facets = new TaxonomyFacetSumValueSource(taxoReader, config, sfc, new LongFieldSource("price"));
assertEquals("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.getTopChildren(10, "a").toString());
-
- IOUtils.close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
public void testWithScore() throws Exception {
@@ -354,8 +356,9 @@ public class TestTaxonomyFacetSumValueSo
Facets facets = new TaxonomyFacetSumValueSource(taxoReader, config, fc, valueSource);
assertEquals("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.getTopChildren(10, "a").toString());
-
- IOUtils.close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
public void testRollupValues() throws Exception {
@@ -384,8 +387,9 @@ public class TestTaxonomyFacetSumValueSo
Facets facets = new TaxonomyFacetSumValueSource(taxoReader, config, sfc, valueSource);
assertEquals("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.getTopChildren(10, "a").toString());
-
- IOUtils.close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
public void testCountAndSumScore() throws Exception {
@@ -416,7 +420,8 @@ public class TestTaxonomyFacetSumValueSo
assertEquals(r.maxDoc(), facets1.getTopChildren(10, "a").value.intValue());
assertEquals(r.maxDoc(), facets2.getTopChildren(10, "b").value.doubleValue(), 1E-10);
- IOUtils.close(taxoWriter, iw, taxoReader, taxoDir, r, indexDir);
+ iw.shutdown();
+ IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
public void testRandom() throws Exception {
@@ -512,6 +517,7 @@ public class TestTaxonomyFacetSumValueSo
assertFloatValuesEquals(expected, actual);
}
- IOUtils.close(w, tw, searcher.getIndexReader(), tr, indexDir, taxoDir);
+ w.shutdown();
+ IOUtils.close(tw, searcher.getIndexReader(), tr, indexDir, taxoDir);
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java Tue Apr 8 15:34:50 2014
@@ -153,7 +153,8 @@ public class TestConcurrentFacetedIndexi
}
}
- IOUtils.close(tw, iw, tr, taxoDir, indexDir);
+ iw.shutdown();
+ IOUtils.close(tw, tr, taxoDir, indexDir);
}
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java Tue Apr 8 15:34:50 2014
@@ -225,7 +225,7 @@ public class TestDirectoryTaxonomyWriter
Directory dir = newDirectory();
// create an empty index first, so that DirTaxoWriter initializes indexEpoch to 1.
- new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null)).close();
+ new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null)).shutdown();
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(dir, OpenMode.CREATE_OR_APPEND, NO_OP_CACHE);
taxoWriter.close();
@@ -465,8 +465,9 @@ public class TestDirectoryTaxonomyWriter
// when too large components were allowed to be added, this resulted in a new added category
assertEquals(ordinal, taxoWriter.addCategory(cp));
-
- IOUtils.close(indexWriter, taxoWriter);
+
+ indexWriter.shutdown();
+ IOUtils.close(taxoWriter);
DirectoryReader indexReader = DirectoryReader.open(indexDir);
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java Tue Apr 8 15:34:50 2014
@@ -140,7 +140,7 @@ public class AllGroupHeadsCollectorTest
IndexReader reader = w.getReader();
IndexSearcher indexSearcher = newSearcher(reader);
- w.close();
+ w.shutdown();
int maxDoc = reader.maxDoc();
Sort sortWithinGroup = new Sort(new SortField("id_1", SortField.Type.INT, true));
@@ -299,7 +299,7 @@ public class AllGroupHeadsCollectorTest
}
final DirectoryReader r = w.getReader();
- w.close();
+ w.shutdown();
// NOTE: intentional but temporary field cache insanity!
final FieldCache.Ints docIdToFieldId = FieldCache.DEFAULT.getInts(SlowCompositeReaderWrapper.wrap(r), "id", false);
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java Tue Apr 8 15:34:50 2014
@@ -102,7 +102,7 @@ public class AllGroupsCollectorTest exte
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.close();
+ w.shutdown();
AbstractAllGroupsCollector<?> allGroupsCollector = createRandomCollector(groupField);
indexSearcher.search(new TermQuery(new Term("content", "random")), allGroupsCollector);
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java Tue Apr 8 15:34:50 2014
@@ -139,7 +139,7 @@ public class DistinctValuesCollectorTest
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.close();
+ w.shutdown();
Comparator<AbstractDistinctValuesCollector.GroupCount<Comparable<Object>>> cmp = new Comparator<AbstractDistinctValuesCollector.GroupCount<Comparable<Object>>>() {
@@ -509,7 +509,7 @@ public class DistinctValuesCollectorTest
}
}
- w.close();
+ w.shutdown();
return new IndexContext(dir, reader, dvType, searchTermToGroupCounts, contentStrings.toArray(new String[contentStrings.size()]));
}
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java Tue Apr 8 15:34:50 2014
@@ -271,7 +271,7 @@ public class GroupFacetCollectorTest ext
assertEquals("15", entries.get(1).getValue().utf8ToString());
assertEquals(2, entries.get(1).getCount());
- w.close();
+ w.shutdown();
indexSearcher.getIndexReader().close();
dir.close();
}
@@ -344,7 +344,7 @@ public class GroupFacetCollectorTest ext
w.addDocument(doc);
w.commit();
- w.close();
+ w.shutdown();
IndexSearcher indexSearcher = newSearcher(DirectoryReader.open(dir));
AbstractGroupFacetCollector groupedAirportFacetCollector = createRandomCollector(groupField, "airport", null, true);
indexSearcher.search(new MatchAllDocsQuery(), groupedAirportFacetCollector);
@@ -661,7 +661,7 @@ public class GroupFacetCollectorTest ext
}
DirectoryReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
return new IndexContext(searchTermToFacetToGroups, reader, numDocs, dir, facetWithMostGroups, numGroups, contentBrs, uniqueFacetValues, useDv);
}
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java Tue Apr 8 15:34:50 2014
@@ -119,7 +119,7 @@ public class GroupingSearchTest extends
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.close();
+ w.shutdown();
Sort groupSort = Sort.RELEVANCE;
GroupingSearch groupingSearch = createRandomGroupingSearch(groupField, groupSort, 5, canUseIDV);
@@ -234,7 +234,7 @@ public class GroupingSearchTest extends
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.close();
+ w.shutdown();
GroupingSearch gs = new GroupingSearch("group");
gs.setAllGroups(true);
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Tue Apr 8 15:34:50 2014
@@ -116,7 +116,7 @@ public class TestGrouping extends Lucene
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.close();
+ w.shutdown();
final Sort groupSort = Sort.RELEVANCE;
@@ -592,7 +592,7 @@ public class TestGrouping extends Lucene
}
final DirectoryReader r = w.getReader();
- w.close();
+ w.shutdown();
return r;
}
@@ -740,7 +740,7 @@ public class TestGrouping extends Lucene
System.arraycopy(groupDocs, 0, groupDocsByID, 0, groupDocs.length);
final DirectoryReader r = w.getReader();
- w.close();
+ w.shutdown();
// NOTE: intentional but temporary field cache insanity!
final FieldCache.Ints docIDToID = FieldCache.DEFAULT.getInts(SlowCompositeReaderWrapper.wrap(r), "id", false);
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Tue Apr 8 15:34:50 2014
@@ -65,7 +65,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, new TokenStreamConcurrent(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.close();
+ indexWriter.shutdown();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -107,7 +107,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, new TokenStreamConcurrent(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.close();
+ indexWriter.shutdown();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -175,7 +175,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, new TokenStreamSparse(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.close();
+ indexWriter.shutdown();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -216,7 +216,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, TEXT, customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.close();
+ indexWriter.shutdown();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -255,7 +255,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, new TokenStreamSparse(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.close();
+ indexWriter.shutdown();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1585759&r1=1585758&r2=1585759&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Tue Apr 8 15:34:50 2014
@@ -1776,7 +1776,7 @@ public class HighlighterTest extends Bas
writer.addDocument( doc( "t_text1", "random words for highlighting tests del" ) );
writer.addDocument( doc( "t_text1", "more random words for second field" ) );
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
}
private void deleteDocument() throws IOException {
@@ -1784,7 +1784,7 @@ public class HighlighterTest extends Bas
writer.deleteDocuments( new Term( "t_text1", "del" ) );
// To see negative idf, keep comment the following line
//writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
}
private void searchIndex() throws IOException, InvalidTokenOffsetsException {
@@ -1904,7 +1904,7 @@ public class HighlighterTest extends Bas
writer.addDocument(doc, analyzer);
writer.forceMerge(1);
- writer.close();
+ writer.shutdown();
reader = DirectoryReader.open(ramDir);
numHighlights = 0;
}
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -101,7 +101,7 @@ public class TokenSourcesTest extends Lu
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.close();
+ indexWriter.shutdown();
}
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.close();
+ indexWriter.shutdown();
}
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.close();
+ indexWriter.shutdown();
}
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.close();
+ indexWriter.shutdown();
}
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.close();
+ indexWriter.shutdown();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -332,7 +332,7 @@ public class TokenSourcesTest extends Lu
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.close();
+ writer.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -78,7 +78,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -130,7 +130,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -182,7 +182,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -234,7 +234,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -295,7 +295,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -405,7 +405,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -458,7 +458,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -500,7 +500,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -541,7 +541,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -583,7 +583,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -625,7 +625,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -668,7 +668,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -710,7 +710,7 @@ public class TestMultiTermHighlighting e
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
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=1585759&r1=1585758&r2=1585759&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 Tue Apr 8 15:34:50 2014
@@ -71,7 +71,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -139,7 +139,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
@@ -174,7 +174,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -209,7 +209,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -246,7 +246,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -321,7 +321,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -358,7 +358,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -396,7 +396,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -667,7 +667,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
@@ -715,7 +715,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -746,7 +746,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -782,7 +782,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
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.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -851,7 +851,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -887,7 +887,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -930,7 +930,7 @@ public class TestPostingsHighlighter ext
}
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -973,7 +973,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter();
@@ -1005,7 +1005,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -1048,7 +1048,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {
@@ -1086,7 +1086,7 @@ public class TestPostingsHighlighter ext
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.close();
+ iw.shutdown();
IndexSearcher searcher = newSearcher(ir);
PostingsHighlighter highlighter = new PostingsHighlighter() {