From 5d8ec31bc46df02831cfb70da749b9cd753a6927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E9=81=93=E6=9D=B0?= Date: Fri, 16 Apr 2021 21:22:31 +0800 Subject: [PATCH] fix #3119 (#3121) --- .../hbase/monitor/HbaseConfigMonitor.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/monitor/HbaseConfigMonitor.java b/client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/monitor/HbaseConfigMonitor.java index ac96f213..09b7052d 100644 --- a/client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/monitor/HbaseConfigMonitor.java +++ b/client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/monitor/HbaseConfigMonitor.java @@ -1,9 +1,10 @@ package com.alibaba.otter.canal.client.adapter.hbase.monitor; -import java.io.File; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; +import com.alibaba.otter.canal.client.adapter.config.YmlConfigBinder; +import com.alibaba.otter.canal.client.adapter.hbase.HbaseAdapter; +import com.alibaba.otter.canal.client.adapter.hbase.config.MappingConfig; +import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader; +import com.alibaba.otter.canal.client.adapter.support.Util; import org.apache.commons.io.filefilter.FileFilterUtils; import org.apache.commons.io.monitor.FileAlterationListenerAdaptor; @@ -13,11 +14,10 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.alibaba.otter.canal.client.adapter.config.YmlConfigBinder; -import com.alibaba.otter.canal.client.adapter.hbase.HbaseAdapter; -import com.alibaba.otter.canal.client.adapter.hbase.config.MappingConfig; -import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader; -import com.alibaba.otter.canal.client.adapter.support.Util; +import java.io.File; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; public class HbaseConfigMonitor { @@ -125,8 +125,8 @@ public class HbaseConfigMonitor { private void addConfigToCache(File file, MappingConfig config) { hbaseAdapter.getHbaseMapping().put(file.getName(), config); Map configMap = hbaseAdapter.getMappingConfigCache() - .computeIfAbsent(StringUtils.trimToEmpty(config.getDestination()) + "." - + config.getHbaseMapping().getDatabase() + "." + config.getHbaseMapping().getTable(), + .computeIfAbsent(StringUtils.trimToEmpty(config.getDestination()) + "_" + + config.getHbaseMapping().getDatabase() + "-" + config.getHbaseMapping().getTable(), k1 -> new HashMap<>()); configMap.put(file.getName(), config); }