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 [11/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/an...
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java Sat Aug 9 18:54:35 2014
@@ -98,7 +98,7 @@ public abstract class BaseDocValuesForma
doc.add(newTextField("fieldname", text, Field.Store.YES));
doc.add(new NumericDocValuesField("dv", 5));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -130,7 +130,7 @@ public abstract class BaseDocValuesForma
doc.add(newTextField("fieldname", text, Field.Store.YES));
doc.add(new FloatDocValuesField("dv", 5.7f));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -163,7 +163,7 @@ public abstract class BaseDocValuesForma
doc.add(new NumericDocValuesField("dv1", 5));
doc.add(new NumericDocValuesField("dv2", 17));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -198,7 +198,7 @@ public abstract class BaseDocValuesForma
doc.add(new BinaryDocValuesField("dv1", new BytesRef(longTerm)));
doc.add(new BinaryDocValuesField("dv2", new BytesRef(text)));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -235,7 +235,7 @@ public abstract class BaseDocValuesForma
doc.add(new NumericDocValuesField("dv1", 5));
doc.add(new BinaryDocValuesField("dv2", new BytesRef("hello world")));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -272,7 +272,7 @@ public abstract class BaseDocValuesForma
doc.add(new NumericDocValuesField("dv2", 5));
doc.add(new BinaryDocValuesField("dv3", new BytesRef("hello world")));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -313,7 +313,7 @@ public abstract class BaseDocValuesForma
doc.add(new SortedDocValuesField("dv2", new BytesRef("hello hello")));
doc.add(new NumericDocValuesField("dv3", 5));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -358,7 +358,7 @@ public abstract class BaseDocValuesForma
doc.add(new NumericDocValuesField("dv", 2));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -388,7 +388,7 @@ public abstract class BaseDocValuesForma
doc.add(new NumericDocValuesField("dv", 99));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -423,7 +423,7 @@ public abstract class BaseDocValuesForma
doc.add(new NumericDocValuesField("dv", Long.MAX_VALUE));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -450,7 +450,7 @@ public abstract class BaseDocValuesForma
doc.add(new NumericDocValuesField("dv", 9062230939892376225L));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -475,7 +475,7 @@ public abstract class BaseDocValuesForma
doc.add(newTextField("fieldname", text, Field.Store.YES));
doc.add(new BinaryDocValuesField("dv", new BytesRef("hello world")));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -516,7 +516,7 @@ public abstract class BaseDocValuesForma
doc.add(new BinaryDocValuesField("dv", new BytesRef("hello 2")));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -551,7 +551,7 @@ public abstract class BaseDocValuesForma
doc.add(newTextField("fieldname", text, Field.Store.YES));
doc.add(new SortedDocValuesField("dv", new BytesRef("hello world")));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -590,7 +590,7 @@ public abstract class BaseDocValuesForma
doc.add(new SortedDocValuesField("dv", new BytesRef("hello world 2")));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -623,7 +623,7 @@ public abstract class BaseDocValuesForma
doc.add(new SortedDocValuesField("dv", new BytesRef("hello world 1")));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -659,7 +659,7 @@ public abstract class BaseDocValuesForma
doc.add(new SortedDocValuesField("dv", new BytesRef("hello world 2")));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -705,7 +705,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedDocValues dv = getOnlySegmentReader(ireader).getSortedDocValues("field");
if (defaultCodecSupportsDocsWithField()) {
@@ -732,7 +732,7 @@ public abstract class BaseDocValuesForma
Document doc = new Document();
doc.add(new BinaryDocValuesField("dv", new BytesRef("hello\nworld\r1")));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -757,7 +757,7 @@ public abstract class BaseDocValuesForma
iwriter.addDocument(doc);
// 2nd doc missing the DV field
iwriter.addDocument(new Document());
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -795,7 +795,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedDocValues dv = getOnlySegmentReader(ireader).getSortedDocValues("field");
assertEquals(3, dv.getValueCount());
@@ -859,7 +859,7 @@ public abstract class BaseDocValuesForma
doc.add(new SortedDocValuesField("dv", new BytesRef("")));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -888,7 +888,7 @@ public abstract class BaseDocValuesForma
doc.add(new BinaryDocValuesField("dv", new BytesRef("")));
iwriter.addDocument(doc);
iwriter.forceMerge(1);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -916,7 +916,7 @@ public abstract class BaseDocValuesForma
random().nextBytes(bytes);
doc.add(new BinaryDocValuesField("dv", b));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -942,7 +942,7 @@ public abstract class BaseDocValuesForma
random().nextBytes(bytes);
doc.add(new SortedDocValuesField("dv", b));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -964,7 +964,7 @@ public abstract class BaseDocValuesForma
Document doc = new Document();
doc.add(new BinaryDocValuesField("dv", new BytesRef("boo!")));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -989,7 +989,7 @@ public abstract class BaseDocValuesForma
Document doc = new Document();
doc.add(new SortedDocValuesField("dv", new BytesRef("boo!")));
iwriter.addDocument(doc);
- iwriter.shutdown();
+ iwriter.close();
// Now search the index:
IndexReader ireader = DirectoryReader.open(directory); // read-only=true
@@ -1022,7 +1022,7 @@ public abstract class BaseDocValuesForma
writer.commit();
writer.forceMerge(1, true);
- writer.shutdown();
+ writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
assertEquals(1, reader.leaves().size());
@@ -1129,7 +1129,7 @@ public abstract class BaseDocValuesForma
}
reader.close();
- w.shutdown();
+ w.close();
dir.close();
}
@@ -1185,7 +1185,7 @@ public abstract class BaseDocValuesForma
// 256 values
writer.forceMerge(numDocs / 256);
- writer.shutdown();
+ writer.close();
// compare
DirectoryReader ir = DirectoryReader.open(dir);
@@ -1243,7 +1243,7 @@ public abstract class BaseDocValuesForma
// 256 values
writer.forceMerge(numDocs / 256);
- writer.shutdown();
+ writer.close();
// compare
DirectoryReader ir = DirectoryReader.open(dir);
@@ -1364,7 +1364,7 @@ public abstract class BaseDocValuesForma
}
}
ir.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -1448,7 +1448,7 @@ public abstract class BaseDocValuesForma
}
}
ir.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -1477,7 +1477,7 @@ public abstract class BaseDocValuesForma
iwriter.addDocument(doc);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
@@ -1503,7 +1503,7 @@ public abstract class BaseDocValuesForma
iwriter.addDocument(doc);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
@@ -1546,7 +1546,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
assertEquals(2, dv.getValueCount());
@@ -1580,7 +1580,7 @@ public abstract class BaseDocValuesForma
iwriter.addDocument(doc);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
@@ -1610,7 +1610,7 @@ public abstract class BaseDocValuesForma
iwriter.addDocument(doc);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
@@ -1650,7 +1650,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
assertEquals(3, dv.getValueCount());
@@ -1694,7 +1694,7 @@ public abstract class BaseDocValuesForma
iwriter.addDocument(doc);
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
assertEquals(1, dv.getValueCount());
@@ -1728,7 +1728,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
assertEquals(1, dv.getValueCount());
@@ -1761,7 +1761,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
assertEquals(1, dv.getValueCount());
@@ -1795,7 +1795,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
assertEquals(1, dv.getValueCount());
@@ -1831,7 +1831,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
assertEquals(0, dv.getValueCount());
@@ -1855,7 +1855,7 @@ public abstract class BaseDocValuesForma
iwriter.addDocument(doc);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedSetDocValues dv = getOnlySegmentReader(ireader).getSortedSetDocValues("field");
assertEquals(3, dv.getValueCount());
@@ -1998,7 +1998,7 @@ public abstract class BaseDocValuesForma
}
}
ir.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -2147,7 +2147,7 @@ public abstract class BaseDocValuesForma
doc.add(new StringField("id", "1", Field.Store.YES));
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
@@ -2177,7 +2177,7 @@ public abstract class BaseDocValuesForma
doc.add(new StringField("id", "1", Field.Store.YES));
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
@@ -2211,7 +2211,7 @@ public abstract class BaseDocValuesForma
doc.add(new NumericDocValuesField("dv1", 5));
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
@@ -2242,7 +2242,7 @@ public abstract class BaseDocValuesForma
doc.add(new StringField("id", "1", Field.Store.YES));
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
@@ -2274,7 +2274,7 @@ public abstract class BaseDocValuesForma
doc.add(new StringField("id", "1", Field.Store.YES));
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
@@ -2310,7 +2310,7 @@ public abstract class BaseDocValuesForma
doc.add(new BinaryDocValuesField("dv1", new BytesRef("boo")));
iw.addDocument(doc);
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
IndexReader ir = DirectoryReader.open(directory);
assertEquals(1, ir.leaves().size());
@@ -2374,7 +2374,7 @@ public abstract class BaseDocValuesForma
int id = random().nextInt(numDocs);
writer.deleteDocuments(new Term("id", Integer.toString(id)));
}
- writer.shutdown();
+ writer.close();
// compare
final DirectoryReader ir = DirectoryReader.open(dir);
@@ -2488,7 +2488,7 @@ public abstract class BaseDocValuesForma
int id = random().nextInt(numDocs);
writer.deleteDocuments(new Term("id", Integer.toString(id)));
}
- writer.shutdown();
+ writer.close();
// compare
final DirectoryReader ir = DirectoryReader.open(dir);
@@ -2615,7 +2615,7 @@ public abstract class BaseDocValuesForma
doc.add(new BinaryDocValuesField("field", new BytesRef()));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
AtomicReader ar = SlowCompositeReaderWrapper.wrap(r);
BinaryDocValues values = ar.getBinaryDocValues("field");
@@ -2635,7 +2635,7 @@ public abstract class BaseDocValuesForma
Document doc = new Document();
doc.add(new SortedNumericDocValuesField("dv", 5));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
// Now search the index:
IndexReader reader = DirectoryReader.open(directory);
@@ -2652,12 +2652,12 @@ public abstract class BaseDocValuesForma
public void testOneSortedNumberOneMissing() throws IOException {
assumeTrue("Codec does not support SORTED_NUMERIC", defaultCodecSupportsSortedNumeric());
Directory directory = newDirectory();
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(null));
Document doc = new Document();
doc.add(new SortedNumericDocValuesField("dv", 5));
writer.addDocument(doc);
writer.addDocument(new Document());
- writer.shutdown();
+ writer.close();
// Now search the index:
IndexReader reader = DirectoryReader.open(directory);
@@ -2686,7 +2686,7 @@ public abstract class BaseDocValuesForma
doc.add(new SortedNumericDocValuesField("dv", 11));
doc.add(new SortedNumericDocValuesField("dv", -5));
writer.addDocument(doc);
- writer.shutdown();
+ writer.close();
// Now search the index:
IndexReader reader = DirectoryReader.open(directory);
@@ -2704,13 +2704,13 @@ public abstract class BaseDocValuesForma
public void testTwoSortedNumberOneMissing() throws IOException {
assumeTrue("Codec does not support SORTED_NUMERIC", defaultCodecSupportsSortedNumeric());
Directory directory = newDirectory();
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(null));
Document doc = new Document();
doc.add(new SortedNumericDocValuesField("dv", 11));
doc.add(new SortedNumericDocValuesField("dv", -5));
writer.addDocument(doc);
writer.addDocument(new Document());
- writer.shutdown();
+ writer.close();
// Now search the index:
IndexReader reader = DirectoryReader.open(directory);
@@ -2735,7 +2735,7 @@ public abstract class BaseDocValuesForma
public void testSortedNumberMerge() throws IOException {
assumeTrue("Codec does not support SORTED_NUMERIC", defaultCodecSupportsSortedNumeric());
Directory directory = newDirectory();
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, null);
+ IndexWriterConfig iwc = new IndexWriterConfig(null);
iwc.setMergePolicy(newLogMergePolicy());
IndexWriter writer = new IndexWriter(directory, iwc);
Document doc = new Document();
@@ -2746,7 +2746,7 @@ public abstract class BaseDocValuesForma
doc.add(new SortedNumericDocValuesField("dv", -5));
writer.addDocument(doc);
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
// Now search the index:
IndexReader reader = DirectoryReader.open(directory);
@@ -2783,7 +2783,7 @@ public abstract class BaseDocValuesForma
iwriter.forceMerge(1);
DirectoryReader ireader = iwriter.getReader();
- iwriter.shutdown();
+ iwriter.close();
SortedNumericDocValues dv = getOnlySegmentReader(ireader).getSortedNumericDocValues("field");
dv.setDocument(0);
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java Sat Aug 9 18:54:35 2014
@@ -170,7 +170,7 @@ abstract class BaseIndexFileFormatTestCa
// do not use RIW which will change things up!
MergePolicy mp = newTieredMergePolicy();
mp.setNoCFSRatio(0);
- IndexWriterConfig cfg = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setUseCompoundFile(false).setMergePolicy(mp);
+ IndexWriterConfig cfg = new IndexWriterConfig(new MockAnalyzer(random())).setUseCompoundFile(false).setMergePolicy(mp);
IndexWriter w = new IndexWriter(dir, cfg);
final int numDocs = atLeast(500);
for (int i = 0; i < numDocs; ++i) {
@@ -186,7 +186,7 @@ abstract class BaseIndexFileFormatTestCa
Directory dir2 = newDirectory();
mp = newTieredMergePolicy();
mp.setNoCFSRatio(0);
- cfg = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setUseCompoundFile(false).setMergePolicy(mp);
+ cfg = new IndexWriterConfig(new MockAnalyzer(random())).setUseCompoundFile(false).setMergePolicy(mp);
w = new IndexWriter(dir2, cfg);
w.addIndexes(reader);
w.commit();
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java Sat Aug 9 18:54:35 2014
@@ -62,7 +62,7 @@ public abstract class BaseMergePolicyTes
mayMerge.set(segmentCount > maxNumSegments);
writer.forceMerge(maxNumSegments);
}
- writer.shutdown();
+ writer.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java Sat Aug 9 18:54:35 2014
@@ -1430,7 +1430,7 @@ public abstract class BasePostingsFormat
assertEquals(termsEnum.term(), new BytesRef("something"));
assertNull(termsEnum.next());
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -1455,7 +1455,7 @@ public abstract class BasePostingsFormat
assertEquals(termsEnum.term(), new BytesRef(""));
assertNull(termsEnum.next());
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -1490,7 +1490,7 @@ public abstract class BasePostingsFormat
}
}
ir.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -1702,7 +1702,7 @@ public abstract class BasePostingsFormat
}
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
Terms terms = MultiFields.getTerms(r, "body");
assertEquals(sumDocFreq.get(), terms.getSumDocFreq());
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java Sat Aug 9 18:54:35 2014
@@ -170,7 +170,7 @@ public abstract class BaseStoredFieldsFo
w.forceMerge(1);
}
}
- w.shutdown();
+ w.close();
dir.close();
}
@@ -205,7 +205,7 @@ public abstract class BaseStoredFieldsFo
assertEquals(f.stringValue(), "1 2 3");
assertFalse(it.hasNext());
r.close();
- w.shutdown();
+ w.close();
d.close();
}
@@ -226,7 +226,7 @@ public abstract class BaseStoredFieldsFo
assertEquals(17, f.binaryValue().length);
doc.add(f);
w.addDocument(doc);
- w.shutdown();
+ w.close();
IndexReader ir = DirectoryReader.open(dir);
StoredDocument doc2 = ir.document(0);
@@ -293,7 +293,7 @@ public abstract class BaseStoredFieldsFo
w.addDocument(doc);
}
final DirectoryReader r = w.getReader();
- w.shutdown();
+ w.close();
assertEquals(numDocs, r.numDocs());
@@ -321,7 +321,7 @@ public abstract class BaseStoredFieldsFo
doc.add(new StringField("field2", "value", Field.Store.YES));
w.addDocument(doc);
IndexReader r = w.getReader();
- w.shutdown();
+ w.close();
assertFalse(r.document(0).getField("field").fieldType().indexed());
assertTrue(r.document(0).getField("field2").fieldType().indexed());
r.close();
@@ -377,7 +377,7 @@ public abstract class BaseStoredFieldsFo
}
}
reader.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -402,7 +402,7 @@ public abstract class BaseStoredFieldsFo
}
rd.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -475,7 +475,7 @@ public abstract class BaseStoredFieldsFo
throw ex.get();
}
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -530,7 +530,7 @@ public abstract class BaseStoredFieldsFo
}
iw.w.addDocument(doc);
if (random().nextBoolean() && (i % (data.length / 10) == 0)) {
- iw.w.shutdown();
+ iw.w.close();
IndexWriterConfig iwConfNew = newIndexWriterConfig(new MockAnalyzer(random()));
// test merging against a non-compressing codec
if (iwConf.getCodec() == otherCodec) {
@@ -578,7 +578,7 @@ public abstract class BaseStoredFieldsFo
iw.commit();
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
dir.close();
}
@@ -647,7 +647,7 @@ public abstract class BaseStoredFieldsFo
}
}
rd.close();
- iw.shutdown();
+ iw.close();
dir.close();
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java Sat Aug 9 18:54:35 2014
@@ -40,7 +40,6 @@ import org.apache.lucene.document.Field.
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.TermsEnum.SeekStatus;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
@@ -539,7 +538,7 @@ public abstract class BaseTermVectorsFor
final Fields fields = reader.getTermVectors(docWithVectorsID);
assertEquals(doc, fields);
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
}
@@ -557,7 +556,7 @@ public abstract class BaseTermVectorsFor
final IndexReader reader = writer.getReader();
assertEquals(doc, reader.getTermVectors(0));
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
}
@@ -572,7 +571,7 @@ public abstract class BaseTermVectorsFor
final IndexReader reader = writer.getReader();
assertEquals(doc, reader.getTermVectors(0));
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
}
@@ -598,7 +597,7 @@ public abstract class BaseTermVectorsFor
final int doc2ID = docID(reader, "2");
assertEquals(doc2, reader.getTermVectors(doc2ID));
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
}
@@ -622,7 +621,7 @@ public abstract class BaseTermVectorsFor
assertEquals(docs[i], reader.getTermVectors(docID));
}
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
@@ -660,7 +659,7 @@ public abstract class BaseTermVectorsFor
}
}
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
}
@@ -711,7 +710,7 @@ public abstract class BaseTermVectorsFor
thread.join();
}
reader.close();
- writer.shutdown();
+ writer.close();
dir.close();
assertNull("One thread threw an exception", exception.get());
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java Sat Aug 9 18:54:35 2014
@@ -37,8 +37,6 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
-import static org.apache.lucene.util.LuceneTestCase.TEST_VERSION_CURRENT;
-
class DocHelper {
public static final FieldType customType;
@@ -271,12 +269,12 @@ class DocHelper {
*/
public static SegmentCommitInfo writeDoc(Random random, Directory dir, Analyzer analyzer, Similarity similarity, Document doc) throws IOException {
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( /* LuceneTestCase.newIndexWriterConfig(random, */
- TEST_VERSION_CURRENT, analyzer).setSimilarity(similarity == null ? IndexSearcher.getDefaultSimilarity() : similarity));
+ analyzer).setSimilarity(similarity == null ? IndexSearcher.getDefaultSimilarity() : similarity));
//writer.setNoCFSRatio(0.0);
writer.addDocument(doc);
writer.commit();
SegmentCommitInfo info = writer.newestSegment();
- writer.shutdown();
+ writer.close();
return info;
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Sat Aug 9 18:54:35 2014
@@ -33,7 +33,6 @@ import org.apache.lucene.util.InfoStream
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.NullInfoStream;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.Version;
/** Silly class that randomizes the indexing experience. EG
* it may swap in a different merge policy/scheduler; may
@@ -69,19 +68,14 @@ public class RandomIndexWriter implement
return new IndexWriter(dir, conf);
}
- /** create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT and MockAnalyzer */
+ /** create a RandomIndexWriter with a random config: Uses MockAnalyzer */
public RandomIndexWriter(Random r, Directory dir) throws IOException {
- this(r, dir, LuceneTestCase.newIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, new MockAnalyzer(r)));
- }
-
- /** create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT */
- public RandomIndexWriter(Random r, Directory dir, Analyzer a) throws IOException {
- this(r, dir, LuceneTestCase.newIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, a));
+ this(r, dir, LuceneTestCase.newIndexWriterConfig(r, new MockAnalyzer(r)));
}
/** create a RandomIndexWriter with a random config */
- public RandomIndexWriter(Random r, Directory dir, Version v, Analyzer a) throws IOException {
- this(r, dir, LuceneTestCase.newIndexWriterConfig(r, v, a));
+ public RandomIndexWriter(Random r, Directory dir, Analyzer a) throws IOException {
+ this(r, dir, LuceneTestCase.newIndexWriterConfig(r, a));
}
/** create a RandomIndexWriter with the provided config */
@@ -364,27 +358,15 @@ public class RandomIndexWriter implement
// forceMerge since presumably they might open a reader on the dir.
if (getReaderCalled == false && r.nextInt(8) == 2) {
doRandomForceMerge();
- // index may have changed, must commit the changes, or otherwise they are discarded by the call to close()
- w.commit();
+ if (w.getConfig().getCommitOnClose() == false) {
+ // index may have changed, must commit the changes, or otherwise they are discarded by the call to close()
+ w.commit();
+ }
}
w.close();
}
/**
- * Shuts down this writer
- * @see IndexWriter#shutdown()
- */
- public void shutdown() throws IOException {
- LuceneTestCase.maybeChangeLiveIndexWriterConfig(r, w.getConfig());
- // if someone isn't using getReader() API, we want to be sure to
- // forceMerge since presumably they might open a reader on the dir.
- if (getReaderCalled == false && r.nextInt(8) == 2) {
- doRandomForceMerge();
- }
- w.shutdown();
- }
-
- /**
* Forces a forceMerge.
* <p>
* NOTE: this should be avoided in tests unless absolutely necessary,
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Sat Aug 9 18:54:35 2014
@@ -442,7 +442,7 @@ public abstract class ThreadedIndexingAn
}
MockAnalyzer analyzer = new MockAnalyzer(random());
analyzer.setMaxTokenLength(TestUtil.nextInt(random(), 1, IndexWriter.MAX_TERM_LENGTH));
- final IndexWriterConfig conf = newIndexWriterConfig(analyzer);
+ final IndexWriterConfig conf = newIndexWriterConfig(analyzer).setCommitOnClose(false);
conf.setInfoStream(new FailOnNonBulkMergesInfoStream());
if (conf.getMergePolicy() instanceof MockRandomMergePolicy) {
((MockRandomMergePolicy)conf.getMergePolicy()).setDoNonBulkMerges(false);
@@ -637,9 +637,13 @@ public abstract class ThreadedIndexingAn
doClose();
- writer.shutdown(false);
+ try {
+ writer.commit();
+ } finally {
+ writer.close();
+ }
- // Cannot shutdown until after writer is closed because
+ // Cannot close until after writer is closed because
// writer has merged segment warmer that uses IS to run
// searches, and that IS may be using this es!
if (es != null) {
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java Sat Aug 9 18:54:35 2014
@@ -33,15 +33,12 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiReader;
-import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.LuceneTestCase;
-import static org.apache.lucene.util.LuceneTestCase.TEST_VERSION_CURRENT;
-
/**
* Utility class for sanity-checking queries.
*/
@@ -203,12 +200,12 @@ public class QueryUtils {
if (LuceneTestCase.VERBOSE) {
System.out.println("NOTE: QueryUtils: now create empty index");
}
- IndexWriter w = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ IndexWriter w = new IndexWriter(d, new IndexWriterConfig(new MockAnalyzer(random)));
for (int i = 0; i < numDocs; i++) {
w.addDocument(new Document());
}
w.forceMerge(1);
- w.shutdown();
+ w.close();
if (LuceneTestCase.VERBOSE) {
System.out.println("NOTE: QueryUtils: done create empty index");
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java Sat Aug 9 18:54:35 2014
@@ -88,7 +88,7 @@ public abstract class SearchEquivalenceT
reader = iw.getReader();
s1 = newSearcher(reader);
s2 = newSearcher(reader);
- iw.shutdown();
+ iw.close();
}
@AfterClass
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java Sat Aug 9 18:54:35 2014
@@ -451,7 +451,7 @@ public abstract class ShardSearchingTest
// TODO: set warmer
MockAnalyzer analyzer = new MockAnalyzer(random());
analyzer.setMaxTokenLength(TestUtil.nextInt(random(), 1, IndexWriter.MAX_TERM_LENGTH));
- IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
+ IndexWriterConfig iwc = new IndexWriterConfig(analyzer);
iwc.setOpenMode(IndexWriterConfig.OpenMode.CREATE);
if (VERBOSE) {
iwc.setInfoStream(new PrintStreamInfoStream(System.out));
@@ -537,7 +537,7 @@ public abstract class ShardSearchingTest
}
searchers.close();
mgr.close();
- writer.shutdown();
+ writer.close();
dir.close();
}
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java Sat Aug 9 18:54:35 2014
@@ -700,7 +700,7 @@ public class MockDirectoryWrapper extend
Set<String> allFiles = new HashSet<>(Arrays.asList(listAll()));
allFiles.removeAll(pendingDeletions);
String[] startFiles = allFiles.toArray(new String[0]);
- IndexWriterConfig iwc = new IndexWriterConfig(LuceneTestCase.TEST_VERSION_CURRENT, null);
+ IndexWriterConfig iwc = new IndexWriterConfig(null);
iwc.setIndexDeletionPolicy(NoDeletionPolicy.INSTANCE);
new IndexWriter(in, iwc).rollback();
String[] endFiles = in.listAll();
@@ -791,7 +791,7 @@ public class MockDirectoryWrapper extend
DirectoryReader ir1 = DirectoryReader.open(this);
int numDocs1 = ir1.numDocs();
ir1.close();
- new IndexWriter(this, new IndexWriterConfig(LuceneTestCase.TEST_VERSION_CURRENT, null)).shutdown();
+ new IndexWriter(this, new IndexWriterConfig(null)).close();
DirectoryReader ir2 = DirectoryReader.open(this);
int numDocs2 = ir2.numDocs();
ir2.close();
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Sat Aug 9 18:54:35 2014
@@ -872,12 +872,12 @@ public abstract class LuceneTestCase ext
/** create a new index writer config with random defaults */
public static IndexWriterConfig newIndexWriterConfig(Analyzer a) {
- return newIndexWriterConfig(random(), TEST_VERSION_CURRENT, a);
+ return newIndexWriterConfig(random(), a);
}
/** create a new index writer config with random defaults using the specified random */
- public static IndexWriterConfig newIndexWriterConfig(Random r, Version v, Analyzer a) {
- IndexWriterConfig c = new IndexWriterConfig(v, a);
+ public static IndexWriterConfig newIndexWriterConfig(Random r, Analyzer a) {
+ IndexWriterConfig c = new IndexWriterConfig(a);
c.setSimilarity(classEnvRule.similarity);
if (VERBOSE) {
// Even though TestRuleSetupAndRestoreClassEnv calls
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java Sat Aug 9 18:54:35 2014
@@ -922,7 +922,7 @@ public final class TestUtil {
ex.awaitTermination(1, TimeUnit.SECONDS);
} catch (InterruptedException e) {
// Just report it on the syserr.
- System.err.println("Could not properly shutdown executor service.");
+ System.err.println("Could not properly close executor service.");
e.printStackTrace(System.err);
}
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java Sat Aug 9 18:54:35 2014
@@ -99,11 +99,11 @@ public class SolrEntityProcessor extends
URL url = new URL(serverPath);
// (wt="javabin|xml") default is javabin
if ("xml".equals(context.getResolvedEntityAttribute(CommonParams.WT))) {
- // TODO: it doesn't matter for this impl when passing a client currently, but we should shutdown this!
+ // TODO: it doesn't matter for this impl when passing a client currently, but we should close this!
solrServer = new HttpSolrServer(url.toExternalForm(), client, new XMLResponseParser());
LOG.info("using XMLResponseParser");
} else {
- // TODO: it doesn't matter for this impl when passing a client currently, but we should shutdown this!
+ // TODO: it doesn't matter for this impl when passing a client currently, but we should close this!
solrServer = new HttpSolrServer(url.toExternalForm(), client);
LOG.info("using BinaryResponseParser");
}
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java Sat Aug 9 18:54:35 2014
@@ -74,7 +74,7 @@ public abstract class AbstractDIHJdbcTes
@AfterClass
public static void afterClassDihJdbcTest() throws Exception {
try {
- DriverManager.getConnection("jdbc:derby:;shutdown=true;territory=en_US");
+ DriverManager.getConnection("jdbc:derby:;close=true;territory=en_US");
} catch (SQLException e) {
// ignore...we might not even be using derby this time...
}
Modified: lucene/dev/trunk/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java (original)
+++ lucene/dev/trunk/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/TreeMergeOutputFormat.java Sat Aug 9 18:54:35 2014
@@ -23,7 +23,6 @@ import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.NullWritable;
@@ -39,7 +38,6 @@ import org.apache.lucene.index.MergePoli
import org.apache.lucene.index.TieredMergePolicy;
import org.apache.lucene.misc.IndexMergeTool;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.Version;
import org.apache.solr.store.hdfs.HdfsDirectory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,7 +96,7 @@ public class TreeMergeOutputFormat exten
Directory mergedIndex = new HdfsDirectory(workDir, context.getConfiguration());
// TODO: shouldn't we pull the Version from the solrconfig.xml?
- IndexWriterConfig writerConfig = new IndexWriterConfig(Version.LUCENE_CURRENT, null)
+ IndexWriterConfig writerConfig = new IndexWriterConfig(null)
.setOpenMode(OpenMode.CREATE).setUseCompoundFile(false)
//.setMergePolicy(mergePolicy) // TODO: grab tuned MergePolicy from solrconfig.xml?
//.setMergeScheduler(...) // TODO: grab tuned MergeScheduler from solrconfig.xml?
@@ -163,7 +161,7 @@ public class TreeMergeOutputFormat exten
start = System.nanoTime();
LOG.info("Optimizing Solr: Closing index writer");
- writer.shutdown();
+ writer.close();
secs = (System.nanoTime() - start) / (float)(10^9);
LOG.info("Optimizing Solr: Done closing index writer in {} secs", secs);
context.setStatus("Done");
Modified: lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java (original)
+++ lucene/dev/trunk/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java Sat Aug 9 18:54:35 2014
@@ -225,7 +225,7 @@ public class MorphlineGoLiveMiniMRTest e
System.clearProperty("test.cache.data");
if (mrCluster != null) {
- //mrCluster.shutdown();
+ //mrCluster.close();
mrCluster = null;
}
if (dfsCluster != null) {
Modified: lucene/dev/trunk/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/EmbeddedTestSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/EmbeddedTestSolrServer.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/EmbeddedTestSolrServer.java (original)
+++ lucene/dev/trunk/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/EmbeddedTestSolrServer.java Sat Aug 9 18:54:35 2014
@@ -24,7 +24,7 @@ import org.apache.solr.client.solrj.resp
import org.apache.solr.core.CoreContainer;
/**
- * An EmbeddedSolrServer that supresses shutdown and rollback requests as
+ * An EmbeddedSolrServer that supresses close and rollback requests as
* necessary for testing
*/
public class EmbeddedTestSolrServer extends EmbeddedSolrServer {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java Sat Aug 9 18:54:35 2014
@@ -439,7 +439,7 @@ final class ShardLeaderElectionContext e
throws InterruptedException, KeeperException, IOException {
// remove our ephemeral and re join the election
if (cc.isShutDown()) {
- log.info("Not rejoining election because CoreContainer is shutdown");
+ log.info("Not rejoining election because CoreContainer is close");
return;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java Sat Aug 9 18:54:35 2014
@@ -150,7 +150,7 @@ public class LeaderInitiatedRecoveryThre
if (coreContainer.isShutDown()) {
log.warn("Stop trying to send recovery command to downed replica core={} coreNodeName={} on "
- + replicaNodeName + " because my core container is shutdown.", coreNeedingRecovery, replicaCoreNodeName);
+ + replicaNodeName + " because my core container is close.", coreNeedingRecovery, replicaCoreNodeName);
continueTrying = false;
break;
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Sat Aug 9 18:54:35 2014
@@ -397,7 +397,7 @@ public class OverseerCollectionProcessor
try {
tpe.awaitTermination(60, TimeUnit.SECONDS);
} catch (InterruptedException e) {
- log.warn("Thread interrupted while waiting for OCP threadpool shutdown.");
+ log.warn("Thread interrupted while waiting for OCP threadpool close.");
Thread.currentThread().interrupt();
} finally {
if (!tpe.isShutdown())
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java Sat Aug 9 18:54:35 2014
@@ -194,7 +194,7 @@ public class ZkCLI {
ZkController.bootstrapConf(zkClient, cc, solrHome);
- // No need to shutdown the CoreContainer, as it wasn't started
+ // No need to close the CoreContainer, as it wasn't started
// up in the first place...
} else if (line.getOptionValue(CMD).equals(UPCONFIG)) {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Sat Aug 9 18:54:35 2014
@@ -81,7 +81,7 @@ import org.slf4j.LoggerFactory;
* notes: loads everything on init, creates what's not there - further updates
* are prompted with Watches.
*
- * TODO: exceptions during shutdown on attempts to update cloud state
+ * TODO: exceptions during close on attempts to update cloud state
*
*/
public final class ZkController {
@@ -708,7 +708,7 @@ public final class ZkController {
boolean nodeDeleted = true;
try {
// we attempt a delete in the case of a quick server bounce -
- // if there was not a graceful shutdown, the node may exist
+ // if there was not a graceful close, the node may exist
// until expiration timeout - so a node won't be created here because
// it exists, but eventually the node will be removed. So delete
// in case it exists and create a new node.
@@ -935,7 +935,7 @@ public final class ZkController {
Thread.sleep(1000);
}
if (cc.isShutDown()) {
- throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "CoreContainer is shutdown");
+ throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "CoreContainer is close");
}
}
throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "Could not get leader props", exp);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Sat Aug 9 18:54:35 2014
@@ -320,7 +320,7 @@ public class CoreContainer {
try {
coreAdminHandler.shutdown();
} catch (Exception e) {
- log.warn("Error shutting down CoreAdminHandler. Continuing to shutdown CoreContainer.");
+ log.warn("Error shutting down CoreAdminHandler. Continuing to close CoreContainer.");
e.printStackTrace();
}
@@ -386,7 +386,7 @@ public class CoreContainer {
protected void finalize() throws Throwable {
try {
if(!isShutDown){
- log.error("CoreContainer was not shutdown prior to finalize(), indicates a bug -- POSSIBLE RESOURCE LEAK!!! instance=" + System.identityHashCode(this));
+ log.error("CoreContainer was not close prior to finalize(), indicates a bug -- POSSIBLE RESOURCE LEAK!!! instance=" + System.identityHashCode(this));
}
} finally {
super.finalize();
@@ -420,7 +420,7 @@ public class CoreContainer {
if (isShutDown) {
core.close();
- throw new IllegalStateException("This CoreContainer has been shutdown");
+ throw new IllegalStateException("This CoreContainer has been close");
}
if (cd.isTransient()) {
old = solrCores.putTransientCore(cfg, name, core, loader);
@@ -473,7 +473,7 @@ public class CoreContainer {
public SolrCore create(CoreDescriptor dcore, boolean publishState) {
if (isShutDown) {
- throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "Solr has shutdown.");
+ throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "Solr has close.");
}
try {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java Sat Aug 9 18:54:35 2014
@@ -51,7 +51,7 @@ public abstract class DirectoryFactory i
/**
* Indicates a Directory will no longer be used, and when it's ref count
- * hits 0, it can be closed. On shutdown all directories will be closed
+ * hits 0, it can be closed. On close all directories will be closed
* whether this has been called or not. This is simply to allow early cleanup.
*
* @throws IOException If there is a low-level I/O error.
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Sat Aug 9 18:54:35 2014
@@ -527,7 +527,7 @@ public final class SolrCore implements S
SolrIndexWriter writer = SolrIndexWriter.create("SolrCore.initIndex", indexDir, getDirectoryFactory(), true,
getLatestSchema(), solrConfig.indexConfig, solrDelPolicy, codec);
- writer.shutdown();
+ writer.close();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java Sat Aug 9 18:54:35 2014
@@ -71,7 +71,7 @@ public class FileBasedSpellChecker exten
// TODO: you should be able to specify the IWC params?
// TODO: if we enable this, codec gets angry since field won't exist in the schema
// config.setCodec(core.getCodec());
- spellChecker.indexDictionary(dictionary, new IndexWriterConfig(core.getSolrConfig().luceneMatchVersion, null), false);
+ spellChecker.indexDictionary(dictionary, new IndexWriterConfig(null), false);
}
/**
@@ -96,7 +96,7 @@ public class FileBasedSpellChecker exten
IndexWriter writer = new IndexWriter(
ramDir,
- new IndexWriterConfig(core.getSolrConfig().luceneMatchVersion, fieldType.getIndexAnalyzer()).
+ new IndexWriterConfig(fieldType.getIndexAnalyzer()).
setMaxBufferedDocs(150).
setMergePolicy(mp).
setOpenMode(IndexWriterConfig.OpenMode.CREATE)
@@ -112,7 +112,7 @@ public class FileBasedSpellChecker exten
writer.addDocument(d);
}
writer.forceMerge(1);
- writer.shutdown();
+ writer.close();
dictionary = new HighFrequencyDictionary(DirectoryReader.open(ramDir),
WORD_FIELD_NAME, 0.0f);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java Sat Aug 9 18:54:35 2014
@@ -93,7 +93,7 @@ public class IndexBasedSpellChecker exte
// TODO: you should be able to specify the IWC params?
// TODO: if we enable this, codec gets angry since field won't exist in the schema
// config.setCodec(core.getCodec());
- spellChecker.indexDictionary(dictionary, new IndexWriterConfig(core.getSolrConfig().luceneMatchVersion, null), false);
+ spellChecker.indexDictionary(dictionary, new IndexWriterConfig(null), false);
}
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java Sat Aug 9 18:54:35 2014
@@ -68,11 +68,11 @@ public final class DefaultSolrCoreState
closer.closeWriter(indexWriter);
} else if (indexWriter != null) {
log.info("closing IndexWriter...");
- indexWriter.shutdown();
+ indexWriter.close();
}
indexWriter = null;
} catch (Exception e) {
- log.error("Error during shutdown of writer.", e);
+ log.error("Error during close of writer.", e);
}
}
@@ -161,7 +161,7 @@ public final class DefaultSolrCoreState
if (!rollback) {
try {
log.info("Closing old IndexWriter... core=" + coreName);
- indexWriter.shutdown();
+ indexWriter.close();
} catch (Exception e) {
SolrException.log(log, "Error closing old IndexWriter. core="
+ coreName, e);
@@ -283,14 +283,14 @@ public final class DefaultSolrCoreState
// check before we grab the lock
if (cc.isShutDown()) {
- log.warn("Skipping recovery because Solr is shutdown");
+ log.warn("Skipping recovery because Solr is close");
return;
}
synchronized (recoveryLock) {
// to be air tight we must also check after lock
if (cc.isShutDown()) {
- log.warn("Skipping recovery because Solr is shutdown");
+ log.warn("Skipping recovery because Solr is close");
return;
}
log.info("Running recovery - first canceling any ongoing recovery");
@@ -304,7 +304,7 @@ public final class DefaultSolrCoreState
}
// check again for those that were waiting
if (cc.isShutDown()) {
- log.warn("Skipping recovery because Solr is shutdown");
+ log.warn("Skipping recovery because Solr is close");
return;
}
if (closed) return;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java Sat Aug 9 18:54:35 2014
@@ -201,7 +201,7 @@ public class HdfsUpdateLog extends Updat
// Record first two logs (oldest first) at startup for potential tlog
// recovery.
- // It's possible that at abnormal shutdown both "tlog" and "prevTlog" were
+ // It's possible that at abnormal close both "tlog" and "prevTlog" were
// uncapped.
for (TransactionLog ll : logs) {
newestLogsOnStartup.addFirst(ll);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/PeerSync.java Sat Aug 9 18:54:35 2014
@@ -138,7 +138,7 @@ public class PeerSync {
uhandler = core.getUpdateHandler();
ulog = uhandler.getUpdateLog();
- // TODO: shutdown
+ // TODO: close
shardHandlerFactory = (HttpShardHandlerFactory) core.getCoreDescriptor().getCoreContainer().getShardHandlerFactory();
shardHandler = shardHandlerFactory.getShardHandler(client);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java Sat Aug 9 18:54:35 2014
@@ -112,7 +112,7 @@ public class SolrCmdDistributor {
if (testing_errorHook != null) Diagnostics.call(testing_errorHook,
err.e);
- // this can happen in certain situations such as shutdown
+ // this can happen in certain situations such as close
if (isRetry) {
if (rspCode == 404 || rspCode == 403 || rspCode == 503) {
doRetry = true;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Sat Aug 9 18:54:35 2014
@@ -199,7 +199,7 @@ public class SolrIndexConfig {
// for the default analyzer, and explicitly pass an analyzer on
// appropriate calls to IndexWriter
- IndexWriterConfig iwc = new IndexWriterConfig(luceneVersion, null);
+ IndexWriterConfig iwc = new IndexWriterConfig(null);
if (maxBufferedDocs != -1)
iwc.setMaxBufferedDocs(maxBufferedDocs);
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java Sat Aug 9 18:54:35 2014
@@ -138,7 +138,7 @@ public class SolrIndexSplitter {
iwRef.decref();
} else {
if (success) {
- iw.shutdown();
+ iw.close();
} else {
IOUtils.closeWhileHandlingException(iw);
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/UpdateLog.java Sat Aug 9 18:54:35 2014
@@ -259,7 +259,7 @@ public class UpdateLog implements Plugin
}
// Record first two logs (oldest first) at startup for potential tlog recovery.
- // It's possible that at abnormal shutdown both "tlog" and "prevTlog" were uncapped.
+ // It's possible that at abnormal close both "tlog" and "prevTlog" were uncapped.
for (TransactionLog ll : logs) {
newestLogsOnStartup.addFirst(ll);
if (newestLogsOnStartup.size() >= 2) break;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java Sat Aug 9 18:54:35 2014
@@ -268,12 +268,12 @@ public final class DocExpirationUpdatePr
// update handler is gone, hard terminiate anything that's left.
if (executor.isTerminating()) {
- log.info("Triggering hard shutdown of DocExpiration Executor");
+ log.info("Triggering hard close of DocExpiration Executor");
executor.shutdownNow();
}
}
public void preClose(SolrCore core) {
- log.info("Triggering Graceful shutdown of DocExpiration Executor");
+ log.info("Triggering Graceful close of DocExpiration Executor");
executor.shutdown();
}
});
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java Sat Aug 9 18:54:35 2014
@@ -195,7 +195,7 @@ public class LeaderElectionIntegrationTe
if (leaderPort == newLeaderPort) {
zkClient.printLayoutToStdOut();
- fail("We didn't find a new leader! " + leaderPort + " was shutdown, but it's still showing as the leader");
+ fail("We didn't find a new leader! " + leaderPort + " was close, but it's still showing as the leader");
}
assertTrue("Could not find leader " + newLeaderPort + " in " + shard1Ports, shard1Ports.contains(newLeaderPort));
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java Sat Aug 9 18:54:35 2014
@@ -49,7 +49,7 @@ public class SolrCoreCheckLockOnStartupT
Directory directory = newFSDirectory(new File(initCoreDataDir, "index"), new SimpleFSLockFactory());
//creates a new IndexWriter without releasing the lock yet
- IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(null));
ignoreException("locked");
try {
@@ -62,7 +62,7 @@ public class SolrCoreCheckLockOnStartupT
} finally {
System.clearProperty("solr.tests.lockType");
unIgnoreException("locked");
- indexWriter.shutdown();
+ indexWriter.close();
directory.close();
deleteCore();
}
@@ -75,7 +75,7 @@ public class SolrCoreCheckLockOnStartupT
log.info("Acquiring lock on {}", indexDir.getAbsolutePath());
Directory directory = newFSDirectory(indexDir, new NativeFSLockFactory());
//creates a new IndexWriter without releasing the lock yet
- IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, null));
+ IndexWriter indexWriter = new IndexWriter(directory, new IndexWriterConfig(null));
ignoreException("locked");
try {
@@ -89,7 +89,7 @@ public class SolrCoreCheckLockOnStartupT
} finally {
System.clearProperty("solr.tests.lockType");
unIgnoreException("locked");
- indexWriter.shutdown();
+ indexWriter.close();
directory.close();
deleteCore();
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java Sat Aug 9 18:54:35 2014
@@ -115,14 +115,14 @@ public class TestArbitraryIndexDir exten
Directory dir = newFSDirectory(newDir);
IndexWriter iw = new IndexWriter(
dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer())
+ new IndexWriterConfig(new StandardAnalyzer())
);
Document doc = new Document();
doc.add(new TextField("id", "2", Field.Store.YES));
doc.add(new TextField("name", "name2", Field.Store.YES));
iw.addDocument(doc);
iw.commit();
- iw.shutdown();
+ iw.close();
//commit will cause searcher to open with the new index dir
assertU(commit());
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecovery.java Sat Aug 9 18:54:35 2014
@@ -661,7 +661,7 @@ public class TestRecovery extends SolrTe
}
- // make sure that log isn't needlessly replayed after a clean shutdown
+ // make sure that log isn't needlessly replayed after a clean close
@Test
public void testCleanShutdown() throws Exception {
DirectUpdateHandler2.commitOnClose = true;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java Sat Aug 9 18:54:35 2014
@@ -658,7 +658,7 @@ public class TestRecoveryHdfs extends So
}
- // make sure that log isn't needlessly replayed after a clean shutdown
+ // make sure that log isn't needlessly replayed after a clean close
@Test
public void testCleanShutdown() throws Exception {
DirectUpdateHandler2.commitOnClose = true;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestSort.java Sat Aug 9 18:54:35 2014
@@ -44,7 +44,6 @@ import org.apache.lucene.search.FilterCo
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.SortField.Type;
@@ -189,7 +188,7 @@ public class TestSort extends SolrTestCa
for (int iterCnt = 0; iterCnt<iter; iterCnt++) {
IndexWriter iw = new IndexWriter(
dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer()).
+ new IndexWriterConfig(new SimpleAnalyzer()).
setOpenMode(IndexWriterConfig.OpenMode.CREATE)
);
final MyDoc[] mydocs = new MyDoc[ndocs];
@@ -222,7 +221,7 @@ public class TestSort extends SolrTestCa
iw.commit();
}
}
- iw.shutdown();
+ iw.close();
Map<String,UninvertingReader.Type> mapping = new HashMap<>();
mapping.put("f", UninvertingReader.Type.SORTED);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestStressLucene.java Sat Aug 9 18:54:35 2014
@@ -101,7 +101,7 @@ public class TestStressLucene extends Te
// RAMDirectory dir = new RAMDirectory();
- // final IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ // final IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Directory dir = newDirectory();
@@ -368,7 +368,7 @@ public class TestStressLucene extends Te
thread.join();
}
- writer.shutdown();
+ writer.close();
reader.close();
dir.close();
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java Sat Aug 9 18:54:35 2014
@@ -246,7 +246,7 @@ public class TestOrdValues extends Lucen
}
iw.forceMerge(1);
}
- iw.shutdown();
+ iw.close();
if (VERBOSE) {
System.out.println("TEST: setUp done close");
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Sat Aug 9 18:54:35 2014
@@ -289,7 +289,7 @@ public class IndexBasedSpellCheckerTest
Directory dir = newFSDirectory(altIndexDir);
IndexWriter iw = new IndexWriter(
dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer())
+ new IndexWriterConfig(new WhitespaceAnalyzer())
);
for (int i = 0; i < ALT_DOCS.length; i++) {
Document doc = new Document();
@@ -297,7 +297,7 @@ public class IndexBasedSpellCheckerTest
iw.addDocument(doc);
}
iw.forceMerge(1);
- iw.shutdown();
+ iw.close();
dir.close();
indexDir.mkdirs();
spellchecker.add(AbstractLuceneSpellChecker.INDEX_DIR, indexDir.getAbsolutePath());
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java Sat Aug 9 18:54:35 2014
@@ -546,8 +546,8 @@ abstract public class SolrExampleTests e
SolrDocumentList out = rsp.getResults();
assertEquals(2, out.getNumFound());
if (!(server1 instanceof EmbeddedSolrServer)) {
- /* Do not shutdown in case of using EmbeddedSolrServer,
- * as that would shutdown the CoreContainer */
+ /* Do not close in case of using EmbeddedSolrServer,
+ * as that would close the CoreContainer */
server1.shutdown();
}
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java?rev=1617004&r1=1617003&r2=1617004&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java Sat Aug 9 18:54:35 2014
@@ -215,7 +215,7 @@ public class ChaosMonkey {
private static void stopJettySolrRunner(JettySolrRunner jetty) throws Exception {
assert(jetty != null);
monkeyLog("stop shard! " + jetty.getLocalPort());
- // get a clean shutdown so that no dirs are left open...
+ // get a clean close so that no dirs are left open...
FilterHolder fh = jetty.getDispatchFilter();
if (fh != null) {
SolrDispatchFilter sdf = (SolrDispatchFilter) fh.getFilter();
@@ -462,7 +462,7 @@ public class ChaosMonkey {
if (LuceneTestCase.random().nextBoolean()) {
- monkeyLog("Jetty will not commit on shutdown");
+ monkeyLog("Jetty will not commit on close");
DirectUpdateHandler2.commitOnClose = false;
}