[iotdb] branch TotalSeriesNumber11 created (now ed67ccc)

[ha...@apache.org]

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

haonan pushed a change to branch TotalSeriesNumber11
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


      at ed67ccc  Fix TotalSeriesNumber in MManager counted twice when recovering

This branch includes the following new commits:

     new ed67ccc  Fix TotalSeriesNumber in MManager counted twice when recovering

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[iotdb] 01/01: Fix TotalSeriesNumber in MManager counted twice when recovering

[ha...@apache.org]

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

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

commit ed67cccf3ffa56004abf65b0d0ec875b65c3b92a
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu May 27 15:48:57 2021 +0800

    Fix TotalSeriesNumber in MManager counted twice when recovering
---
 server/src/main/java/org/apache/iotdb/db/metadata/MManager.java    | 7 +------
 .../test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java  | 4 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index 1eedf02..325a2e4 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -216,16 +216,11 @@ public class MManager {
 
       isRecovering = true;
       int lineNumber = initFromLog(logFile);
-      List<PartialPath> storageGroups = mtree.getAllStorageGroupPaths();
-      for (PartialPath sg : storageGroups) {
-        MNode node = mtree.getNodeByPath(sg);
-        totalSeriesNumber.addAndGet(node.getMeasurementMNodeCount());
-      }
 
       logWriter = new MLogWriter(config.getSchemaDir(), MetadataConstant.METADATA_LOG);
       logWriter.setLineNumber(lineNumber);
       isRecovering = false;
-    } catch (IOException | MetadataException e) {
+    } catch (IOException e) {
       mtree = new MTree();
       logger.error("Cannot read MTree from file, using an empty new one", e);
     }
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
index 4f9b34a..889d3b2 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
@@ -516,7 +516,7 @@ public class MManagerBasicTest {
   }
 
   @Test
-  public void testTotalSeriesNumber() {
+  public void testTotalSeriesNumber() throws Exception {
     MManager manager = IoTDB.metaManager;
 
     try {
@@ -559,6 +559,8 @@ public class MManagerBasicTest {
           null);
 
       assertEquals(6, manager.getTotalSeriesNumber());
+      EnvironmentUtils.restartDaemon();
+      assertEquals(6, manager.getTotalSeriesNumber());
       manager.deleteTimeseries(new PartialPath("root.laptop.d2.s1"));
       assertEquals(5, manager.getTotalSeriesNumber());
       manager.deleteStorageGroups(Collections.singletonList(new PartialPath("root.laptop")));