Delete some unused check in MManager

apache · Feb 20, 2020 · ecfda43 · ecfda43
1 parent a193551
commit ecfda43
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 203 deletions.
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java
@@ -99,7 +99,7 @@ public Status analyze() throws IOException, MetadataException {
 
         analyzeUnseqFiles(bufferedReader);
 
-        List<String> storageGroupPaths = MManager.getInstance().getPaths(storageGroupName + ".*");
+        List<String> storageGroupPaths = MManager.getInstance().getAllTimeseriesName(storageGroupName + ".*");
         unmergedPaths = new ArrayList<>();
         for (String path : storageGroupPaths) {
           unmergedPaths.add(new Path(path));

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
@@ -114,7 +114,7 @@ private void doMerge() throws IOException, MetadataException {
         .getStorageGroupSchema(storageGroupName);
     resource.addMeasurements(measurementSchemas);
 
-    List<String> storageGroupPaths = MManager.getInstance().getPaths(storageGroupName + ".*");
+    List<String> storageGroupPaths = MManager.getInstance().getAllTimeseriesName(storageGroupName + ".*");
     List<Path> unmergedSeries = new ArrayList<>();
     for (String path : storageGroupPaths) {
       unmergedSeries.add(new Path(path));

diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/IncorrectRootException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/IncorrectRootException.java