You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/08/09 20:54:43 UTC
svn commit: r1617004 [8/11] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
lucene/analysis/common/src/test/org/apache/lucene/ana...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java Sat Aug 9 18:54:35 2014
@@ -54,7 +54,7 @@ public class TestSpanMultiTermQueryWrapp
field.setStringValue("jumps over extremely very lazy broxn dog");
iw.addDocument(doc);
reader = iw.getReader();
- iw.shutdown();
+ iw.close();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java Sat Aug 9 18:54:35 2014
@@ -61,7 +61,7 @@ public class TestSpans extends LuceneTes
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
}
@@ -475,15 +475,14 @@ public class TestSpans extends LuceneTes
// LUCENE-1404
public void testNPESpanQuery() throws Throwable {
final Directory dir = newDirectory();
- final IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ final IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())));
// Add documents
addDoc(writer, "1", "the big dogs went running to the market");
addDoc(writer, "2", "the cat chased the mouse, then the cat ate the mouse quickly");
// Commit
- writer.shutdown();
+ writer.close();
// Get searcher
final IndexReader reader = DirectoryReader.open(dir);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Sat Aug 9 18:54:35 2014
@@ -66,7 +66,7 @@ public class TestSpansAdvanced extends L
addDocument(writer, "3", "I think it should work.");
addDocument(writer, "4", "I think it should work.");
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
searcher.setSimilarity(new DefaultSimilarity());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java Sat Aug 9 18:54:35 2014
@@ -56,7 +56,7 @@ public class TestSpansAdvanced2 extends
addDocument(writer, "C", "It shouldn't.");
addDocument(writer, "D", "Should we, should we, should we.");
reader2 = writer.getReader();
- writer.shutdown();
+ writer.close();
// re-open the searcher since we added more docs
searcher2 = newSearcher(reader2);
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -232,7 +232,7 @@ public class TestBufferedIndexInput exte
try {
IndexWriter writer = new IndexWriter(
dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).
+ new IndexWriterConfig(new MockAnalyzer(random())).
setOpenMode(OpenMode.CREATE).
setMergePolicy(newLogMergePolicy(false))
);
@@ -276,7 +276,7 @@ public class TestBufferedIndexInput exte
hits = searcher.search(new TermQuery(aaa), null, 1000).scoreDocs;
dir.tweakBufferSizes();
assertEquals(35, hits.length);
- writer.shutdown();
+ writer.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.store;
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -32,7 +31,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.TestIndexWriterReader;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
public class TestFileSwitchDirectory extends BaseDirectoryTestCase {
@@ -56,7 +54,7 @@ public class TestFileSwitchDirectory ext
OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
IndexWriter writer = new IndexWriter(
fsd,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).
+ new IndexWriterConfig(new MockAnalyzer(random())).
setMergePolicy(newLogMergePolicy(false)).setCodec(Codec.forName("Lucene40")).setUseCompoundFile(false)
);
TestIndexWriterReader.createIndexNoClose(true, "ram", writer);
@@ -78,7 +76,7 @@ public class TestFileSwitchDirectory ext
assertFalse(fileExtensions.contains(ext));
}
reader.close();
- writer.shutdown();
+ writer.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -37,7 +37,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
public class TestLockFactory extends LuceneTestCase {
@@ -52,7 +51,7 @@ public class TestLockFactory extends Luc
// Lock prefix should have been set:
assertTrue("lock prefix was not set by the RAMDirectory", lf.lockPrefixSet);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())));
// add 100 documents (so that commit lock is used)
for (int i = 0; i < 100; i++) {
@@ -71,7 +70,7 @@ public class TestLockFactory extends Luc
lock.lockAttempts > 0);
}
- writer.shutdown();
+ writer.close();
}
// Verify: we can use the NoLockFactory with RAMDirectory w/ no
@@ -84,21 +83,21 @@ public class TestLockFactory extends Luc
assertTrue("RAMDirectory.setLockFactory did not take",
NoLockFactory.class.isInstance(dir.getLockFactory()));
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())));
writer.commit(); // required so the second open succeed
// Create a 2nd IndexWriter. This is normally not allowed but it should run through since we're not
// using any locks:
IndexWriter writer2 = null;
try {
- writer2 = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
+ writer2 = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
} catch (Exception e) {
e.printStackTrace(System.out);
fail("Should not have hit an IOException with no locking");
}
- writer.shutdown();
+ writer.close();
if (writer2 != null) {
- writer2.shutdown();
+ writer2.close();
}
}
@@ -110,19 +109,19 @@ public class TestLockFactory extends Luc
assertTrue("RAMDirectory did not use correct LockFactory: got " + dir.getLockFactory(),
SingleInstanceLockFactory.class.isInstance(dir.getLockFactory()));
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())));
// Create a 2nd IndexWriter. This should fail:
IndexWriter writer2 = null;
try {
- writer2 = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
+ writer2 = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
fail("Should have hit an IOException with two IndexWriters on default SingleInstanceLockFactory");
} catch (IOException e) {
}
- writer.shutdown();
+ writer.close();
if (writer2 != null) {
- writer2.shutdown();
+ writer2.close();
}
}
@@ -153,9 +152,9 @@ public class TestLockFactory extends Luc
Directory dir = newFSDirectory(indexDir, lockFactory);
// First create a 1 doc index:
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
addDoc(w);
- w.shutdown();
+ w.close();
WriterThread writer = new WriterThread(100, dir);
SearcherThread searcher = new SearcherThread(100, dir);
@@ -270,7 +269,7 @@ public class TestLockFactory extends Luc
IndexWriter writer = null;
for(int i=0;i<this.numIteration;i++) {
try {
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
+ writer = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
} catch (IOException e) {
if (e.toString().indexOf(" timed out:") == -1) {
hitException = true;
@@ -300,7 +299,7 @@ public class TestLockFactory extends Luc
break;
}
try {
- writer.shutdown();
+ writer.close();
} 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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -27,28 +27,28 @@ public class TestMockDirectoryWrapper ex
public void testFailIfIndexWriterNotClosed() throws IOException {
MockDirectoryWrapper dir = newMockDirectory();
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(null));
try {
dir.close();
fail();
} catch (Exception expected) {
assertTrue(expected.getMessage().contains("there are still open locks"));
}
- iw.shutdown();
+ iw.close();
dir.close();
}
public void testFailIfIndexWriterNotClosedChangeLockFactory() throws IOException {
MockDirectoryWrapper dir = newMockDirectory();
dir.setLockFactory(new SingleInstanceLockFactory());
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(null));
try {
dir.close();
fail();
} catch (Exception expected) {
assertTrue(expected.getMessage().contains("there are still open locks"));
}
- iw.shutdown();
+ iw.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -355,7 +355,7 @@ public class TestMultiMMap extends BaseD
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
int numAsserts = atLeast(100);
for (int i = 0; i < numAsserts; i++) {
@@ -363,7 +363,6 @@ public class TestMultiMMap extends BaseD
assertEquals("" + docID, reader.document(docID).get("docid"));
}
reader.close();
- writer.close();
dir.close();
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -93,7 +93,7 @@ public class TestNRTCachingDirectory ext
}
// Close should force cache to clear since all files are sync'd
- w.shutdown();
+ w.close();
final String[] cachedFiles = cachedDir.listCachedFiles();
for(String file : cachedFiles) {
@@ -117,7 +117,7 @@ public class TestNRTCachingDirectory ext
Directory fsDir = FSDirectory.open(new File("/path/to/index"));
NRTCachingDirectory cachedFSDir = new NRTCachingDirectory(fsDir, 2.0, 25.0);
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
+ IndexWriterConfig conf = new IndexWriterConfig(analyzer);
IndexWriter writer = new IndexWriter(cachedFSDir, conf);
writer.close();
cachedFSDir.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -53,7 +53,7 @@ public class TestRAMDirectory extends Ba
Directory dir = newFSDirectory(path);
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
+ new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
// add some documents
Document doc = null;
for (int i = 0; i < docsToAdd; i++) {
@@ -62,7 +62,7 @@ public class TestRAMDirectory extends Ba
writer.addDocument(doc);
}
assertEquals(docsToAdd, writer.maxDoc());
- writer.shutdown();
+ writer.close();
dir.close();
return path;
@@ -124,7 +124,7 @@ public class TestRAMDirectory extends Ba
dir.close();
final IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
+ new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND));
writer.forceMerge(1);
assertEquals(ramDir.sizeInBytes(), ramDir.getRecomputedSizeInBytes());
@@ -155,6 +155,6 @@ public class TestRAMDirectory extends Ba
writer.forceMerge(1);
assertEquals(ramDir.sizeInBytes(), ramDir.getRecomputedSizeInBytes());
- writer.shutdown();
+ writer.close();
}
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -21,7 +21,6 @@ import java.io.File;
import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -73,8 +72,7 @@ public class TestWindowsMMap extends Luc
// interior filters.
MockAnalyzer analyzer = new MockAnalyzer(random());
// TODO: something about lock timeouts and leftover locks.
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, analyzer)
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(analyzer)
.setOpenMode(OpenMode.CREATE));
writer.commit();
IndexReader reader = DirectoryReader.open(dir);
@@ -89,7 +87,7 @@ public class TestWindowsMMap extends Luc
}
reader.close();
- writer.shutdown();
+ writer.close();
rmDir(dirPath);
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -321,7 +321,7 @@ public class TestFSTs extends LuceneTest
docCount++;
}
IndexReader r = DirectoryReader.open(writer, true);
- writer.shutdown();
+ writer.close();
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.shutdown();
+ w.close();
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.shutdown();
+ w.close();
}
*/
@@ -885,7 +885,7 @@ public class TestFSTs extends LuceneTest
// turn writer into reader:
final IndexReader r = w.getReader();
final IndexSearcher s = newSearcher(r);
- w.shutdown();
+ w.close();
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.shutdown();
+ w.close();
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.shutdown();
+ //w.close();
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.shutdown();
+ //w.close();
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.shutdown();
+ //w.close();
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.shutdown();
+ //w.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -42,9 +42,9 @@ public class TestFailIfUnreferencedFiles
public void testDummy() throws Exception {
MockDirectoryWrapper dir = newMockDirectory();
dir.setAssertNoUnrefencedFilesOnClose(true);
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(null));
iw.addDocument(new Document());
- iw.shutdown();
+ iw.close();
IndexOutput output = dir.createOutput("_hello.world", IOContext.DEFAULT);
output.writeString("i am unreferenced!");
output.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -89,7 +89,7 @@ public class IndexFiles {
Directory dir = FSDirectory.open(new File(indexPath));
// :Post-Release-Update-Version.LUCENE_XY:
Analyzer analyzer = new StandardAnalyzer();
- IndexWriterConfig iwc = new IndexWriterConfig(Version.LUCENE_5_0, analyzer);
+ IndexWriterConfig iwc = new IndexWriterConfig(analyzer);
if (create) {
// Create a new index in the directory, removing any
@@ -118,7 +118,7 @@ public class IndexFiles {
//
// writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -61,8 +61,7 @@ public class AssociationsFacetsExample {
/** Build the example index. */
private void index() throws IOException {
- IndexWriterConfig iwc = new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
- new WhitespaceAnalyzer());
+ IndexWriterConfig iwc = new IndexWriterConfig(new WhitespaceAnalyzer());
IndexWriter indexWriter = new IndexWriter(indexDir, iwc);
// Writes facet ords to a separate directory from the main index
@@ -86,7 +85,7 @@ public class AssociationsFacetsExample {
doc.add(new FloatAssociationFacetField(0.34f, "genre", "software"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- indexWriter.shutdown();
+ indexWriter.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -87,7 +87,7 @@ public class DistanceFacetsExample imple
/** Build the example index. */
public void index() throws IOException {
- IndexWriter writer = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
+ IndexWriter writer = new IndexWriter(indexDir, new IndexWriterConfig(
new WhitespaceAnalyzer()));
// TODO: we could index in radians instead ... saves all the conversions in getBoundingBoxFilter
@@ -117,7 +117,7 @@ public class DistanceFacetsExample imple
// Open near-real-time searcher
searcher = new IndexSearcher(DirectoryReader.open(writer, true));
- writer.shutdown();
+ writer.close();
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -58,7 +58,7 @@ public class ExpressionAggregationFacets
/** Build the example index. */
private void index() throws IOException {
- IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
+ IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(
new WhitespaceAnalyzer()));
// Writes facet ords to a separate directory from the main index
@@ -76,7 +76,7 @@ public class ExpressionAggregationFacets
doc.add(new FacetField("A", "C"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- indexWriter.shutdown();
+ indexWriter.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -56,7 +56,7 @@ public class MultiCategoryListsFacetsExa
/** Build the example index. */
private void index() throws IOException {
- IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
+ IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(
new WhitespaceAnalyzer()));
// Writes facet ords to a separate directory from the main index
@@ -87,7 +87,7 @@ public class MultiCategoryListsFacetsExa
doc.add(new FacetField("Publish Date", "1999", "5", "5"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- indexWriter.shutdown();
+ indexWriter.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -60,7 +60,7 @@ public class RangeFacetsExample implemen
/** Build the example index. */
public void index() throws IOException {
- IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
+ IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(
new WhitespaceAnalyzer()));
// Add documents with a fake timestamp, 1000 sec before
@@ -77,7 +77,7 @@ public class RangeFacetsExample implemen
// Open near-real-time searcher
searcher = new IndexSearcher(DirectoryReader.open(indexWriter, true));
- indexWriter.shutdown();
+ indexWriter.close();
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -57,7 +57,7 @@ public class SimpleFacetsExample {
/** Build the example index. */
private void index() throws IOException {
- IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
+ IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(
new WhitespaceAnalyzer()));
// Writes facet ords to a separate directory from the main index
@@ -88,7 +88,7 @@ public class SimpleFacetsExample {
doc.add(new FacetField("Publish Date", "1999", "5", "5"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- indexWriter.shutdown();
+ indexWriter.close();
taxoWriter.close();
}
@@ -253,4 +253,4 @@ public class SimpleFacetsExample {
}
}
-}
\ No newline at end of file
+}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -55,7 +55,7 @@ public class SimpleSortedSetFacetsExampl
/** Build the example index. */
private void index() throws IOException {
- IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(FacetExamples.EXAMPLES_VER,
+ IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(
new WhitespaceAnalyzer()));
Document doc = new Document();
doc.add(new SortedSetDocValuesFacetField("Author", "Bob"));
@@ -82,7 +82,7 @@ public class SimpleSortedSetFacetsExampl
doc.add(new SortedSetDocValuesFacetField("Publish Year", "1999"));
indexWriter.addDocument(config.build(doc));
- indexWriter.shutdown();
+ indexWriter.close();
}
/** 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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -51,7 +51,6 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
/**
* Example servlet that uses the XML queryparser.
@@ -134,7 +133,7 @@ public class FormBasedXmlQueryDemo exten
private void openExampleIndex() throws IOException {
//Create a RAM-based index from our test data file
RAMDirectory rd = new RAMDirectory();
- IndexWriterConfig iwConfig = new IndexWriterConfig(Version.LUCENE_CURRENT, analyzer);
+ IndexWriterConfig iwConfig = new IndexWriterConfig(analyzer);
IndexWriter writer = new IndexWriter(rd, iwConfig);
InputStream dataIn = getServletContext().getResourceAsStream("/WEB-INF/data.tsv");
BufferedReader br = new BufferedReader(new InputStreamReader(dataIn, StandardCharsets.UTF_8));
@@ -155,7 +154,7 @@ public class FormBasedXmlQueryDemo exten
}
line = br.readLine();
}
- writer.shutdown();
+ writer.close();
//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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -82,7 +82,7 @@ public class TestDemoExpressions extend
reader = iw.getReader();
searcher = new IndexSearcher(reader);
- iw.shutdown();
+ iw.close();
}
@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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -65,7 +65,7 @@ public class TestExpressionRescorer exte
reader = iw.getReader();
searcher = new IndexSearcher(reader);
- iw.shutdown();
+ iw.close();
}
@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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -81,7 +81,7 @@ public class TestExpressionSorts extends
iw.addDocument(document);
}
reader = iw.getReader();
- iw.shutdown();
+ iw.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -70,7 +70,7 @@ public class TestExpressionValueSource e
iw.forceMerge(1);
reader = iw.getReader();
- iw.shutdown();
+ iw.close();
}
@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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -49,7 +49,6 @@ import org.apache.lucene.store.LockObtai
import org.apache.lucene.store.NativeFSLockFactory;
import org.apache.lucene.store.SimpleFSLockFactory;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.Version;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -286,7 +285,7 @@ public class DirectoryTaxonomyWriter imp
// :Post-Release-Update-Version.LUCENE_XY:
// Make sure we use a MergePolicy which always merges adjacent segments and thus
// keeps the doc IDs ordered as well (this is crucial for the taxonomy index).
- return new IndexWriterConfig(Version.LUCENE_5_0, null).setOpenMode(openMode).setMergePolicy(
+ return new IndexWriterConfig(null).setOpenMode(openMode).setMergePolicy(
new LogByteSizeMergePolicy());
}
@@ -340,7 +339,7 @@ public class DirectoryTaxonomyWriter imp
public synchronized void close() throws IOException {
if (!isClosed) {
commit();
- indexWriter.shutdown();
+ indexWriter.close();
doClose();
}
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -110,7 +110,7 @@ public class TestDrillDownQuery extends
taxoWriter.close();
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -44,15 +44,12 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.LeafCollector;
-import org.apache.lucene.search.Collector;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.SimpleCollector;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
@@ -243,7 +240,7 @@ public class TestDrillSideways extends F
assertEquals(0, r.hits.totalHits);
assertNull(r.facets.getTopChildren(10, "Publish Date"));
assertNull(r.facets.getTopChildren(10, "Author"));
- writer.shutdown();
+ writer.close();
IOUtils.close(searcher.getIndexReader(), taxoReader, taxoWriter, dir, taxoDir);
}
@@ -298,7 +295,7 @@ 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());
- writer.shutdown();
+ writer.close();
IOUtils.close(searcher.getIndexReader(), taxoReader, taxoWriter, dir, taxoDir);
}
@@ -354,7 +351,7 @@ 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());
- writer.shutdown();
+ writer.close();
IOUtils.close(searcher.getIndexReader(), taxoReader, taxoWriter, dir, taxoDir);
}
@@ -760,7 +757,7 @@ public class TestDrillSideways extends F
}
}
- w.shutdown();
+ w.close();
IOUtils.close(r, tr, tw, d, td);
}
@@ -1068,7 +1065,7 @@ 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);
- writer.shutdown();
+ writer.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -68,7 +68,7 @@ public class TestFacetsConfig extends Fa
// these two addDocument() used to fail
indexWriter.addDocument(doc);
indexWriter.addDocument(doc);
- indexWriter.shutdown();
+ indexWriter.close();
IOUtils.close(taxoWriter);
DirectoryReader indexReader = DirectoryReader.open(indexDir);
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -91,7 +91,7 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$facets", ir);
- iw.shutdown();
+ iw.close();
IOUtils.close(tr, ir, tw, indexDir, taxoDir);
}
@@ -131,7 +131,7 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$facets", ir);
assertOrdinalsExist("$author", ir);
- iw.shutdown();
+ iw.close();
IOUtils.close(tr, ir, tw, indexDir, taxoDir);
}
@@ -175,7 +175,7 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$music", ir);
assertOrdinalsExist("$music", ir);
- iw.shutdown();
+ iw.close();
IOUtils.close(tr, ir, tw, indexDir, taxoDir);
}
@@ -227,7 +227,7 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$bands", ir);
assertOrdinalsExist("$composers", ir);
- iw.shutdown();
+ iw.close();
IOUtils.close(tr, ir, tw, indexDir, taxoDir);
}
@@ -271,7 +271,7 @@ public class TestMultipleIndexFields ext
assertOrdinalsExist("$music", ir);
assertOrdinalsExist("$literature", ir);
- iw.shutdown();
+ iw.close();
IOUtils.close(tr, ir, iw, tw, indexDir, taxoDir);
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -58,7 +58,7 @@ public class TestRandomSamplingFacetsCol
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter);
// Test empty results
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -88,7 +88,7 @@ public class TestRangeFacetCounts extend
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
@@ -152,7 +152,7 @@ public class TestRangeFacetCounts extend
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
@@ -188,7 +188,7 @@ public class TestRangeFacetCounts extend
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
FacetsCollector fc = new FacetsCollector();
IndexSearcher s = newSearcher(r);
@@ -306,7 +306,7 @@ 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());
- w.shutdown();
+ w.close();
IOUtils.close(tw, tr, td, r, d);
}
@@ -336,7 +336,7 @@ 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());
- w.shutdown();
+ w.close();
IOUtils.close(r, d);
}
@@ -367,7 +367,7 @@ 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());
- w.shutdown();
+ w.close();
IOUtils.close(r, d);
}
@@ -515,7 +515,7 @@ public class TestRangeFacetCounts extend
}
}
- w.shutdown();
+ w.close();
IOUtils.close(r, dir);
}
@@ -674,7 +674,7 @@ public class TestRangeFacetCounts extend
}
}
- w.shutdown();
+ w.close();
IOUtils.close(r, dir);
}
@@ -818,7 +818,7 @@ public class TestRangeFacetCounts extend
}
}
- w.shutdown();
+ w.close();
IOUtils.close(r, dir);
}
@@ -856,7 +856,7 @@ 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());
- w.shutdown();
+ w.close();
IOUtils.close(r, d);
}
@@ -970,7 +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());
- writer.shutdown();
+ writer.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -92,7 +92,7 @@ public class TestSortedSetDocValuesFacet
TopDocs hits = searcher.search(q, 1);
assertEquals(1, hits.totalHits);
- writer.shutdown();
+ writer.close();
IOUtils.close(searcher.getIndexReader(), dir);
}
@@ -135,7 +135,7 @@ public class TestSortedSetDocValuesFacet
}
r.close();
- writer.shutdown();
+ writer.close();
searcher.getIndexReader().close();
dir.close();
}
@@ -174,7 +174,7 @@ public class TestSortedSetDocValuesFacet
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.shutdown();
+ writer.close();
// Per-top-reader state:
SortedSetDocValuesReaderState state = new DefaultSortedSetDocValuesReaderState(searcher.getIndexReader());
@@ -219,7 +219,7 @@ public class TestSortedSetDocValuesFacet
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.shutdown();
+ writer.close();
// Per-top-reader state:
SortedSetDocValuesReaderState state = new DefaultSortedSetDocValuesReaderState(searcher.getIndexReader());
@@ -266,7 +266,7 @@ 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());
- writer.shutdown();
+ writer.close();
IOUtils.close(searcher.getIndexReader(), dir);
}
@@ -355,7 +355,7 @@ public class TestSortedSetDocValuesFacet
assertEquals(expected, actual);
}
- w.shutdown();
+ w.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -81,7 +81,7 @@ public class TestCachedOrdinalsReader ex
}
}
- writer.shutdown();
+ writer.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -203,7 +203,7 @@ public class TestSearcherTaxonomyManager
System.out.println("TEST: now stop");
}
- w.shutdown();
+ w.close();
IOUtils.close(mgr, tw, taxoDir, dir);
}
@@ -256,7 +256,7 @@ public class TestSearcherTaxonomyManager
System.out.println("TEST: now stop");
}
- w.shutdown();
+ w.close();
IOUtils.close(mgr, tw, taxoDir, indexDir);
}
@@ -282,7 +282,7 @@ public class TestSearcherTaxonomyManager
// expected
}
- w.shutdown();
+ w.close();
IOUtils.close(mgr, tw, taxoDir, dir);
}
@@ -321,7 +321,7 @@ public class TestSearcherTaxonomyManager
mgr.release(pair);
}
- w.shutdown();
+ w.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -24,12 +24,6 @@ import org.apache.lucene.facet.FacetTest
import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
import org.apache.lucene.facet.FacetsConfig;
-import org.apache.lucene.facet.taxonomy.FloatAssociationFacetField;
-import org.apache.lucene.facet.taxonomy.IntAssociationFacetField;
-import org.apache.lucene.facet.taxonomy.TaxonomyFacetSumFloatAssociations;
-import org.apache.lucene.facet.taxonomy.TaxonomyFacetSumIntAssociations;
-import org.apache.lucene.facet.taxonomy.TaxonomyReader;
-import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
import org.apache.lucene.index.IndexReader;
@@ -86,7 +80,7 @@ public class TestTaxonomyFacetAssociatio
taxoWriter.close();
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
taxoReader = new DirectoryTaxonomyReader(taxoDir);
}
@@ -182,7 +176,7 @@ public class TestTaxonomyFacetAssociatio
} catch (IllegalArgumentException exc) {
// expected
}
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, dir, taxoDir);
}
@@ -203,7 +197,7 @@ public class TestTaxonomyFacetAssociatio
} catch (IllegalArgumentException exc) {
// expected
}
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, dir, taxoDir);
}
@@ -224,7 +218,7 @@ public class TestTaxonomyFacetAssociatio
} catch (IllegalArgumentException exc) {
// expected
}
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, dir, taxoDir);
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -141,7 +141,7 @@ public class TestTaxonomyFacetCounts ext
assertTrue(result.indexOf(" /2012") != -1);
assertTrue(result.indexOf(" /20") != -1);
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
}
@@ -199,7 +199,7 @@ 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());
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
}
@@ -258,7 +258,7 @@ public class TestTaxonomyFacetCounts ext
// expected
}
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, taxoDir, dir);
}
@@ -283,7 +283,7 @@ public class TestTaxonomyFacetCounts ext
doc.add(newTextField("field", "text", Field.Store.NO));
doc.add(new FacetField("a", "path"));
writer.addDocument(config.build(taxoWriter, doc));
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, dir, taxoDir);
}
@@ -329,7 +329,7 @@ public class TestTaxonomyFacetCounts ext
assertEquals(1, result.labelValues.length);
assertEquals(1, result.labelValues[0].value.intValue());
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
}
@@ -363,7 +363,7 @@ 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());
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
}
@@ -413,7 +413,7 @@ public class TestTaxonomyFacetCounts ext
}
assertEquals(1, facets.getSpecificValue("dim2"));
assertEquals(1, facets.getSpecificValue("dim3"));
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, searcher.getIndexReader(), taxoReader, dir, taxoDir);
}
@@ -464,7 +464,7 @@ public class TestTaxonomyFacetCounts ext
}
assertEquals(numLabels, allLabels.size());
- writer.shutdown();
+ writer.close();
IOUtils.close(searcher.getIndexReader(), taxoWriter, taxoReader, dir, taxoDir);
}
@@ -486,7 +486,7 @@ public class TestTaxonomyFacetCounts ext
} catch (IllegalArgumentException iae) {
// expected
}
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, dir, taxoDir);
}
@@ -509,7 +509,7 @@ public class TestTaxonomyFacetCounts ext
} catch (IllegalArgumentException iae) {
// expected
}
- writer.shutdown();
+ writer.close();
IOUtils.close(taxoWriter, dir, taxoDir);
}
@@ -539,7 +539,7 @@ 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());
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -568,7 +568,7 @@ public class TestTaxonomyFacetCounts ext
assertEquals(r.numDocs(), result.value.intValue());
}
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -597,7 +597,7 @@ public class TestTaxonomyFacetCounts ext
List<FacetResult> res2 = facets.getAllDims(10);
assertEquals("calling getFacetResults twice should return the .equals()=true result", res1, res2);
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -624,7 +624,7 @@ public class TestTaxonomyFacetCounts ext
assertEquals(10, facets.getTopChildren(2, "a").childCount);
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -663,7 +663,7 @@ 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
- indexWriter.shutdown();
+ indexWriter.close();
IOUtils.close(taxoWriter);
DirectoryReader indexReader = DirectoryReader.open(indexDir);
@@ -768,7 +768,7 @@ public class TestTaxonomyFacetCounts ext
assertEquals(expected, actual);
}
- w.shutdown();
+ w.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -37,8 +37,6 @@ import org.apache.lucene.facet.Facets;
import org.apache.lucene.facet.FacetsCollector;
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.LabelAndValue;
-import org.apache.lucene.facet.taxonomy.TaxonomyReader;
-import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
import org.apache.lucene.index.DirectoryReader;
@@ -261,7 +259,7 @@ public class TestTaxonomyFacetCounts2 ex
// segment w/ categories and some content
indexDocsWithFacetsAndSomeTerms(indexWriter, taxoWriter, allExpectedCounts);
- indexWriter.shutdown();
+ indexWriter.close();
IOUtils.close(taxoWriter);
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -106,7 +106,7 @@ public class TestTaxonomyFacetSumValueSo
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.shutdown();
+ writer.close();
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
@@ -172,7 +172,7 @@ public class TestTaxonomyFacetSumValueSo
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.shutdown();
+ writer.close();
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
@@ -215,7 +215,7 @@ public class TestTaxonomyFacetSumValueSo
// NRT open
IndexSearcher searcher = newSearcher(writer.getReader());
- writer.shutdown();
+ writer.close();
// NRT open
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);
@@ -279,7 +279,7 @@ public class TestTaxonomyFacetSumValueSo
int expected = (int) (td.getMaxScore() * td.totalHits);
assertEquals(expected, facets.getSpecificValue("dim", "a").intValue());
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -305,7 +305,7 @@ public class TestTaxonomyFacetSumValueSo
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());
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -357,7 +357,7 @@ public class TestTaxonomyFacetSumValueSo
assertEquals("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.getTopChildren(10, "a").toString());
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -388,7 +388,7 @@ public class TestTaxonomyFacetSumValueSo
assertEquals("dim=a path=[] value=10.0 childCount=2\n 1 (6.0)\n 0 (4.0)\n", facets.getTopChildren(10, "a").toString());
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -420,7 +420,7 @@ public class TestTaxonomyFacetSumValueSo
assertEquals(r.maxDoc(), facets1.getTopChildren(10, "a").value.intValue());
assertEquals(r.maxDoc(), facets2.getTopChildren(10, "b").value.doubleValue(), 1E-10);
- iw.shutdown();
+ iw.close();
IOUtils.close(taxoWriter, taxoReader, taxoDir, r, indexDir);
}
@@ -517,7 +517,7 @@ public class TestTaxonomyFacetSumValueSo
assertFloatValuesEquals(expected, actual);
}
- w.shutdown();
+ w.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -153,7 +153,7 @@ public class TestConcurrentFacetedIndexi
}
}
- iw.shutdown();
+ iw.close();
IOUtils.close(tw, tr, taxoDir, indexDir);
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java Sat Aug 9 18:54:35 2014
@@ -260,7 +260,7 @@ public class TestDirectoryTaxonomyReader
// hold onto IW to forceMerge
// note how we don't close it, since DTW will close it.
final IndexWriter iw = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(new LogByteSizeMergePolicy()));
DirectoryTaxonomyWriter writer = new DirectoryTaxonomyWriter(dir) {
@Override
@@ -303,7 +303,7 @@ public class TestDirectoryTaxonomyReader
// hold onto IW to forceMerge
// note how we don't close it, since DTW will close it.
final IndexWriter iw = new IndexWriter(dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ new IndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(new LogByteSizeMergePolicy()));
DirectoryTaxonomyWriter writer = new DirectoryTaxonomyWriter(dir) {
@Override
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -30,7 +30,6 @@ import org.apache.lucene.store.AlreadyCl
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
import org.junit.Test;
/*
@@ -225,7 +224,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)).shutdown();
+ new IndexWriter(dir, new IndexWriterConfig(null)).close();
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(dir, OpenMode.CREATE_OR_APPEND, NO_OP_CACHE);
taxoWriter.close();
@@ -466,7 +465,7 @@ public class TestDirectoryTaxonomyWriter
// when too large components were allowed to be added, this resulted in a new added category
assertEquals(ordinal, taxoWriter.addCategory(cp));
- indexWriter.shutdown();
+ indexWriter.close();
IOUtils.close(taxoWriter);
DirectoryReader indexReader = DirectoryReader.open(indexDir);
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -34,20 +34,17 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInfo.DocValuesType;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiDocValues;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
@@ -137,7 +134,7 @@ public class AllGroupHeadsCollectorTest
IndexReader reader = w.getReader();
IndexSearcher indexSearcher = newSearcher(reader);
- w.shutdown();
+ w.close();
int maxDoc = reader.maxDoc();
Sort sortWithinGroup = new Sort(new SortField("id_1", SortField.Type.INT, true));
@@ -288,7 +285,7 @@ public class AllGroupHeadsCollectorTest
}
final DirectoryReader r = w.getReader();
- w.shutdown();
+ w.close();
final NumericDocValues docIdToFieldId = MultiDocValues.getNumericValues(r, "id");
final int[] fieldIdToDocID = new int[numDocs];
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -101,7 +101,7 @@ public class AllGroupsCollectorTest exte
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.shutdown();
+ w.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -128,7 +128,7 @@ public class DistinctValuesCollectorTest
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.shutdown();
+ w.close();
Comparator<AbstractDistinctValuesCollector.GroupCount<Comparable<Object>>> cmp = new Comparator<AbstractDistinctValuesCollector.GroupCount<Comparable<Object>>>() {
@@ -460,7 +460,7 @@ public class DistinctValuesCollectorTest
}
}
- w.shutdown();
+ w.close();
return new IndexContext(dir, reader, 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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -275,7 +275,7 @@ public class GroupFacetCollectorTest ext
assertEquals("15", entries.get(1).getValue().utf8ToString());
assertEquals(2, entries.get(1).getCount());
- w.shutdown();
+ w.close();
indexSearcher.getIndexReader().close();
dir.close();
}
@@ -346,7 +346,7 @@ public class GroupFacetCollectorTest ext
w.addDocument(doc);
w.commit();
- w.shutdown();
+ w.close();
IndexSearcher indexSearcher = newSearcher(DirectoryReader.open(dir));
AbstractGroupFacetCollector groupedAirportFacetCollector = createRandomCollector(groupField + "_dv", "airport", null, true);
indexSearcher.search(new MatchAllDocsQuery(), groupedAirportFacetCollector);
@@ -633,7 +633,7 @@ public class GroupFacetCollectorTest ext
}
DirectoryReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
return new IndexContext(searchTermToFacetToGroups, reader, numDocs, dir, facetWithMostGroups, numGroups, contentBrs, uniqueFacetValues);
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -118,7 +118,7 @@ public class GroupingSearchTest extends
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.shutdown();
+ w.close();
Sort groupSort = Sort.RELEVANCE;
GroupingSearch groupingSearch = createRandomGroupingSearch(groupField, groupSort, 5, canUseIDV);
@@ -232,7 +232,7 @@ public class GroupingSearchTest extends
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.shutdown();
+ w.close();
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -119,7 +119,7 @@ public class TestGrouping extends Lucene
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
- w.shutdown();
+ w.close();
final Sort groupSort = Sort.RELEVANCE;
@@ -593,7 +593,7 @@ public class TestGrouping extends Lucene
}
final DirectoryReader r = w.getReader();
- w.shutdown();
+ w.close();
return r;
}
@@ -739,7 +739,7 @@ public class TestGrouping extends Lucene
System.arraycopy(groupDocs, 0, groupDocsByID, 0, groupDocs.length);
final DirectoryReader r = w.getReader();
- w.shutdown();
+ w.close();
final NumericDocValues docIDToID = MultiDocValues.getNumericValues(r, "id");
DirectoryReader rBlocks = null;
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -35,8 +35,6 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.LeafCollector;
-import org.apache.lucene.search.Collector;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
@@ -65,7 +63,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, new TokenStreamConcurrent(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -107,7 +105,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, new TokenStreamConcurrent(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -175,7 +173,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, new TokenStreamSparse(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -216,7 +214,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, TEXT, customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
final IndexReader indexReader = DirectoryReader.open(directory);
try {
@@ -255,7 +253,7 @@ public class HighlighterPhraseTest exten
document.add(new Field(FIELD, new TokenStreamSparse(), customType));
indexWriter.addDocument(document);
} finally {
- indexWriter.shutdown();
+ indexWriter.close();
}
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=1617004&r1=1617003&r2=1617004&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 Sat Aug 9 18:54:35 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.search.highlig
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.Reader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
@@ -1770,21 +1769,21 @@ public class HighlighterTest extends Bas
}
private void makeIndex() throws IOException {
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)));
writer.addDocument( doc( "t_text1", "random words for highlighting tests del" ) );
writer.addDocument( doc( "t_text1", "more random words for second field del" ) );
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.shutdown();
+ writer.close();
}
private void deleteDocument() throws IOException {
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)).setOpenMode(OpenMode.APPEND));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)).setOpenMode(OpenMode.APPEND));
writer.deleteDocuments( new Term( "t_text1", "del" ) );
// To see negative idf, keep comment the following line
//writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
}
private void searchIndex() throws IOException, InvalidTokenOffsetsException {
@@ -1903,7 +1902,7 @@ public class HighlighterTest extends Bas
writer.addDocument(doc, analyzer);
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(ramDir);
numHighlights = 0;
}