Merge remote-tracking branch 'origin/1.8_v3.8.1' into v1.8.0_dev

todd5167 · todd5167 · commit fd20156400a1 · 2019-10-09T11:26:56.000+08:00
diff --git a/rdb/rdb-side/src/main/java/com/dtstack/flink/sql/side/rdb/all/RdbAllReqRow.java b/rdb/rdb-side/src/main/java/com/dtstack/flink/sql/side/rdb/all/RdbAllReqRow.java
@@ -119,9 +119,8 @@ public void flatMap(Row value, Collector<Row> out) throws Exception {
         for (Integer conValIndex : sideInfo.getEqualValIndex()) {
             Object equalObj = value.getField(conValIndex);
             if (equalObj == null) {
-                out.collect(null);
+                return;
             }
-
             inputParams.add(equalObj);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,8 @@ public void flatMap(Row value, Collector<Row> out) throws Exception {`
`119`	`119`	`for (Integer conValIndex : sideInfo.getEqualValIndex()) {`
`120`	`120`	`Object equalObj = value.getField(conValIndex);`
`121`	`121`	`if (equalObj == null) {`
`122`		`- out.collect(null);`
	`122`	`+ return;`
`123`	`123`	`}`
`124`		`-`
`125`	`124`	`inputParams.add(equalObj);`
`126`	`125`	`}`
`127`	`126`