rename methods (#7396)
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 304ff6d..05983c6 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
@@ -138,7 +138,7 @@
* 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) {
@@ -149,7 +149,7 @@
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/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadPointCompactionPerformer.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadPointCompactionPerformer.java
index d2940da..7f9ae6b 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadPointCompactionPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadPointCompactionPerformer.java
@@ -151,7 +151,7 @@
FragmentInstanceContext fragmentInstanceContext,
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()) {
return;
@@ -191,10 +191,10 @@
MultiTsFileDeviceIterator.MeasurementIterator measurementIterator =
deviceIterator.iterateNotAlignedSeries(device, false);
List<String> allMeasurements =
- new ArrayList<>(deviceIterator.getAllMeasurementSchemas().keySet());
+ new ArrayList<>(deviceIterator.getAllSchemasOfCurrentDevice().keySet());
allMeasurements.sort((String::compareTo));
int subTaskNums = Math.min(allMeasurements.size(), subTaskNum);
- Map<String, MeasurementSchema> schemaMap = deviceIterator.getAllMeasurementSchemas();
+ Map<String, MeasurementSchema> schemaMap = deviceIterator.getAllSchemasOfCurrentDevice();
// construct sub tasks and start compacting measurements in parallel
compactionWriter.startChunkGroup(device, false);
for (int taskCount = 0; taskCount < allMeasurements.size(); ) {
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 da511cc..562a3bb 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
@@ -56,7 +56,7 @@
}
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
this.measurementNode =
MetadataIndexNode.deserializeFrom(
reader.readData(startEndPair.right.left, startEndPair.right.right));
@@ -69,7 +69,7 @@
}
}
- public MetadataIndexNode getMeasurementNode() {
+ public MetadataIndexNode getFirstMeasurementNodeOfCurrentDevice() {
return measurementNode;
}
}
