[iotdb] branch master updated: [IOTDB-1462] fix cross space compaction recover use wrong storage group name bug (#3496)

[qiaojialin]

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

qiaojialin 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 a3f1358  [IOTDB-1462] fix cross space compaction recover use wrong 
storage group name bug (#3496)
a3f1358 is described below

commit a3f1358e3b5c475523467bd2b18f4ade7b61427c
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Sat Jul 3 03:49:50 2021 -0500

    [IOTDB-1462] fix cross space compaction recover use wrong storage group 
name bug (#3496)
---
 .../iotdb/db/engine/storagegroup/StorageGroupProcessor.java       | 2 +-
 .../java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 0487a34..bb3820e 100755
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -485,7 +485,7 @@ public class StorageGroupProcessor {
               tsFileManagement::mergeEndAction,
               taskName,
               IoTDBDescriptor.getInstance().getConfig().isForceFullMerge(),
-              logicalStorageGroupName + "-" + virtualStorageGroupId);
+              logicalStorageGroupName);
       logger.info(
           "{} - {} a RecoverMergeTask {} starts...",
           logicalStorageGroupName,
diff --git 
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java 
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java
index 76e0dba..499a2c9 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupByMonthIT.java
@@ -34,6 +34,8 @@ import java.sql.ResultSet;
 import java.sql.Statement;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.TimeZone;
 
 import static org.apache.iotdb.db.constant.TestConstant.sum;
@@ -237,13 +239,19 @@ public class IoTDBGroupByMonthIT {
 
       Assert.assertTrue(hasResultSet);
       int cnt = 0;
+      List<String> times = new ArrayList<>();
       try (ResultSet resultSet = statement.getResultSet()) {
         while (resultSet.next()) {
           String ans = resultSet.getString(sum("root.sg1.d1.temperature"));
+          times.add(resultSet.getString("Time"));
           if (ans.equals("0.0")) {
             cnt++;
           }
         }
+        if (cnt < 28 || cnt > 31) {
+          System.out.println("cnt: " + cnt);
+          System.out.println(times);
+        }
         Assert.assertTrue(cnt >= 28);
         Assert.assertTrue(cnt <= 31);
       }