回滚 5f30a74 ，解决 '回滚导致的test分支变更内容'无法提交的问题

Author: xuchao

core/src/main/java/com/dtstack/flink/sql/side/JoinInfo.java

@@ -27,6 +27,7 @@
 import com.google.common.base.Strings;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * Join信息

core/src/main/java/com/dtstack/flink/sql/util/ParseUtils.java

@@ -38,6 +38,7 @@
 
 import com.google.common.collect.HashBasedTable;
 
+import com.google.common.collect.HashBiMap;
 import org.apache.calcite.sql.SqlBasicCall;
 import org.apache.calcite.sql.SqlIdentifier;
 import org.apache.calcite.sql.SqlJoin;
@@ -48,6 +49,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import static org.apache.calcite.sql.SqlKind.AS;

rdb/rdb-side/src/main/java/com/dtstack/flink/sql/side/rdb/async/RdbAsyncReqRow.java

@@ -130,7 +130,7 @@ public void asyncInvoke(CRow input, ResultFuture<CRow> resultFuture) throws Exce
             }
         }
 
-        rdbSQLClient.getConnection(conn -> {
+        rdbSqlClient.getConnection(conn -> {
             if (conn.failed()) {
                 //Treatment failures
                 resultFuture.completeExceptionally(conn.cause());
@@ -197,9 +197,9 @@ private Object convertDataType(Object val) {
         } else if (val instanceof Instant) {
 
         } else if (val instanceof Timestamp) {
-            val = DateUtil.getStringFromTimestamp((Timestamp) val);
+            val = DateUtil.timestampToString((Timestamp) val);
         } else if (val instanceof java.util.Date) {
-            val = DateUtil.getStringFromDate((java.sql.Date) val);
+            val = DateUtil.dateToString((java.sql.Date) val);
         } else {
             val = val.toString();
         }