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/08/07 13:58:50 UTC
svn commit: r1804336 - in
/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment:
DefaultSegmentWriter.java file/FileStoreBuilder.java
Author: mduerig
Date: Mon Aug 7 13:58:49 2017
New Revision: 1804336
URL: http://svn.apache.org/viewvc?rev=1804336&view=rev
Log:
OAK-6519: Properly handle tail compactions in deduplication caches
Remove FIXMEs as this has been fixed along with OAK-6504 in r1804332
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java?rev=1804336&r1=1804335&r2=1804336&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java Mon Aug 7 13:58:49 2017
@@ -272,7 +272,6 @@ public class DefaultSegmentWriter implem
SegmentWriteOperation with(@Nonnull SegmentBufferWriter writer) {
checkState(this.writer == null);
this.writer = writer;
- // FIXME OAK-6519: Properly handle tail compactions in deduplication caches
int generation = writer.getGCGeneration().getGeneration();
this.stringCache = cacheManager.getStringCache(generation);
this.templateCache = cacheManager.getTemplateCache(generation);
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java?rev=1804336&r1=1804335&r2=1804336&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreBuilder.java Mon Aug 7 13:58:49 2017
@@ -102,7 +102,6 @@ public class FileStoreBuilder {
public void compactionSucceeded(@Nonnull GCGeneration newGeneration) {
compacted();
if (cacheManager != null) {
- // FIXME OAK-6519: Properly handle tail compactions in deduplication caches
cacheManager.evictOldGeneration(newGeneration.getGeneration());
}
}
@@ -110,7 +109,6 @@ public class FileStoreBuilder {
@Override
public void compactionFailed(@Nonnull GCGeneration failedGeneration) {
if (cacheManager != null) {
- // FIXME OAK-6519: Properly handle tail compactions in deduplication caches
cacheManager.evictGeneration(failedGeneration.getGeneration());
}
}