svn commit: r1862927 - in /jackrabbit/oak/trunk/oak-store-document/src: main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java

[reschke]

Author: reschke
Date: Thu Jul 11 13:54:21 2019
New Revision: 1862927

URL: http://svn.apache.org/viewvc?rev=1862927&view=rev
Log:
OAK-8476: RDBVersionGCSupport returns incorrect value for "oldest deleted 
document"

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java?rev=1862927&r1=1862926&r2=1862927&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBVersionGCSupport.java
 Thu Jul 11 13:54:21 2019
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.jackrabbit.oak.plugins.document.Collection;
 import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
@@ -177,9 +178,10 @@ public class RDBVersionGCSupport extends
 
         LOG.debug("getOldestDeletedOnceTimestamp() <- start");
         try {
-            modifiedMs = store.getMinValue(Collection.NODES, 
NodeDocument.MODIFIED_IN_SECS, null, null,
+            long modifiedSec = store.getMinValue(Collection.NODES, 
NodeDocument.MODIFIED_IN_SECS, null, null,
                     RDBDocumentStore.EMPTY_KEY_PATTERN,
                     Collections.singletonList(new 
QueryCondition(NodeDocument.DELETED_ONCE, "=", 1)));
+            modifiedMs = TimeUnit.SECONDS.toMillis(modifiedSec);
         } catch (DocumentStoreException ex) {
             LOG.debug("getMinValue(MODIFIED)", ex);
         }

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java?rev=1862927&r1=1862926&r2=1862927&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java
 Thu Jul 11 13:54:21 2019
@@ -32,7 +32,6 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -128,8 +127,8 @@ public class VersionGCSupportTest {
     }
 
     @Test
-    @Ignore("OAK-8476")
     public void findOldest() {
+        // see OAK-8476
         long secs = 123456;
         long offset = SECONDS.toMillis(secs);
         Revision r = new Revision(offset, 0, 1);