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 md...@apache.org on 2017/03/01 17:26:25 UTC
svn commit: r1784999 - in /jackrabbit/oak/trunk:
oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/
oak-segmen...
Author: mduerig
Date: Wed Mar 1 17:26:24 2017
New Revision: 1784999
URL: http://svn.apache.org/viewvc?rev=1784999&view=rev
Log:
OAK-3690: Decouple SegmentBufferWriter from SegmentStore
Replace *Store.getTracker calls with getIdProvider calls
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java?rev=1784999&r1=1784998&r2=1784999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/SegmentTarExplorerBackend.java Wed Mar 1 17:26:24 2017
@@ -180,7 +180,7 @@ class SegmentTarExplorerBackend implemen
public Set<UUID> getReferencedSegmentIds() {
Set<UUID> ids = newHashSet();
- for (SegmentId id : store.getTracker().getReferencedSegmentIds()) {
+ for (SegmentId id : store.getReferencedSegmentIds()) {
ids.add(id.asUUID());
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java?rev=1784999&r1=1784998&r2=1784999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java Wed Mar 1 17:26:24 2017
@@ -72,7 +72,7 @@ public class SegmentBufferWriterPool imp
private final SegmentStore store;
@Nonnull
- private final SegmentTracker tracker;
+ private final SegmentIdProvider idProvider;
@Nonnull
private final SegmentReader reader;
@@ -87,12 +87,12 @@ public class SegmentBufferWriterPool imp
public SegmentBufferWriterPool(
@Nonnull SegmentStore store,
- @Nonnull SegmentTracker tracker,
+ @Nonnull SegmentIdProvider idProvider,
@Nonnull SegmentReader reader,
@Nonnull String wid,
@Nonnull Supplier<Integer> gcGeneration) {
this.store = checkNotNull(store);
- this.tracker = checkNotNull(tracker);
+ this.idProvider = checkNotNull(idProvider);
this.reader = checkNotNull(reader);
this.wid = checkNotNull(wid);
this.gcGeneration = checkNotNull(gcGeneration);
@@ -192,7 +192,7 @@ public class SegmentBufferWriterPool imp
if (writer == null) {
writer = new SegmentBufferWriter(
store,
- tracker,
+ idProvider,
reader,
getWriterId(wid),
gcGeneration.get()
@@ -201,7 +201,7 @@ public class SegmentBufferWriterPool imp
disposed.add(writer);
writer = new SegmentBufferWriter(
store,
- tracker,
+ idProvider,
reader,
getWriterId(wid),
gcGeneration.get()
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java?rev=1784999&r1=1784998&r2=1784999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriterBuilder.java Wed Mar 1 17:26:24 2017
@@ -200,7 +200,7 @@ public final class SegmentWriterBuilder
if (pooled) {
return new SegmentBufferWriterPool(
store,
- store.getTracker(),
+ store.getSegmentIdProvider(),
store.getReader(),
name,
generation
@@ -221,7 +221,7 @@ public final class SegmentWriterBuilder
if (pooled) {
return new SegmentBufferWriterPool(
store,
- store.getTracker(),
+ store.getSegmentIdProvider(),
store.getReader(),
name,
generation
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java?rev=1784999&r1=1784998&r2=1784999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java Wed Mar 1 17:26:24 2017
@@ -212,11 +212,6 @@ public abstract class AbstractFileStore
}
@Nonnull
- public SegmentTracker getTracker() {
- return tracker;
- }
-
- @Nonnull
public abstract SegmentWriter getWriter();
@Nonnull
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java?rev=1784999&r1=1784998&r2=1784999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReadOnlyFileStore.java Wed Mar 1 17:26:24 2017
@@ -243,4 +243,8 @@ public class ReadOnlyFileStore extends A
public ReadOnlyRevisions getRevisions() {
return revisions;
}
+
+ public Set<SegmentId> getReferencedSegmentIds() {
+ return tracker.getReferencedSegmentIds();
+ }
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java?rev=1784999&r1=1784998&r2=1784999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java Wed Mar 1 17:26:24 2017
@@ -84,11 +84,6 @@ public class MemoryStore implements Segm
}
@Nonnull
- public SegmentTracker getTracker() {
- return tracker;
- }
-
- @Nonnull
public SegmentWriter getWriter() {
return segmentWriter;
}
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java?rev=1784999&r1=1784998&r2=1784999&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPoolTest.java Wed Mar 1 17:26:24 2017
@@ -52,7 +52,7 @@ public class SegmentBufferWriterPoolTest
private final SegmentBufferWriterPool pool = new SegmentBufferWriterPool(
store,
- store.getTracker(),
+ store.getSegmentIdProvider(),
store.getReader(),
"",
Suppliers.ofInstance(0)