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 2023/04/11 12:38:05 UTC
[jackrabbit-filevault] branch JCRVLT-697 updated: JCRVLT-697: count stash ops towards autosave limit
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch JCRVLT-697
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/JCRVLT-697 by this push:
new db46270a JCRVLT-697: count stash ops towards autosave limit
db46270a is described below
commit db46270a825166b92d20e680d54897aaca48e2b4
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Apr 11 13:37:55 2023 +0100
JCRVLT-697: count stash ops towards autosave limit
---
.../org/apache/jackrabbit/vault/fs/api/ImportInfo.java | 8 +++++++-
.../org/apache/jackrabbit/vault/fs/api/package-info.java | 2 +-
.../jackrabbit/vault/fs/impl/io/DocViewImporter.java | 2 +-
.../jackrabbit/vault/fs/impl/io/ImportInfoImpl.java | 8 +++++++-
.../vault/fs/impl/io/JcrSysViewTransformer.java | 2 +-
.../org/apache/jackrabbit/vault/fs/impl/io/NodeStash.java | 15 ++++++++++++---
6 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/ImportInfo.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/ImportInfo.java
index 116d2063..f3077d66 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/ImportInfo.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/ImportInfo.java
@@ -51,6 +51,12 @@ public interface ImportInfo {
*/
void onCreated(String path);
+ /**
+ * Marks that the child node at {@code path} was moved due to stashing.
+ * @param path the path
+ */
+ void onStashed(String path);
+
/**
* Marks that the node at {@code path} was deleted.
* @param path the path
@@ -125,7 +131,7 @@ public interface ImportInfo {
* @return a new, merged info.
*/
ImportInfo merge(ImportInfo info);
-
+
/**
* returns the number of non-NOP entries.
* @return the number of modified entries.
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java
index 625d01f4..c48c58ce 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/api/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-@Version("2.11.0")
+@Version("3.0.0")
package org.apache.jackrabbit.vault.fs.api;
import org.osgi.annotation.versioning.Version;
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 7ac3f3ad..97a01b7b 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
@@ -971,7 +971,7 @@ public class DocViewImporter implements DocViewParserHandler {
// try to set uuid via sysview import if it differs from existing one
if (identifier.isPresent() && !node.getIdentifier().equals(identifier.get()) && !"rep:root".equals(ni.getPrimaryType().orElse(""))) {
NodeStash stash = new NodeStash(session, node.getPath());
- stash.stash();
+ stash.stash(importInfo);
Node parent = node.getParent();
removeReferences(node);
node.remove();
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/ImportInfoImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/ImportInfoImpl.java
index e09f7979..2106cb21 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/ImportInfoImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/ImportInfoImpl.java
@@ -158,6 +158,12 @@ public class ImportInfoImpl implements ImportInfo {
numErrors++;
}
+ @Override
+ public void onStashed(String path) {
+ // path currently unused
+ numModified += 1;
+ }
+
/**
* remembers that a package path was remapped during import. e.g. when the importer follows and existing
* authorizable for MERGE and UPDATE modes.
@@ -211,7 +217,7 @@ public class ImportInfoImpl implements ImportInfo {
public Collection<String> getToVersion() {
return toVersion;
}
-
+
public void registerToVersion(String path) {
toVersion.add(path);
}
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JcrSysViewTransformer.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JcrSysViewTransformer.java
index 22b75c86..e7e18a91 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JcrSysViewTransformer.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/JcrSysViewTransformer.java
@@ -110,7 +110,7 @@ public class JcrSysViewTransformer implements DocViewAdapter {
if (existingPath != null) {
// check if there is an existing node with the name
recovery = new NodeStash(session, existingPath).excludeName("rep:cache");
- recovery.stash();
+ recovery.stash(null);
}
excludeNode(NAME_REP_CACHE);
this.importMode = importMode;
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/NodeStash.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/NodeStash.java
index d6a4afc8..8629a53a 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/NodeStash.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/io/NodeStash.java
@@ -114,7 +114,7 @@ public class NodeStash {
* Moves the child nodes and optionally properties of the path to a temporary location.
* @return the stashed node's primary type (if it needs to be kept)
*/
- public @Nullable String stash() {
+ public @Nullable String stash(@Nullable ImportInfo importInfo) {
try {
Node parent = session.getNode(path);
Node tmp = getOrCreateTemporaryNode();
@@ -131,8 +131,12 @@ public class NodeStash {
continue;
}
try {
- session.move(child.getPath(), tmp.getPath() + "/" + name);
+ String path = child.getPath();
+ session.move(path, tmp.getPath() + "/" + name);
childNodeCount += 1;
+ if (importInfo != null) {
+ importInfo.onStashed(path);
+ }
} catch (RepositoryException e) {
log.error("Error while moving child node to temporary location. Child will be removed.", e);
}
@@ -183,6 +187,7 @@ public class NodeStash {
Node parent = session.getNode(path);
NodeIterator iter = tmpNode.getNodes();
boolean hasErrors = false;
+
while (iter.hasNext()) {
Node child = iter.nextNode();
String newPath = parent.getPath() + "/" + child.getName();
@@ -190,7 +195,11 @@ public class NodeStash {
if (session.nodeExists(newPath)) {
log.debug("Skipping restore from temporary location {} as node already exists at {}", child.getPath(), newPath);
} else {
- session.move(child.getPath(), newPath);
+ String path = child.getPath();
+ session.move(path, newPath);
+ if (importInfo != null) {
+ importInfo.onStashed(path);
+ }
}
} catch (RepositoryException e) {
log.warn(