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 mr...@apache.org on 2017/07/18 12:41:23 UTC

svn commit: r1802287 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java

Author: mreutegg
Date: Tue Jul 18 12:41:23 2017
New Revision: 1802287

URL: http://svn.apache.org/viewvc?rev=1802287&view=rev
Log:
OAK-6466: Suppress NOP info message from revision GC

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java?rev=1802287&r1=1802286&r2=1802287&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java Tue Jul 18 12:41:23 2017
@@ -674,6 +674,9 @@ public class VersionGarbageCollector {
         }
 
         void updateResurrectedDocuments(VersionGCStats stats) throws IOException {
+            if (resurrectedIds.isEmpty()) {
+                return;
+            }
             int updateCount = resetDeletedOnce(resurrectedIds);
             resurrectedIds.clear();
             stats.updateResurrectedGCCount += updateCount;

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java?rev=1802287&r1=1802286&r2=1802287&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java Tue Jul 18 12:41:23 2017
@@ -221,10 +221,9 @@ public class VersionGCTest {
 
         gc.gc(1, TimeUnit.HOURS);
 
-        assertEquals(3, infoMessages.size());
+        assertEquals(2, infoMessages.size());
         assertTrue(infoMessages.get(0).startsWith("Looking at revisions"));
-        assertTrue(infoMessages.get(1).startsWith("Proceeding to reset"));
-        assertTrue(infoMessages.get(2).startsWith("Revision garbage collection finished"));
+        assertTrue(infoMessages.get(1).startsWith("Revision garbage collection finished"));
     }
 
     private Future<VersionGCStats> gc() {