Merge remote-tracking branch 'origin/1.5_v3.6.1' into 1.5_v3.7.2

Author: todd5167

mysql/mysql-side/mysql-async-side/src/main/java/com/dtstack/flink/sql/side/mysql/MysqlAsyncReqRow.java

@@ -69,11 +69,12 @@ public void open(Configuration parameters) throws Exception {
                 .put("idle_connection_test_period", DEFAULT_IDLE_CONNECTION_TEST_PEROID)
                 .put("test_connection_on_checkin", DEFAULT_TEST_CONNECTION_ON_CHECKIN);
 
-
+        System.setProperty("vertx.disableFileCPResolving", "true");
 
         VertxOptions vo = new VertxOptions();
         vo.setEventLoopPoolSize(DEFAULT_VERTX_EVENT_LOOP_POOL_SIZE);
         vo.setWorkerPoolSize(DEFAULT_VERTX_WORKER_POOL_SIZE);
+        vo.setFileResolverCachingEnabled(false);
         Vertx vertx = Vertx.vertx(vo);
         setRdbSQLClient(JDBCClient.createNonShared(vertx, mysqlClientConfig));
     }

oracle/oracle-side/oracle-async-side/src/main/java/com/dtstack/flink/sql/side/oracle/OracleAsyncReqRow.java

@@ -59,11 +59,14 @@ public void open(Configuration parameters) throws Exception {
                 .put("provider_class", DT_PROVIDER_CLASS)
                 .put("preferred_test_query", PREFERRED_TEST_QUERY_SQL)
                 .put("idle_connection_test_period", DEFAULT_IDLE_CONNECTION_TEST_PEROID)
-                .put("test_connection_on_checkin", DEFAULT_TEST_CONNECTION_ON_CHECKIN);;
+                .put("test_connection_on_checkin", DEFAULT_TEST_CONNECTION_ON_CHECKIN);
+
+        System.setProperty("vertx.disableFileCPResolving", "true");
 
         VertxOptions vo = new VertxOptions();
         vo.setEventLoopPoolSize(DEFAULT_VERTX_EVENT_LOOP_POOL_SIZE);
         vo.setWorkerPoolSize(DEFAULT_VERTX_WORKER_POOL_SIZE);
+        vo.setFileResolverCachingEnabled(false);
         Vertx vertx = Vertx.vertx(vo);
         setRdbSQLClient(JDBCClient.createNonShared(vertx, oracleClientConfig));
     }

rdb/rdb-sink/src/main/java/com/dtstack/flink/sql/sink/rdb/RdbSink.java

@@ -69,6 +69,8 @@ public abstract class RdbSink implements RetractStreamTableSink<Row>, Serializab
 
     protected String tableName;
 
+    protected String registerTabName;
+
     protected String sql;
 
     protected List<String> primaryKeys;
@@ -112,6 +114,7 @@ public RdbSink genStreamSink(TargetTableInfo targetTableInfo) {
         String tmpUserName = rdbTableInfo.getUserName();
         String tmpPassword = rdbTableInfo.getPassword();
         String tmpTableName = rdbTableInfo.getTableName();
+        String tmpRegisterName = rdbTableInfo.getName();
 
         Integer tmpSqlBatchSize = rdbTableInfo.getBatchSize();
         if (tmpSqlBatchSize != null) {
@@ -136,6 +139,7 @@ public RdbSink genStreamSink(TargetTableInfo targetTableInfo) {
         this.userName = tmpUserName;
         this.password = tmpPassword;
         this.tableName = tmpTableName;
+        this.registerTabName = tmpRegisterName;
         this.primaryKeys = rdbTableInfo.getPrimaryKeys();
         this.dbType = rdbTableInfo.getType();
 
@@ -193,7 +197,7 @@ protected void buildSqlTypes(List<Class> fieldTypeArray) {
     public void emitDataStream(DataStream<Tuple2<Boolean, Row>> dataStream) {
         RichSinkFunction richSinkFunction = createJdbcSinkFunc();
         DataStreamSink streamSink = dataStream.addSink(richSinkFunction);
-        streamSink.name(tableName);
+        streamSink.name(registerTabName);
         if (parallelism > 0) {
             streamSink.setParallelism(parallelism);
         }

sqlserver/sqlserver-side/sqlserver-async-side/src/main/java/com/dtstack/flink/sql/side/sqlserver/SqlserverAsyncReqRow.java

@@ -57,11 +57,14 @@ public void open(Configuration parameters) throws Exception {
                 .put("provider_class", DT_PROVIDER_CLASS)
                 .put("preferred_test_query", PREFERRED_TEST_QUERY_SQL)
                 .put("idle_connection_test_period", DEFAULT_IDLE_CONNECTION_TEST_PEROID)
-                .put("test_connection_on_checkin", DEFAULT_TEST_CONNECTION_ON_CHECKIN);;
+                .put("test_connection_on_checkin", DEFAULT_TEST_CONNECTION_ON_CHECKIN);
+
+        System.setProperty("vertx.disableFileCPResolving", "true");
 
         VertxOptions vo = new VertxOptions();
         vo.setEventLoopPoolSize(DEFAULT_VERTX_EVENT_LOOP_POOL_SIZE);
         vo.setWorkerPoolSize(DEFAULT_VERTX_WORKER_POOL_SIZE);
+        vo.setFileResolverCachingEnabled(false);
         Vertx vertx = Vertx.vertx(vo);
         setRdbSQLClient(JDBCClient.createNonShared(vertx, sqlserverClientConfig));
     }