解决合并冲突

zoudaokoulife · zoudaokoulife · commit 54d4459f51b4 · 2020-02-21T11:39:26.000+08:00
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
@@ -872,7 +872,7 @@ private void joinFun(Object pollObj, Map<String, Table> localTableCache,
         replaceInfoList.add(replaceInfo);
 
         if (!tableEnv.isRegistered(joinInfo.getNewTableName())){
-            Table joinTable = tableEnv.fromDataStream(dsOut, String.join(",", sideOutTypeInfo.getFieldNames()));
+            Table joinTable = tableEnv.fromDataStream(dsOut);
             tableEnv.registerTable(joinInfo.getNewTableName(), joinTable);
             localTableCache.put(joinInfo.getNewTableName(), joinTable);
         }

Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@ private void joinFun(Object pollObj, Map<String, Table> localTableCache,`
`872`	`872`	`replaceInfoList.add(replaceInfo);`
`873`	`873`
`874`	`874`	`if (!tableEnv.isRegistered(joinInfo.getNewTableName())){`
`875`		`- Table joinTable = tableEnv.fromDataStream(dsOut, String.join(",", sideOutTypeInfo.getFieldNames()));`
	`875`	`+ Table joinTable = tableEnv.fromDataStream(dsOut);`
`876`	`876`	`tableEnv.registerTable(joinInfo.getNewTableName(), joinTable);`
`877`	`877`	`localTableCache.put(joinInfo.getNewTableName(), joinTable);`
`878`	`878`	`}`