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 2016/05/17 15:39:07 UTC
svn commit: r1744288 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
SegmentTracker.java file/FileStore.java
Author: mduerig
Date: Tue May 17 15:39:06 2016
New Revision: 1744288
URL: http://svn.apache.org/viewvc?rev=1744288&view=rev
Log:
OAK-4373: Refactor SegmentTracker
Remove segment version
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java?rev=1744288&r1=1744287&r2=1744288&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentTracker.java Tue May 17 15:39:06 2016
@@ -108,11 +108,8 @@ public class SegmentTracker {
*/
private final AtomicInteger segmentCounter = new AtomicInteger();
- private final SegmentVersion segmentVersion;
-
public SegmentTracker(SegmentStore store, int cacheSizeMB, SegmentVersion version) {
checkArgument(SegmentVersion.isValid(version));
- this.segmentVersion = version;
for (int i = 0; i < tables.length; i++) {
tables[i] = new SegmentIdTable(this);
@@ -184,10 +181,6 @@ public class SegmentTracker {
return store;
}
- public SegmentVersion getSegmentVersion() {
- return segmentVersion;
- }
-
/**
* Clear the caches
*/
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1744288&r1=1744287&r2=1744288&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java Tue May 17 15:39:06 2016
@@ -1068,8 +1068,8 @@ public class FileStore implements Segmen
// FIXME OAK-4279: Rework offline compaction
// This way of compacting has no progress logging
final int gcGeneration = tracker.getGcGen() + 1;
- SegmentWriter writer = new SegmentWriter(this, tracker.getSegmentVersion(),
- new SegmentBufferWriter(this, tracker.getSegmentVersion(), "c", gcGeneration),
+ SegmentWriter writer = new SegmentWriter(this, version,
+ new SegmentBufferWriter(this, version, "c", gcGeneration),
new RecordCache<String>() {
@Override
protected Cache<String> getCache(int generation) {