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

merge code and format

Browse Source
This commit is contained in:
jianghang.loujh
2026-02-12 17:32:33 +08:00
parent c0de979595
commit 24877fdf03
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client-adapter/es7x/src/main/java/com/alibaba/otter/canal/client/adapter/es7x/support/ESConnection.java
View File

@@ -132,14 +132,14 @@ public class ESConnection {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
return null; return null;
} }
// 通过别名查询mapping返回的是真实索引名称，mappings.get(index)返回null，为兼容别名情况修改如下： // 通过别名查询mapping返回的是真实索引名称，mappings.get(index)返回null，为兼容别名情况修改如下：
mappingMetaData = mappings.get(index); mappingMetaData = mappings.get(index);
if (mappingMetaData == null && !mappings.isEmpty()) { if (mappingMetaData == null && !mappings.isEmpty()) {
// 如果通过索引名找不到，可能是别名，取第一个映射 // 如果通过索引名找不到，可能是别名，取第一个映射
mappingMetaData = mappings.values().iterator().next(); mappingMetaData = mappings.values().iterator().next();
} }
// 如果还是null，说明索引不存在或没有mapping // 如果还是null，说明索引不存在或没有mapping
if (mappingMetaData == null) { if (mappingMetaData == null) {
throw new IllegalArgumentException("Not found the mapping info of index: " + index); throw new IllegalArgumentException("Not found the mapping info of index: " + index);

4
client-adapter/es8x/src/main/java/com/alibaba/otter/canal/client/adapter/es8x/support/ESConnection.java
View File

@@ -142,14 +142,14 @@ public class ESConnection {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
return null; return null;
} }
// 通过别名查询mapping返回的是真实索引名称，mappings.get(index)返回null，为兼容别名情况修改如下： // 通过别名查询mapping返回的是真实索引名称，mappings.get(index)返回null，为兼容别名情况修改如下：
mappingMetaData = mappings.get(index); mappingMetaData = mappings.get(index);
if (mappingMetaData == null && !mappings.isEmpty()) { if (mappingMetaData == null && !mappings.isEmpty()) {
// 如果通过索引名找不到，可能是别名，取第一个映射 // 如果通过索引名找不到，可能是别名，取第一个映射
mappingMetaData = mappings.values().iterator().next(); mappingMetaData = mappings.values().iterator().next();
} }
// 如果还是null，说明索引不存在或没有mapping // 如果还是null，说明索引不存在或没有mapping
if (mappingMetaData == null) { if (mappingMetaData == null) {
throw new IllegalArgumentException("Not found the mapping info of index: " + index); throw new IllegalArgumentException("Not found the mapping info of index: " + index);