This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch merge_master0710 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit cc88a11383eab6d4954d77a1a1fbd5dfbebf2c31 Author: JackieTien97 <[email protected]> AuthorDate: Wed Jul 10 18:26:00 2024 +0800 fix compile errors in PipeTabletEventTsFileBatch, TsFileInsertionDataContainerProvider and PipeMemoryWeightUtil --- .../payload/evolvable/batch/PipeTabletEventTsFileBatch.java | 11 ++++++----- .../container/TsFileInsertionDataContainerProvider.java | 3 +-- .../iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventTsFileBatch.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventTsFileBatch.java index e02f2d7bbb0..b27b0b467b3 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventTsFileBatch.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/batch/PipeTabletEventTsFileBatch.java @@ -37,7 +37,7 @@ import org.apache.tsfile.read.common.Path; import org.apache.tsfile.utils.Pair; import org.apache.tsfile.write.TsFileWriter; import org.apache.tsfile.write.record.Tablet; -import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.IMeasurementSchema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -203,7 +203,7 @@ public class PipeTabletEventTsFileBatch extends PipeTabletEventBatch { // Sort the tablets by device id for (int i = 0, size = tabletList.size(); i < size; ++i) { final Tablet tablet = tabletList.get(i); - final String deviceId = tablet.deviceId; + final String deviceId = tablet.getDeviceId(); device2Tablets.computeIfAbsent(deviceId, k -> new ArrayList<>()).add(tablet); device2Aligned.put(deviceId, isTabletAlignedList.get(i)); } @@ -346,16 +346,17 @@ public class PipeTabletEventTsFileBatch extends PipeTabletEventBatch { for (final Tablet tablet : tabletsToWrite) { if (isAligned) { try { - fileWriter.registerAlignedTimeseries(new Path(tablet.deviceId), tablet.getSchemas()); + fileWriter.registerAlignedTimeseries( + new Path(tablet.getDeviceId()), tablet.getSchemas()); } catch (final WriteProcessException ignore) { // Do nothing if the timeSeries has been registered } fileWriter.writeAligned(tablet); } else { - for (final MeasurementSchema schema : tablet.getSchemas()) { + for (final IMeasurementSchema schema : tablet.getSchemas()) { try { - fileWriter.registerTimeseries(new Path(tablet.deviceId), schema); + fileWriter.registerTimeseries(new Path(tablet.getDeviceId()), schema); } catch (final WriteProcessException ignore) { // Do nothing if the timeSeries has been registered } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainerProvider.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainerProvider.java index 9ce61d70eab..d240face2ba 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainerProvider.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/container/TsFileInsertionDataContainerProvider.java @@ -29,7 +29,6 @@ import org.apache.iotdb.db.pipe.event.common.tsfile.container.scan.TsFileInserti import org.apache.iotdb.db.pipe.resource.PipeDataNodeResourceManager; import org.apache.tsfile.file.metadata.IDeviceID; -import org.apache.tsfile.file.metadata.PlainDeviceID; import java.io.File; import java.io.IOException; @@ -115,7 +114,7 @@ public class TsFileInsertionDataContainerProvider { return deviceIsAlignedMap.entrySet().stream() .filter( entry -> { - final String deviceId = ((PlainDeviceID) entry.getKey()).toStringID(); + final IDeviceID deviceId = entry.getKey(); return pattern.coversDevice(deviceId) || pattern.mayOverlapWithDevice(deviceId); }) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java index f93d8f33fbf..ff9c996c6a2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java @@ -25,7 +25,7 @@ import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.write.record.Tablet; -import org.apache.tsfile.write.schema.MeasurementSchema; +import org.apache.tsfile.write.schema.IMeasurementSchema; import java.util.List; import java.util.Map; @@ -75,10 +75,10 @@ public class PipeMemoryWeightUtil { } // values - final List<MeasurementSchema> timeseries = tablet.getSchemas(); + final List<IMeasurementSchema> timeseries = tablet.getSchemas(); if (timeseries != null) { for (int column = 0; column < timeseries.size(); column++) { - final MeasurementSchema measurementSchema = timeseries.get(column); + final IMeasurementSchema measurementSchema = timeseries.get(column); if (measurementSchema == null) { continue; }
