azkaban-aplcache

replaced multicache for caffeine

7/21/2020 5:47:54 AM

Details

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutionFlowDao.java b/azkaban-common/src/main/java/azkaban/executor/ExecutionFlowDao.java
index 9bd4945..013d74f 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutionFlowDao.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutionFlowDao.java
@@ -138,7 +138,7 @@ public class ExecutionFlowDao {
     }
   }
 
-  public static APLCache<List<ExecutableFlow>> fetchRecentlyFinishedFlowsCache = new APLCache<>("static-multi:ExecutionFlowDao.fetchRecentlyFinishedFlows");
+  public static APLCache<List<ExecutableFlow>> fetchRecentlyFinishedFlowsCache = new APLCache<>("static-multi:ExecutionFlowDao.fetchRecentlyFinishedFlows", 1000);
 
   List<ExecutableFlow> fetchRecentlyFinishedFlows(final Duration maxAge)
       throws ExecutorManagerException {
diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java b/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
index f8f3a33..7a7fac0 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutorManager.java
@@ -66,7 +66,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.joda.time.DateTime;
 
-import br.ufrgs.inf.prosoft.cache.GetterCache;
+import br.ufrgs.inf.prosoft.cache.*;
 
 /**
  * Executor manager used to manage the client side job.
@@ -597,7 +597,7 @@ public class ExecutorManager extends EventHandler implements
     }
   }
 
-public static GetterCache<List<ExecutableFlow>> getRecentlyFinishedFlowsCache = new GetterCache<>("static-getter:ExecutorManager.getRecentlyFinishedFlows");
+public static CaffeineGetterCache<List<ExecutableFlow>> getRecentlyFinishedFlowsCache = new CaffeineGetterCache<>("static-getter:ExecutorManager.getRecentlyFinishedFlows", 1000);
 
   @Override
   public List<ExecutableFlow> getRecentlyFinishedFlows() {
diff --git a/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java b/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
index 5f31b1b..dfb242f 100644
--- a/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
+++ b/azkaban-common/src/main/java/azkaban/executor/JdbcExecutorLoader.java
@@ -89,7 +89,7 @@ public class JdbcExecutorLoader implements ExecutorLoader {
     return this.executionFlowDao.fetchQueuedFlows();
   }
 
-  public static APLCache<List<ExecutableFlow>> fetchRecentlyFinishedFlowsCache = new APLCache<>("static-multi:JdbcExecutorLoader.fetchRecentlyFinishedFlows");
+  public static APLCache<List<ExecutableFlow>> fetchRecentlyFinishedFlowsCache = new APLCache<>("static-multi:JdbcExecutorLoader.fetchRecentlyFinishedFlows", 1000);
 
   /**
    * maxAge indicates how long finished flows are shown in Recently Finished flow page.
diff --git a/azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java b/azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java
index 64e700a..9cc1060 100644
--- a/azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java
+++ b/azkaban-common/src/main/java/azkaban/project/JdbcProjectImpl.java
@@ -182,7 +182,7 @@ public class JdbcProjectImpl implements ProjectLoader {
     return project;
   }
 
-  public static APLCache<List<Triple<String, Boolean, Permission>>> fetchPermissionsForProjectCache = new APLCache<>("static-multi:JdbcProjectImpl.fetchPermissionsForProject");
+  public static APLCache<List<Triple<String, Boolean, Permission>>> fetchPermissionsForProjectCache = new APLCache<>("static-multi:JdbcProjectImpl.fetchPermissionsForProject", 1000);
 
   private List<Triple<String, Boolean, Permission>> fetchPermissionsForProject(
       final Project project)
diff --git a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
index 7c43370..3bdc391 100644
--- a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
+++ b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
@@ -166,7 +166,7 @@ public class ProjectManager {
     return array;
   }
 
-  public static APLCache<List<Project>> getGroupProjectsCache = new APLCache<>("static-multi:ProjectManager.getGroupProjects");
+  public static APLCache<List<Project>> getGroupProjectsCache = new APLCache<>("static-multi:ProjectManager.getGroupProjects", 1000);
 
   public List<Project> getGroupProjects(final User user) {
     return getGroupProjectsCache.computeIfAbsent(Thread.currentThread(), new Object[]{user}, () -> {
diff --git a/azkaban-common/src/main/java/azkaban/utils/StringUtils.java b/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
index 7e8b0ba..c8eec62 100644
--- a/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
+++ b/azkaban-common/src/main/java/azkaban/utils/StringUtils.java
@@ -89,7 +89,7 @@ public class StringUtils {
     return buffer.toString();
   }
 
-  public static APLCache<Boolean> isFromBrowserCache = new APLCache<>("static-multi:StringUtils.isFromBrowser");
+  public static APLCache<Boolean> isFromBrowserCache = new APLCache<>("static-multi:StringUtils.isFromBrowser", 1000);
 
   public static boolean isFromBrowser(final String userAgent) {
     return isFromBrowserCache.computeIfAbsent(Thread.currentThread(), new Object[]{userAgent}, () -> {