You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2024/08/08 12:31:29 UTC
(jackrabbit-filevault) branch JCRVLT-768 created (now af303c42)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch JCRVLT-768
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
at af303c42 JCRVLT-768: vlt: when DEGUG logging stashing ops, add the IdConflictPolicy as well
This branch includes the following new commits:
new af303c42 JCRVLT-768: vlt: when DEGUG logging stashing ops, add the IdConflictPolicy as well
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-filevault) 01/01: JCRVLT-768: vlt: when DEGUG logging stashing ops, add the IdConflictPolicy as well
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch JCRVLT-768
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit af303c42e13eb3a8ea8891c2851d1dfba2cbb9a8
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Aug 8 13:30:53 2024 +0100
JCRVLT-768: vlt: when DEGUG logging stashing ops, add the IdConflictPolicy as well
---
.../apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java
index 3572276b..b341d05c 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/DocViewImporter.java
@@ -993,8 +993,9 @@ public class DocViewImporter implements DocViewParserHandler {
if (identifier.isPresent() && !node.getIdentifier().equals(identifier.get()) && !"rep:root".equals(ni.getPrimaryType().orElse(""))) {
long startTime = System.currentTimeMillis();
String previousIdentifier = node.getIdentifier();
- log.debug("Node stashing for {} starting, existing identifier: {}, new identifier: {}, import mode: {}",
- node.getPath(), previousIdentifier, identifier.get(), importMode);
+ log.debug(
+ "Node stashing for {} starting, existing identifier: {}, new identifier: {}, ImportMode: {}, IdConflictPoliy: {}",
+ node.getPath(), previousIdentifier, identifier.get(), importMode, idConflictPolicy);
NodeStash stash = new NodeStash(session, node.getPath());
stash.stash(importInfo);
Node parent = node.getParent();
@@ -1002,9 +1003,10 @@ public class DocViewImporter implements DocViewParserHandler {
node.remove();
updatedNode = createNewNode(parent, ni);
stash.recover(importMode, importInfo);
- log.debug("Node stashing for {} finished, previous identifier: {}, new identifier: {}, elapsed: {}, import mode: {}",
+ log.debug(
+ "Node stashing for {} finished, previous identifier: {}, new identifier: {}, elapsed: {}, ImportMode: {}, IdConflictPoliy: {}",
updatedNode.getPath(), previousIdentifier, updatedNode.getIdentifier(),
- Duration.ofMillis(System.currentTimeMillis() - startTime), importMode);
+ Duration.ofMillis(System.currentTimeMillis() - startTime), importMode, idConflictPolicy);
} else {
// TODO: is this faster than using sysview import?
// set new primary type (but never set rep:root)