remove unused code in TsFileResource

apache · Mar 30, 2020 · 3286c98 · 3286c98
1 parent cf5f441
commit 3286c98
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -518,7 +518,7 @@ public boolean isFileAlreadyExist(TsFileResource tsFileResource, String storageG
     return processor != null && processor.isFileAlreadyExist(tsFileResource, partitionNum);
   }
 
-  public long getTimePartitionInterval() {
+  public static long getTimePartitionInterval() {
     return timePartitionInterval;
   }
 

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
@@ -31,7 +31,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.engine.merge.manage.MergeContext;
 import org.apache.iotdb.db.engine.merge.manage.MergeManager;

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
@@ -119,20 +119,17 @@ private void doMerge() throws IOException, MetadataException {
 
     Set<String> devices = MManager.getInstance().getDevices(storageGroupName);
     Map<Path, MeasurementSchema> measurementSchemaMap = new HashMap<>();
+    List<Path> unmergedSeries = new ArrayList<>();
     for (String device : devices) {
       InternalMNode deviceNode = (InternalMNode) MManager.getInstance().getNodeByPath(device);
       for (Entry<String, MNode> entry : deviceNode.getChildren().entrySet()) {
-        measurementSchemaMap.put(new Path(device, entry.getKey()), ((LeafMNode) entry.getValue()).getSchema());
+        Path path = new Path(device, entry.getKey());
+        measurementSchemaMap.put(path, ((LeafMNode) entry.getValue()).getSchema());
+        unmergedSeries.add(path);
       }
     }
     resource.setMeasurementSchemaMap(measurementSchemaMap);
 
-    List<String> storageGroupPaths = MManager.getInstance().getAllTimeseriesName(storageGroupName + ".*");
-    List<Path> unmergedSeries = new ArrayList<>();
-    for (String path : storageGroupPaths) {
-      unmergedSeries.add(new Path(path));
-    }
-
     mergeLogger.logMergeStart();
 
     MergeMultiChunkTask mergeChunkTask = new MergeMultiChunkTask(mergeContext, taskName, mergeLogger, resource,

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -104,11 +104,6 @@ public TsFileProcessor getProcessor() {
 
   private FSFactory fsFactory = FSFactoryProducer.getFSFactory();
 
-  /**
-   * set to false if we failed to get TimeSeriesMetadata
-   */
-  private boolean canGetTimeSeriesMetadata = true;
-
   public TsFileResource() {
   }
 
@@ -474,14 +469,6 @@ public void setProcessor(TsFileProcessor processor) {
     this.processor = processor;
   }
 
-  public boolean canGetTimeSeriesMetadata() {
-    return canGetTimeSeriesMetadata;
-  }
-
-  public void setCanGetTimeSeriesMetadata(boolean canGetTimeSeriesMetadata) {
-    this.canGetTimeSeriesMetadata = canGetTimeSeriesMetadata;
-  }
-
   public TimeseriesMetadata getTimeSeriesMetadata() {
     return timeSeriesMetadata;
   }