You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2016/05/05 08:48:54 UTC
svn commit: r1742376 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinitionTest.java
Author: chetanm
Date: Thu May 5 08:48:54 2016
New Revision: 1742376
URL: http://svn.apache.org/viewvc?rev=1742376&view=rev
Log:
OAK-4300 - Cost per entry for Lucene index of type v1 should be higher than that of v2
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=1742376&r1=1742375&r2=1742376&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 Thu May 5 08:48:54 2016
@@ -270,7 +270,7 @@ class IndexDefinition implements Aggrega
}
this.maxFieldLength = getOptionalValue(defn, LuceneIndexConstants.MAX_FIELD_LENGTH, DEFAULT_MAX_FIELD_LENGTH);
- this.costPerEntry = getOptionalValue(defn, LuceneIndexConstants.COST_PER_ENTRY, 1.0);
+ this.costPerEntry = getOptionalValue(defn, LuceneIndexConstants.COST_PER_ENTRY, getDefaultCostPerEntry(version));
this.costPerExecution = getOptionalValue(defn, LuceneIndexConstants.COST_PER_EXECUTION, 1.0);
this.indexesAllTypes = areAllTypesIndexed();
this.analyzers = collectAnalyzers(defn);
@@ -1512,4 +1512,10 @@ class IndexDefinition implements Aggrega
return activeDelete >= 0;
}
+ private static double getDefaultCostPerEntry(IndexFormatVersion version) {
+ //For older format cost per entry would be higher as it does a runtime
+ //aggregation
+ return version == IndexFormatVersion.V1 ? 1.5 : 1.0;
+ }
+
}
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=1742376&r1=1742375&r2=1742376&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 Thu May 5 08:48:54 2016
@@ -835,6 +835,17 @@ public class IndexDefinitionTest {
}
+ @Test
+ public void costPerEntryForOlderVersion() throws Exception{
+ builder.setProperty(LuceneIndexConstants.COMPAT_MODE, 2);
+ IndexDefinition defn = new IndexDefinition(root, builder.getNodeState());
+ assertEquals(1.0, defn.getCostPerEntry(), 0.0);
+
+ builder.setProperty(LuceneIndexConstants.COMPAT_MODE, 1);
+ defn = new IndexDefinition(root, builder.getNodeState());
+ assertEquals(1.5, defn.getCostPerEntry(), 0.0);
+ }
+
//TODO indexesAllNodesOfMatchingType - with nullCheckEnabled
private static IndexingRule getRule(IndexDefinition defn, String typeName){