From 365ca4d01f1db42e78308991a5ee58aada771395 Mon Sep 17 00:00:00 2001 From: gaecfov Date: Mon, 16 Sep 2019 09:44:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=BD=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E5=8C=85=E5=90=AB=E5=B8=B8=E9=87=8F=E6=8B=BC=E6=8E=A5?= =?UTF-8?q?=E6=97=B6=E8=A7=A3=E6=9E=90=E4=B8=BB=E9=94=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=9D=A1=E4=BB=B6=E6=8B=BC=E6=8E=A5=E6=97=B6?= =?UTF-8?q?=E4=BC=9A=E5=A4=9A=E5=87=BA=20where=20null=3Dnull=20(#2188)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canal/client/adapter/es/config/SchemaItem.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/SchemaItem.java b/client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/SchemaItem.java index bad97bd4..0faf2de4 100644 --- a/client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/SchemaItem.java +++ b/client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/config/SchemaItem.java @@ -87,10 +87,13 @@ public class SchemaItem { .forEach((fieldName, fieldItem) -> fieldItem.getColumnItems().forEach(columnItem -> { // TableItem tableItem = getAliasTableItems().get(columnItem.getOwner()); // if (!tableItem.isSubQuery()) { - List fieldItems = columnFields.computeIfAbsent( - columnItem.getOwner() + "." + columnItem.getColumnName(), - k -> new ArrayList<>()); - fieldItems.add(fieldItem); + //当数据列并非原始列时，columnName是空的，例如concat('px',id) + if(columnItem.getColumnName() != null) { + List fieldItems = columnFields.computeIfAbsent( + columnItem.getOwner() + "." + columnItem.getColumnName(), + k -> new ArrayList<>()); + fieldItems.add(fieldItem); + } // } else { // tableItem.getSubQueryFields().forEach(subQueryField -> { // List fieldItems = columnFields.computeIfAbsent(