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 2015/10/13 10:02:50 UTC
svn commit: r1708298 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionMapTest.java
Author: mduerig
Date: Tue Oct 13 08:02:50 2015
New Revision: 1708298
URL: http://svn.apache.org/viewvc?rev=1708298&view=rev
Log:
OAK-3511: Test failure: CompactionMapTest.removeSome
Unconditionally clear recent keys on compress
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionMapTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java?rev=1708298&r1=1708297&r2=1708298&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/PersistedCompactionMap.java Tue Oct 13 08:02:50 2015
@@ -229,9 +229,9 @@ public class PersistedCompactionMap impl
", baseId=" + previousBaseId + '}';
writer.writeString(mapInfo);
writer.flush();
- recent.clear();
}
+ recent.clear();
if (recordCount == 0) {
entries = null;
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionMapTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionMapTest.java?rev=1708298&r1=1708297&r2=1708298&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionMapTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionMapTest.java Tue Oct 13 08:02:50 2015
@@ -46,7 +46,6 @@ import javax.annotation.Nonnull;
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
import org.junit.After;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -213,7 +212,6 @@ public class CompactionMapTest {
* See OAK-3511
*/
@Test
- @Ignore("OAK-3511") // FIXME OAK-3511
public void removeRecentKey() {
compactionMap1.compress();