LUCENE-2320: move configuration of MergePolicy to IndexWriterConfig
git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@925462 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index e82f9a7..491ecf9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,15 @@
This means that terms with a position increment gap of zero do not
affect the norms calculation by default. (Robert Muir)
+* LUCENE-2320: MergePolicy.writer is now of type SetOnce, which allows setting
+ the IndexWriter for a MergePolicy exactly once. You can change references to
+ 'writer' from <code>writer.doXYZ()</code> to <code>writer.get().doXYZ()</code>
+ (it is also advisable to add an <code>assert writer != null;</code> before you
+ access the wrapped IndexWriter.
+ In addition, MergePolicy only exposes a default constructor, and the one that
+ took IndexWriter as argument has been removed from all MergePolicy extensions.
+ (Shai Erera via Mike McCandless)
+
Changes in runtime behavior
* LUCENE-1923: Made IndexReader.toString() produce something
@@ -94,6 +103,10 @@
Additionally, the setter/getter related to MergePolicy were deprecated as
well. One should interact with the MergePolicy directly.
(Shai Erera via Mike McCandless)
+
+* LUCENE-2320: IndexWriter's MergePolicy configuration was moved to
+ IndexWriterConfig and the respective methods on IndexWriter were deprecated.
+ (Shai Erera via Mike McCandless)
Bug fixes
@@ -166,6 +179,9 @@
* LUCENE-2247: Added a CharArrayMap<V> for performance improvements
in some stemmers and synonym filters. (Uwe Schindler)
+
+* LUCENE-2320: Added SetOnce which wraps an object and allows it to be set
+ exactly once. (Shai Erera via Mike McCandless)
* LUCENE-2314: Added AttributeSource.copyTo(AttributeSource) that
allows to use cloneAttributes() and this method as a replacement
diff --git a/backwards/src/java/org/apache/lucene/index/IndexWriter.java b/backwards/src/java/org/apache/lucene/index/IndexWriter.java
index eb37044..37efd32 100644
--- a/backwards/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/backwards/src/java/org/apache/lucene/index/IndexWriter.java
@@ -279,7 +279,7 @@
// merges
private HashSet<SegmentInfo> mergingSegments = new HashSet<SegmentInfo>();
- private MergePolicy mergePolicy = new LogByteSizeMergePolicy(this);
+ private MergePolicy mergePolicy = new LogByteSizeMergePolicy();
private MergeScheduler mergeScheduler = new ConcurrentMergeScheduler();
private LinkedList<MergePolicy.OneMerge> pendingMerges = new LinkedList<MergePolicy.OneMerge>();
private Set<MergePolicy.OneMerge> runningMerges = new HashSet<MergePolicy.OneMerge>();
diff --git a/backwards/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java b/backwards/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
index 6eb8aa9..0750472 100644
--- a/backwards/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
+++ b/backwards/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
@@ -30,8 +30,7 @@
* or larger will never be merged. @see setMaxMergeMB */
public static final double DEFAULT_MAX_MERGE_MB = Long.MAX_VALUE;
- public LogByteSizeMergePolicy(IndexWriter writer) {
- super(writer);
+ public LogByteSizeMergePolicy() {
minMergeSize = (long) (DEFAULT_MIN_MERGE_MB*1024*1024);
maxMergeSize = (long) (DEFAULT_MAX_MERGE_MB*1024*1024);
}
diff --git a/backwards/src/java/org/apache/lucene/index/LogDocMergePolicy.java b/backwards/src/java/org/apache/lucene/index/LogDocMergePolicy.java
index 926b155..1ce6edb 100644
--- a/backwards/src/java/org/apache/lucene/index/LogDocMergePolicy.java
+++ b/backwards/src/java/org/apache/lucene/index/LogDocMergePolicy.java
@@ -28,8 +28,7 @@
/** Default minimum segment size. @see setMinMergeDocs */
public static final int DEFAULT_MIN_MERGE_DOCS = 1000;
- public LogDocMergePolicy(IndexWriter writer) {
- super(writer);
+ public LogDocMergePolicy() {
minMergeSize = DEFAULT_MIN_MERGE_DOCS;
// maxMergeSize is never used by LogDocMergePolicy; set
diff --git a/backwards/src/java/org/apache/lucene/index/LogMergePolicy.java b/backwards/src/java/org/apache/lucene/index/LogMergePolicy.java
index 013d33c..57977b8f 100644
--- a/backwards/src/java/org/apache/lucene/index/LogMergePolicy.java
+++ b/backwards/src/java/org/apache/lucene/index/LogMergePolicy.java
@@ -66,10 +66,6 @@
private boolean useCompoundFile = true;
private boolean useCompoundDocStore = true;
- public LogMergePolicy(IndexWriter writer) {
- super(writer);
- }
-
protected boolean verbose() {
return writer != null && writer.verbose();
}
diff --git a/backwards/src/java/org/apache/lucene/index/MergePolicy.java b/backwards/src/java/org/apache/lucene/index/MergePolicy.java
index 3f0a626..a35e2f8 100644
--- a/backwards/src/java/org/apache/lucene/index/MergePolicy.java
+++ b/backwards/src/java/org/apache/lucene/index/MergePolicy.java
@@ -200,8 +200,8 @@
final protected IndexWriter writer;
- public MergePolicy(IndexWriter writer) {
- this.writer = writer;
+ public MergePolicy() {
+ this.writer = null;
}
/**
diff --git a/backwards/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java b/backwards/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java
index 8b486fc..a8e7c6ac 100755
--- a/backwards/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java
+++ b/backwards/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java
@@ -429,7 +429,7 @@
private IndexWriter newWriter(Directory dir, boolean create)
throws IOException {
final IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), create, IndexWriter.MaxFieldLength.UNLIMITED);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
return writer;
}
@@ -503,7 +503,7 @@
Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
- writer.setMergePolicy(new LogByteSizeMergePolicy(writer));
+ writer.setMergePolicy(new LogByteSizeMergePolicy());
writer.setMaxBufferedDocs(5);
writer.setUseCompoundFile(false);
writer.setMergeFactor(100);
@@ -529,7 +529,7 @@
Directory dir2 = new MockRAMDirectory();
writer = new IndexWriter(dir2, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
- LogByteSizeMergePolicy lmp = new LogByteSizeMergePolicy(writer);
+ LogByteSizeMergePolicy lmp = new LogByteSizeMergePolicy();
lmp.setMinMergeMB(0.0001);
writer.setMergePolicy(lmp);
writer.setMergeFactor(4);
diff --git a/backwards/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/backwards/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
index 332fa2d..ed86a9e 100644
--- a/backwards/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
+++ b/backwards/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
@@ -120,7 +120,7 @@
ConcurrentMergeScheduler cms = new ConcurrentMergeScheduler();
writer.setMergeScheduler(cms);
- LogDocMergePolicy mp = new LogDocMergePolicy(writer);
+ LogDocMergePolicy mp = new LogDocMergePolicy();
writer.setMergePolicy(mp);
// Force degenerate merging so we can get a mix of
diff --git a/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java b/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
index c5206eb..8cbef68 100644
--- a/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
+++ b/backwards/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
@@ -949,7 +949,7 @@
IndexWriter.unlock(dir);
IndexWriter w = new IndexWriter(dir, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
- w.setMergePolicy(new LogDocMergePolicy(w));
+ w.setMergePolicy(new LogDocMergePolicy());
for (int i = 0; i < 100; i++) {
w.addDocument(createDocument(i, 4));
diff --git a/backwards/src/test/org/apache/lucene/index/TestIndexWriter.java b/backwards/src/test/org/apache/lucene/index/TestIndexWriter.java
index 8102750..7662b85 100644
--- a/backwards/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/backwards/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -608,7 +608,7 @@
for(int numDocs=38;numDocs<500;numDocs += 38) {
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
- LogDocMergePolicy ldmp = new LogDocMergePolicy(writer);
+ LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMinMergeDocs(1);
writer.setMergePolicy(ldmp);
writer.setMergeFactor(5);
@@ -622,6 +622,8 @@
final int segCount = sis.size();
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.LIMITED);
+ ldmp = new LogDocMergePolicy();
+ ldmp.setMinMergeDocs(1);
writer.setMergePolicy(ldmp);
writer.setMergeFactor(5);
writer.optimize(3);
@@ -645,7 +647,7 @@
doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.ANALYZED));
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
- LogDocMergePolicy ldmp = new LogDocMergePolicy(writer);
+ LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMinMergeDocs(1);
writer.setMergePolicy(ldmp);
writer.setMergeFactor(4);
@@ -2757,7 +2759,7 @@
writer.setMaxBufferedDocs(2);
writer.setRAMBufferSizeMB(IndexWriter.DISABLE_AUTO_FLUSH);
writer.setMergeScheduler(new SerialMergeScheduler());
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
Document document = new Document();
@@ -2790,7 +2792,7 @@
writer.setMaxBufferedDocs(2);
writer.setRAMBufferSizeMB(IndexWriter.DISABLE_AUTO_FLUSH);
writer.setMergeScheduler(new SerialMergeScheduler());
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
Directory[] indexDirs = {new MockRAMDirectory(dir)};
writer.addIndexesNoOptimize(indexDirs);
@@ -2809,7 +2811,7 @@
writer.setMaxBufferedDocs(2);
writer.setRAMBufferSizeMB(IndexWriter.DISABLE_AUTO_FLUSH);
writer.setMergeScheduler(new SerialMergeScheduler());
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
Document document = new Document();
@@ -2847,7 +2849,7 @@
writer.setMaxBufferedDocs(2);
writer.setRAMBufferSizeMB(IndexWriter.DISABLE_AUTO_FLUSH);
writer.setMergeScheduler(new SerialMergeScheduler());
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
Document document = new Document();
@@ -2869,7 +2871,7 @@
writer.setMaxBufferedDocs(2);
writer.setRAMBufferSizeMB(IndexWriter.DISABLE_AUTO_FLUSH);
writer.setMergeScheduler(new SerialMergeScheduler());
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
for(int i=0;i<6;i++)
writer.addDocument(document);
diff --git a/backwards/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/backwards/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
index 2be383a..48f8820 100755
--- a/backwards/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
+++ b/backwards/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
@@ -37,7 +37,7 @@
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
writer.setMaxBufferedDocs(10);
writer.setMergeFactor(10);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
for (int i = 0; i < 100; i++) {
addDoc(writer);
@@ -54,7 +54,7 @@
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
writer.setMaxBufferedDocs(10);
writer.setMergeFactor(10);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
boolean noOverMerge = false;
for (int i = 0; i < 100; i++) {
@@ -76,7 +76,7 @@
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
writer.setMaxBufferedDocs(10);
writer.setMergeFactor(10);
- LogDocMergePolicy mp = new LogDocMergePolicy(writer);
+ LogDocMergePolicy mp = new LogDocMergePolicy();
mp.setMinMergeDocs(100);
writer.setMergePolicy(mp);
@@ -86,6 +86,7 @@
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false, IndexWriter.MaxFieldLength.LIMITED);
writer.setMaxBufferedDocs(10);
+ mp = new LogDocMergePolicy();
writer.setMergePolicy(mp);
mp.setMinMergeDocs(100);
writer.setMergeFactor(10);
@@ -102,7 +103,7 @@
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
writer.setMaxBufferedDocs(10);
writer.setMergeFactor(100);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
for (int i = 0; i < 250; i++) {
addDoc(writer);
@@ -128,7 +129,7 @@
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED);
writer.setMaxBufferedDocs(101);
writer.setMergeFactor(101);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
// leftmost* segment has 1 doc
// rightmost* segment has 100 docs
@@ -142,7 +143,7 @@
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED);
writer.setMaxBufferedDocs(101);
writer.setMergeFactor(101);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
}
writer.setMaxBufferedDocs(10);
@@ -171,7 +172,7 @@
Directory dir = new RAMDirectory();
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true, IndexWriter.MaxFieldLength.UNLIMITED);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
writer.setMaxBufferedDocs(10);
writer.setMergeFactor(100);
@@ -186,7 +187,7 @@
reader.close();
writer = new IndexWriter(dir, new WhitespaceAnalyzer(), false, IndexWriter.MaxFieldLength.UNLIMITED);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer.setMergePolicy(new LogDocMergePolicy());
writer.setMaxBufferedDocs(10);
writer.setMergeFactor(5);
diff --git a/backwards/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/backwards/src/test/org/apache/lucene/index/TestIndexWriterReader.java
index b763bc0..38be635 100644
--- a/backwards/src/test/org/apache/lucene/index/TestIndexWriterReader.java
+++ b/backwards/src/test/org/apache/lucene/index/TestIndexWriterReader.java
@@ -572,7 +572,7 @@
boolean multiSegment) throws IOException {
IndexWriter w = new IndexWriter(dir1, new WhitespaceAnalyzer(),
IndexWriter.MaxFieldLength.LIMITED);
- w.setMergePolicy(new LogDocMergePolicy(w));
+ w.setMergePolicy(new LogDocMergePolicy());
for (int i = 0; i < 100; i++) {
w.addDocument(createDocument(i, indexName, 4));
if (multiSegment && (i % 10) == 0) {
diff --git a/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java b/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
index 3c28c6e..2b0240b 100644
--- a/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
+++ b/contrib/ant/src/java/org/apache/lucene/ant/IndexTask.java
@@ -283,13 +283,14 @@
log("checkLastModified = " + checkLastModified, Project.MSG_VERBOSE);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
Version.LUCENE_CURRENT, analyzer).setOpenMode(
- create ? OpenMode.CREATE : OpenMode.APPEND));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ create ? OpenMode.CREATE : OpenMode.APPEND);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundIndex);
lmp.setUseCompoundDocStore(useCompoundIndex);
lmp.setMergeFactor(mergeFactor);
+ IndexWriter writer = new IndexWriter(dir, conf);
int totalFiles = 0;
int totalIndexed = 0;
int totalIgnored = 0;
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
index 8730c57..2dae587 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java
@@ -91,7 +91,7 @@
final String mergePolicy = config.get("merge.policy",
"org.apache.lucene.index.LogByteSizeMergePolicy");
try {
- writer.setMergePolicy(Class.forName(mergePolicy).asSubclass(MergePolicy.class).getConstructor(IndexWriter.class).newInstance(writer));
+ writer.setMergePolicy(Class.forName(mergePolicy).asSubclass(MergePolicy.class).newInstance());
} catch (Exception e) {
throw new RuntimeException("unable to instantiate class '" + mergePolicy + "' as merge policy", e);
}
diff --git a/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java b/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
index 3845e1d..4b5c616 100755
--- a/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
+++ b/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
@@ -676,11 +676,11 @@
public static class MyMergePolicy extends LogDocMergePolicy {
boolean called;
- public MyMergePolicy(IndexWriter writer) {
- super(writer);
+ public MyMergePolicy() {
called = true;
}
}
+
/**
* Test that we can set merge policy".
*/
@@ -710,7 +710,7 @@
// 2. execute the algorithm (required in every "logic" test)
Benchmark benchmark = execBenchmark(algLines);
- assertTrue("did not use the specified MergeScheduler", ((MyMergePolicy) benchmark.getRunData().getIndexWriter().getMergePolicy()).called);
+ assertTrue("did not use the specified MergePolicy", ((MyMergePolicy) benchmark.getRunData().getIndexWriter().getConfig().getMergePolicy()).called);
benchmark.getRunData().getIndexWriter().close();
// 3. test number of docs in the index
@@ -754,8 +754,8 @@
final IndexWriter writer = benchmark.getRunData().getIndexWriter();
assertEquals(2, writer.getConfig().getMaxBufferedDocs());
assertEquals(IndexWriterConfig.DISABLE_AUTO_FLUSH, (int) writer.getConfig().getRAMBufferSizeMB());
- assertEquals(3, ((LogMergePolicy) writer.getMergePolicy()).getMergeFactor());
- assertFalse(((LogMergePolicy) writer.getMergePolicy()).getUseCompoundFile());
+ assertEquals(3, ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor());
+ assertFalse(((LogMergePolicy) writer.getConfig().getMergePolicy()).getUseCompoundFile());
writer.close();
Directory dir = benchmark.getRunData().getDirectory();
IndexReader reader = IndexReader.open(dir, true);
diff --git a/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java b/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
index 46b79d0..2cf2096 100644
--- a/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
+++ b/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
@@ -30,19 +30,18 @@
* <p>This is based on code from zoie, described in more detail
* at http://code.google.com/p/zoie/wiki/ZoieMergePolicy.</p>
*/
-public class BalancedSegmentMergePolicy extends LogByteSizeMergePolicy
-{
+public class BalancedSegmentMergePolicy extends LogByteSizeMergePolicy {
+
public static final int DEFAULT_NUM_LARGE_SEGMENTS = 10;
private boolean _partialExpunge = false;
private int _numLargeSegments = DEFAULT_NUM_LARGE_SEGMENTS;
private int _maxSmallSegments = 2 * LogMergePolicy.DEFAULT_MERGE_FACTOR;
private int _maxSegments = _numLargeSegments + _maxSmallSegments;
-
- public BalancedSegmentMergePolicy(IndexWriter writer) {
- super(writer);
+
+ public BalancedSegmentMergePolicy() {
}
-
+
public void setMergePolicyParams(MergePolicyParams params) {
if (params!=null) {
setPartialExpunge(params._doPartialExpunge);
@@ -122,6 +121,7 @@
private boolean isOptimized(IndexWriter writer, SegmentInfo info)
throws IOException {
+ assert writer != null;
return !info.hasDeletions() &&
!info.hasSeparateNorms() &&
info.dir == writer.getDirectory() &&
@@ -135,7 +135,7 @@
MergeSpecification spec = null;
- if (!isOptimized(infos, writer, maxNumSegments, segmentsToOptimize)) {
+ if (!isOptimized(infos, writer.get(), maxNumSegments, segmentsToOptimize)) {
// Find the newest (rightmost) segment that needs to
// be optimized (other segments may have been flushed
@@ -158,7 +158,7 @@
// Since we must optimize down to 1 segment, the
// choice is simple:
boolean useCompoundFile = getUseCompoundFile();
- if (last > 1 || !isOptimized(writer, infos.info(0))) {
+ if (last > 1 || !isOptimized(writer.get(), infos.info(0))) {
spec = new MergeSpecification();
spec.add(new OneMerge(infos.range(0, last), useCompoundFile));
diff --git a/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java b/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
index 9948e7c..3cfd8b7 100644
--- a/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
+++ b/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
@@ -114,7 +114,7 @@
IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(1000);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
for (int i=0; i<data.length; ++i) {
if (((i%2)==0 && even) || ((i%2)==1 && odd)) {
Document doc = new Document();
diff --git a/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java b/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java
index 101aef9..36836d4 100755
--- a/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java
+++ b/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SpellChecker.java
@@ -397,7 +397,7 @@
ensureOpen();
final Directory dir = this.spellIndex;
final IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(Version.LUCENE_CURRENT, new WhitespaceAnalyzer(Version.LUCENE_CURRENT)).setRAMBufferSizeMB(ramMB));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(mergeFactor);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(mergeFactor);
Iterator<String> iter = dict.getWordsIterator();
while (iter.hasNext()) {
diff --git a/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java b/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java
index 061b746..82242dd 100644
--- a/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java
+++ b/contrib/wordnet/src/java/org/apache/lucene/wordnet/Syns2Index.java
@@ -250,8 +250,8 @@
// override the specific index if it already exists
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
Version.LUCENE_CURRENT, ana).setOpenMode(OpenMode.CREATE));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(true); // why?
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(true); // why?
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(true); // why?
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(true); // why?
Iterator<String> i1 = word2Nums.keySet().iterator();
while (i1.hasNext()) // for each word
{
diff --git a/src/java/org/apache/lucene/index/IndexWriter.java b/src/java/org/apache/lucene/index/IndexWriter.java
index 9f72970..1bee82a 100644
--- a/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/src/java/org/apache/lucene/index/IndexWriter.java
@@ -290,7 +290,7 @@
// merges
private HashSet<SegmentInfo> mergingSegments = new HashSet<SegmentInfo>();
- private MergePolicy mergePolicy = new LogByteSizeMergePolicy(this);
+ private MergePolicy mergePolicy;
// TODO 4.0: this should be made final once the setter is removed
private /*final*/MergeScheduler mergeScheduler;
private LinkedList<MergePolicy.OneMerge> pendingMerges = new LinkedList<MergePolicy.OneMerge>();
@@ -871,8 +871,8 @@
public void setTermIndexInterval(int interval) {
ensureOpen();
this.termIndexInterval = interval;
- // Required so config.getSimilarity returns the right value. But this will
- // go away together with the method in 4.0.
+ // Required so config.getTermIndexInterval returns the right value. But this
+ // will go away together with the method in 4.0.
config.setTermIndexInterval(interval);
}
@@ -1077,6 +1077,8 @@
termIndexInterval = conf.getTermIndexInterval();
writeLockTimeout = conf.getWriteLockTimeout();
similarity = conf.getSimilarity();
+ mergePolicy = conf.getMergePolicy();
+ mergePolicy.setIndexWriter(this);
mergeScheduler = conf.getMergeScheduler();
mergedSegmentWarmer = conf.getMergedSegmentWarmer();
@@ -1210,6 +1212,8 @@
/**
* Expert: set the merge policy used by this writer.
+ *
+ * @deprecated use {@link IndexWriterConfig#setMergePolicy(MergePolicy)} instead.
*/
public void setMergePolicy(MergePolicy mp) {
ensureOpen();
@@ -1219,14 +1223,20 @@
if (mergePolicy != mp)
mergePolicy.close();
mergePolicy = mp;
+ mergePolicy.setIndexWriter(this);
pushMaxBufferedDocs();
if (infoStream != null)
message("setMergePolicy " + mp);
+ // Required so config.getMergePolicy returns the right value. But this will
+ // go away together with the method in 4.0.
+ config.setMergePolicy(mp);
}
/**
* Expert: returns the current MergePolicy in use by this writer.
* @see #setMergePolicy
+ *
+ * @deprecated use {@link IndexWriterConfig#getMergePolicy()} instead
*/
public MergePolicy getMergePolicy() {
ensureOpen();
@@ -1249,7 +1259,7 @@
this.mergeScheduler = mergeScheduler;
if (infoStream != null)
message("setMergeScheduler " + mergeScheduler);
- // Required so config.getSimilarity returns the right value. But this will
+ // Required so config.getMergeScheduler returns the right value. But this will
// go away together with the method in 4.0.
config.setMergeScheduler(mergeScheduler);
}
@@ -1327,8 +1337,8 @@
docWriter.setMaxFieldLength(maxFieldLength);
if (infoStream != null)
message("setMaxFieldLength " + maxFieldLength);
- // Required so config.getSimilarity returns the right value. But this will
- // go away together with the method in 4.0.
+ // Required so config.getMaxFieldLength returns the right value. But this
+ // will go away together with the method in 4.0.
config.setMaxFieldLength(maxFieldLength);
}
@@ -1376,8 +1386,8 @@
pushMaxBufferedDocs();
if (infoStream != null)
message("setMaxBufferedDocs " + maxBufferedDocs);
- // Required so config.getSimilarity returns the right value. But this will
- // go away together with the method in 4.0.
+ // Required so config.getMaxBufferedDocs returns the right value. But this
+ // will go away together with the method in 4.0.
config.setMaxBufferedDocs(maxBufferedDocs);
}
@@ -1464,8 +1474,8 @@
docWriter.setRAMBufferSizeMB(mb);
if (infoStream != null)
message("setRAMBufferSizeMB " + mb);
- // Required so config.getSimilarity returns the right value. But this will
- // go away together with the method in 4.0.
+ // Required so config.getRAMBufferSizeMB returns the right value. But this
+ // will go away together with the method in 4.0.
config.setRAMBufferSizeMB(mb);
}
@@ -1499,8 +1509,8 @@
docWriter.setMaxBufferedDeleteTerms(maxBufferedDeleteTerms);
if (infoStream != null)
message("setMaxBufferedDeleteTerms " + maxBufferedDeleteTerms);
- // Required so config.getSimilarity returns the right value. But this will
- // go away together with the method in 4.0.
+ // Required so config.getMaxBufferedDeleteTerms returns the right value. But
+ // this will go away together with the method in 4.0.
config.setMaxBufferedDeleteTerms(maxBufferedDeleteTerms);
}
@@ -1612,8 +1622,8 @@
public void setWriteLockTimeout(long writeLockTimeout) {
ensureOpen();
this.writeLockTimeout = writeLockTimeout;
- // Required so config.getSimilarity returns the right value. But this will
- // go away together with the method in 4.0.
+ // Required so config.getWriteLockTimeout returns the right value. But this
+ // will go away together with the method in 4.0.
config.setWriteLockTimeout(writeLockTimeout);
}
@@ -4959,8 +4969,8 @@
*/
public void setMergedSegmentWarmer(IndexReaderWarmer warmer) {
mergedSegmentWarmer = warmer;
- // Required so config.getSimilarity returns the right value. But this will
- // go away together with the method in 4.0.
+ // Required so config.getMergedSegmentWarmer returns the right value. But
+ // this will go away together with the method in 4.0.
config.setMergedSegmentWarmer(mergedSegmentWarmer);
}
diff --git a/src/java/org/apache/lucene/index/IndexWriterConfig.java b/src/java/org/apache/lucene/index/IndexWriterConfig.java
index a74de72..189cbf5 100644
--- a/src/java/org/apache/lucene/index/IndexWriterConfig.java
+++ b/src/java/org/apache/lucene/index/IndexWriterConfig.java
@@ -116,6 +116,7 @@
private int maxBufferedDocs;
private IndexingChain indexingChain;
private IndexReaderWarmer mergedSegmentWarmer;
+ private MergePolicy mergePolicy;
private int maxThreadStates;
// required for clone
@@ -144,6 +145,7 @@
maxBufferedDocs = DEFAULT_MAX_BUFFERED_DOCS;
indexingChain = DocumentsWriter.defaultIndexingChain;
mergedSegmentWarmer = null;
+ mergePolicy = new LogByteSizeMergePolicy();
maxThreadStates = DEFAULT_MAX_THREAD_STATES;
}
@@ -491,10 +493,26 @@
return mergedSegmentWarmer;
}
- /** Sets the max number of simultaneous threads that may
- * be indexing documents at once in IndexWriter. */
+ /**
+ * Expert: {@link MergePolicy} is invoked whenever there are changes to the
+ * segments in the index. Its role is to select which merges to do, if any,
+ * and return a {@link MergePolicy.MergeSpecification} describing the merges.
+ * It also selects merges to do for optimize(). (The default is
+ * {@link LogByteSizeMergePolicy}.
+ */
+ public IndexWriterConfig setMergePolicy(MergePolicy mergePolicy) {
+ this.mergePolicy = mergePolicy == null ? new LogByteSizeMergePolicy() : mergePolicy;
+ return this;
+ }
+
+ /**
+ * Sets the max number of simultaneous threads that may be indexing documents
+ * at once in IndexWriter. Values < 1 are invalid and if passed
+ * <code>maxThreadStates</code> will be set to
+ * {@link #DEFAULT_MAX_THREAD_STATES}.
+ */
public IndexWriterConfig setMaxThreadStates(int maxThreadStates) {
- this.maxThreadStates = maxThreadStates;
+ this.maxThreadStates = maxThreadStates < 1 ? DEFAULT_MAX_THREAD_STATES : maxThreadStates;
return this;
}
@@ -504,6 +522,15 @@
return maxThreadStates;
}
+ /**
+ * Returns the current MergePolicy in use by this writer.
+ *
+ * @see #setMergePolicy(MergePolicy)
+ */
+ public MergePolicy getMergePolicy() {
+ return mergePolicy;
+ }
+
/** Expert: sets the {@link DocConsumer} chain to be used to process documents. */
IndexWriterConfig setIndexingChain(IndexingChain indexingChain) {
this.indexingChain = indexingChain == null ? DocumentsWriter.defaultIndexingChain : indexingChain;
@@ -533,6 +560,7 @@
sb.append("ramBufferSizeMB=").append(ramBufferSizeMB).append("\n");
sb.append("maxBufferedDocs=").append(maxBufferedDocs).append("\n");
sb.append("mergedSegmentWarmer=").append(mergedSegmentWarmer).append("\n");
+ sb.append("mergePolicy=").append(mergePolicy).append("\n");
sb.append("maxThreadStates=").append(maxThreadStates).append("\n");
return sb.toString();
}
diff --git a/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java b/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
index 6eb8aa9..f602e7f 100644
--- a/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
+++ b/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java
@@ -30,11 +30,11 @@
* or larger will never be merged. @see setMaxMergeMB */
public static final double DEFAULT_MAX_MERGE_MB = Long.MAX_VALUE;
- public LogByteSizeMergePolicy(IndexWriter writer) {
- super(writer);
+ public LogByteSizeMergePolicy() {
minMergeSize = (long) (DEFAULT_MIN_MERGE_MB*1024*1024);
maxMergeSize = (long) (DEFAULT_MAX_MERGE_MB*1024*1024);
}
+
@Override
protected long size(SegmentInfo info) throws IOException {
return sizeBytes(info);
diff --git a/src/java/org/apache/lucene/index/LogDocMergePolicy.java b/src/java/org/apache/lucene/index/LogDocMergePolicy.java
index 926b155..a86111c 100644
--- a/src/java/org/apache/lucene/index/LogDocMergePolicy.java
+++ b/src/java/org/apache/lucene/index/LogDocMergePolicy.java
@@ -28,14 +28,14 @@
/** Default minimum segment size. @see setMinMergeDocs */
public static final int DEFAULT_MIN_MERGE_DOCS = 1000;
- public LogDocMergePolicy(IndexWriter writer) {
- super(writer);
+ public LogDocMergePolicy() {
minMergeSize = DEFAULT_MIN_MERGE_DOCS;
-
+
// maxMergeSize is never used by LogDocMergePolicy; set
// it to Long.MAX_VALUE to disable it
maxMergeSize = Long.MAX_VALUE;
}
+
@Override
protected long size(SegmentInfo info) throws IOException {
return sizeDocs(info);
diff --git a/src/java/org/apache/lucene/index/LogMergePolicy.java b/src/java/org/apache/lucene/index/LogMergePolicy.java
index 013d33c..48651bc 100644
--- a/src/java/org/apache/lucene/index/LogMergePolicy.java
+++ b/src/java/org/apache/lucene/index/LogMergePolicy.java
@@ -66,17 +66,18 @@
private boolean useCompoundFile = true;
private boolean useCompoundDocStore = true;
- public LogMergePolicy(IndexWriter writer) {
- super(writer);
+ public LogMergePolicy() {
+ super();
}
-
+
protected boolean verbose() {
- return writer != null && writer.verbose();
+ IndexWriter w = writer.get();
+ return w != null && w.verbose();
}
private void message(String message) {
if (verbose())
- writer.message("LMP: " + message);
+ writer.get().message("LMP: " + message);
}
/** <p>Returns the number of segments that are merged at
@@ -160,7 +161,7 @@
protected long sizeDocs(SegmentInfo info) throws IOException {
if (calibrateSizeByDeletes) {
- int delCount = writer.numDeletedDocs(info);
+ int delCount = writer.get().numDeletedDocs(info);
return (info.docCount - (long)delCount);
} else {
return info.docCount;
@@ -170,7 +171,7 @@
protected long sizeBytes(SegmentInfo info) throws IOException {
long byteSize = info.sizeInBytes();
if (calibrateSizeByDeletes) {
- int delCount = writer.numDeletedDocs(info);
+ int delCount = writer.get().numDeletedDocs(info);
float delRatio = (info.docCount <= 0 ? 0.0f : ((float)delCount / (float)info.docCount));
return (info.docCount <= 0 ? byteSize : (long)(byteSize * (1.0f - delRatio)));
} else {
@@ -199,10 +200,12 @@
* writer, and matches the current compound file setting */
private boolean isOptimized(SegmentInfo info)
throws IOException {
- boolean hasDeletions = writer.numDeletedDocs(info) > 0;
+ IndexWriter w = writer.get();
+ assert w != null;
+ boolean hasDeletions = w.numDeletedDocs(info) > 0;
return !hasDeletions &&
!info.hasSeparateNorms() &&
- info.dir == writer.getDirectory() &&
+ info.dir == w.getDirectory() &&
info.getUseCompoundFile() == useCompoundFile;
}
@@ -309,9 +312,11 @@
MergeSpecification spec = new MergeSpecification();
int firstSegmentWithDeletions = -1;
+ IndexWriter w = writer.get();
+ assert w != null;
for(int i=0;i<numSegments;i++) {
final SegmentInfo info = segmentInfos.info(i);
- int delCount = writer.numDeletedDocs(info);
+ int delCount = w.numDeletedDocs(info);
if (delCount > 0) {
if (verbose())
message(" segment " + info.name + " has deletions");
diff --git a/src/java/org/apache/lucene/index/MergePolicy.java b/src/java/org/apache/lucene/index/MergePolicy.java
index 5d72284..a0798da 100644
--- a/src/java/org/apache/lucene/index/MergePolicy.java
+++ b/src/java/org/apache/lucene/index/MergePolicy.java
@@ -18,6 +18,8 @@
*/
import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.SetOnce;
+import org.apache.lucene.util.SetOnce.AlreadySetException;
import java.io.IOException;
import java.util.List;
@@ -52,12 +54,6 @@
* LogByteSizeMergePolicy}.</p>
*
* @lucene.experimental
- *
- * <p><b>NOTE</b>: This class typically requires access to
- * package-private APIs (e.g. <code>SegmentInfos</code>) to do its job;
- * if you implement your own MergePolicy, you'll need to put
- * it in package org.apache.lucene.index in order to use
- * these APIs.
*/
public abstract class MergePolicy implements java.io.Closeable {
@@ -225,13 +221,29 @@
}
}
- final protected IndexWriter writer;
-
- public MergePolicy(IndexWriter writer) {
- this.writer = writer;
+ protected final SetOnce<IndexWriter> writer;
+
+ /**
+ * Creates a new merge policy instance. Note that if you intend to use it
+ * without passing it to {@link IndexWriter}, you should call
+ * {@link #setIndexWriter(IndexWriter)}.
+ */
+ public MergePolicy() {
+ writer = new SetOnce<IndexWriter>();
}
/**
+ * Sets the {@link IndexWriter} to use by this merge policy. This method is
+ * allowed to be called only once, and is usually set by IndexWriter. If it is
+ * called more than once, {@link AlreadySetException} is thrown.
+ *
+ * @see SetOnce
+ */
+ public void setIndexWriter(IndexWriter writer) {
+ this.writer.set(writer);
+ }
+
+ /**
* Determine what set of merge operations are now necessary on the index.
* {@link IndexWriter} calls this whenever there is a change to the segments.
* This call is always synchronized on the {@link IndexWriter} instance so
diff --git a/src/java/org/apache/lucene/index/MergeScheduler.java b/src/java/org/apache/lucene/index/MergeScheduler.java
index 920dfcc..59e512a 100644
--- a/src/java/org/apache/lucene/index/MergeScheduler.java
+++ b/src/java/org/apache/lucene/index/MergeScheduler.java
@@ -25,12 +25,6 @@
* MergeScheduler is {@link ConcurrentMergeScheduler}.</p>
*
* @lucene.experimental
- *
- * <p><b>NOTE</b>: This class typically requires access to
- * package-private APIs (eg, SegmentInfos) to do its job;
- * if you implement your own MergePolicy, you'll need to put
- * it in package org.apache.lucene.index in order to use
- * these APIs.
*/
public abstract class MergeScheduler {
diff --git a/src/java/org/apache/lucene/util/SetOnce.java b/src/java/org/apache/lucene/util/SetOnce.java
new file mode 100644
index 0000000..3366b3c
--- /dev/null
+++ b/src/java/org/apache/lucene/util/SetOnce.java
@@ -0,0 +1,77 @@
+package org.apache.lucene.util;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A convenient class which offers a semi-immutable object wrapper
+ * implementation which allows one to set the value of an object exactly once,
+ * and retrieve it many times. If {@link #set(Object)} is called more than once,
+ * {@link AlreadySetException} is thrown and the operation
+ * will fail.
+ *
+ * @lucene.experimental
+ */
+public final class SetOnce<T> {
+
+ /** Thrown when {@link SetOnce#set(Object)} is called more than once. */
+ public static final class AlreadySetException extends RuntimeException {
+ public AlreadySetException() {
+ super("The object cannot be set twice!");
+ }
+ }
+
+ private volatile T obj = null;
+ private final AtomicBoolean set;
+
+ /**
+ * A default constructor which does not set the internal object, and allows
+ * setting it by calling {@link #set(Object)}.
+ */
+ public SetOnce() {
+ set = new AtomicBoolean(false);
+ }
+
+ /**
+ * Creates a new instnace with the internal object set to the given object.
+ * Note that any calls to {@link #set(Object)} afterwards will result in
+ * {@link AlreadySetException}
+ *
+ * @throws AlreadySetException if called more than once
+ * @see #set(Object)
+ */
+ public SetOnce(T obj) {
+ this.obj = obj;
+ set = new AtomicBoolean(true);
+ }
+
+ /** Sets the given object. If the object has already been set, an exception is thrown. */
+ public final void set(T obj) {
+ if (set.compareAndSet(false, true)) {
+ this.obj = obj;
+ } else {
+ throw new AlreadySetException();
+ }
+ }
+
+ /** Returns the object set by {@link #set(Object)}. */
+ public final T get() {
+ return obj;
+ }
+}
diff --git a/src/test/org/apache/lucene/TestSearch.java b/src/test/org/apache/lucene/TestSearch.java
index c587e8e..c6e8458 100644
--- a/src/test/org/apache/lucene/TestSearch.java
+++ b/src/test/org/apache/lucene/TestSearch.java
@@ -73,11 +73,11 @@
throws Exception {
Directory directory = new RAMDirectory();
Analyzer analyzer = new SimpleAnalyzer(TEST_VERSION_CURRENT);
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
- TEST_VERSION_CURRENT, analyzer));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ IndexWriter writer = new IndexWriter(directory, conf);
String[] docs = {
"a b c d e",
diff --git a/src/test/org/apache/lucene/TestSearchForDuplicates.java b/src/test/org/apache/lucene/TestSearchForDuplicates.java
index 1e550f0..4382974 100644
--- a/src/test/org/apache/lucene/TestSearchForDuplicates.java
+++ b/src/test/org/apache/lucene/TestSearchForDuplicates.java
@@ -78,11 +78,11 @@
private void doTest(PrintWriter out, boolean useCompoundFiles) throws Exception {
Directory directory = new RAMDirectory();
Analyzer analyzer = new SimpleAnalyzer(TEST_VERSION_CURRENT);
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
- TEST_VERSION_CURRENT, analyzer));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFiles);
lmp.setUseCompoundDocStore(useCompoundFiles);
+ IndexWriter writer = new IndexWriter(directory, conf);
final int MAX_DOCS = 225;
diff --git a/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java b/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java
index 7851033..7300c62 100755
--- a/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java
+++ b/src/test/org/apache/lucene/index/TestAddIndexesNoOptimize.java
@@ -49,8 +49,8 @@
writer.close();
writer = newWriter(aux, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
// add 40 documents in separate files
addDocs(writer, 40);
assertEquals(40, writer.maxDoc());
@@ -257,14 +257,14 @@
writer.close();
writer = newWriter(aux, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(1000));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
// add 140 documents in separate files
addDocs(writer, 40);
writer.close();
writer = newWriter(aux, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(1000));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
addDocs(writer, 100);
writer.close();
@@ -297,7 +297,7 @@
IndexWriter writer = newWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
addDocs(writer, 10);
writer.addIndexesNoOptimize(new Directory[] { aux });
@@ -320,7 +320,7 @@
setUpDirs(dir, aux);
IndexWriter writer = newWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(9));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
addDocs(writer, 2);
writer.addIndexesNoOptimize(new Directory[] { aux });
@@ -345,7 +345,7 @@
IndexWriter writer = newWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
writer.addIndexesNoOptimize(new Directory[] { aux, new RAMDirectory(aux) });
assertEquals(1060, writer.maxDoc());
@@ -375,7 +375,7 @@
IndexWriter writer = newWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(4));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
writer.addIndexesNoOptimize(new Directory[] { aux, new RAMDirectory(aux) });
assertEquals(1020, writer.maxDoc());
@@ -399,7 +399,7 @@
IndexWriter writer = newWriter(aux2, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(100));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
writer.addIndexesNoOptimize(new Directory[] { aux });
assertEquals(30, writer.maxDoc());
assertEquals(3, writer.getSegmentCount());
@@ -421,7 +421,7 @@
writer = newWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(6));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
writer.addIndexesNoOptimize(new Directory[] { aux, aux2 });
assertEquals(1025, writer.maxDoc());
@@ -434,8 +434,8 @@
private IndexWriter newWriter(Directory dir, IndexWriterConfig conf)
throws IOException {
+ conf.setMergePolicy(new LogDocMergePolicy());
final IndexWriter writer = new IndexWriter(dir, conf);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
return writer;
}
@@ -486,17 +486,17 @@
writer.close();
writer = newWriter(aux, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(100));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
// add 30 documents in 3 segments
for (int i = 0; i < 3; i++) {
addDocs(writer, 10);
writer.close();
writer = newWriter(aux, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(100));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false); // use one without a compound file
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
}
assertEquals(30, writer.maxDoc());
assertEquals(3, writer.getSegmentCount());
@@ -507,12 +507,13 @@
public void testHangOnClose() throws IOException {
Directory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(5));
- LogByteSizeMergePolicy lmp = new LogByteSizeMergePolicy(writer);
+ LogByteSizeMergePolicy lmp = new LogByteSizeMergePolicy();
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
lmp.setMergeFactor(100);
- writer.setMergePolicy(lmp);
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(5).setMergePolicy(lmp));
Document doc = new Document();
doc.add(new Field("content", "aaa bbb ccc ddd eee fff ggg hhh iii", Field.Store.YES,
@@ -534,13 +535,14 @@
writer.close();
Directory dir2 = new MockRAMDirectory();
- writer = new IndexWriter(dir2, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMergeScheduler(new SerialMergeScheduler()));
- lmp = new LogByteSizeMergePolicy(writer);
+ lmp = new LogByteSizeMergePolicy();
lmp.setMinMergeMB(0.0001);
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
lmp.setMergeFactor(4);
- writer.setMergePolicy(lmp);
+ writer = new IndexWriter(dir2, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMergeScheduler(new SerialMergeScheduler()).setMergePolicy(lmp));
writer.addIndexesNoOptimize(new Directory[] {dir});
writer.close();
dir.close();
@@ -552,15 +554,15 @@
public void testTargetCFS() throws IOException {
Directory dir = new RAMDirectory();
IndexWriter writer = newWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
addDocs(writer, 1);
writer.close();
Directory other = new RAMDirectory();
writer = newWriter(other, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(true);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(true);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(true);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(true);
writer.addIndexesNoOptimize(new Directory[] {dir});
assertTrue(writer.newestSegment().getUseCompoundFile());
writer.close();
diff --git a/src/test/org/apache/lucene/index/TestAtomicUpdate.java b/src/test/org/apache/lucene/index/TestAtomicUpdate.java
index b635c06..47e5eb3 100644
--- a/src/test/org/apache/lucene/index/TestAtomicUpdate.java
+++ b/src/test/org/apache/lucene/index/TestAtomicUpdate.java
@@ -126,10 +126,11 @@
TimedThread[] threads = new TimedThread[4];
- IndexWriter writer = new MockIndexWriter(directory, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
- .setMaxBufferedDocs(7));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(3);
+ .setMaxBufferedDocs(7);
+ ((LogMergePolicy) conf.getMergePolicy()).setMergeFactor(3);
+ IndexWriter writer = new MockIndexWriter(directory, conf);
// Establish a base index of 100 docs:
for(int i=0;i<100;i++) {
diff --git a/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
index 35e109e..58225ee 100644
--- a/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
+++ b/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -472,9 +472,10 @@
dirName = fullDir(dirName);
Directory dir = FSDirectory.open(new File(dirName));
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(doCFS);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(doCFS);
+ IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10);
+ ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(doCFS);
+ ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundDocStore(doCFS);
+ IndexWriter writer = new IndexWriter(dir, conf);
for(int i=0;i<35;i++) {
addDoc(writer, i);
@@ -483,9 +484,10 @@
writer.close();
// open fresh writer so we get no prx file in the added segment
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(doCFS);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(doCFS);
+ conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10);
+ ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(doCFS);
+ ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundDocStore(doCFS);
+ writer = new IndexWriter(dir, conf);
addNoProxDoc(writer);
writer.close();
diff --git a/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
index a9892e3..80b8437 100644
--- a/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
+++ b/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
@@ -109,15 +109,14 @@
RAMDirectory directory = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
-
- LogDocMergePolicy mp = new LogDocMergePolicy(writer);
- writer.setMergePolicy(mp);
-
+ LogDocMergePolicy mp = new LogDocMergePolicy();
// Force degenerate merging so we can get a mix of
// merging of segments with and without deletes at the
// start:
mp.setMinMergeDocs(1000);
+ IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
+ .setMergePolicy(mp));
Document doc = new Document();
Field idField = new Field("id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
@@ -183,7 +182,7 @@
doc.add(idField);
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(100);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(100);
for(int iter=0;iter<10;iter++) {
@@ -200,7 +199,7 @@
// Force a bunch of merge threads to kick off so we
// stress out aborting them on close:
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(3);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(3);
writer.addDocument(doc);
writer.commit();
@@ -212,7 +211,7 @@
// Reopen
writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.APPEND));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(100);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(100);
}
writer.close();
diff --git a/src/test/org/apache/lucene/index/TestDeletionPolicy.java b/src/test/org/apache/lucene/index/TestDeletionPolicy.java
index d04390c..2f43d52 100644
--- a/src/test/org/apache/lucene/index/TestDeletionPolicy.java
+++ b/src/test/org/apache/lucene/index/TestDeletionPolicy.java
@@ -202,10 +202,13 @@
Directory dir = new RAMDirectory();
ExpirationTimeDeletionPolicy policy = new ExpirationTimeDeletionPolicy(dir, SECONDS);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setIndexDeletionPolicy(policy));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT,
+ new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setIndexDeletionPolicy(policy);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ IndexWriter writer = new IndexWriter(dir, conf);
writer.close();
long lastDeleteTime = 0;
@@ -213,11 +216,13 @@
// Record last time when writer performed deletes of
// past commits
lastDeleteTime = System.currentTimeMillis();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy));
- lmp = (LogMergePolicy) writer.getMergePolicy();
+ conf = new IndexWriterConfig(TEST_VERSION_CURRENT,
+ new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
+ OpenMode.APPEND).setIndexDeletionPolicy(policy);
+ lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ writer = new IndexWriter(dir, conf);
for(int j=0;j<17;j++) {
addDoc(writer);
}
@@ -277,24 +282,26 @@
Directory dir = new RAMDirectory();
policy.dir = dir;
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setIndexDeletionPolicy(policy).setMaxBufferedDocs(10)
- .setMergeScheduler(new SerialMergeScheduler()));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ .setMergeScheduler(new SerialMergeScheduler());
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ IndexWriter writer = new IndexWriter(dir, conf);
for(int i=0;i<107;i++) {
addDoc(writer);
}
writer.close();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ conf = new IndexWriterConfig(TEST_VERSION_CURRENT,
new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
- OpenMode.APPEND).setIndexDeletionPolicy(policy));
- lmp = (LogMergePolicy) writer.getMergePolicy();
+ OpenMode.APPEND).setIndexDeletionPolicy(policy);
+ lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ writer = new IndexWriter(dir, conf);
writer.optimize();
writer.close();
@@ -462,23 +469,25 @@
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy)
- .setMaxBufferedDocs(10));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ .setMaxBufferedDocs(10);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ IndexWriter writer = new IndexWriter(dir, conf);
for(int i=0;i<107;i++) {
addDoc(writer);
}
writer.close();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy));
- lmp = (LogMergePolicy) writer.getMergePolicy();
+ conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy);
+ lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ writer = new IndexWriter(dir, conf);
writer.optimize();
writer.close();
@@ -512,13 +521,14 @@
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
for(int j=0;j<N+1;j++) {
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy)
- .setMaxBufferedDocs(10));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ .setMaxBufferedDocs(10);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ IndexWriter writer = new IndexWriter(dir, conf);
for(int i=0;i<17;i++) {
addDoc(writer);
}
@@ -571,23 +581,25 @@
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ .setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ IndexWriter writer = new IndexWriter(dir, conf);
writer.close();
Term searchTerm = new Term("content", "aaa");
Query query = new TermQuery(searchTerm);
for(int i=0;i<N+1;i++) {
- writer = new IndexWriter(dir, new IndexWriterConfig(
+ conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy));
- lmp = (LogMergePolicy) writer.getMergePolicy();
+ .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy);
+ lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ writer = new IndexWriter(dir, conf);
for(int j=0;j<17;j++) {
addDoc(writer);
}
@@ -603,11 +615,12 @@
reader.close();
searcher.close();
}
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy));
- lmp = (LogMergePolicy) writer.getMergePolicy();
+ conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy);
+ lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ writer = new IndexWriter(dir, conf);
writer.optimize();
// this is a commit
writer.close();
@@ -677,26 +690,28 @@
KeepLastNDeletionPolicy policy = new KeepLastNDeletionPolicy(N);
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE).setIndexDeletionPolicy(policy)
- .setMaxBufferedDocs(10));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ .setMaxBufferedDocs(10);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ IndexWriter writer = new IndexWriter(dir, conf);
writer.close();
Term searchTerm = new Term("content", "aaa");
Query query = new TermQuery(searchTerm);
for(int i=0;i<N+1;i++) {
- writer = new IndexWriter(dir, new IndexWriterConfig(
+ conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy)
- .setMaxBufferedDocs(10));
- lmp = (LogMergePolicy) writer.getMergePolicy();
+ .setMaxBufferedDocs(10);
+ lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setUseCompoundFile(useCompoundFile);
lmp.setUseCompoundDocStore(useCompoundFile);
+ writer = new IndexWriter(dir, conf);
for(int j=0;j<17;j++) {
addDoc(writer);
}
diff --git a/src/test/org/apache/lucene/index/TestFieldsReader.java b/src/test/org/apache/lucene/index/TestFieldsReader.java
index afc5868..196a425 100644
--- a/src/test/org/apache/lucene/index/TestFieldsReader.java
+++ b/src/test/org/apache/lucene/index/TestFieldsReader.java
@@ -60,9 +60,10 @@
fieldInfos = new FieldInfos();
DocHelper.setupDoc(testDoc);
fieldInfos.add(testDoc);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false);
+ IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
+ ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundDocStore(false);
+ IndexWriter writer = new IndexWriter(dir, conf);
writer.addDocument(testDoc);
writer.close();
}
@@ -216,8 +217,9 @@
FSDirectory tmpDir = FSDirectory.open(file);
assertTrue(tmpDir != null);
- IndexWriter writer = new IndexWriter(tmpDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
+ IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE);
+ ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(false);
+ IndexWriter writer = new IndexWriter(tmpDir, conf);
writer.addDocument(testDoc);
writer.close();
diff --git a/src/test/org/apache/lucene/index/TestIndexFileDeleter.java b/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
index 132064e..7ead2dd 100644
--- a/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
+++ b/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
@@ -41,13 +41,15 @@
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(10));
int i;
for(i=0;i<35;i++) {
addDoc(writer, i);
}
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
for(;i<45;i++) {
addDoc(writer, i);
}
diff --git a/src/test/org/apache/lucene/index/TestIndexReader.java b/src/test/org/apache/lucene/index/TestIndexReader.java
index 07a419c..078f903 100644
--- a/src/test/org/apache/lucene/index/TestIndexReader.java
+++ b/src/test/org/apache/lucene/index/TestIndexReader.java
@@ -175,7 +175,7 @@
writer = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT,
new StandardAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.APPEND));
// want to get some more segments here
- int mergeFactor = ((LogMergePolicy) writer.getMergePolicy()).getMergeFactor();
+ int mergeFactor = ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor();
for (int i = 0; i < 5*mergeFactor; i++) {
addDocumentWithFields(writer);
}
@@ -255,7 +255,7 @@
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
// want to get some more segments here
// new termvector fields
- int mergeFactor = ((LogMergePolicy) writer.getMergePolicy()).getMergeFactor();
+ int mergeFactor = ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor();
for (int i = 0; i < 5 * mergeFactor; i++) {
Document doc = new Document();
doc.add(new Field("tvnot","one two two three three three", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO));
@@ -559,8 +559,8 @@
// add 1 documents with term : aaa
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
addDoc(writer, searchTerm.text());
writer.close();
diff --git a/src/test/org/apache/lucene/index/TestIndexReaderClone.java b/src/test/org/apache/lucene/index/TestIndexReaderClone.java
index 993705e..0b39ee5 100644
--- a/src/test/org/apache/lucene/index/TestIndexReaderClone.java
+++ b/src/test/org/apache/lucene/index/TestIndexReaderClone.java
@@ -487,8 +487,8 @@
final Directory dir = new MockRAMDirectory();
IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
- ((LogMergePolicy) w.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) w.getMergePolicy()).setUseCompoundDocStore(false);
+ ((LogMergePolicy) w.getConfig().getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) w.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
Document doc = new Document();
doc.add(new Field("field", "yes it's stored", Field.Store.YES, Field.Index.ANALYZED));
w.addDocument(doc);
diff --git a/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java b/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
index d9df6e6..6fc16ee 100644
--- a/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
+++ b/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
@@ -116,7 +116,7 @@
IndexWriter iw = new IndexWriter(dir3, new IndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
.setMaxBufferedDocs(5));
- ((LogMergePolicy) iw.getMergePolicy()).setMergeFactor(3);
+ ((LogMergePolicy) iw.getConfig().getMergePolicy()).setMergeFactor(3);
iw.addIndexesNoOptimize(new Directory[] { dir1, dir2 });
iw.optimize();
iw.close();
@@ -134,7 +134,7 @@
// now with optimize
iw = new IndexWriter(dir3, new IndexWriterConfig(TEST_VERSION_CURRENT,
anlzr).setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(5));
- ((LogMergePolicy) iw.getMergePolicy()).setMergeFactor(3);
+ ((LogMergePolicy) iw.getConfig().getMergePolicy()).setMergeFactor(3);
iw.optimize();
iw.close();
verifyIndex(dir3);
@@ -236,7 +236,7 @@
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.CREATE)
.setMaxBufferedDocs(5).setSimilarity(similarityOne));
- LogMergePolicy lmp = (LogMergePolicy) iw.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
lmp.setMergeFactor(3);
lmp.setUseCompoundFile(true);
lmp.setUseCompoundDocStore(true);
@@ -286,13 +286,14 @@
private void addDocs(Directory dir, int ndocs, boolean compound)
throws IOException {
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
- .setMaxBufferedDocs(5).setSimilarity(similarityOne));
- LogMergePolicy lmp = (LogMergePolicy) iw.getMergePolicy();
+ IndexWriterConfig conf = new IndexWriterConfig(
+ TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
+ .setMaxBufferedDocs(5).setSimilarity(similarityOne);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setMergeFactor(3);
lmp.setUseCompoundFile(compound);
lmp.setUseCompoundDocStore(compound);
+ IndexWriter iw = new IndexWriter(dir, conf);
for (int i = 0; i < ndocs; i++) {
iw.addDocument(newDoc());
}
diff --git a/src/test/org/apache/lucene/index/TestIndexReaderReopen.java b/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
index 6f1b518..1db7a98 100644
--- a/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
+++ b/src/test/org/apache/lucene/index/TestIndexReaderReopen.java
@@ -949,9 +949,9 @@
public static void createIndex(Directory dir, boolean multiSegment) throws IOException {
IndexWriter.unlock(dir);
- IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
-
- w.setMergePolicy(new LogDocMergePolicy(w));
+ IndexWriter w = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMergePolicy(new LogDocMergePolicy()));
for (int i = 0; i < 100; i++) {
w.addDocument(createDocument(i, 4));
diff --git a/src/test/org/apache/lucene/index/TestIndexWriter.java b/src/test/org/apache/lucene/index/TestIndexWriter.java
index 71004cb..ba9bf34 100644
--- a/src/test/org/apache/lucene/index/TestIndexWriter.java
+++ b/src/test/org/apache/lucene/index/TestIndexWriter.java
@@ -606,13 +606,13 @@
doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.ANALYZED));
for(int numDocs=38;numDocs<500;numDocs += 38) {
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE)
- .setMaxBufferedDocs(2));
- LogDocMergePolicy ldmp = new LogDocMergePolicy(writer);
+ LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMinMergeDocs(1);
ldmp.setMergeFactor(5);
- writer.setMergePolicy(ldmp);
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(2).setMergePolicy(
+ ldmp));
for(int j=0;j<numDocs;j++)
writer.addDocument(doc);
writer.close();
@@ -621,9 +621,10 @@
sis.read(dir);
final int segCount = sis.size();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ ldmp = new LogDocMergePolicy();
ldmp.setMergeFactor(5);
- writer.setMergePolicy(ldmp);
+ writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMergePolicy(ldmp));
writer.optimize(3);
writer.close();
@@ -644,12 +645,12 @@
final Document doc = new Document();
doc.add(new Field("content", "aaa", Field.Store.YES, Field.Index.ANALYZED));
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- LogDocMergePolicy ldmp = new LogDocMergePolicy(writer);
+ LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMinMergeDocs(1);
ldmp.setMergeFactor(4);
- writer.setMergePolicy(ldmp);
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(2).setMergePolicy(ldmp));
for(int iter=0;iter<10;iter++) {
for(int i=0;i<19;i++)
@@ -1526,9 +1527,9 @@
Directory dir = new MockRAMDirectory();
for(int pass=0;pass<2;pass++) {
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE)
- .setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(101);
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(2));
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(101);
Document doc = new Document();
doc.add(new Field("field", "aaa", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
for(int i=0;i<200;i++)
@@ -1652,10 +1653,11 @@
int pri = Thread.currentThread().getPriority();
try {
MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT))
- .setMaxBufferedDocs(2));
- ((LogMergePolicy) iw.getMergePolicy()).setMergeFactor(2);
+ .setMaxBufferedDocs(2);
+ ((LogMergePolicy) conf.getMergePolicy()).setMergeFactor(2);
+ IndexWriter iw = new IndexWriter(dir, conf);
Document document = new Document();
document.add(new Field("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.YES));
@@ -1693,12 +1695,13 @@
// LUCENE-1013
public void testSetMaxMergeDocs() throws IOException {
MockRAMDirectory dir = new MockRAMDirectory();
- IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriterConfig conf = new IndexWriterConfig(
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT))
- .setMergeScheduler(new MyMergeScheduler()).setMaxBufferedDocs(2));
- LogMergePolicy lmp = (LogMergePolicy) iw.getMergePolicy();
+ .setMergeScheduler(new MyMergeScheduler()).setMaxBufferedDocs(2);
+ LogMergePolicy lmp = (LogMergePolicy) conf.getMergePolicy();
lmp.setMaxMergeDocs(20);
lmp.setMergeFactor(2);
+ IndexWriter iw = new IndexWriter(dir, conf);
Document document = new Document();
document.add(new Field("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
Field.TermVector.YES));
@@ -2060,7 +2063,7 @@
int delID = 0;
for(int i=0;i<20;i++) {
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy();
lmp.setMergeFactor(2);
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
@@ -2097,7 +2100,7 @@
if (0 == i % 4) {
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
- LogMergePolicy lmp2 = (LogMergePolicy) writer.getMergePolicy();
+ LogMergePolicy lmp2 = (LogMergePolicy) writer.getConfig().getMergePolicy();
lmp2.setUseCompoundFile(false);
lmp2.setUseCompoundDocStore(false);
writer.optimize();
@@ -2122,7 +2125,7 @@
conf.setMergeScheduler(new SerialMergeScheduler());
}
IndexWriter writer = new IndexWriter(directory, conf);
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(100);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(100);
//System.out.println("TEST: pass=" + pass + " cms=" + (pass >= 2));
for(int iter=0;iter<10;iter++) {
@@ -2140,7 +2143,7 @@
// Force a bunch of merge threads to kick off so we
// stress out aborting them on close:
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
final IndexWriter finalWriter = writer;
final ArrayList<Throwable> failure = new ArrayList<Throwable>();
@@ -2268,7 +2271,7 @@
// We expect AlreadyClosedException
((ConcurrentMergeScheduler) conf.getMergeScheduler()).setSuppressExceptions();
IndexWriter writer = new IndexWriter(dir, conf);
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
IndexerThread[] threads = new IndexerThread[NUM_THREADS];
@@ -2360,7 +2363,7 @@
// We expect disk full exceptions in the merge threads
((ConcurrentMergeScheduler) conf.getMergeScheduler()).setSuppressExceptions();
IndexWriter writer = new IndexWriter(dir, conf);
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
dir.setMaxSizeInBytes(4*1024+20*iter);
IndexerThread[] threads = new IndexerThread[NUM_THREADS];
@@ -2449,7 +2452,7 @@
// We expect disk full exceptions in the merge threads
((ConcurrentMergeScheduler) conf.getMergeScheduler()).setSuppressExceptions();
IndexWriter writer = new IndexWriter(dir, conf);
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
IndexerThread[] threads = new IndexerThread[NUM_THREADS];
@@ -2666,7 +2669,7 @@
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(5);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(5);
for (int i = 0; i < 23; i++)
addDoc(writer);
@@ -2720,7 +2723,7 @@
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
failure.setDoFail();
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(5);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(5);
for (int i = 0; i < 23; i++) {
addDoc(writer);
@@ -2750,10 +2753,11 @@
Directory dir = new MockRAMDirectory();
for(int iter=0;iter<2;iter++) {
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2).setRAMBufferSizeMB(
- IndexWriterConfig.DISABLE_AUTO_FLUSH).setMergeScheduler(
- new SerialMergeScheduler()));
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(2).setRAMBufferSizeMB(
+ IndexWriterConfig.DISABLE_AUTO_FLUSH).setMergeScheduler(
+ new SerialMergeScheduler()).setMergePolicy(
+ new LogDocMergePolicy()));
Document document = new Document();
@@ -2784,8 +2788,8 @@
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
new StandardAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2)
.setRAMBufferSizeMB(IndexWriterConfig.DISABLE_AUTO_FLUSH)
- .setMergeScheduler(new SerialMergeScheduler()));
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ .setMergeScheduler(new SerialMergeScheduler()).setMergePolicy(
+ new LogDocMergePolicy()));
Directory[] indexDirs = {new MockRAMDirectory(dir)};
writer.addIndexesNoOptimize(indexDirs);
@@ -2803,8 +2807,8 @@
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH).setMergeScheduler(
- new SerialMergeScheduler()));
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ new SerialMergeScheduler()).setMergePolicy(
+ new LogDocMergePolicy()));
Document document = new Document();
@@ -2840,8 +2844,7 @@
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH).setMergeScheduler(
- new SerialMergeScheduler()));
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ new SerialMergeScheduler()).setMergePolicy(new LogDocMergePolicy()));
Document document = new Document();
@@ -2860,8 +2863,8 @@
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
new StandardAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2)
.setRAMBufferSizeMB(IndexWriterConfig.DISABLE_AUTO_FLUSH)
- .setMergeScheduler(new SerialMergeScheduler()));
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ .setMergeScheduler(new SerialMergeScheduler()).setMergePolicy(
+ new LogDocMergePolicy()));
for(int i=0;i<6;i++)
writer.addDocument(document);
@@ -2951,7 +2954,7 @@
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(50);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(50);
Document document = new Document();
@@ -2977,7 +2980,7 @@
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
new StandardAnalyzer(TEST_VERSION_CURRENT)));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(3);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(3);
assertEquals(49, writer.numDocs());
writer.expungeDeletes();
writer.close();
@@ -2996,7 +2999,7 @@
TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(50);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(50);
Document document = new Document();
@@ -3022,7 +3025,7 @@
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
// Force many merges to happen
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(3);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(3);
writer.expungeDeletes(false);
writer.close();
ir = IndexReader.open(dir, true);
@@ -3132,8 +3135,9 @@
// LUCENE-1210
public void testExceptionOnMergeInit() throws IOException {
MockRAMDirectory dir = new MockRAMDirectory();
- MockIndexWriter2 w = new MockIndexWriter2(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) w.getMergePolicy()).setMergeFactor(2);
+ IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2);
+ ((LogMergePolicy) conf.getMergePolicy()).setMergeFactor(2);
+ MockIndexWriter2 w = new MockIndexWriter2(dir, conf);
w.doFail = true;
Document doc = new Document();
doc.add(new Field("field", "a field", Field.Store.YES,
@@ -3526,7 +3530,7 @@
Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(5);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(5);
for (int i = 0; i < 23; i++)
addDoc(writer);
@@ -3577,7 +3581,7 @@
dir.setPreventDoubleWrite(false);
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(5);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(5);
for (int i = 0; i < 23; i++)
addDoc(writer);
@@ -4014,15 +4018,16 @@
public void testOptimizeExceptions() throws IOException {
RAMDirectory startDir = new MockRAMDirectory();
- IndexWriter w = new IndexWriter(startDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) w.getMergePolicy()).setMergeFactor(100);
+ IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2);
+ ((LogMergePolicy) conf.getMergePolicy()).setMergeFactor(100);
+ IndexWriter w = new IndexWriter(startDir, conf);
for(int i=0;i<27;i++)
addDoc(w);
w.close();
for(int i=0;i<200;i++) {
MockRAMDirectory dir = new MockRAMDirectory(startDir);
- IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
+ conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT));
((ConcurrentMergeScheduler) conf.getMergeScheduler()).setSuppressExceptions();
w = new IndexWriter(dir, conf);
dir.setRandomIOExceptionRate(0.5, 100);
@@ -4392,8 +4397,11 @@
if (w != null) {
w.close();
}
- w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) w.getMergePolicy()).setMergeFactor(2);
+ IndexWriterConfig conf = new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(
+ TEST_VERSION_CURRENT)).setMaxBufferedDocs(2);
+ ((LogMergePolicy) conf.getMergePolicy()).setMergeFactor(2);
+ w = new IndexWriter(dir, conf);
//((ConcurrentMergeScheduler) w.getMergeScheduler()).setSuppressExceptions();
if (!first && !allowInterrupt) {
@@ -4611,7 +4619,7 @@
Directory dir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy();
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
diff --git a/src/test/org/apache/lucene/index/TestIndexWriterConfig.java b/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
index 787f786..2de98c6 100644
--- a/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
+++ b/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
@@ -80,6 +80,8 @@
assertEquals(IndexWriterConfig.DEFAULT_MAX_BUFFERED_DOCS, conf.getMaxBufferedDocs());
assertTrue(DocumentsWriter.defaultIndexingChain == conf.getIndexingChain());
assertNull(conf.getMergedSegmentWarmer());
+ assertEquals(IndexWriterConfig.DEFAULT_MAX_THREAD_STATES, conf.getMaxThreadStates());
+ assertEquals(LogByteSizeMergePolicy.class, conf.getMergePolicy().getClass());
// Sanity check - validate that all getters are covered.
Set<String> getters = new HashSet<String>();
@@ -98,6 +100,7 @@
getters.add("getMaxBufferedDocs");
getters.add("getIndexingChain");
getters.add("getMergedSegmentWarmer");
+ getters.add("getMergePolicy");
getters.add("getMaxThreadStates");
for (Method m : IndexWriterConfig.class.getDeclaredMethods()) {
if (m.getDeclaringClass() == IndexWriterConfig.class && m.getName().startsWith("get")) {
@@ -130,6 +133,7 @@
assertEquals(IndexWriterConfig.DISABLE_AUTO_FLUSH, IndexWriterConfig.DEFAULT_MAX_BUFFERED_DELETE_TERMS);
assertEquals(IndexWriterConfig.DISABLE_AUTO_FLUSH, IndexWriterConfig.DEFAULT_MAX_BUFFERED_DOCS);
assertEquals(16.0, IndexWriterConfig.DEFAULT_RAM_BUFFER_SIZE_MB, 0.0);
+ assertEquals(8, IndexWriterConfig.DEFAULT_MAX_THREAD_STATES);
}
@Test
@@ -225,7 +229,19 @@
} catch (IllegalArgumentException e) {
// this is expected
}
+
+ assertEquals(IndexWriterConfig.DEFAULT_MAX_THREAD_STATES, conf.getMaxThreadStates());
+ conf.setMaxThreadStates(5);
+ assertEquals(5, conf.getMaxThreadStates());
+ conf.setMaxThreadStates(0);
+ assertEquals(IndexWriterConfig.DEFAULT_MAX_THREAD_STATES, conf.getMaxThreadStates());
+ // Test MergePolicy
+ assertEquals(LogByteSizeMergePolicy.class, conf.getMergePolicy().getClass());
+ conf.setMergePolicy(new LogDocMergePolicy());
+ assertEquals(LogDocMergePolicy.class, conf.getMergePolicy().getClass());
+ conf.setMergePolicy(null);
+ assertEquals(LogByteSizeMergePolicy.class, conf.getMergePolicy().getClass());
}
/**
@@ -268,5 +284,9 @@
writer.setMergedSegmentWarmer(new MyWarmer());
assertEquals(MyWarmer.class, writer.getConfig().getMergedSegmentWarmer().getClass());
+
+ writer.setMergePolicy(new LogDocMergePolicy());
+ assertEquals(LogDocMergePolicy.class, writer.getConfig().getMergePolicy().getClass());
}
+
}
diff --git a/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
index 0bd5f9b..3e0b57a 100644
--- a/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
+++ b/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
@@ -641,7 +641,7 @@
MockRAMDirectory dir = new MockRAMDirectory();
IndexWriter modifier = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDeleteTerms(2));
- LogMergePolicy lmp = (LogMergePolicy) modifier.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) modifier.getConfig().getMergePolicy();
lmp.setUseCompoundFile(true);
lmp.setUseCompoundDocStore(true);
diff --git a/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
index ec9c6b9..35ae35e 100755
--- a/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
+++ b/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
@@ -35,9 +35,9 @@
public void testNormalCase() throws IOException {
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(10).setMergePolicy(new LogDocMergePolicy()));
for (int i = 0; i < 100; i++) {
addDoc(writer);
@@ -51,9 +51,9 @@
public void testNoOverMerge() throws IOException {
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(10).setMergePolicy(new LogDocMergePolicy()));
boolean noOverMerge = false;
for (int i = 0; i < 100; i++) {
@@ -72,21 +72,23 @@
public void testForceFlush() throws IOException {
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
- LogDocMergePolicy mp = new LogDocMergePolicy(writer);
+ LogDocMergePolicy mp = new LogDocMergePolicy();
mp.setMinMergeDocs(100);
- writer.setMergePolicy(mp);
+ mp.setMergeFactor(10);
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(10).setMergePolicy(mp));
for (int i = 0; i < 100; i++) {
addDoc(writer);
writer.close();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(10));
- writer.setMergePolicy(mp);
+ mp = new LogDocMergePolicy();
+ mp.setMergeFactor(10);
+ writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
+ OpenMode.APPEND).setMaxBufferedDocs(10).setMergePolicy(mp));
mp.setMinMergeDocs(100);
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
checkInvariants(writer);
}
@@ -97,16 +99,16 @@
public void testMergeFactorChange() throws IOException {
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(100);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(10).setMergePolicy(new LogDocMergePolicy()));
for (int i = 0; i < 250; i++) {
addDoc(writer);
checkInvariants(writer);
}
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(5);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(5);
// merge policy only fixes segments on levels where merges
// have been triggered, so check invariants after all adds
@@ -122,9 +124,9 @@
public void testMaxBufferedDocsChange() throws IOException {
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(101));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(101);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(101).setMergePolicy(new LogDocMergePolicy()));
// leftmost* segment has 1 doc
// rightmost* segment has 100 docs
@@ -135,17 +137,18 @@
}
writer.close();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(101));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(101);
- writer.setMergePolicy(new LogDocMergePolicy(writer));
+ writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
+ OpenMode.APPEND).setMaxBufferedDocs(101).setMergePolicy(
+ new LogDocMergePolicy()));
}
writer.close();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(10));
- writer.setMergePolicy(new LogDocMergePolicy(writer));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(10);
+ LogDocMergePolicy ldmp = new LogDocMergePolicy();
+ ldmp.setMergeFactor(10);
+ writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
+ OpenMode.APPEND).setMaxBufferedDocs(10).setMergePolicy(ldmp));
// merge policy only fixes segments on levels where merges
// have been triggered, so check invariants after all adds
@@ -169,9 +172,11 @@
public void testMergeDocCount0() throws IOException {
Directory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- writer.setMergePolicy(new LogDocMergePolicy(writer));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(100);
+ LogDocMergePolicy ldmp = new LogDocMergePolicy();
+ ldmp.setMergeFactor(100);
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMaxBufferedDocs(10).setMergePolicy(ldmp));
for (int i = 0; i < 250; i++) {
addDoc(writer);
@@ -183,10 +188,11 @@
reader.deleteDocuments(new Term("content", "aaa"));
reader.close();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(10));
- writer.setMergePolicy(new LogDocMergePolicy(writer));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(5);
+ ldmp = new LogDocMergePolicy();
+ ldmp.setMergeFactor(5);
+ writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
+ OpenMode.APPEND).setMaxBufferedDocs(10).setMergePolicy(ldmp));
// merge factor is changed, so check invariants after all adds
for (int i = 0; i < 10; i++) {
@@ -210,8 +216,8 @@
private void checkInvariants(IndexWriter writer) throws IOException {
_TestUtil.syncConcurrentMerges(writer);
int maxBufferedDocs = writer.getConfig().getMaxBufferedDocs();
- int mergeFactor = ((LogMergePolicy) writer.getMergePolicy()).getMergeFactor();
- int maxMergeDocs = ((LogMergePolicy) writer.getMergePolicy()).getMaxMergeDocs();
+ int mergeFactor = ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor();
+ int maxMergeDocs = ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMaxMergeDocs();
int ramSegmentCount = writer.getNumBufferedDocuments();
assertTrue(ramSegmentCount < maxBufferedDocs);
diff --git a/src/test/org/apache/lucene/index/TestIndexWriterMerging.java b/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
index 373c67d..33dc8b2 100644
--- a/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
+++ b/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
@@ -58,7 +58,7 @@
Directory merged = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(merged, new IndexWriterConfig(TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
writer.addIndexesNoOptimize(new Directory[]{indexA, indexB});
writer.optimize();
@@ -97,7 +97,7 @@
TEST_VERSION_CURRENT,
new StandardAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
for (int i = start; i < (start + numDocs); i++)
{
diff --git a/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/src/test/org/apache/lucene/index/TestIndexWriterReader.java
index 0a39d1f..511fdbe 100644
--- a/src/test/org/apache/lucene/index/TestIndexWriterReader.java
+++ b/src/test/org/apache/lucene/index/TestIndexWriterReader.java
@@ -491,8 +491,9 @@
public static void createIndex(Directory dir1, String indexName,
boolean multiSegment) throws IOException {
- IndexWriter w = new IndexWriter(dir1, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
- w.setMergePolicy(new LogDocMergePolicy(w));
+ IndexWriter w = new IndexWriter(dir1, new IndexWriterConfig(
+ TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ .setMergePolicy(new LogDocMergePolicy()));
for (int i = 0; i < 100; i++) {
w.addDocument(createDocument(i, indexName, 4));
if (multiSegment && (i % 10) == 0) {
@@ -538,7 +539,7 @@
// get a reader to put writer into near real-time mode
IndexReader r1 = writer.getReader();
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
for (int i = 0; i < 10; i++) {
writer.addDocument(createDocument(i, "test", 4));
@@ -622,7 +623,7 @@
Directory dir1 = new MockRAMDirectory();
final IndexWriter writer = new IndexWriter(dir1, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.setInfoStream(infoStream);
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
// create the index
createIndexNoClose(false, "test", writer);
@@ -699,7 +700,7 @@
Directory dir1 = new MockRAMDirectory();
final IndexWriter writer = new IndexWriter(dir1, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.setInfoStream(infoStream);
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
// create the index
createIndexNoClose(false, "test", writer);
diff --git a/src/test/org/apache/lucene/index/TestLazyBug.java b/src/test/org/apache/lucene/index/TestLazyBug.java
index ff945a4..415e8cb 100755
--- a/src/test/org/apache/lucene/index/TestLazyBug.java
+++ b/src/test/org/apache/lucene/index/TestLazyBug.java
@@ -73,7 +73,7 @@
Random r = newRandom();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy();
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
diff --git a/src/test/org/apache/lucene/index/TestLazyProxSkipping.java b/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
index da1c761..f4ccee3 100755
--- a/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
+++ b/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
@@ -61,8 +61,8 @@
Directory directory = new SeekCountingDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
String content;
diff --git a/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java b/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
index 19bd5bc..5dd7748 100644
--- a/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
+++ b/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
@@ -33,9 +33,9 @@
public void testIndexing() throws Exception {
Directory mainDir = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(mainDir, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
IndexReader reader = writer.getReader(); // start pooling readers
reader.close();
RunThread[] indexThreads = new RunThread[4];
diff --git a/src/test/org/apache/lucene/index/TestNorms.java b/src/test/org/apache/lucene/index/TestNorms.java
index df0abb6..9d1f268 100755
--- a/src/test/org/apache/lucene/index/TestNorms.java
+++ b/src/test/org/apache/lucene/index/TestNorms.java
@@ -103,7 +103,7 @@
IndexWriter iw = new IndexWriter(dir3, new IndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
.setMaxBufferedDocs(5));
- ((LogMergePolicy) iw.getMergePolicy()).setMergeFactor(3);
+ ((LogMergePolicy) iw.getConfig().getMergePolicy()).setMergeFactor(3);
iw.addIndexesNoOptimize(new Directory[]{dir1,dir2});
iw.optimize();
iw.close();
@@ -121,7 +121,7 @@
// now with optimize
iw = new IndexWriter(dir3, new IndexWriterConfig(TEST_VERSION_CURRENT,
anlzr).setOpenMode(OpenMode.APPEND).setMaxBufferedDocs(5));
- ((LogMergePolicy) iw.getMergePolicy()).setMergeFactor(3);
+ ((LogMergePolicy) iw.getConfig().getMergePolicy()).setMergeFactor(3);
iw.optimize();
iw.close();
verifyIndex(dir3);
@@ -148,7 +148,7 @@
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.CREATE)
.setMaxBufferedDocs(5).setSimilarity(similarityOne));
- LogMergePolicy lmp = (LogMergePolicy) iw.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
lmp.setMergeFactor(3);
lmp.setUseCompoundFile(true);
lmp.setUseCompoundDocStore(true);
@@ -192,7 +192,7 @@
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
.setMaxBufferedDocs(5).setSimilarity(similarityOne));
- LogMergePolicy lmp = (LogMergePolicy) iw.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
lmp.setMergeFactor(3);
lmp.setUseCompoundFile(compound);
lmp.setUseCompoundDocStore(compound);
diff --git a/src/test/org/apache/lucene/index/TestOmitTf.java b/src/test/org/apache/lucene/index/TestOmitTf.java
index 83a77fe..d8dda08 100644
--- a/src/test/org/apache/lucene/index/TestOmitTf.java
+++ b/src/test/org/apache/lucene/index/TestOmitTf.java
@@ -115,7 +115,7 @@
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
IndexWriter writer = new IndexWriter(ram, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(3));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
Document d = new Document();
// this field will have Tf
@@ -168,7 +168,7 @@
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
IndexWriter writer = new IndexWriter(ram, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(10));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
Document d = new Document();
// this field will have Tf
@@ -216,7 +216,7 @@
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
IndexWriter writer = new IndexWriter(ram, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(3));
- LogMergePolicy lmp = (LogMergePolicy) writer.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy();
lmp.setMergeFactor(2);
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
@@ -250,8 +250,7 @@
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(2)
.setSimilarity(new SimpleSimilarity()));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(2);
-
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
StringBuilder sb = new StringBuilder(265);
String term = "term";
diff --git a/src/test/org/apache/lucene/index/TestStressIndexing2.java b/src/test/org/apache/lucene/index/TestStressIndexing2.java
index 692316b..8c72210 100644
--- a/src/test/org/apache/lucene/index/TestStressIndexing2.java
+++ b/src/test/org/apache/lucene/index/TestStressIndexing2.java
@@ -139,7 +139,7 @@
IndexWriter w = new MockIndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE).setRAMBufferSizeMB(
0.1).setMaxBufferedDocs(maxBufferedDocs));
- LogMergePolicy lmp = (LogMergePolicy) w.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) w.getConfig().getMergePolicy();
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
lmp.setMergeFactor(mergeFactor);
@@ -190,7 +190,7 @@
IndexWriter w = new MockIndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(OpenMode.CREATE)
.setRAMBufferSizeMB(0.1).setMaxBufferedDocs(maxBufferedDocs).setMaxThreadStates(maxThreadStates));
- LogMergePolicy lmp = (LogMergePolicy) w.getMergePolicy();
+ LogMergePolicy lmp = (LogMergePolicy) w.getConfig().getMergePolicy();
lmp.setUseCompoundFile(false);
lmp.setUseCompoundDocStore(false);
lmp.setMergeFactor(mergeFactor);
diff --git a/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/src/test/org/apache/lucene/index/TestTermVectorsReader.java
index 87f1753..8c89c0f 100644
--- a/src/test/org/apache/lucene/index/TestTermVectorsReader.java
+++ b/src/test/org/apache/lucene/index/TestTermVectorsReader.java
@@ -93,8 +93,8 @@
Arrays.sort(tokens);
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MyAnalyzer()));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
Document doc = new Document();
for(int i=0;i<testFields.length;i++) {
final Field.TermVector tv;
diff --git a/src/test/org/apache/lucene/index/TestTermdocPerf.java b/src/test/org/apache/lucene/index/TestTermdocPerf.java
index 7a48e0e..4ce7eb9 100644
--- a/src/test/org/apache/lucene/index/TestTermdocPerf.java
+++ b/src/test/org/apache/lucene/index/TestTermdocPerf.java
@@ -74,7 +74,7 @@
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzer)
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(100));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(100);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(100);
for (int i=0; i<ndocs; i++) {
writer.addDocument(doc);
diff --git a/src/test/org/apache/lucene/index/TestThreadedOptimize.java b/src/test/org/apache/lucene/index/TestThreadedOptimize.java
index 6284a10..897ec10 100644
--- a/src/test/org/apache/lucene/index/TestThreadedOptimize.java
+++ b/src/test/org/apache/lucene/index/TestThreadedOptimize.java
@@ -62,7 +62,7 @@
for(int iter=0;iter<NUM_ITER;iter++) {
final int iterFinal = iter;
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(1000);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
for(int i=0;i<200;i++) {
Document d = new Document();
@@ -71,7 +71,7 @@
writer.addDocument(d);
}
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(4);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(4);
//writer.setInfoStream(System.out);
Thread[] threads = new Thread[NUM_THREADS];
diff --git a/src/test/org/apache/lucene/index/TestTransactions.java b/src/test/org/apache/lucene/index/TestTransactions.java
index e3ca574..854e560 100644
--- a/src/test/org/apache/lucene/index/TestTransactions.java
+++ b/src/test/org/apache/lucene/index/TestTransactions.java
@@ -93,13 +93,13 @@
public void doWork() throws Throwable {
IndexWriter writer1 = new IndexWriter(dir1, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(3));
- ((LogMergePolicy) writer1.getMergePolicy()).setMergeFactor(2);
+ ((LogMergePolicy) writer1.getConfig().getMergePolicy()).setMergeFactor(2);
((ConcurrentMergeScheduler) writer1.getConfig().getMergeScheduler()).setSuppressExceptions();
// Intentionally use different params so flush/merge
// happen @ different times
IndexWriter writer2 = new IndexWriter(dir2, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) writer2.getMergePolicy()).setMergeFactor(3);
+ ((LogMergePolicy) writer2.getConfig().getMergePolicy()).setMergeFactor(3);
((ConcurrentMergeScheduler) writer2.getConfig().getMergeScheduler()).setSuppressExceptions();
update(writer1);
diff --git a/src/test/org/apache/lucene/search/TestElevationComparator.java b/src/test/org/apache/lucene/search/TestElevationComparator.java
index 97313a5..06c09e0 100644
--- a/src/test/org/apache/lucene/search/TestElevationComparator.java
+++ b/src/test/org/apache/lucene/search/TestElevationComparator.java
@@ -36,7 +36,7 @@
public void testSorting() throws Throwable {
Directory directory = new MockRAMDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(1000);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
writer.addDocument(adoc(new String[] {"id", "a", "title", "ipod", "str_s", "a"}));
writer.addDocument(adoc(new String[] {"id", "b", "title", "ipod ipod", "str_s", "b"}));
writer.addDocument(adoc(new String[] {"id", "c", "title", "ipod ipod ipod", "str_s","c"}));
diff --git a/src/test/org/apache/lucene/search/TestSort.java b/src/test/org/apache/lucene/search/TestSort.java
index 2d4c46b..6b3dad4 100644
--- a/src/test/org/apache/lucene/search/TestSort.java
+++ b/src/test/org/apache/lucene/search/TestSort.java
@@ -109,7 +109,7 @@
IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(
TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(1000);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
for (int i=0; i<data.length; ++i) {
if (((i%2)==0 && even) || ((i%2)==1 && odd)) {
Document doc = new Document();
@@ -146,7 +146,7 @@
IndexWriter writer = new IndexWriter(indexStore, new IndexWriterConfig(
TEST_VERSION_CURRENT, new SimpleAnalyzer(
TEST_VERSION_CURRENT)).setMaxBufferedDocs(4));
- ((LogMergePolicy) writer.getMergePolicy()).setMergeFactor(97);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(97);
for (int i=0; i<NUM_STRINGS; i++) {
Document doc = new Document();
String num = getRandomCharString(getRandomNumber(2, 8), 48, 52);
diff --git a/src/test/org/apache/lucene/store/TestBufferedIndexInput.java b/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
index a920321..8156f04 100755
--- a/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
+++ b/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
@@ -248,7 +248,7 @@
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setOpenMode(OpenMode.CREATE));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
for(int i=0;i<37;i++) {
Document doc = new Document();
doc.add(new Field("content", "aaa bbb ccc ddd" + i, Field.Store.YES, Field.Index.ANALYZED));
diff --git a/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java b/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
index 8088fbb..3b03c2c 100644
--- a/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
+++ b/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
@@ -45,8 +45,8 @@
FileSwitchDirectory fsd = new FileSwitchDirectory(fileExtensions, primaryDir, secondaryDir, true);
IndexWriter writer = new IndexWriter(fsd, new IndexWriterConfig(TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundFile(false);
- ((LogMergePolicy) writer.getMergePolicy()).setUseCompoundDocStore(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
+ ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
TestIndexWriterReader.createIndexNoClose(true, "ram", writer);
IndexReader reader = writer.getReader();
assertEquals(100, reader.maxDoc());
diff --git a/src/test/org/apache/lucene/util/TestSetOnce.java b/src/test/org/apache/lucene/util/TestSetOnce.java
new file mode 100644
index 0000000..28c43eb
--- /dev/null
+++ b/src/test/org/apache/lucene/util/TestSetOnce.java
@@ -0,0 +1,103 @@
+package org.apache.lucene.util;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import static org.junit.Assert.*;
+
+import java.util.Random;
+
+import org.apache.lucene.util.SetOnce.AlreadySetException;
+import org.junit.Test;
+
+public class TestSetOnce extends LuceneTestCaseJ4 {
+
+ private static final class SetOnceThread extends Thread {
+ SetOnce<Integer> set;
+ boolean success = false;
+
+ @Override
+ public void run() {
+ try {
+ sleep(RAND.nextInt(10)); // sleep for a short time
+ set.set(new Integer(Integer.parseInt(getName().substring(2))));
+ success = true;
+ } catch (InterruptedException e) {
+ // ignore
+ } catch (RuntimeException e) {
+ // TODO: change exception type
+ // expected.
+ success = false;
+ }
+ }
+ }
+
+ private static final Random RAND = new Random();
+
+ @Test
+ public void testEmptyCtor() throws Exception {
+ SetOnce<Integer> set = new SetOnce<Integer>();
+ assertNull(set.get());
+ }
+
+ @Test(expected=AlreadySetException.class)
+ public void testSettingCtor() throws Exception {
+ SetOnce<Integer> set = new SetOnce<Integer>(new Integer(5));
+ assertEquals(5, set.get().intValue());
+ set.set(new Integer(7));
+ }
+
+ @Test(expected=AlreadySetException.class)
+ public void testSetOnce() throws Exception {
+ SetOnce<Integer> set = new SetOnce<Integer>();
+ set.set(new Integer(5));
+ assertEquals(5, set.get().intValue());
+ set.set(new Integer(7));
+ }
+
+ @Test
+ public void testSetMultiThreaded() throws Exception {
+ long seed = RAND.nextLong();
+ RAND.setSeed(seed);
+ if (VERBOSE) {
+ System.out.println("testSetMultiThreaded: seed=" + seed);
+ }
+ final SetOnce<Integer> set = new SetOnce<Integer>();
+ SetOnceThread[] threads = new SetOnceThread[10];
+ for (int i = 0; i < threads.length; i++) {
+ threads[i] = new SetOnceThread();
+ threads[i].setName("t-" + (i+1));
+ threads[i].set = set;
+ }
+
+ for (Thread t : threads) {
+ t.start();
+ }
+
+ for (Thread t : threads) {
+ t.join();
+ }
+
+ for (SetOnceThread t : threads) {
+ if (t.success) {
+ int expectedVal = Integer.parseInt(t.getName().substring(2));
+ assertEquals("thread " + t.getName(), expectedVal, t.set.get().intValue());
+ }
+ }
+ }
+
+}
