fix tests

Author: jt2594838

integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtension2IT.java

@@ -24,6 +24,7 @@
 import org.apache.iotdb.commons.client.exception.ClientManagerException;
 import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
 import org.apache.iotdb.commons.cluster.NodeStatus;
+import org.apache.iotdb.commons.pipe.config.constant.SystemConstant;
 import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
 import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionReq;
 import org.apache.iotdb.confignode.rpc.thrift.TDataPartitionTableResp;
@@ -147,6 +148,7 @@ public void testAutoRegionGroupExtensionPolicy2()
 
       // Check DataRegionGroups
       TShowRegionResp resp = client.showRegion(new TShowRegionReq());
+      resp.getRegionInfoList().removeIf(r -> r.getDatabase().startsWith(SystemConstant.SYSTEM_DATABASE));
       Map<Integer, AtomicInteger> counter = new HashMap<>();
       resp.getRegionInfoList()
           .forEach(

integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java

@@ -176,7 +176,6 @@ private void checkRegionDistribution(
     Map<String, Integer> databaseRegionCounter = new TreeMap<>();
     Map<Integer, Integer> dataNodeRegionCounter = new TreeMap<>();
     Map<String, Map<Integer, Integer>> databaseDataNodeRegionCounter = new TreeMap<>();
-    resp.getRegionInfoList().removeIf(r -> r.database.equals(SystemConstant.SYSTEM_DATABASE));
     resp.getRegionInfoList()
         .forEach(
             regionInfo -> {
@@ -187,7 +186,8 @@ private void checkRegionDistribution(
                   .merge(regionInfo.getDataNodeId(), 1, Integer::sum);
             });
     // The number of RegionGroups should not less than the testMinRegionGroupNum for each database
-    Assert.assertEquals(TEST_DATABASE_NUM, databaseRegionCounter.size());
+    // +1 for system database
+    Assert.assertEquals(TEST_DATABASE_NUM + 1, databaseRegionCounter.size());
     databaseRegionCounter.forEach(
         (database, regionCount) ->
             Assert.assertTrue(
@@ -199,13 +199,15 @@ private void checkRegionDistribution(
     // DataNode
     Assert.assertEquals(TEST_DATA_NODE_NUM, dataNodeRegionCounter.size());
     System.out.println(databaseRegionCounter);
+    System.out.println(dataNodeRegionCounter);
     Assert.assertTrue(
         dataNodeRegionCounter.values().stream().max(Integer::compareTo).orElse(0)
                 - dataNodeRegionCounter.values().stream().min(Integer::compareTo).orElse(0)
             <= 1);
     // The maximal Region count - minimal Region count should be less than or equal to 1 for each
     // Database
-    Assert.assertEquals(TEST_DATABASE_NUM, databaseDataNodeRegionCounter.size());
+    // +1 for system database
+    Assert.assertEquals(TEST_DATABASE_NUM + 1, databaseDataNodeRegionCounter.size());
     databaseDataNodeRegionCounter.forEach(
         (database, dataNodeRegionCount) ->
             Assert.assertTrue(

integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeIdempotentIT.java

@@ -175,7 +175,7 @@ public void testDeleteTimeSeriesIdempotent() throws Exception {
         "create database root.sg",
         "count databases",
         "count,",
-        Collections.singleton("2,"));
+        Collections.singleton("3,"));
   }
 
   @Test
@@ -186,7 +186,7 @@ public void testCreateTemplateIdempotent() throws Exception {
         "create database root.sg1",
         "count databases",
         "count,",
-        Collections.singleton("1,"));
+        Collections.singleton("2,"));
   }
 
   @Test
@@ -198,7 +198,7 @@ public void testExtendTemplateIdempotent() throws Exception {
         "create database root.sg1",
         "count databases",
         "count,",
-        Collections.singleton("1,"));
+        Collections.singleton("2,"));
   }
 
   @Test
@@ -210,7 +210,7 @@ public void testDropTemplateIdempotent() throws Exception {
         "create database root.sg1",
         "count databases",
         "count,",
-        Collections.singleton("1,"));
+        Collections.singleton("2,"));
   }
 
   @Test
@@ -223,7 +223,7 @@ public void testSetTemplateIdempotent() throws Exception {
         "create database root.sg2",
         "count databases",
         "count,",
-        Collections.singleton("2,"));
+        Collections.singleton("3,"));
   }
 
   @Test
@@ -237,7 +237,7 @@ public void testUnsetTemplateIdempotent() throws Exception {
         "create database root.sg2",
         "count databases",
         "count,",
-        Collections.singleton("2,"));
+        Collections.singleton("3,"));
   }
 
   @Test
@@ -267,7 +267,7 @@ public void testDeactivateTemplateIdempotent() throws Exception {
         "create database root.sg2",
         "count databases",
         "count,",
-        Collections.singleton("2,"));
+        Collections.singleton("3,"));
   }
 
   @Test
@@ -278,7 +278,7 @@ public void testCreateDatabaseIdempotent() throws Exception {
         "create database root.sg2",
         "count databases",
         "count,",
-        Collections.singleton("2,"));
+        Collections.singleton("3,"));
   }
 
   @Test
@@ -289,7 +289,7 @@ public void testAlterDatabaseIdempotent() throws Exception {
         "create database root.sg2",
         "count databases",
         "count,",
-        Collections.singleton("2,"));
+        Collections.singleton("3,"));
   }
 
   @Test
@@ -300,7 +300,7 @@ public void testDropDatabaseIdempotent() throws Exception {
         "create database root.sg2",
         "count databases",
         "count,",
-        Collections.singleton("1,"));
+        Collections.singleton("2,"));
   }
 
   @Test
@@ -322,7 +322,7 @@ public void testCreateRoleIdempotent() throws Exception {
         "create database root.sg1",
         "count databases",
         "count,",
-        Collections.singleton("1,"));
+        Collections.singleton("2,"));
   }
 
   @Test
@@ -357,7 +357,7 @@ public void testRevokeRoleIdempotent() throws Exception {
         "create database root.sg1",
         "count databases",
         "count,",
-        Collections.singleton("1,"));
+        Collections.singleton("2,"));
   }
 
   @Test
@@ -393,7 +393,7 @@ public void testDropRoleIdempotent() throws Exception {
         "create database root.sg1",
         "count databases",
         "count,",
-        Collections.singleton("1,"));
+        Collections.singleton("2,"));
   }
 
   // Table model