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 ju...@apache.org on 2014/06/16 18:10:31 UTC
svn commit: r1602914 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Author: jukka
Date: Mon Jun 16 16:10:31 2014
New Revision: 1602914
URL: http://svn.apache.org/r1602914
Log:
OAK-1804: TarMK compaction
With the compaction feature in place there's no more need to explicitly
flush the segment writer whenever checkpoints are added or removed.
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java?rev=1602914&r1=1602913&r2=1602914&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStore.java Mon Jun 16 16:10:31 2014
@@ -206,7 +206,6 @@ public class SegmentNodeStore implements
if (commitSemaphore.tryAcquire()) {
try {
refreshHead();
- store.getTracker().getWriter().flush();
SegmentNodeState state = head.get();
SegmentNodeBuilder builder = state.builder();
@@ -227,7 +226,6 @@ public class SegmentNodeStore implements
cp.setChildNode(ROOT, state.getChildNode(ROOT));
SegmentNodeState newState = builder.getNodeState();
- store.getTracker().getWriter().flush();
if (store.setHead(state, newState)) {
refreshHead();
return name;
@@ -264,7 +262,6 @@ public class SegmentNodeStore implements
if (commitSemaphore.tryAcquire()) {
try {
refreshHead();
- store.getTracker().getWriter().flush();
SegmentNodeState state = head.get();
SegmentNodeBuilder builder = state.builder();
@@ -275,7 +272,6 @@ public class SegmentNodeStore implements
cp.remove();
}
SegmentNodeState newState = builder.getNodeState();
- store.getTracker().getWriter().flush();
if (store.setHead(state, newState)) {
refreshHead();
return;