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 re...@apache.org on 2015/04/16 18:20:08 UTC
svn commit: r1674108 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java
Author: reschke
Date: Thu Apr 16 16:20:07 2015
New Revision: 1674108
URL: http://svn.apache.org/r1674108
Log:
OAK-2781 - log time spent for repository scan upon node type change (ported to 1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 16 16:20:07 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672834-1672835,1673351,1673410,1673436,1673644,1673662-1673664,1673669,1673695,1674075
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672834-1672835,1673351,1673410,1673436,1673644,1673662-1673664,1673669,1673695,1674075,1674107
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java?rev=1674108&r1=1674107&r2=1674108&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditorProvider.java Thu Apr 16 16:20:07 2015
@@ -34,11 +34,15 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.VisibleEditor;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@Component
@Service(EditorProvider.class)
public class TypeEditorProvider implements EditorProvider {
+ private static final Logger LOG = LoggerFactory.getLogger(TypeEditorProvider.class);
+
private final boolean strict;
public TypeEditorProvider(boolean strict) {
@@ -69,6 +73,7 @@ public class TypeEditorProvider implemen
Set<String> modifiedTypes =
registration.getModifiedTypes(beforeTypes);
if (!modifiedTypes.isEmpty()) {
+ long start = System.currentTimeMillis();
// Some node types were modified, so scan the repository
// to make sure that the modified definitions still apply.
Editor editor = new VisibleEditor(new TypeEditor(
@@ -76,6 +81,8 @@ public class TypeEditorProvider implemen
primary, mixins, builder));
CommitFailedException exception =
EditorDiff.process(editor, MISSING_NODE, after);
+ LOG.info("Node type changes: " + modifiedTypes + "; repository scan took " + (System.currentTimeMillis() - start)
+ + "ms" + (exception == null ? "" : "; failed with " + exception.getMessage()));
if (exception != null) {
throw exception;
}