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 am...@apache.org on 2016/10/24 04:50:47 UTC
svn commit: r1766336 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob: CompositeDataStoreCache.java UploadStagingCache.java

Author: amitj
Date: Mon Oct 24 04:50:47 2016
New Revision: 1766336

URL: http://svn.apache.org/viewvc?rev=1766336&view=rev
Log:
OAK-4979: Caching sub-system implementation for DataStore

@trivial marking purgeInterval in seconds

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java?rev=1766336&r1=1766335&r2=1766336&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CompositeDataStoreCache.java Mon Oct 24 04:50:47 2016
@@ -64,7 +64,7 @@ public class CompositeDataStoreCache ext
         final StagingUploader uploader, StatisticsProvider statsProvider,
         ListeningExecutorService executor,
         ScheduledExecutorService scheduledExecutor /* purge scheduled executor */,
-        long purgeInterval /* async purge interval */) {
+        long purgeInterval /* async purge interval secs */) {
 
         checkArgument(uploadSplitPercentage >= 0 && uploadSplitPercentage < 100,
             "Upload percentage should be between 0 and 100");

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java?rev=1766336&r1=1766335&r2=1766336&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java Mon Oct 24 04:50:47 2016
@@ -67,9 +67,6 @@ import static org.apache.jackrabbit.oak.
  * The appropriate backend for this cache are wrapped in {@link StagingUploader}
  * implementations.
  * <p>
- * Stats:
- * - Status for a particular upload
- * - Upload time
  */
 public class UploadStagingCache implements Closeable {
     /**
@@ -140,7 +137,7 @@ public class UploadStagingCache implemen
         @Nullable FileCache cache, StatisticsProvider statisticsProvider,
         @Nullable ListeningExecutorService executor,
         @Nullable ScheduledExecutorService scheduledExecutor,
-        long removalPeriod) {
+        long purgeInterval /** secs **/) {
 
         this.currentSize = new AtomicLong();
         this.size = size;
@@ -164,7 +161,7 @@ public class UploadStagingCache implemen
 
         build();
 
-        removeExecutor.scheduleAtFixedRate(new RemoveJob(), removalPeriod, removalPeriod,
+        removeExecutor.scheduleAtFixedRate(new RemoveJob(), purgeInterval, purgeInterval,
             TimeUnit.SECONDS);
     }