[iotdb] branch rel/0.13 updated: rename methods (#7397)

[marklau99]

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

marklau99 pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.13 by this push:
     new 1cc635cb27 rename methods (#7397)
1cc635cb27 is described below

commit 1cc635cb2703d8a774bd1592dc8367dfbdb316c8
Author: 周沛辰 <45144903+chouben...@users.noreply.github.com>
AuthorDate: Thu Sep 22 15:16:40 2022 +0800

    rename methods (#7397)
---
 .../java/org/apache/iotdb/db/engine/compaction/CompactionUtils.java  | 5 +++--
 .../db/engine/compaction/inner/utils/MultiTsFileDeviceIterator.java  | 4 ++--
 .../main/java/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 389620123d..d8b081c649 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 @@ public class CompactionUtils {
       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 @@ public class CompactionUtils {
       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 6b33ad5ce0..6e2223d3c5 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 class MultiTsFileDeviceIterator implements 
AutoCloseable {
    * 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 class MultiTsFileDeviceIterator implements 
AutoCloseable {
       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 3df4144fd0..95d72b7517 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 class TsFileDeviceIterator implements 
Iterator<Pair<String, Boolean>> {
     }
     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 class TsFileDeviceIterator implements 
Iterator<Pair<String, Boolean>> {
     }
   }
 
-  public MetadataIndexNode getMeasurementNode() {
+  public MetadataIndexNode getFirstMeasurementNodeOfCurrentDevice() {
     return measurementNode;
   }
 }