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 2015/04/10 12:11:01 UTC
svn commit: r1672607 - in /jackrabbit/oak/branches/1.2: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Author: chetanm
Date: Fri Apr 10 10:11:00 2015
New Revision: 1672607
URL: http://svn.apache.org/r1672607
Log:
OAK-2473 - Log time taken in couple of places in indexing
Merging 1672603
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 10:11:00 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672468,1672537
+/jackrabbit/oak/trunk:1672468,1672537,1672603
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1672607&r1=1672606&r2=1672607&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java Fri Apr 10 10:11:00 2015
@@ -36,6 +36,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.apache.jackrabbit.oak.util.PerfLogger;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
@@ -55,6 +56,9 @@ public class LuceneIndexEditorContext {
private static final Logger log = LoggerFactory
.getLogger(LuceneIndexEditorContext.class);
+ private static final PerfLogger PERF_LOGGER =
+ new PerfLogger(LoggerFactory.getLogger(LuceneIndexEditorContext.class.getName() + ".perf"));
+
private static IndexWriterConfig getIndexWriterConfig(IndexDefinition definition) {
// FIXME: Hack needed to make Lucene work in an OSGi environment
Thread thread = Thread.currentThread();
@@ -139,7 +143,9 @@ public class LuceneIndexEditorContext {
IndexWriter getWriter() throws IOException {
if (writer == null) {
+ final long start = PERF_LOGGER.start();
writer = new IndexWriter(newIndexDirectory(definition, definitionBuilder), config);
+ PERF_LOGGER.end(start, -1, "Created IndexWriter for directory {}", definition);
}
return writer;
}
@@ -157,7 +163,7 @@ public class LuceneIndexEditorContext {
}
if (writer != null) {
-
+ final long start = PERF_LOGGER.start();
updateSuggester();
writer.close();
@@ -168,6 +174,7 @@ public class LuceneIndexEditorContext {
NodeBuilder status = definitionBuilder.child(":status");
status.setProperty("lastUpdated", ISO8601.format(Calendar.getInstance()), Type.DATE);
status.setProperty("indexedNodes",indexedNodes);
+ PERF_LOGGER.end(start, -1, "Closed IndexWriter for directory {}", definition);
}
}