From c16a38341b4033e4c00b5381106cdd63430b645c Mon Sep 17 00:00:00 2001 From: houxinyu Date: Sun, 9 Jul 2023 17:25:10 +0800 Subject: [PATCH] fix:lambda --- .../redis/util/RedisParserByPolling.java | 86 +++++++++---------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPolling.java b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPolling.java index 18d91152e..2ac5853b1 100644 --- a/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPolling.java +++ b/liteflow-rule-plugin/liteflow-rule-redis/src/main/java/com/yomahub/liteflow/parser/redis/util/RedisParserByPolling.java @@ -209,55 +209,53 @@ public class RedisParserByPolling implements RedisParserHelper{ * 再根据hash中value的SHA值修改变化的和被删除的chain */ private Runnable pollChainTask(String keyLua, String valueLua) { - Runnable r = new Runnable() { - @Override - public void run() { - String chainKey = redisParserVO.getChainKey(); - //先获取chainKey中最新的chain数量 - String keyNum = chainJedis.evalsha(keyLua, 1, chainKey).toString(); - //修改chainFieldNum为最新chain数量 - chainFieldNum = Integer.parseInt(keyNum); + Runnable r = () -> { + String chainKey = redisParserVO.getChainKey(); + //先获取chainKey中最新的chain数量 + String keyNum = chainJedis.evalsha(keyLua, 1, chainKey).toString(); + //修改chainFieldNum为最新chain数量 + chainFieldNum = Integer.parseInt(keyNum); - //遍历Map,判断各个chain的value有无变化：修改变化了值的chain和被删除的chain - for(Map.Entry entry: chainSHAMap.entrySet()) { - String chainId = entry.getKey(); - String oldSHA = entry.getValue(); - String newSHA = chainJedis.evalsha(valueLua, 2, chainKey, chainId).toString(); - if (StrUtil.equals(newSHA, "nil")) { - //新SHA值为nil, 即未获取到该chain,表示该chain已被删除 - FlowBus.removeChain(chainId); - LOG.info("starting reload flow config... delete key={}", chainId); + //遍历Map,判断各个chain的value有无变化：修改变化了值的chain和被删除的chain + for(Map.Entry entry: chainSHAMap.entrySet()) { + String chainId = entry.getKey(); + String oldSHA = entry.getValue(); + String newSHA = chainJedis.evalsha(valueLua, 2, chainKey, chainId).toString(); + if (StrUtil.equals(newSHA, "nil")) { + //新SHA值为nil, 即未获取到该chain,表示该chain已被删除 + FlowBus.removeChain(chainId); + LOG.info("starting reload flow config... delete key={}", chainId); - //修改SHAMap - chainSHAMap.remove(chainId); - } - else if (!StrUtil.equals(newSHA, oldSHA)) { - //SHA值发生变化,表示该chain的值已被修改,重新拉取变化的chain + //修改SHAMap + chainSHAMap.remove(chainId); + } + else if (!StrUtil.equals(newSHA, oldSHA)) { + //SHA值发生变化,表示该chain的值已被修改,重新拉取变化的chain + String chainData = chainJedis.hget(chainKey, chainId); + LiteFlowChainELBuilder.createChain().setChainId(chainId).setEL(chainData).build(); + LOG.info("starting poll flow config... update key={} new value={},", chainId, chainData); + + //修改SHAMap + chainSHAMap.put(chainId, newSHA); + } + //SHA值无变化,表示该chain未改变 + } + + //处理新添加chain和chainId被修改的情况 + if (chainFieldNum > chainSHAMap.size()) { + //如果封装的SHAMap数量比最新chain总数少, 说明有两种情况： + // 1、添加了新chain + // 2、修改了chainId:因为遍历到旧的id时会取到nil,SHAMap会把原来的chainId删掉,但没有机会添加新的chainId + // 3、上述两者结合 + //在此处重新拉取所有chainId集合,补充添加新chain + Set newChainSet = chainJedis.hkeys(chainKey); + for (String chainId : newChainSet) { + if (chainSHAMap.get(chainId) == null) { + //将新chainId添加到LiteFlowChainELBuilder和SHAMap String chainData = chainJedis.hget(chainKey, chainId); LiteFlowChainELBuilder.createChain().setChainId(chainId).setEL(chainData).build(); LOG.info("starting poll flow config... update key={} new value={},", chainId, chainData); - - //修改SHAMap - chainSHAMap.put(chainId, newSHA); - } - //SHA值无变化,表示该chain未改变 - } - - //处理新添加chain和chainId被修改的情况 - if (chainFieldNum > chainSHAMap.size()) { - //如果封装的SHAMap数量比新的chain总数少, 说明有两种情况： - // 1、添加了新chain - // 2、修改了chainId:因为遍历到旧的id时会取到nil,SHAMap会把原来的chainId删掉,但没有机会添加新的chainId - //在此处重新拉取所有chainId集合,补充添加新chainId - Set newChainSet = chainJedis.hkeys(chainKey); - for (String chainId : newChainSet) { - if (chainSHAMap.get(chainId) == null) { - //将新chainId添加到LiteFlowChainELBuilder和SHAMap - String chainData = chainJedis.hget(chainKey, chainId); - LiteFlowChainELBuilder.createChain().setChainId(chainId).setEL(chainData).build(); - LOG.info("starting poll flow config... update key={} new value={},", chainId, chainData); - chainSHAMap.put(chainId, DigestUtil.sha1Hex(chainData)); - } + chainSHAMap.put(chainId, DigestUtil.sha1Hex(chainData)); } } }