fix/修改固定频率注解格式&destroy时关闭线程池&对是否已经存在固定刷新的任务做判断

Author: LIZHUANGZHUANG001

src/main/java/com/jarvis/cache/AutoLoadHandler.java

@@ -37,6 +37,11 @@ public class AutoLoadHandler {
      */
     private final ConcurrentHashMap<CacheKeyTO, AutoLoadTO> autoLoadMap;
 
+    /**
+     * 固定频率刷新队列
+     */
+    static CopyOnWriteArrayList<CacheKeyTO> fixRateRefreshArrayList;
+
     private final CacheHandler cacheHandler;
 
     /**
@@ -62,7 +67,7 @@ public class AutoLoadHandler {
     private final AutoLoadConfig config;
 
 
-    private static ScheduledThreadPoolExecutor scheduledThreadPoolExecutor;
+    static ScheduledThreadPoolExecutor scheduledThreadPoolExecutor;
 
     public static ScheduledThreadPoolExecutor getScheduledThreadPoolExecutor() {
         return scheduledThreadPoolExecutor;
@@ -79,6 +84,7 @@ public AutoLoadHandler(CacheHandler cacheHandler, AutoLoadConfig config) {
             this.running = true;
             this.threads = new Thread[this.config.getThreadCnt()];
             this.autoLoadMap = new ConcurrentHashMap<CacheKeyTO, AutoLoadTO>(this.config.getMaxElement());
+            fixRateRefreshArrayList = new CopyOnWriteArrayList<CacheKeyTO>();
             this.autoLoadQueue = new LinkedBlockingQueue<AutoLoadTO>(this.config.getMaxElement());
             this.sortThread = new Thread(new SortRunnable());
             this.sortThread.setDaemon(true);
@@ -162,12 +168,18 @@ public AutoLoadTO putIfAbsent(CacheKeyTO cacheKey, CacheAopProxyChain joinPoint,
         }
 
         // 如果fixRateUpdateCache注解字段不为空,则走固定刷新逻辑
-        if(StringUtils.isNotEmpty(cache.fixRateUpdateCache())) {
+        if(cache.fixRateUpdateCache() > 0) {
             AutoLoadTO autoLoadTO = autoLoadMap.get(cacheKey);
-            if (null != autoLoadTO) {
+            if (autoLoadTO != null) {
                 autoLoadMap.remove(cacheKey);
             }
 
+            // 如果已经存在 则忽略
+            if(fixRateRefreshArrayList.contains(cacheKey)) {
+                return null;
+            }
+
+            // 否则执行固定频率刷新
             DeepClone deepClone = new DeepClone(joinPoint, cache).invoke();
             if (deepClone.is()) return null;
 
@@ -224,7 +236,7 @@ public AutoLoadTO putIfAbsent(CacheKeyTO cacheKey, CacheAopProxyChain joinPoint,
 
     private boolean fixRateUpdateCacheIfNeeded(String methodName, AutoLoadTO autoLoadTO) {
         if (null == autoLoadTO || autoLoadTO.getCache() == null ||
-                StringUtils.isEmpty(autoLoadTO.getCache().fixRateUpdateCache())) {
+                autoLoadTO.getCache().fixRateUpdateCache() <= 0) {
             return false;
         }
 
@@ -234,25 +246,10 @@ private boolean fixRateUpdateCacheIfNeeded(String methodName, AutoLoadTO autoLoa
     }
 
     private void doExecute(String methodName, AutoLoadTO autoLoadTO) {
-        // 解析fixRateUpdateCache Timer表达式
-        String updateCacheCronExpression = autoLoadTO.getCache().fixRateUpdateCache();
-        if (!updateCacheCronExpression.contains(",")) {
-            log.error("不符合规则的频率表达式{}", updateCacheCronExpression);
-            return;
-        }
-        long delay;
-        long period;
-        try {
-            String[] split = updateCacheCronExpression.split(",");
-            delay = Long.parseLong(split[0]);
-            period = Long.parseLong(split[1]);
-        } catch (Exception e) {
-            log.error("not matched cron expression-{}", updateCacheCronExpression);
-            return;
-        }
-        scheduledThreadPoolExecutor.scheduleWithFixedDelay(new FixRateUpdateCacheTask(autoLoadTO), delay,
+        int period = autoLoadTO.getCache().fixRateUpdateCache();
+        scheduledThreadPoolExecutor.scheduleWithFixedDelay(new FixRateUpdateCacheTask(autoLoadTO), 0,
                 period, TimeUnit.SECONDS);
-        log.info("register fix rate refresh task——method-{}, rate-{}", methodName, updateCacheCronExpression);
+        log.info("register fix rate refresh task——method-{}, period-{}", methodName, period);
     }
 
     class FixRateUpdateCacheTask implements Runnable{

src/main/java/com/jarvis/cache/CacheHandler.java

@@ -463,6 +463,7 @@ public void writeCache(CacheAopProxyChain pjp, Object[] arguments, Cache cache,
     public void destroy() {
         autoLoadHandler.shutdown();
         refreshHandler.shutdown();
+        AutoLoadHandler.scheduledThreadPoolExecutor.shutdown();
         log.trace("cache destroy ... ... ...");
     }
 

src/main/java/com/jarvis/cache/RefreshHandler.java

@@ -69,6 +69,10 @@ public void removeTask(CacheKeyTO cacheKey) {
     }
 
     public void doRefresh(CacheAopProxyChain pjp, Cache cache, CacheKeyTO cacheKey, CacheWrapper<Object> cacheWrapper) {
+        // 如果已经交由固定频率刷新，则不做过期判断
+        if (AutoLoadHandler.fixRateRefreshArrayList.contains(cacheKey)) {
+            return;
+        }
         int expire = cacheWrapper.getExpire();
         if (expire < REFRESH_MIN_EXPIRE) {// 如果过期时间太小了，就不允许自动加载，避免加载过于频繁，影响系统稳定性
             return;

src/main/java/com/jarvis/cache/annotation/Cache.java

@@ -73,14 +73,11 @@
     boolean autoload() default false;
 
     /**
-     * 以固定频率的方式刷新缓存 (补充expire无限大时无法依靠alarmTime频繁刷新缓存的不足)
-     * 格式 “initDelay,period” 默认单位s 【初始延迟时长,执行周期】
-     *              如【5，10】意为5s后开始以10s为周期执行刷新任务
-     *      为了向后兼容, 当alarmTime存在时优先解析alarmTime
-     *      暂不支持自定义+扩展
-     * @return 固定表达式 “initDelay,period”
-     */
-    String fixRateUpdateCache() default "";
+     * 固定频率刷新 默认是不开启的
+     *      如果开启了此配置，则优先以此配置进行缓存刷新
+     * @return 刷新间隔
+     */
+    int fixRateUpdateCache() default 0;
 
     /**
      * 自动缓存的条件，可以为空，返回 true 或者 false，如果设置了此值，autoload() 就失效，例如：null !=