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

fixed #1338

Browse Source
This commit is contained in:
machey
2018-12-25 22:27:27 +08:00
parent b5697a366a
commit dffbc437a6
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/ESAdapter.java
View File

@@ -75,8 +75,8 @@ public class ESAdapter implements OuterAdapter {
// 过滤不匹配的key的配置 // 过滤不匹配的key的配置
esSyncConfigTmp.forEach((key, config) -> { esSyncConfigTmp.forEach((key, config) -> {
if ((config.getOuterAdapterKey() == null && configuration.getKey() == null) if ((config.getOuterAdapterKey() == null && configuration.getKey() == null)
|| (config.getOuterAdapterKey() != null && config.getOuterAdapterKey() || (config.getOuterAdapterKey() != null
.equalsIgnoreCase(configuration.getKey()))) { && config.getOuterAdapterKey().equalsIgnoreCase(configuration.getKey()))) {
esSyncConfig.put(key, config); esSyncConfig.put(key, config);
} }
}); });
@@ -98,15 +98,11 @@ public class ESAdapter implements OuterAdapter {
} }
String schema = matcher.group(2); String schema = matcher.group(2);
schemaItem.getAliasTableItems() schemaItem.getAliasTableItems().values().forEach(tableItem -> {
.values() Map<String, ESSyncConfig> esSyncConfigMap = dbTableEsSyncConfig
.forEach(tableItem -> { .computeIfAbsent(schema + "-" + tableItem.getTableName(), k -> new HashMap<>());
Map<String, ESSyncConfig> esSyncConfigMap = dbTableEsSyncConfig.computeIfAbsent(schema esSyncConfigMap.put(configName, config);
+ "-" });
+ tableItem.getTableName(),
k -> new HashMap<>());
esSyncConfigMap.put(configName, config);
});
} }
Map<String, String> properties = configuration.getProperties(); Map<String, String> properties = configuration.getProperties();
@@ -140,7 +136,9 @@ public class ESAdapter implements OuterAdapter {
String database = dml.getDatabase(); String database = dml.getDatabase();
String table = dml.getTable(); String table = dml.getTable();
Map<String, ESSyncConfig> configMap = dbTableEsSyncConfig.get(database + "-" + table); Map<String, ESSyncConfig> configMap = dbTableEsSyncConfig.get(database + "-" + table);
esSyncService.sync(configMap.values(), dml); if (configMap != null) {
esSyncService.sync(configMap.values(), dml);
}
} }
@Override @Override

4
client-adapter/hbase/src/main/java/com/alibaba/otter/canal/client/adapter/hbase/HbaseAdapter.java
View File

@@ -115,7 +115,9 @@ public class HbaseAdapter implements OuterAdapter {
String database = dml.getDatabase(); String database = dml.getDatabase();
String table = dml.getTable(); String table = dml.getTable();
Map<String, MappingConfig> configMap = mappingConfigCache.get(destination + "." + database + "." + table); Map<String, MappingConfig> configMap = mappingConfigCache.get(destination + "." + database + "." + table);
configMap.values().forEach(config -> hbaseSyncService.sync(config, dml)); if (configMap != null) {
configMap.values().forEach(config -> hbaseSyncService.sync(config, dml));
}
} }
@Override @Override