From 659018dcd4a66a83d91a6ff714ebcee8118f6921 Mon Sep 17 00:00:00 2001
From: choubenson <2027178562@qq.com>
Date: Thu, 22 Sep 2022 10:08:03 +0800
Subject: [PATCH] rename methods

---
 .../apache/iotdb/db/engine/compaction/CompactionUtils.java   | 5 +++--
 .../compaction/inner/utils/MultiTsFileDeviceIterator.java    | 4 ++--
 .../org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java   | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java
index 389620123db9f..d8b081c64948c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java
@@ -128,7 +128,7 @@ private static void compactAlignedSeries(
       QueryContext queryContext,
       QueryDataSource queryDataSource)
       throws IOException, MetadataException {
-    Map<String, MeasurementSchema> schemaMap = deviceIterator.getAllMeasurementSchemas();
+    Map<String, MeasurementSchema> schemaMap = deviceIterator.getAllSchemasOfCurrentDevice();
 
     List<IMeasurementSchema> measurementSchemas = new ArrayList<>(schemaMap.values());
     if (measurementSchemas.isEmpty()) {
@@ -165,7 +165,8 @@ private static void compactNonAlignedSeries(
       QueryContext queryContext,
       QueryDataSource queryDataSource)
       throws IOException, InterruptedException {
-    Map<String, MeasurementSchema> measurementSchemaMap = deviceIterator.getAllMeasurementSchemas();
+    Map<String, MeasurementSchema> measurementSchemaMap =
+        deviceIterator.getAllSchemasOfCurrentDevice();
     int subTaskNums = Math.min(measurementSchemaMap.size(), subTaskNum);
 
     // assign all measurements to different sub tasks
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/MultiTsFileDeviceIterator.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/MultiTsFileDeviceIterator.java
index 6b33ad5ce0c36..6e2223d3c5e13 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/MultiTsFileDeviceIterator.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/utils/MultiTsFileDeviceIterator.java
@@ -139,7 +139,7 @@ public Pair<String, Boolean> nextDevice() {
    * files from the newest to the oldest in turn and start traversing the index tree from the
    * firstMeasurementNode node to get all the measurements under the current device.
    */
-  public Map<String, MeasurementSchema> getAllMeasurementSchemas() throws IOException {
+  public Map<String, MeasurementSchema> getAllSchemasOfCurrentDevice() throws IOException {
     Map<String, MeasurementSchema> schemaMap = new ConcurrentHashMap<>();
     // get schemas from the newest file to the oldest file
     for (TsFileResource resource : tsFileResources) {
@@ -150,7 +150,7 @@ public Map<String, MeasurementSchema> getAllMeasurementSchemas() throws IOExcept
       List<TimeseriesMetadata> timeseriesMetadataList = new ArrayList<>();
       reader.getDeviceTimeseriesMetadata(
           timeseriesMetadataList,
-          deviceIteratorMap.get(resource).getMeasurementNode(),
+          deviceIteratorMap.get(resource).getFirstMeasurementNodeOfCurrentDevice(),
           schemaMap.keySet(),
           true);
       for (TimeseriesMetadata timeseriesMetadata : timeseriesMetadataList) {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java
index 3df4144fd0eb0..95d72b75173e0 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileDeviceIterator.java
@@ -57,7 +57,7 @@ public Pair<String, Boolean> next() {
     }
     Pair<String, Pair<Long, Long>> startEndPair = queue.remove();
     try {
-      // first measurement node of this device
+      // get the first measurment node of this device, to know if the device is alignd
       MetadataIndexNode measurementNode =
           MetadataIndexNode.deserializeFrom(
               reader.readData(startEndPair.right.left, startEndPair.right.right));
@@ -71,7 +71,7 @@ public Pair<String, Boolean> next() {
     }
   }
 
-  public MetadataIndexNode getMeasurementNode() {
+  public MetadataIndexNode getFirstMeasurementNodeOfCurrentDevice() {
     return measurementNode;
   }
 }