Author: catholicon
Date: Sat Sep 23 09:11:10 2017
New Revision: 1809380
URL: http://svn.apache.org/viewvc?rev=1809380&view=rev
Log:
OAK-6704: Set default merge policy to TieredMergePolicy
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1809380&r1=1809379&r2=1809380&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
Sat Sep 23 09:11:10 2017
@@ -1519,9 +1519,9 @@ public final class IndexDefinition imple
if (mergePolicyName != null) {
if (mergePolicyName.equalsIgnoreCase("no")) {
mergePolicy = NoMergePolicy.COMPOUND_FILES;
- } else if (mergePolicyName.equalsIgnoreCase("mitigated") ||
mergePolicyName.equalsIgnoreCase("default")) {
+ } else if (mergePolicyName.equalsIgnoreCase("mitigated")) {
mergePolicy = new CommitMitigatingTieredMergePolicy();
- } else if (mergePolicyName.equalsIgnoreCase("tiered")) {
+ } else if (mergePolicyName.equalsIgnoreCase("tiered") ||
mergePolicyName.equalsIgnoreCase("default")) {
mergePolicy = new TieredMergePolicy();
} else if (mergePolicyName.equalsIgnoreCase("logbyte")) {
mergePolicy = new LogByteSizeMergePolicy();
@@ -1530,7 +1530,7 @@ public final class IndexDefinition imple
}
}
if (mergePolicy == null) {
- mergePolicy = new CommitMitigatingTieredMergePolicy();
+ mergePolicy = new TieredMergePolicy();
}
return mergePolicy;
}
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java?rev=1809380&r1=1809379&r2=1809380&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Sat Sep 23 09:11:10 2017
@@ -162,7 +162,7 @@ public class IndexDefinitionTest {
public void mergePolicyConfig() throws Exception{
IndexDefinition defn = new IndexDefinition(root,
builder.getNodeState(), "/foo");
assertNotNull(defn.getMergePolicy());
- assertEquals(CommitMitigatingTieredMergePolicy.class,
defn.getMergePolicy().getClass());
+ assertEquals(TieredMergePolicy.class,
defn.getMergePolicy().getClass());
builder.setProperty(LuceneIndexConstants.MERGE_POLICY_NAME, "tiered");
defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
@@ -187,7 +187,7 @@ public class IndexDefinitionTest {
builder.setProperty(LuceneIndexConstants.MERGE_POLICY_NAME, "default");
defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
assertNotNull(defn.getMergePolicy());
- assertEquals(CommitMitigatingTieredMergePolicy.class,
defn.getMergePolicy().getClass());
+ assertEquals(TieredMergePolicy.class,
defn.getMergePolicy().getClass());
builder.setProperty(LuceneIndexConstants.MERGE_POLICY_NAME,
"mitigated");
defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
@@ -198,7 +198,7 @@ public class IndexDefinitionTest {
builder.setProperty(LuceneIndexConstants.MERGE_POLICY_NAME,
"whoawhoa");
defn = new IndexDefinition(root, builder.getNodeState(), "/foo");
assertNotNull(defn.getMergePolicy());
- assertEquals(CommitMitigatingTieredMergePolicy.class,
defn.getMergePolicy().getClass());
+ assertEquals(TieredMergePolicy.class,
defn.getMergePolicy().getClass());
}
@Test
