From 4c5ffccc45070a8fb516372298628d6de1a37157 Mon Sep 17 00:00:00 2001 From: zengqiao Date: Thu, 9 Feb 2023 17:00:50 +0800 Subject: [PATCH] =?UTF-8?q?[Optimize]=E5=88=A0=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../broker/impl/BrokerConfigServiceImpl.java | 1 - .../broker/impl/BrokerSpecServiceImpl.java | 4 ---- .../component/AbstractMonitorSinkService.java | 21 +++---------------- .../cache/DataBaseDataLocalCache.java | 1 + 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerConfigServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerConfigServiceImpl.java index f47a3fa5..aa2bb7ec 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerConfigServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerConfigServiceImpl.java @@ -23,7 +23,6 @@ import com.xiaojukeji.know.streaming.km.common.utils.ConvertUtil; import com.xiaojukeji.know.streaming.km.core.service.broker.BrokerConfigService; import com.xiaojukeji.know.streaming.km.core.service.oprecord.OpLogWrapService; import com.xiaojukeji.know.streaming.km.core.service.version.BaseKafkaVersionControlService; -import com.xiaojukeji.know.streaming.km.core.service.version.BaseVersionControlService; import com.xiaojukeji.know.streaming.km.persistence.kafka.KafkaAdminClient; import com.xiaojukeji.know.streaming.km.persistence.kafka.KafkaAdminZKClient; import com.xiaojukeji.know.streaming.km.persistence.mysql.broker.BrokerConfigDAO; diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerSpecServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerSpecServiceImpl.java index 5cbe3ce8..7ba20b15 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerSpecServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerSpecServiceImpl.java @@ -1,7 +1,5 @@ package com.xiaojukeji.know.streaming.km.core.service.broker.impl; -import com.didiglobal.logi.log.ILog; -import com.didiglobal.logi.log.LogFactory; import com.xiaojukeji.know.streaming.km.common.bean.entity.broker.BrokerSpec; import com.xiaojukeji.know.streaming.km.common.bean.po.config.PlatformClusterConfigPO; import com.xiaojukeji.know.streaming.km.common.enums.config.ConfigGroupEnum; @@ -17,8 +15,6 @@ import java.util.Map; @Service public class BrokerSpecServiceImpl implements BrokerSpecService { - private static final ILog LOGGER = LogFactory.getLog(BrokerSpecServiceImpl.class); - @Autowired private PlatformClusterConfigService platformClusterConfigService; diff --git a/km-extends/km-monitor/src/main/java/com/xiaojukeji/know/streaming/km/monitor/component/AbstractMonitorSinkService.java b/km-extends/km-monitor/src/main/java/com/xiaojukeji/know/streaming/km/monitor/component/AbstractMonitorSinkService.java index 8bac5ac6..f35c5ec6 100644 --- a/km-extends/km-monitor/src/main/java/com/xiaojukeji/know/streaming/km/monitor/component/AbstractMonitorSinkService.java +++ b/km-extends/km-monitor/src/main/java/com/xiaojukeji/know/streaming/km/monitor/component/AbstractMonitorSinkService.java @@ -16,11 +16,11 @@ import java.util.Map; import static com.xiaojukeji.know.streaming.km.monitor.common.MonitorSinkTagEnum.*; public abstract class AbstractMonitorSinkService implements ApplicationListener { - protected static final ILog LOGGER = LogFactory.getLog(AbstractMonitorSinkService.class); + protected static final ILog LOGGER = LogFactory.getLog(AbstractMonitorSinkService.class); - private static final int STEP = 60; + private static final int STEP = 60; - private FutureUtil sinkTP = FutureUtil.init( + private static final FutureUtil sinkTP = FutureUtil.init( "SinkMetricsTP", 5, 5, @@ -156,21 +156,6 @@ public abstract class AbstractMonitorSinkService implements ApplicationListener< return pointList; } - private List replicationMetric2SinkPoint(List replicationMetrics){ - List pointList = new ArrayList<>(); - - for(ReplicationMetrics r : replicationMetrics){ - Map tagsMap = new HashMap<>(); - tagsMap.put(CLUSTER_ID.getName(), r.getClusterPhyId()); - tagsMap.put(BROKER_ID.getName(), r.getBrokerId()); - tagsMap.put(PARTITION_ID.getName(), r.getPartitionId()); - - pointList.addAll(genSinkPoint("Replication", r.getMetrics(), r.getTimestamp(), tagsMap)); - } - - return pointList; - } - private List zookeeperMetric2SinkPoint(List zookeeperMetricsList){ List pointList = new ArrayList<>(); diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/cache/DataBaseDataLocalCache.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/cache/DataBaseDataLocalCache.java index 32ac7ce8..cb67b14b 100644 --- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/cache/DataBaseDataLocalCache.java +++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/cache/DataBaseDataLocalCache.java @@ -39,6 +39,7 @@ public class DataBaseDataLocalCache { private static Cache>> partitionsCache; private static Cache>> healthCheckResultCache; + private static Cache haTopicCache; @PostConstruct