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 mr...@apache.org on 2019/09/18 13:04:23 UTC
svn commit: r1867114 - in
/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document:
CommitDiff.java DocumentNodeStoreBranch.java
Author: mreutegg
Date: Wed Sep 18 13:04:22 2019
New Revision: 1867114
URL: http://svn.apache.org/viewvc?rev=1867114&view=rev
Log:
OAK-8634: Decouple CommitDiff from DocumentNodeStore
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java?rev=1867114&r1=1867113&r2=1867114&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java Wed Sep 18 13:04:22 2019
@@ -38,8 +38,6 @@ import static org.apache.jackrabbit.oak.
*/
class CommitDiff implements NodeStateDiff {
- private final DocumentNodeStore store;
-
private final CommitBuilder commit;
private final JsopBuilder builder;
@@ -48,18 +46,18 @@ class CommitDiff implements NodeStateDif
private final BundlingHandler bundlingHandler;
- CommitDiff(@NotNull DocumentNodeStore store,
+ CommitDiff(@NotNull BundlingHandler bundlingHandler,
@NotNull CommitBuilder commitBuilder,
@NotNull BlobSerializer blobs) {
- this(checkNotNull(store), checkNotNull(commitBuilder),
- store.getBundlingConfigHandler().newBundlingHandler(),
+ this(checkNotNull(commitBuilder),
+ checkNotNull(bundlingHandler),
new JsopBuilder(), checkNotNull(blobs));
}
- private CommitDiff(DocumentNodeStore store, CommitBuilder commitBuilder,
- BundlingHandler bundlingHandler, JsopBuilder builder,
+ private CommitDiff(CommitBuilder commitBuilder,
+ BundlingHandler bundlingHandler,
+ JsopBuilder builder,
BlobSerializer blobs) {
- this.store = store;
this.commit = commitBuilder;
this.bundlingHandler = bundlingHandler;
this.builder = builder;
@@ -93,7 +91,7 @@ class CommitDiff implements NodeStateDif
}
setOrTouchChildrenFlag(child);
return after.compareAgainstBaseState(EMPTY_NODE,
- new CommitDiff(store, commit, child, builder, blobs));
+ new CommitDiff(commit, child, builder, blobs));
}
@Override
@@ -105,7 +103,7 @@ class CommitDiff implements NodeStateDif
//would still impact even though new nodetype does not have bundling enabled
BundlingHandler child = bundlingHandler.childChanged(name, before, after);
return after.compareAgainstBaseState(before,
- new CommitDiff(store, commit, child, builder, blobs));
+ new CommitDiff(commit, child, builder, blobs));
}
@Override
@@ -116,7 +114,7 @@ class CommitDiff implements NodeStateDif
}
setOrTouchChildrenFlag(child);
return MISSING_NODE.compareAgainstBaseState(before,
- new CommitDiff(store, commit, child, builder, blobs));
+ new CommitDiff(commit, child, builder, blobs));
}
/**
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java?rev=1867114&r1=1867113&r2=1867114&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java Wed Sep 18 13:04:22 2019
@@ -282,7 +282,9 @@ class DocumentNodeStoreBranch implements
return persist(new Changes() {
@Override
public void with(@NotNull CommitBuilder commitBuilder) {
- CommitDiff diff = new CommitDiff(store, commitBuilder, store.getBlobSerializer());
+ CommitDiff diff = new CommitDiff(
+ store.getBundlingConfigHandler().newBundlingHandler(),
+ commitBuilder, store.getBlobSerializer());
toPersist.compareAgainstBaseState(base, diff);
stats.numDocuments += diff.getNumChanges();
}