Author: chetanm
Date: Thu Jun 11 09:06:39 2015
New Revision: 1684836
URL: http://svn.apache.org/r1684836
Log:
OAK-2926 - Fast result size estimate
Use parametrized logging to avoid unnecessary Query.toString evaluation
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1684836&r1=1684835&r2=1684836&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
Thu Jun 11 09:06:39 2015
@@ -458,12 +458,13 @@ public class LuceneIndex implements Adva
nonFullTextConstraints, indexNode.getDefinition());
if (luceneRequestFacade.getLuceneRequest() instanceof
Query) {
Query query = (Query)
luceneRequestFacade.getLuceneRequest();
- LOG.debug("estimate size for query " + query);
TotalHitCountCollector collector = new
TotalHitCountCollector();
searcher.search(query, collector);
- return collector.getTotalHits();
+ int totalHits = collector.getTotalHits();
+ LOG.debug("Estimated size for query {} is {}", query,
totalHits);
+ return totalHits;
}
- LOG.debug("estimate size: not a Query: " +
luceneRequestFacade.getLuceneRequest());
+ LOG.debug("Estimated size: not a Query: {}",
luceneRequestFacade.getLuceneRequest());
} catch (IOException e) {
LOG.warn("query via {} failed.", LuceneIndex.this, e);
} finally {
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1684836&r1=1684835&r2=1684836&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
Thu Jun 11 09:06:39 2015
@@ -461,12 +461,13 @@ public class LucenePropertyIndex impleme
LuceneRequestFacade luceneRequestFacade =
getLuceneRequest(plan, searcher.getIndexReader());
if (luceneRequestFacade.getLuceneRequest() instanceof
Query) {
Query query = (Query)
luceneRequestFacade.getLuceneRequest();
- LOG.debug("estimate size for query " + query);
TotalHitCountCollector collector = new
TotalHitCountCollector();
searcher.search(query, collector);
- return collector.getTotalHits();
+ int totalHits = collector.getTotalHits();
+ LOG.debug("Estimated size for query {} is {}", query,
totalHits);
+ return totalHits;
}
- LOG.debug("estimate size: not a Query: " +
luceneRequestFacade.getLuceneRequest());
+ LOG.debug("estimate size: not a Query: {}",
luceneRequestFacade.getLuceneRequest());
} catch (IOException e) {
LOG.warn("query via {} failed.", LucenePropertyIndex.this,
e);
} finally {
