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 2014/11/27 12:41:41 UTC
svn commit: r1642117 - in /jackrabbit/oak/branches/1.0: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
Author: chetanm
Date: Thu Nov 27 11:41:41 2014
New Revision: 1642117
URL: http://svn.apache.org/r1642117
Log:
OAK-2268: Support index time Aggregation of repository nodes
Merging 1642056
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1642056
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1642117&r1=1642116&r2=1642117&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java Thu Nov 27 11:41:41 2014
@@ -416,7 +416,7 @@ class IndexDefinition implements Aggrega
definedIndexRules.add(rule);
// register under node type and all its sub types
- log.debug("Found rule '{}' for NodeType '{}'", rule, rule.getNodeTypeName());
+ log.trace("Found rule '{}' for NodeType '{}'", rule, rule.getNodeTypeName());
List<String> ntNames = allNames;
if (!rule.inherited){
@@ -432,7 +432,7 @@ class IndexDefinition implements Aggrega
perNtConfig = new ArrayList<IndexingRule>();
nt2rules.put(ntName, perNtConfig);
}
- log.debug("Registering it for name '{}'", ntName);
+ log.trace("Registering rule '{}' for name '{}'", rule, ntName);
perNtConfig.add(new IndexingRule(rule, ntName));
}
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java?rev=1642117&r1=1642116&r2=1642117&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java Thu Nov 27 11:41:41 2014
@@ -99,11 +99,11 @@ class IndexPlanner {
}
private IndexPlan.Builder getPlanBuilder() {
- log.debug("Evaluating plan with index definition {}", defn);
+ log.trace("Evaluating plan with index definition {}", defn);
FullTextExpression ft = filter.getFullTextConstraint();
if (!defn.getVersion().isAtLeast(IndexFormatVersion.V2)){
- log.debug("Index is old format. Not supported");
+ log.trace("Index is old format. Not supported");
return null;
}
@@ -331,11 +331,13 @@ class IndexPlanner {
//some condition defined. So again find a rule which applies
IndexingRule matchingRule = defn.getApplicableIndexingRule(rule.getNodeTypeName());
if (matchingRule != null){
+ log.debug("Applicable IndexingRule found {}", matchingRule);
return rule;
}
}
}
- log.debug("No applicable IndexingRule found for any of the superTypes {}", filter.getSupertypes());
+ log.trace("No applicable IndexingRule found for any of the superTypes {}",
+ filter.getSupertypes());
}
return null;
}