Merge remote-tracking branch 'origin/feat_1.8_asyncException_mergeDev' into feat_1.8_asyncException_mergeTest

dapeng · dapeng · commit 4e8d16e405d7 · 2020-05-13T14:47:09.000+08:00
# Conflicts:
#	core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java
diff --git a/core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java b/core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java
@@ -383,10 +383,6 @@ private void joinFun(Object pollObj,
             throw new RuntimeException("can't not find side table:" + joinInfo.getRightTableName());
         }
 
-        if(!checkJoinCondition(joinInfo.getCondition(), joinInfo.getRightTableAlias(), sideTableInfo)){
-            throw new RuntimeException("ON condition must contain all equal fields!!!");
-        }
-
         rightScopeChild.setRowTypeInfo(sideTableInfo.getRowTypeInfo());
 
         joinScope.addScope(leftScopeChild);

Original file line number	Diff line number	Diff line change
`@@ -383,10 +383,6 @@ private void joinFun(Object pollObj,`
`383`	`383`	`throw new RuntimeException("can't not find side table:" + joinInfo.getRightTableName());`
`384`	`384`	`}`
`385`	`385`
`386`		`- if(!checkJoinCondition(joinInfo.getCondition(), joinInfo.getRightTableAlias(), sideTableInfo)){`
`387`		`- throw new RuntimeException("ON condition must contain all equal fields!!!");`
`388`		`- }`
`389`		`-`
`390`	`386`	`rightScopeChild.setRowTypeInfo(sideTableInfo.getRowTypeInfo());`
`391`	`387`
`392`	`388`	`joinScope.addScope(leftScopeChild);`