Author: mreutegg
Date: Wed Jul 13 15:57:28 2016
New Revision: 1752448
URL: http://svn.apache.org/viewvc?rev=1752448&view=rev
Log:
OAK-4556: Track branch on newBranchCommit()
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1752448&r1=1752447&r2=1752448&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
Wed Jul 13 15:57:28 2016
@@ -59,7 +59,6 @@ public class Commit {
private static final Logger LOG = LoggerFactory.getLogger(Commit.class);
protected final DocumentNodeStore nodeStore;
- private final DocumentNodeStoreBranch branch;
private final RevisionVector baseRevision;
private final Revision revision;
private final HashMap<String, UpdateOp> operations = new
LinkedHashMap<String, UpdateOp>();
@@ -85,18 +84,13 @@ public class Commit {
* @param revision the revision for this commit.
* @param baseRevision the base revision for this commit or {@code null} if
* there is none.
- * @param branch the branch associated with this commit or {@code null} if
- * there is none.
- *
*/
Commit(@Nonnull DocumentNodeStore nodeStore,
@Nonnull Revision revision,
- @Nullable RevisionVector baseRevision,
- @Nullable DocumentNodeStoreBranch branch) {
+ @Nullable RevisionVector baseRevision) {
this.nodeStore = checkNotNull(nodeStore);
this.revision = checkNotNull(revision);
this.baseRevision = baseRevision;
- this.branch = branch;
}
UpdateOp getUpdateOperationForNode(String path) {
@@ -179,28 +173,13 @@ public class Commit {
boolean isBranch = baseRev != null && baseRev.isBranch();
Revision rev = getRevision();
if (isBranch && !nodeStore.isDisableBranches()) {
- rev = rev.asBranchRevision();
- // remember branch commit
- Branch b = nodeStore.getBranches().getBranch(baseRev);
- if (b == null) {
- // baseRev is marker for new branch
- b = nodeStore.getBranches().create(
- baseRev.asTrunkRevision(), rev, branch);
- LOG.debug("Branch created with base revision {} and " +
- "modifications on {}", baseRevision,
operations.keySet());
- if (LOG.isTraceEnabled()) {
- LOG.trace("Branch created", new Exception());
- }
- } else {
- b.addCommit(rev);
- }
try {
// prepare commit
prepare(baseRev);
success = true;
} finally {
if (!success) {
- b.removeCommit(rev);
+ b.removeCommit(rev.asBranchRevision());
if (!b.hasCommits()) {
nodeStore.getBranches().remove(b);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1752448&r1=1752447&r2=1752448&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
Wed Jul 13 15:57:28 2016
@@ -501,7 +501,7 @@ public final class DocumentNodeStore
if (rootDoc == null) {
// root node is missing: repository is not initialized
Revision commitRev = newRevision();
- Commit commit = new Commit(this, commitRev, null, null);
+ Commit commit = new Commit(this, commitRev, null);
RevisionVector head = new RevisionVector(commitRev);
DocumentNodeState n = new DocumentNodeState(this, "/", head);
commit.addNode(n);
@@ -771,6 +771,11 @@ public final class DocumentNodeStore
} finally {
backgroundOperationLock.readLock().unlock();
}
+ } else {
+ Branch b = branches.getBranch(c.getBaseRevision());
+ if (b != null) {
+ b.removeCommit(c.getRevision().asBranchRevision());
+ }
}
}
@@ -2219,7 +2224,7 @@ public final class DocumentNodeStore
Commit c;
try {
checkOpen();
- c = new Commit(this, commitQueue.createRevision(), base, null);
+ c = new Commit(this, commitQueue.createRevision(), base);
success = true;
} finally {
if (!success) {
@@ -2236,7 +2241,23 @@ public final class DocumentNodeStore
"base must be a branch revision: " + base);
checkOpen();
- return new Commit(this, newRevision(), base, branch);
+ Commit c = new Commit(this, newRevision(), base);
+ if (!isDisableBranches()) {
+ Revision rev = c.getRevision().asBranchRevision();
+ // remember branch commit
+ Branch b = getBranches().getBranch(base);
+ if (b == null) {
+ // baseRev is marker for new branch
+ getBranches().create(base.asTrunkRevision(), rev, branch);
+ LOG.debug("Branch created with base revision {}", base);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Branch created", new Exception());
+ }
+ } else {
+ b.addCommit(rev);
+ }
+ }
+ return c;
}
/**
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java?rev=1752448&r1=1752447&r2=1752448&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
Wed Jul 13 15:57:28 2016
@@ -35,7 +35,7 @@ class MergeCommit extends Commit {
MergeCommit(DocumentNodeStore nodeStore,
RevisionVector baseRevision,
SortedSet<Revision> revisions) {
- super(nodeStore, revisions.last(), baseRevision, null);
+ super(nodeStore, revisions.last(), baseRevision);
this.mergeRevs = revisions;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java?rev=1752448&r1=1752447&r2=1752448&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
Wed Jul 13 15:57:28 2016
@@ -179,7 +179,7 @@ class UnsavedModifications {
int size = pathList.size();
if (updateOp == null) {
// create UpdateOp
- Commit commit = new Commit(store, r, null, null);
+ Commit commit = new Commit(store, r, null);
updateOp = commit.getUpdateOperationForNode(p);
NodeDocument.setLastRev(updateOp, r);
lastRev = r;
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1752448&r1=1752447&r2=1752448&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
Wed Jul 13 15:57:28 2016
@@ -265,7 +265,7 @@ public class DocumentNodeStoreTest {
public void run() {
try {
Revision r = store.newRevision();
- Commit c = new Commit(store, r, head, null);
+ Commit c = new Commit(store, r, head);
c.addNode(new DocumentNodeState(store,
"/newConflictingNode", new RevisionVector(r)));
c.addNode(new DocumentNodeState(store, "/deletedNode", new
RevisionVector(r)));
c.updateProperty("/updateNode", "foo", "baz");
@@ -283,7 +283,7 @@ public class DocumentNodeStoreTest {
created.acquireUninterruptibly();
// commit will succeed and add collision marker to writer commit
Revision r = store.newRevision();
- Commit c = new Commit(store, r, head, null);
+ Commit c = new Commit(store, r, head);
c.addNode(new DocumentNodeState(store, "/newConflictingNode", new
RevisionVector(r)));
c.addNode(new DocumentNodeState(store, "/newNonConflictingNode", new
RevisionVector(r)));
c.apply();
