chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #3119 (#3121)

Browse Source
This commit is contained in:
许道杰
2021-04-16 21:22:31 +08:00
committed by GitHub
parent 82b18ebe62
commit 5d8ec31bc4
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/monitor/HbaseConfigMonitor.java
View File

@@ -1,9 +1,10 @@
package com.alibaba.otter.canal.client.adapter.hbase.monitor; package com.alibaba.otter.canal.client.adapter.hbase.monitor;
import java.io.File; import com.alibaba.otter.canal.client.adapter.config.YmlConfigBinder;
import java.util.HashMap; import com.alibaba.otter.canal.client.adapter.hbase.HbaseAdapter;
import java.util.Map; import com.alibaba.otter.canal.client.adapter.hbase.config.MappingConfig;
import java.util.Properties; 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.filefilter.FileFilterUtils;
import org.apache.commons.io.monitor.FileAlterationListenerAdaptor; import org.apache.commons.io.monitor.FileAlterationListenerAdaptor;
@@ -13,11 +14,10 @@ import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.alibaba.otter.canal.client.adapter.config.YmlConfigBinder; import java.io.File;
import com.alibaba.otter.canal.client.adapter.hbase.HbaseAdapter; import java.util.HashMap;
import com.alibaba.otter.canal.client.adapter.hbase.config.MappingConfig; import java.util.Map;
import com.alibaba.otter.canal.client.adapter.support.MappingConfigsLoader; import java.util.Properties;
import com.alibaba.otter.canal.client.adapter.support.Util;
public class HbaseConfigMonitor { public class HbaseConfigMonitor {
@@ -125,8 +125,8 @@ public class HbaseConfigMonitor {
private void addConfigToCache(File file, MappingConfig config) { private void addConfigToCache(File file, MappingConfig config) {
hbaseAdapter.getHbaseMapping().put(file.getName(), config); hbaseAdapter.getHbaseMapping().put(file.getName(), config);
Map<String, MappingConfig> configMap = hbaseAdapter.getMappingConfigCache() Map<String, MappingConfig> configMap = hbaseAdapter.getMappingConfigCache()
.computeIfAbsent(StringUtils.trimToEmpty(config.getDestination()) + "." .computeIfAbsent(StringUtils.trimToEmpty(config.getDestination()) + "_"
+ config.getHbaseMapping().getDatabase() + "." + config.getHbaseMapping().getTable(), + config.getHbaseMapping().getDatabase() + "-" + config.getHbaseMapping().getTable(),
k1 -> new HashMap<>()); k1 -> new HashMap<>());
configMap.put(file.getName(), config); configMap.put(file.getName(), config);
} }