Skip to content

Commit a3e00d5

Browse files
committed
Address load fallback review comments
1 parent 732bf87 commit a3e00d5

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/converter/LoadTreeTsFileTabletIterator.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
import org.apache.tsfile.file.metadata.IDeviceID;
3131
import org.apache.tsfile.file.metadata.TimeseriesMetadata;
32-
import org.apache.tsfile.read.TsFileDeviceIterator;
3332
import org.apache.tsfile.read.TsFileSequenceReader;
3433
import org.apache.tsfile.utils.Pair;
3534
import org.apache.tsfile.write.record.Tablet;
35+
import org.apache.tsfile.write.schema.IMeasurementSchema;
3636
import org.slf4j.Logger;
3737
import org.slf4j.LoggerFactory;
3838

@@ -264,12 +264,13 @@ private LinkedHashMap<IDeviceID, List<String>> readDeviceMeasurementsInOrder()
264264
throws IOException {
265265
final LinkedHashMap<IDeviceID, List<String>> deviceMeasurementsMap = new LinkedHashMap<>();
266266
try (final TsFileSequenceReader reader = new TsFileSequenceReader(file.getAbsolutePath())) {
267-
final TsFileDeviceIterator deviceIterator = reader.getAllDevicesIteratorWithIsAligned();
268-
while (deviceIterator.hasNext()) {
269-
final IDeviceID device = deviceIterator.next().getLeft();
267+
final Iterator<Pair<IDeviceID, List<TimeseriesMetadata>>> metadataIterator =
268+
reader.iterAllTimeseriesMetadata(false, false);
269+
while (metadataIterator.hasNext()) {
270+
final Pair<IDeviceID, List<TimeseriesMetadata>> deviceMetadata = metadataIterator.next();
270271
deviceMeasurementsMap.put(
271-
device,
272-
reader.readDeviceMetadata(device).values().stream()
272+
deviceMetadata.getLeft(),
273+
deviceMetadata.getRight().stream()
273274
.map(TimeseriesMetadata::getMeasurementId)
274275
.collect(Collectors.toList()));
275276
}
@@ -506,9 +507,7 @@ private void splitOrSkipActiveQueryTask() {
506507
}
507508

508509
private List<String> extractMeasurementNames(final Tablet tablet) {
509-
final List<String> measurements = new ArrayList<>(tablet.getSchemas().size());
510-
tablet.getSchemas().forEach(schema -> measurements.add(schema.getMeasurementName()));
511-
return measurements;
510+
return IMeasurementSchema.getMeasurementNameList(tablet.getSchemas());
512511
}
513512

514513
private boolean measurementsEqual(

0 commit comments

Comments
 (0)