[hotfix-859][core] Fix NPE when NameMapping is empty.

DTStack · May 23, 2022 · 0fda02e · 0fda02e
1 parent f2eb609
commit 0fda02e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/...nector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisSinkFactory.java b/...nector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisSinkFactory.java
@@ -137,7 +137,9 @@ public DorisSinkFactory(SyncConf syncConf) {
  .setLoadProperties(
  parameter.getProperties(LOAD_PROPERTIES_KEY, new Properties()))
  .setPassword(parameter.getStringVal(PASSWORD_KEY, ""))
- .setNameMapped(syncConf.getNameMappingConf() != null)
+ .setNameMapped(
+ syncConf.getNameMappingConf() != null
+ && !syncConf.getNameMappingConf().isEmpty())
  .setWriteMode(
  parameter.getStringVal(WRITE_MODE_KEY, DORIS_WRITE_MODE_DEFAULT))
  .setUsername(parameter.getStringVal(USER_NAME_KEY))

diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingConf.java
@@ -20,6 +20,8 @@
 
 package com.dtstack.chunjun.mapping;
 
+import org.apache.commons.lang.StringUtils;
+
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -83,6 +85,14 @@ public void setSqlConevnt(Boolean sqlConevnt) {
  this.sqlConevnt = sqlConevnt;
  }
 
+ public boolean isEmpty() {
+ return tableMappings.isEmpty()
+ && schemaMappings.isEmpty()
+ && fieldMappings.isEmpty()
+ && StringUtils.isEmpty(pattern)
+ && null == sqlConevnt;
+ }
+
  @Override
  public String toString() {
  return new StringJoiner(", ", NameMappingConf.class.getSimpleName() + "[", "]")

diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingFlatMap.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingFlatMap.java
@@ -43,13 +43,15 @@ public class NameMappingFlatMap extends RichFlatMapFunction<RowData, RowData> {
  private final MappingClient client;
  private final DdlConvent source;
  private final DdlConvent sink;
+ private final boolean turnOff;
  private final ConventExceptionProcessHandler conventExceptionProcessHandler;
 
  public NameMappingFlatMap(
  NameMappingConf conf,
  DdlConvent source,
  DdlConvent sink,
  ConventExceptionProcessHandler conventExceptionProcessHandler) {
+ this.turnOff = conf == null || conf.isEmpty();
  this.client = new MappingClient(conf);
  this.source = source;
  this.sink = sink;
@@ -59,6 +61,10 @@ public NameMappingFlatMap(
 
  @Override
  public void flatMap(RowData value, Collector<RowData> collector) {
+ if (turnOff) {
+ collector.collect(value);
+ return;
+ }
  RowData rowData = client.map(value);
  if (rowData instanceof ColumnRowData) {
  collector.collect(rowData);