svn commit: r1774629 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: compaction/SegmentRevisionGC.java compaction/SegmentRevisionGCMBean.java file/FileStoreGCMonitor.java

[adulceanu]

Author: adulceanu
Date: Fri Dec 16 15:46:37 2016
New Revision: 1774629

URL: http://svn.apache.org/viewvc?rev=1774629&view=rev
Log:
    OAK-5189 - SegmentRevisionGC should expose unformatted timestamps

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGC.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGC.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGC.java?rev=1774629&r1=1774628&r2=1774629&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGC.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGC.java
 Fri Dec 16 15:46:37 2016
@@ -115,16 +115,14 @@ public interface SegmentRevisionGC {
     void cancelRevisionGC();
 
     /**
-     * @return  timestamp of the last compaction or {@code null} if none.
+     * @return  time of the last compaction in milliseconds.
      */
-    @CheckForNull
-    String getLastCompaction();
+    long getLastCompaction();
 
     /**
-     * @return  timestamp of the last cleanup or {@code null} if none.
+     * @return  time of the last cleanup in milliseconds.
      */
-    @CheckForNull
-    String getLastCleanup();
+    long getLastCleanup();
 
     /**
      * @return  repository size after the last cleanup.

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java?rev=1774629&r1=1774628&r2=1774629&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/compaction/SegmentRevisionGCMBean.java
 Fri Dec 16 15:46:37 2016
@@ -123,15 +123,13 @@ public class SegmentRevisionGCMBean
         fileStore.cancelGC();
     }
 
-    @CheckForNull
     @Override
-    public String getLastCompaction() {
+    public long getLastCompaction() {
         return fileStoreGCMonitor.getLastCompaction();
     }
 
-    @CheckForNull
     @Override
-    public String getLastCleanup() {
+    public long getLastCleanup() {
         return fileStoreGCMonitor.getLastCleanup();
     }
 

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java?rev=1774629&r1=1774628&r2=1774629&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStoreGCMonitor.java
 Fri Dec 16 15:46:37 2016
@@ -20,12 +20,10 @@
 package org.apache.jackrabbit.oak.segment.file;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static java.text.DateFormat.getDateTimeInstance;
 import static org.slf4j.helpers.MessageFormatter.arrayFormat;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Date;
 
 import javax.annotation.Nonnull;
 
@@ -93,12 +91,12 @@ public class FileStoreGCMonitor implemen
         this.status = status;
     }
 
-    public String getLastCompaction() {
-        return toString(lastCompaction);
+    public long getLastCompaction() {
+        return lastCompaction;
     }
 
-    public String getLastCleanup() {
-        return toString(lastCleanup);
+    public long getLastCleanup() {
+        return lastCleanup;
     }
 
     public long getLastRepositorySize() {
@@ -109,14 +107,6 @@ public class FileStoreGCMonitor implemen
         return lastReclaimedSize;
     }
 
-    private static String toString(long timestamp) {
-        if (timestamp != 0) {
-            return getDateTimeInstance().format(new Date(timestamp));
-        } else {
-            return null;
-        }
-    }
-
     public String getLastError() {
         return lastError;
     }