fix-IT

Author: Caideyipi

integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java

@@ -939,19 +939,18 @@ public static void executeNonQueriesWithRetry(
     }
   }
 
-  public static boolean tryExecuteNonQueryWithRetry(
-      BaseEnv env, String sql, Connection defaultConnection) {
-    return tryExecuteNonQueryWithRetry(
+  public static boolean executeNonQuery(BaseEnv env, String sql, Connection defaultConnection) {
+    return executeNonQuery(
         env, sql, SessionConfig.DEFAULT_USER, SessionConfig.DEFAULT_PASSWORD, defaultConnection);
   }
 
-  public static boolean tryExecuteNonQueryWithRetry(
+  public static boolean executeNonQuery(
       String dataBaseName,
       String sqlDialect,
       BaseEnv env,
       String sql,
       Connection defaultConnection) {
-    return tryExecuteNonQueryWithRetry(
+    return executeNonQuery(
         env,
         sql,
         SessionConfig.DEFAULT_USER,
@@ -961,21 +960,21 @@ public static boolean tryExecuteNonQueryWithRetry(
         defaultConnection);
   }
 
-  public static boolean tryExecuteNonQueryWithRetry(
+  public static boolean executeNonQuery(
       BaseEnv env, String sql, String userName, String password, Connection defaultConnection) {
-    return tryExecuteNonQueriesWithRetry(
+    return executeNonQueries(
         env, Collections.singletonList(sql), userName, password, defaultConnection);
   }
 
-  public static boolean tryExecuteNonQueryWithRetry(
+  public static boolean executeNonQuery(
       BaseEnv env,
       String sql,
       String userName,
       String password,
       String dataBaseName,
       String sqlDialect,
       Connection defaultConnection) {
-    return tryExecuteNonQueriesWithRetry(
+    return executeNonQueries(
         env,
         Collections.singletonList(sql),
         userName,
@@ -985,9 +984,9 @@ public static boolean tryExecuteNonQueryWithRetry(
         defaultConnection);
   }
 
-  public static boolean tryExecuteNonQueriesWithRetry(
+  public static boolean executeNonQueries(
       BaseEnv env, List<String> sqlList, Connection defaultConnection) {
-    return tryExecuteNonQueriesWithRetry(
+    return executeNonQueries(
         env,
         sqlList,
         SessionConfig.DEFAULT_USER,
@@ -997,13 +996,13 @@ public static boolean tryExecuteNonQueriesWithRetry(
         defaultConnection);
   }
 
-  public static boolean tryExecuteNonQueriesWithRetry(
+  public static boolean executeNonQueries(
       String dataBase,
       String sqlDialect,
       BaseEnv env,
       List<String> sqlList,
       Connection defaultConnection) {
-    return tryExecuteNonQueriesWithRetry(
+    return executeNonQueries(
         env,
         sqlList,
         SessionConfig.DEFAULT_USER,
@@ -1015,16 +1014,62 @@ public static boolean tryExecuteNonQueriesWithRetry(
 
   // This method will not throw failure given that a failure is encountered.
   // Instead, it returns a flag to indicate the result of the execution.
-  public static boolean tryExecuteNonQueriesWithRetry(
+  public static boolean executeNonQueries(
       BaseEnv env,
       List<String> sqlList,
       String userName,
       String password,
       Connection defaultConnection) {
-    return tryExecuteNonQueriesWithRetry(
+    return executeNonQueries(
         env, sqlList, userName, password, null, TREE_SQL_DIALECT, defaultConnection);
   }
 
+  public static boolean executeNonQueries(
+      BaseEnv env,
+      List<String> sqlList,
+      String userName,
+      String password,
+      String dataBase,
+      String sqlDialect,
+      Connection defaultConnection) {
+    int lastIndex = 0;
+    Connection localConnection = null;
+    Connection connectionToUse = defaultConnection;
+    Statement statement;
+    try {
+      // create a new connection if default is not provided or the previous is broken
+      if (connectionToUse == null) {
+        localConnection =
+            env.getConnection(
+                userName,
+                password,
+                BaseEnv.TABLE_SQL_DIALECT.equals(sqlDialect)
+                    ? BaseEnv.TABLE_SQL_DIALECT
+                    : TREE_SQL_DIALECT);
+        connectionToUse = localConnection;
+      }
+      statement = connectionToUse.createStatement();
+      if (BaseEnv.TABLE_SQL_DIALECT.equals(sqlDialect) && dataBase != null) {
+        statement.execute("use " + dataBase);
+      }
+      for (int i = lastIndex; i < sqlList.size(); ++i) {
+        statement.execute(sqlList.get(i));
+      }
+      return true;
+    } catch (SQLException e) {
+      // the default connection should be closed by the upper level
+      // while the local connection should be closed here
+      if (connectionToUse == localConnection && localConnection != null) {
+        try {
+          localConnection.close();
+        } catch (SQLException ex) {
+          // ignore
+        }
+      }
+      throw new RuntimeException(e);
+    }
+  }
+
   public static boolean tryExecuteNonQueriesWithRetry(
       BaseEnv env,
       List<String> sqlList,
@@ -1073,7 +1118,16 @@ public static boolean tryExecuteNonQueriesWithRetry(
           }
         }
         connectionToUse = null;
-        throw new RuntimeException(e);
+
+        if (retryCountLeft > 0) {
+          try {
+            Thread.sleep(10000);
+          } catch (InterruptedException ignored) {
+          }
+        } else {
+          e.printStackTrace();
+          return false;
+        }
       }
     }
     return false;

integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java

@@ -112,7 +112,7 @@ public static boolean insertData(
               tableName, i, i, i, i, i, i, i, i, i, i, getDateStr(i), i, i));
     }
     list.add("flush");
-    return TestUtils.tryExecuteNonQueriesWithRetry(
+    return TestUtils.executeNonQueries(
         dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
   }
 
@@ -163,7 +163,7 @@ public static boolean insertData(
               values[11],
               i));
     }
-    return TestUtils.tryExecuteNonQueriesWithRetry(
+    return TestUtils.executeNonQueries(
         dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
   }
 
@@ -180,7 +180,7 @@ public static boolean insertDataNotThrowError(
               "insert into %s (s0, s3, s2, s1, s4, s5, s6, s7, s8, s9, s10, s11, time) values ('t%s','t%s','t%s','t%s','%s', %s.0, %s, %s, %d, %d.0, '%s', '%s', %s)",
               tableName, i, i, i, i, i, i, i, i, i, i, getDateStr(i), i, i));
     }
-    return TestUtils.tryExecuteNonQueriesWithRetry(
+    return TestUtils.executeNonQueries(
         dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null);
   }
 
@@ -246,7 +246,7 @@ public static void deleteData(
     List<String> list = new ArrayList<>(end - start + 1);
     list.add(
         String.format("delete from %s where time >= %s and time <= %s", tableName, start, end));
-    if (!TestUtils.tryExecuteNonQueriesWithRetry(
+    if (!TestUtils.executeNonQueries(
         dataBaseName, BaseEnv.TABLE_SQL_DIALECT, baseEnv, list, null)) {
       fail();
     }