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 [7/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/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Sat Aug 9 18:54:35 2014
@@ -24,7 +24,6 @@ import org.apache.lucene.analysis.Canned
import org.apache.lucene.analysis.Token;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -34,7 +33,6 @@ import org.apache.lucene.index.MultiFiel
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
@@ -135,7 +133,7 @@ public class TestMultiPhraseQuery extend
// okay, all terms must belong to the same field
}
- writer.shutdown();
+ writer.close();
reader.close();
indexStore.close();
}
@@ -147,7 +145,7 @@ public class TestMultiPhraseQuery extend
add("blueberry chocolate pie", writer);
add("blueberry chocolate tart", writer);
IndexReader r = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(r);
MultiPhraseQuery q = new MultiPhraseQuery();
@@ -165,7 +163,7 @@ public class TestMultiPhraseQuery extend
RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("a b c d e f g h i k", writer);
IndexReader r = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(r);
@@ -185,7 +183,7 @@ public class TestMultiPhraseQuery extend
RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("a b c d e f g h i k", writer);
IndexReader r = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(r);
MultiPhraseQuery q = new MultiPhraseQuery();
@@ -233,7 +231,7 @@ public class TestMultiPhraseQuery extend
// just make sure no exc:
searcher.explain(q, 0);
- writer.shutdown();
+ writer.close();
reader.close();
indexStore.close();
}
@@ -260,7 +258,7 @@ public class TestMultiPhraseQuery extend
// exception will be thrown here without fix for #35626:
ScoreDoc[] hits = searcher.search(q, null, 1000).scoreDocs;
assertEquals("Wrong number of hits", 0, hits.length);
- writer.shutdown();
+ writer.close();
reader.close();
indexStore.close();
}
@@ -282,7 +280,7 @@ public class TestMultiPhraseQuery extend
// just make sure no exc:
searcher.explain(q, 0);
- writer.shutdown();
+ writer.close();
reader.close();
indexStore.close();
}
@@ -349,7 +347,7 @@ public class TestMultiPhraseQuery extend
Weight weight = query.createWeight(searcher);
assertEquals(10f * 10f, weight.getValueForNormalization(), 0.001f);
- writer.shutdown();
+ writer.close();
reader.close();
indexStore.close();
}
@@ -375,7 +373,7 @@ public class TestMultiPhraseQuery extend
doc.add(new TextField("field", new CannedTokenStream(tokens)));
writer.addDocument(doc);
IndexReader r = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher s = newSearcher(r);
MultiPhraseQuery mpq = new MultiPhraseQuery();
//mpq.setSlop(1);
@@ -473,7 +471,7 @@ public class TestMultiPhraseQuery extend
doc.add(new TextField("field", new CannedTokenStream(INCR_0_DOC_TOKENS)));
writer.addDocument(doc);
IndexReader r = DirectoryReader.open(writer,false);
- writer.shutdown();
+ writer.close();
IndexSearcher s = newSearcher(r);
if (VERBOSE) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Sat Aug 9 18:54:35 2014
@@ -73,7 +73,7 @@ public class TestMultiTermConstantScore
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java Sat Aug 9 18:54:35 2014
@@ -58,7 +58,7 @@ public class TestMultiTermQueryRewrites
((i % 2 == 0) ? swriter1 : swriter2).addDocument(doc);
}
writer.forceMerge(1); swriter1.forceMerge(1); swriter2.forceMerge(1);
- writer.shutdown(); swriter1.shutdown(); swriter2.shutdown();
+ writer.close(); swriter1.close(); swriter2.close();
reader = DirectoryReader.open(dir);
searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Sat Aug 9 18:54:35 2014
@@ -52,7 +52,7 @@ public class TestMultiThreadTermVectors
doc.add(fld);
writer.addDocument(doc);
}
- writer.shutdown();
+ writer.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Sat Aug 9 18:54:35 2014
@@ -30,7 +30,6 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
public class TestMultiValuedNumericRangeQuery extends LuceneTestCase {
@@ -58,7 +57,7 @@ public class TestMultiValuedNumericRange
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher=newSearcher(reader);
num = atLeast(50);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java Sat Aug 9 18:54:35 2014
@@ -35,7 +35,7 @@ public class TestNGramPhraseQuery extend
public static void beforeClass() throws Exception {
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
- writer.shutdown();
+ writer.close();
reader = DirectoryReader.open(directory);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNot.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNot.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNot.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNot.java Sat Aug 9 18:54:35 2014
@@ -50,7 +50,7 @@ public class TestNot extends LuceneTestC
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(0, hits.length);
- writer.shutdown();
+ writer.close();
reader.close();
store.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Sat Aug 9 18:54:35 2014
@@ -123,7 +123,7 @@ public class TestNumericRangeQuery32 ext
reader = writer.getReader();
searcher=newSearcher(reader);
- writer.shutdown();
+ writer.close();
}
@AfterClass
@@ -322,7 +322,7 @@ public class TestNumericRangeQuery32 ext
writer.addDocument(doc);
}
- writer.shutdown();
+ writer.close();
IndexReader r = DirectoryReader.open(dir);
IndexSearcher s = newSearcher(r);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Sat Aug 9 18:54:35 2014
@@ -132,7 +132,7 @@ public class TestNumericRangeQuery64 ext
}
reader = writer.getReader();
searcher=newSearcher(reader);
- writer.shutdown();
+ writer.close();
}
@AfterClass
@@ -349,7 +349,7 @@ public class TestNumericRangeQuery64 ext
writer.addDocument(doc);
}
- writer.shutdown();
+ writer.close();
IndexReader r = DirectoryReader.open(dir);
IndexSearcher s = newSearcher(r);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Sat Aug 9 18:54:35 2014
@@ -58,7 +58,7 @@ public class TestPhrasePrefixQuery exten
writer.addDocument(doc4);
writer.addDocument(doc5);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java Sat Aug 9 18:54:35 2014
@@ -79,7 +79,7 @@ public class TestPhraseQuery extends Luc
writer.addDocument(doc);
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
}
@@ -220,7 +220,7 @@ public class TestPhraseQuery extends Luc
doc.add(newTextField("field", "the stop words are here", Field.Store.YES));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
@@ -250,7 +250,7 @@ public class TestPhraseQuery extends Luc
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
@@ -288,7 +288,7 @@ public class TestPhraseQuery extends Luc
writer.addDocument(doc);
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
@@ -341,7 +341,7 @@ public class TestPhraseQuery extends Luc
writer.addDocument(doc3);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
searcher.setSimilarity(new DefaultSimilarity());
@@ -644,7 +644,7 @@ public class TestPhraseQuery extends Luc
IndexReader reader = w.getReader();
IndexSearcher s = newSearcher(reader);
- w.shutdown();
+ w.close();
// now search
int num = atLeast(10);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java Sat Aug 9 18:54:35 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.io.Reader;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
@@ -96,7 +95,7 @@ public class TestPositionIncrement exten
d.add(newTextField("field", "bogus", Field.Store.YES));
writer.addDocument(d);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
@@ -283,7 +282,7 @@ public class TestPositionIncrement exten
}
assertEquals(5, count);
assertTrue(sawZero);
- writer.shutdown();
+ writer.close();
is.getIndexReader().close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java Sat Aug 9 18:54:35 2014
@@ -82,7 +82,7 @@ public class TestPositiveScoresOnlyColle
writer.addDocument(new Document());
writer.commit();
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Weight fake = new TermQuery(new Term("fake", "weight")).createWeight(searcher);
Scorer s = new SimpleScorer(fake);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java Sat Aug 9 18:54:35 2014
@@ -100,7 +100,7 @@ public class TestPrefixFilter extends Lu
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(0, hits.length);
- writer.shutdown();
+ writer.close();
reader.close();
directory.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Sat Aug 9 18:54:35 2014
@@ -70,7 +70,7 @@ public class TestPrefixInBooleanQuery ex
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.shutdown();
+ writer.close();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java Sat Aug 9 18:54:35 2014
@@ -60,7 +60,7 @@ public class TestPrefixQuery extends Luc
assertFalse(query.getTermsEnum(terms) instanceof PrefixTermsEnum);
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("everything", 3, hits.length);
- writer.shutdown();
+ writer.close();
reader.close();
directory.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java Sat Aug 9 18:54:35 2014
@@ -35,7 +35,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.StringHelper;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
/**
* Create an index with random unicode terms
@@ -65,7 +64,7 @@ public class TestPrefixRandom extends Lu
}
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.shutdown();
+ writer.close();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java Sat Aug 9 18:54:35 2014
@@ -64,7 +64,7 @@ public class TestQueryRescorer extends L
doc.add(newTextField("field", "wizard oz the the the the the the", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
// Do ordinary BooleanQuery:
BooleanQuery bq = new BooleanQuery();
@@ -122,7 +122,7 @@ public class TestQueryRescorer extends L
doc.add(newTextField("field", "wizard oz the the the the the the", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
// Do ordinary BooleanQuery:
BooleanQuery bq = new BooleanQuery();
@@ -161,7 +161,7 @@ public class TestQueryRescorer extends L
doc.add(newTextField("field", "wizard oz the the the the the the", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
// Do ordinary BooleanQuery:
BooleanQuery bq = new BooleanQuery();
@@ -215,7 +215,7 @@ public class TestQueryRescorer extends L
doc.add(newTextField("field", "wizard oz the the the the the the", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
// Do ordinary BooleanQuery:
BooleanQuery bq = new BooleanQuery();
@@ -293,7 +293,7 @@ public class TestQueryRescorer extends L
doc.add(newTextField("field", "wizard oz the the the the the the", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
// Do ordinary BooleanQuery:
BooleanQuery bq = new BooleanQuery();
@@ -355,7 +355,7 @@ public class TestQueryRescorer extends L
w.addDocument(doc);
}
final IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
int numHits = TestUtil.nextInt(random(), 1, numDocs);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java Sat Aug 9 18:54:35 2014
@@ -38,7 +38,7 @@ public class TestQueryWrapperFilter exte
doc.add(newTextField("field", "value", Field.Store.NO));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
TermQuery termQuery = new TermQuery(new Term("field", "value"));
@@ -112,7 +112,7 @@ public class TestQueryWrapperFilter exte
}
final IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
final TopDocs hits = newSearcher(r).search(new MatchAllDocsQuery(),
new QueryWrapperFilter(new TermQuery(new Term("field", "a"))),
numDocs);
@@ -134,7 +134,7 @@ public class TestQueryWrapperFilter exte
}
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java Sat Aug 9 18:54:35 2014
@@ -51,7 +51,7 @@ public class TestRegexpQuery extends Luc
doc.add(newTextField(FN, "the quick brown fox jumps over the lazy ??? dog 493432 49344", Field.Store.NO));
writer.addDocument(doc);
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java Sat Aug 9 18:54:35 2014
@@ -65,7 +65,7 @@ public class TestRegexpRandom extends Lu
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java Sat Aug 9 18:54:35 2014
@@ -91,7 +91,7 @@ public class TestRegexpRandom2 extends L
reader = writer.getReader();
searcher1 = newSearcher(reader);
searcher2 = newSearcher(reader);
- writer.shutdown();
+ writer.close();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java Sat Aug 9 18:54:35 2014
@@ -58,7 +58,7 @@ public class TestSameScoresWithThreads e
}
IndexReader r = w.getReader();
//System.out.println("numDocs=" + r.numDocs());
- w.shutdown();
+ w.close();
final IndexSearcher s = newSearcher(r);
Terms terms = MultiFields.getFields(r).terms("body");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java Sat Aug 9 18:54:35 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -107,7 +106,7 @@ public class TestScoreCachingWrappingSco
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
writer.commit();
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Weight fake = new TermQuery(new Term("fake", "weight")).createWeight(searcher);
Scorer s = new SimpleScorer(fake);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java Sat Aug 9 18:54:35 2014
@@ -51,7 +51,7 @@ public class TestScorerPerf extends Luce
d = newDirectory();
IndexWriter iw = new IndexWriter(d, newIndexWriterConfig(new MockAnalyzer(random())));
iw.addDocument(new Document());
- iw.shutdown();
+ iw.close();
r = DirectoryReader.open(d);
s = newSearcher(r);
}
@@ -77,7 +77,7 @@ public class TestScorerPerf extends Luce
iw.addDocument(d);
}
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java Sat Aug 9 18:54:35 2014
@@ -179,7 +179,7 @@ public class TestSearchAfter extends Luc
}
}
reader = iw.getReader();
- iw.shutdown();
+ iw.close();
searcher = newSearcher(reader);
if (VERBOSE) {
System.out.println(" searcher=" + searcher);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java Sat Aug 9 18:54:35 2014
@@ -65,7 +65,7 @@ public class TestSearchWithThreads exten
sb.delete(0, sb.length());
}
final IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
final long endTime = System.currentTimeMillis();
if (VERBOSE) System.out.println("BUILD took " + (endTime-startTime));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java Sat Aug 9 18:54:35 2014
@@ -285,7 +285,7 @@ public class TestSearcherManager extends
assertFalse(success.get());
assertTrue(triedReopen.get());
assertNull("" + exc[0], exc[0]);
- writer.shutdown();
+ writer.close();
dir.close();
if (es != null) {
es.shutdown();
@@ -296,7 +296,7 @@ public class TestSearcherManager extends
public void testCloseTwice() throws Exception {
// test that we can close SM twice (per Closeable's contract).
Directory dir = newDirectory();
- new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null)).shutdown();
+ new IndexWriter(dir, new IndexWriterConfig(null)).close();
SearcherManager sm = new SearcherManager(dir, null);
sm.close();
sm.close();
@@ -329,14 +329,14 @@ public class TestSearcherManager extends
}
// sm.close(); -- already closed
- writer.shutdown();
+ writer.close();
dir.close();
}
public void testEnsureOpen() throws Exception {
Directory dir = newDirectory();
- new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null)).shutdown();
+ new IndexWriter(dir, new IndexWriterConfig(null)).close();
SearcherManager sm = new SearcherManager(dir, null);
IndexSearcher s = sm.acquire();
sm.close();
@@ -362,7 +362,7 @@ public class TestSearcherManager extends
public void testListenerCalled() throws Exception {
Directory dir = newDirectory();
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(null));
final AtomicBoolean afterRefreshCalled = new AtomicBoolean(false);
SearcherManager sm = new SearcherManager(iw, false, new SearcherFactory());
sm.addListener(new ReferenceManager.RefreshListener() {
@@ -382,7 +382,7 @@ public class TestSearcherManager extends
sm.maybeRefreshBlocking();
assertTrue(afterRefreshCalled.get());
sm.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -411,7 +411,7 @@ public class TestSearcherManager extends
} catch (IllegalStateException ise) {
// expected
}
- w.shutdown();
+ w.close();
other.close();
dir.close();
}
@@ -421,7 +421,7 @@ public class TestSearcherManager extends
// threads cannot obtain it.
final Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- w.shutdown();
+ w.close();
final SearcherManager sm = new SearcherManager(dir, null);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java Sat Aug 9 18:54:35 2014
@@ -67,7 +67,7 @@ public class TestSimilarity extends Luce
writer.addDocument(d1);
writer.addDocument(d2);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
searcher.setSimilarity(new SimpleSimilarity());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java Sat Aug 9 18:54:35 2014
@@ -60,7 +60,7 @@ public class TestSimilarityProvider exte
field2.setStringValue("jumps over lazy brown dog");
iw.addDocument(doc);
reader = iw.getReader();
- iw.shutdown();
+ iw.close();
searcher = newSearcher(reader);
searcher.setSimilarity(sim);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Sat Aug 9 18:54:35 2014
@@ -26,7 +26,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -148,7 +147,7 @@ public class TestSloppyPhraseQuery exten
assertEquals("slop: "+slop+" query: "+query+" doc: "+doc+" Wrong number of hits", expectedNumResults, c.totalHits);
//QueryUtils.check(query,searcher);
- writer.shutdown();
+ writer.close();
reader.close();
ramDir.close();
@@ -239,7 +238,7 @@ public class TestSloppyPhraseQuery exten
f.setStringValue("drug druggy drug druggy drug");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
PhraseQuery pq = new PhraseQuery();
@@ -266,7 +265,7 @@ public class TestSloppyPhraseQuery exten
doc.add(newField("lyrics", document, new FieldType(TextField.TYPE_NOT_STORED)));
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
PhraseQuery pq = new PhraseQuery();
@@ -319,7 +318,7 @@ public class TestSloppyPhraseQuery exten
doc.add(newField("lyrics", document, new FieldType(TextField.TYPE_NOT_STORED)));
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java Sat Aug 9 18:54:35 2014
@@ -64,7 +64,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "bar", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING));
@@ -92,7 +92,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "foo", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING, true));
@@ -120,7 +120,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "bar", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING_VAL));
@@ -148,7 +148,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "foo", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING_VAL, true));
@@ -176,7 +176,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "bar", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING_VAL));
@@ -204,7 +204,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "foo", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.STRING_VAL, true));
@@ -236,7 +236,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
@@ -269,7 +269,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT, true));
@@ -300,7 +300,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.INT));
@@ -331,7 +331,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortField("value", SortField.Type.INT);
@@ -366,7 +366,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
@@ -399,7 +399,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG, true));
@@ -430,7 +430,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.LONG));
@@ -461,7 +461,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortField("value", SortField.Type.LONG);
@@ -496,7 +496,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4.2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
@@ -529,7 +529,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4.2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT, true));
@@ -560,7 +560,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4.2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.FLOAT));
@@ -591,7 +591,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4.2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortField("value", SortField.Type.FLOAT);
@@ -630,7 +630,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4.2333333333332", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
@@ -661,7 +661,7 @@ public class TestSort extends LuceneTest
writer.addDocument(doc);
doc = new Document();
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
@@ -697,7 +697,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4.2333333333332", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE, true));
@@ -733,7 +733,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4.2333333333332", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortField("value", SortField.Type.DOUBLE));
@@ -769,7 +769,7 @@ public class TestSort extends LuceneTest
doc.add(newStringField("value", "4.2333333333332", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortField("value", SortField.Type.DOUBLE);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java Sat Aug 9 18:54:35 2014
@@ -27,7 +27,6 @@ import java.util.Random;
import java.util.Set;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.StoredField;
@@ -119,7 +118,7 @@ public class TestSortRandom extends Luce
}
final IndexReader r = writer.getReader();
- writer.shutdown();
+ writer.close();
if (VERBOSE) {
System.out.println(" reader=" + r);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java Sat Aug 9 18:54:35 2014
@@ -63,7 +63,7 @@ public class TestSortRescorer extends Lu
reader = iw.getReader();
searcher = new IndexSearcher(reader);
- iw.shutdown();
+ iw.close();
}
@Override
@@ -129,7 +129,7 @@ public class TestSortRescorer extends Lu
w.addDocument(doc);
}
final IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
IndexSearcher s = newSearcher(r);
int numHits = TestUtil.nextInt(random(), 1, numDocs);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java Sat Aug 9 18:54:35 2014
@@ -20,20 +20,11 @@ package org.apache.lucene.search;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedNumericDocValuesField;
-import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.NumericUtils;
@@ -90,7 +81,7 @@ public class TestSortedNumericSortField
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT));
@@ -119,7 +110,7 @@ public class TestSortedNumericSortField
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT, true));
@@ -150,7 +141,7 @@ public class TestSortedNumericSortField
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortedNumericSortField("value", SortField.Type.INT);
@@ -185,7 +176,7 @@ public class TestSortedNumericSortField
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortedNumericSortField("value", SortField.Type.INT);
@@ -216,7 +207,7 @@ public class TestSortedNumericSortField
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.INT));
@@ -244,7 +235,7 @@ public class TestSortedNumericSortField
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.FLOAT));
@@ -272,7 +263,7 @@ public class TestSortedNumericSortField
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedNumericSortField("value", SortField.Type.DOUBLE));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java Sat Aug 9 18:54:35 2014
@@ -25,11 +25,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -71,7 +66,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -101,7 +96,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -134,7 +129,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -171,7 +166,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -204,7 +199,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -235,7 +230,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -266,7 +261,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -300,7 +295,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -338,7 +333,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -370,7 +365,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -401,7 +396,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -432,7 +427,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -466,7 +461,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -504,7 +499,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "2", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
@@ -536,7 +531,7 @@ public class TestSortedSetSelector exten
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
// slow wrapper does not support random access ordinals (there is no need for that!)
IndexSearcher searcher = newSearcher(ir, false);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java Sat Aug 9 18:54:35 2014
@@ -24,13 +24,6 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -86,7 +79,7 @@ public class TestSortedSetSortField exte
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", false));
@@ -115,7 +108,7 @@ public class TestSortedSetSortField exte
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", true));
@@ -146,7 +139,7 @@ public class TestSortedSetSortField exte
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortedSetSortField("value", false);
@@ -181,7 +174,7 @@ public class TestSortedSetSortField exte
doc.add(newStringField("id", "3", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
SortField sortField = new SortedSetSortField("value", false);
@@ -212,7 +205,7 @@ public class TestSortedSetSortField exte
doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
IndexReader ir = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(ir);
Sort sort = new Sort(new SortedSetSortField("value", false));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Sat Aug 9 18:54:35 2014
@@ -54,7 +54,7 @@ public class TestSubScorerFreqs extends
}
s = newSearcher(w.getReader());
- w.shutdown();
+ w.close();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java Sat Aug 9 18:54:35 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.io.Reader;
import java.util.Set;
import org.apache.lucene.analysis.*;
@@ -248,14 +247,14 @@ public class TestTermRangeQuery extends
for (int i = 0; i < values.length; i++) {
insertDoc(writer, values[i]);
}
- writer.shutdown();
+ writer.close();
}
// shouldnt create an analyzer for every doc?
private void addDoc(String content) throws IOException {
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)).setOpenMode(OpenMode.APPEND));
insertDoc(writer, content);
- writer.shutdown();
+ writer.close();
}
private void insertDoc(IndexWriter writer, String content) throws IOException {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java Sat Aug 9 18:54:35 2014
@@ -58,7 +58,7 @@ public class TestTermScorer extends Luce
writer.addDocument(doc);
}
indexReader = SlowCompositeReaderWrapper.wrap(writer.getReader());
- writer.shutdown();
+ writer.close();
indexSearcher = newSearcher(indexReader);
indexSearcher.setSimilarity(new DefaultSimilarity());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java Sat Aug 9 18:54:35 2014
@@ -28,7 +28,6 @@ import org.apache.lucene.document.TextFi
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.English;
@@ -71,7 +70,7 @@ public class TestTermVectors extends Luc
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
}
@AfterClass
@@ -90,7 +89,7 @@ public class TestTermVectors extends Luc
private void createDir(Directory dir) throws IOException {
IndexWriter writer = createWriter(dir);
writer.addDocument(createDoc());
- writer.shutdown();
+ writer.close();
}
private Document createDoc() {
@@ -121,7 +120,7 @@ public class TestTermVectors extends Luc
writer.addDocument(createDoc());
}
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
verifyIndex(target);
target.close();
@@ -138,7 +137,7 @@ public class TestTermVectors extends Luc
IndexWriter writer = createWriter(target);
writer.addIndexes(input);
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
verifyIndex(target);
@@ -160,7 +159,7 @@ public class TestTermVectors extends Luc
r.close();
}
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
verifyIndex(target);
IOUtils.close(target, input[0], input[1]);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java Sat Aug 9 18:54:35 2014
@@ -88,7 +88,7 @@ public class TestTimeLimitingCollector e
add(docText[i%docText.length], iw);
}
reader = iw.getReader();
- iw.shutdown();
+ iw.close();
searcher = newSearcher(reader);
BooleanQuery booleanQuery = new BooleanQuery();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java Sat Aug 9 18:54:35 2014
@@ -112,7 +112,7 @@ public class TestTopDocsCollector extend
writer.addDocument(new Document());
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java Sat Aug 9 18:54:35 2014
@@ -122,7 +122,7 @@ public class TestTopDocsMerge extends Lu
}
reader = w.getReader();
- w.shutdown();
+ w.close();
}
// NOTE: sometimes reader has just one segment, which is
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java Sat Aug 9 18:54:35 2014
@@ -41,7 +41,7 @@ public class TestTopFieldCollector exten
iw.addDocument(doc);
}
ir = iw.getReader();
- iw.shutdown();
+ iw.close();
is = newSearcher(ir);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java Sat Aug 9 18:54:35 2014
@@ -60,7 +60,7 @@ public class TestTopScoreDocCollector ex
assertEquals("expected doc Id " + j + " found " + sd[j].doc, j, sd[j].doc);
}
}
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java Sat Aug 9 18:54:35 2014
@@ -37,7 +37,7 @@ public class TestTotalHitCountCollector
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
TotalHitCountCollector c = new TotalHitCountCollector();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java Sat Aug 9 18:54:35 2014
@@ -253,7 +253,7 @@ public class TestWildcard
doc.add(newTextField(field, contents[i], Field.Store.YES));
writer.addDocument(doc);
}
- writer.shutdown();
+ writer.close();
return indexStore;
}
@@ -352,7 +352,7 @@ public class TestWildcard
doc.add(newTextField(field, docs[i], Field.Store.NO));
iw.addDocument(doc);
}
- iw.shutdown();
+ iw.close();
IndexReader reader = DirectoryReader.open(dir);
IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java Sat Aug 9 18:54:35 2014
@@ -31,7 +31,6 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TestUtil;
/**
* Create an index with terms from 000-999.
@@ -63,7 +62,7 @@ public class TestWildcardRandom extends
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.shutdown();
+ writer.close();
if (VERBOSE) {
System.out.println("TEST: setUp searcher=" + searcher);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java Sat Aug 9 18:54:35 2014
@@ -35,9 +35,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
-import static org.apache.lucene.util.LuceneTestCase.TEST_VERSION_CURRENT;
-
-import java.io.Reader;
import java.io.IOException;
import java.util.Random;
@@ -121,7 +118,7 @@ public class PayloadHelper {
// TODO randomize this
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
- TEST_VERSION_CURRENT, analyzer).setSimilarity(similarity));
+ analyzer).setSimilarity(similarity));
// writer.infoStream = System.out;
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
@@ -131,7 +128,7 @@ public class PayloadHelper {
writer.addDocument(doc);
}
reader = DirectoryReader.open(writer, true);
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = LuceneTestCase.newSearcher(reader);
searcher.setSimilarity(similarity);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Sat Aug 9 18:54:35 2014
@@ -16,7 +16,6 @@ package org.apache.lucene.search.payload
* limitations under the License.
*/
import java.io.IOException;
-import java.io.Reader;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
@@ -118,7 +117,7 @@ public class TestPayloadNearQuery extend
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
searcher.setSimilarity(similarity);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Sat Aug 9 18:54:35 2014
@@ -44,7 +44,6 @@ import org.apache.lucene.document.Field;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import java.io.Reader;
import java.io.IOException;
@@ -130,7 +129,7 @@ public class TestPayloadTermQuery extend
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
searcher.setSimilarity(similarity);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java Sat Aug 9 18:54:35 2014
@@ -78,7 +78,7 @@ public class TestSimilarity2 extends Luc
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
for (Similarity sim : sims) {
@@ -97,7 +97,7 @@ public class TestSimilarity2 extends Luc
doc.add(newTextField("foo", "bar", Field.Store.NO));
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
for (Similarity sim : sims) {
@@ -119,7 +119,7 @@ public class TestSimilarity2 extends Luc
doc.add(newTextField("foo", "bar", Field.Store.NO));
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
for (Similarity sim : sims) {
@@ -144,7 +144,7 @@ public class TestSimilarity2 extends Luc
doc.add(newField("foo", "bar", ft));
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
for (Similarity sim : sims) {
@@ -169,7 +169,7 @@ public class TestSimilarity2 extends Luc
doc.add(f);
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
for (Similarity sim : sims) {
@@ -195,7 +195,7 @@ public class TestSimilarity2 extends Luc
doc.add(f);
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
for (Similarity sim : sims) {
@@ -221,7 +221,7 @@ public class TestSimilarity2 extends Luc
doc.add(newField("foo", "bar", ft));
iw.addDocument(doc);
IndexReader ir = iw.getReader();
- iw.shutdown();
+ iw.close();
IndexSearcher is = newSearcher(ir);
for (Similarity sim : sims) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java Sat Aug 9 18:54:35 2014
@@ -119,7 +119,7 @@ public class TestSimilarityBase extends
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.shutdown();
+ writer.close();
sims = new ArrayList<>();
for (BasicModel basicModel : BASIC_MODELS) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java Sat Aug 9 18:54:35 2014
@@ -120,7 +120,7 @@ public class TestBasics extends LuceneTe
}
reader = writer.getReader();
searcher = newSearcher(reader);
- writer.shutdown();
+ writer.close();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Sat Aug 9 18:54:35 2014
@@ -113,7 +113,7 @@ public class TestFieldMaskingSpanQuery e
field("first", "bubba"),
field("last", "jones") }));
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Sat Aug 9 18:54:35 2014
@@ -58,7 +58,7 @@ public class TestNearSpansOrdered extend
writer.addDocument(doc);
}
reader = writer.getReader();
- writer.shutdown();
+ writer.close();
searcher = newSearcher(reader);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Sat Aug 9 18:54:35 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.search.spans;
*/
import java.io.IOException;
-import java.io.Reader;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
@@ -117,7 +116,7 @@ public class TestPayloadSpans extends Lu
doc.add(newTextField(PayloadHelper.FIELD, "one two three one four three", Field.Store.YES));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
checkSpans(MultiSpansWrapper.wrap(reader.getContext(), snq), 1,new int[]{2});
@@ -262,7 +261,7 @@ public class TestPayloadSpans extends Lu
IndexReader reader = writer.getReader();
IndexSearcher is = newSearcher(reader);
- writer.shutdown();
+ writer.close();
SpanTermQuery stq1 = new SpanTermQuery(new Term("content", "a"));
SpanTermQuery stq2 = new SpanTermQuery(new Term("content", "k"));
@@ -298,7 +297,7 @@ public class TestPayloadSpans extends Lu
writer.addDocument(doc);
IndexReader reader = writer.getReader();
IndexSearcher is = newSearcher(reader);
- writer.shutdown();
+ writer.close();
SpanTermQuery stq1 = new SpanTermQuery(new Term("content", "a"));
SpanTermQuery stq2 = new SpanTermQuery(new Term("content", "k"));
@@ -333,7 +332,7 @@ public class TestPayloadSpans extends Lu
writer.addDocument(doc);
IndexReader reader = writer.getReader();
IndexSearcher is = newSearcher(reader);
- writer.shutdown();
+ writer.close();
SpanTermQuery stq1 = new SpanTermQuery(new Term("content", "a"));
SpanTermQuery stq2 = new SpanTermQuery(new Term("content", "k"));
@@ -374,7 +373,7 @@ public class TestPayloadSpans extends Lu
writer.addDocument(doc);
IndexReader reader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(reader);
PayloadSpanUtil psu = new PayloadSpanUtil(searcher.getTopReaderContext());
@@ -438,7 +437,7 @@ public class TestPayloadSpans extends Lu
}
closeIndexReader = writer.getReader();
- writer.shutdown();
+ writer.close();
IndexSearcher searcher = newSearcher(closeIndexReader);
return searcher;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java Sat Aug 9 18:54:35 2014
@@ -59,7 +59,7 @@ public class TestSpanFirstQuery extends
sfq = new SpanNotQuery(include, sfq);
assertEquals(1, searcher.search(sfq, 10).totalHits);
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
}