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：当查询列包含常量拼接时解析主键字段进行条件拼接时会多出 where null=null (#2188)

Browse Source
This commit is contained in:
gaecfov
2019-09-16 09:44:59 +08:00
committed by agapple
parent 419a73b3de
commit 365ca4d01f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/SchemaItem.java
View File

@@ -87,10 +87,13 @@ public class SchemaItem {
.forEach((fieldName, fieldItem) -> fieldItem.getColumnItems().forEach(columnItem -> { .forEach((fieldName, fieldItem) -> fieldItem.getColumnItems().forEach(columnItem -> {
// TableItem tableItem = getAliasTableItems().get(columnItem.getOwner()); // TableItem tableItem = getAliasTableItems().get(columnItem.getOwner());
// if (!tableItem.isSubQuery()) { // if (!tableItem.isSubQuery()) {
List<FieldItem> fieldItems = columnFields.computeIfAbsent( //当数据列并非原始列时，columnName是空的，例如concat('px',id)
columnItem.getOwner() + "." + columnItem.getColumnName(), if(columnItem.getColumnName() != null) {
k -> new ArrayList<>()); List<FieldItem> fieldItems = columnFields.computeIfAbsent(
fieldItems.add(fieldItem); columnItem.getOwner() + "." + columnItem.getColumnName(),
k -> new ArrayList<>());
fieldItems.add(fieldItem);
}
// } else { // } else {
// tableItem.getSubQueryFields().forEach(subQueryField -> { // tableItem.getSubQueryFields().forEach(subQueryField -> {
// List<FieldItem> fieldItems = columnFields.computeIfAbsent( // List<FieldItem> fieldItems = columnFields.computeIfAbsent(