(iotdb) branch master updated: Pipe IT: Refactored IT to complement necessary flush to all the pipe ITs (#12164)

[rong]

This is an automated email from the ASF dual-hosted git repository.

rong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 9ceeeb5aabb Pipe IT: Refactored IT to complement necessary flush to 
all the pipe ITs (#12164)
9ceeeb5aabb is described below

commit 9ceeeb5aabb07a29ba840338116c728cee4a63fc
Author: Caideyipi <87789683+caidey...@users.noreply.github.com>
AuthorDate: Wed Mar 13 14:02:47 2024 +0800

    Pipe IT: Refactored IT to complement necessary flush to all the pipe ITs 
(#12164)
---
 .../apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java    | 5 ++++-
 .../{PipePatternFormatIT.java => IoTDBPipePatternFormatIT.java}     | 2 +-
 .../java/org/apache/iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java  | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
index 41c400b0a79..c6fdf4fb037 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
@@ -95,6 +95,9 @@ public class IoTDBPipeAutoConflictIT extends 
AbstractPipeDualAutoIT {
         return;
       }
     }
+    if (!TestUtils.tryExecuteNonQueryWithRetry(senderEnv, "flush")) {
+      return;
+    }
 
     for (int i = 200; i < 300; ++i) {
       if (!TestUtils.tryExecuteNonQueryWithRetry(
@@ -138,7 +141,7 @@ public class IoTDBPipeAutoConflictIT extends 
AbstractPipeDualAutoIT {
         return;
       }
     }
-    if (!TestUtils.tryExecuteNonQueryWithRetry(senderEnv, "flush")) {
+    if (!TestUtils.tryExecuteNonQueryWithRetry(receiverEnv, "flush")) {
       return;
     }
 
diff --git 
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/PipePatternFormatIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipePatternFormatIT.java
similarity index 99%
rename from 
integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/PipePatternFormatIT.java
rename to 
integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipePatternFormatIT.java
index e93b969d532..2195221d25c 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/PipePatternFormatIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipePatternFormatIT.java
@@ -41,7 +41,7 @@ import java.util.Set;
 
 @RunWith(IoTDBTestRunner.class)
 @Category({MultiClusterIT2.class})
-public class PipePatternFormatIT extends AbstractPipeDualAutoIT {
+public class IoTDBPipePatternFormatIT extends AbstractPipeDualAutoIT {
   @Test
   public void testPrefixPattern() throws Exception {
     DataNodeWrapper receiverDataNode = receiverEnv.getDataNodeWrapper(0);
diff --git 
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java
index f680e292c0e..1129261b4b9 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeInclusionIT.java
@@ -93,8 +93,10 @@ public class IoTDBPipeInclusionIT extends 
AbstractPipeDualManualIT {
           Collections.singleton(
               
"root.ln.wf01.wt01.status,null,root.ln,BOOLEAN,PLAIN,LZ4,{\"tag3\":\"v3\"},{\"attr4\":\"v4\"},null,null,BASE,"));
 
-      if (!TestUtils.tryExecuteNonQueryWithRetry(
-          senderEnv, "insert into root.ln.wf01.wt01(time, status) 
values(now(), false)")) {
+      if (!TestUtils.tryExecuteNonQueriesWithRetry(
+          senderEnv,
+          Arrays.asList(
+              "insert into root.ln.wf01.wt01(time, status) values(now(), 
false)", "flush"))) {
         return;
       }