This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch new_object_type in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit cbf0927918e23df7c6658dca52e4725da53e4550 Author: HTHou <[email protected]> AuthorDate: Tue Jul 15 12:17:30 2025 +0800 fix multi measurement name --- .../plan/planner/plan/node/write/RelationalInsertTabletNode.java | 2 +- .../dataregion/tsfile/generator/TsFileNameGenerator.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java index 7844248601d..ee93712e77d 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java @@ -474,7 +474,7 @@ public class RelationalInsertTabletNode extends InsertTabletNode { byte[] content = ReadWriteIOUtils.readBytes(buffer, buffer.remaining()); String relativePath = TsFileNameGenerator.generateObjectFilePath( - entry.getKey().getRegionId().getId(), times[j], getDeviceID(j)); + entry.getKey().getRegionId().getId(), times[j], getDeviceID(j), measurements[column]); ObjectNode objectNode = new ObjectNode(isEoF, offset, content, relativePath); objectNode.setDataRegionReplicaSet(entry.getKey()); result.add(objectNode); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/generator/TsFileNameGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/generator/TsFileNameGenerator.java index b3f1327483a..8ad353a96ef 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/generator/TsFileNameGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/generator/TsFileNameGenerator.java @@ -176,7 +176,8 @@ public class TsFileNameGenerator { } } - public static String generateObjectFilePath(int regionId, long time, IDeviceID iDeviceID) { + public static String generateObjectFilePath( + int regionId, long time, IDeviceID iDeviceID, String measurement) { String objectFileName = time + ".bin"; Object[] segments = iDeviceID.getSegments(); StringBuilder relativePathString = @@ -186,6 +187,7 @@ public class TsFileNameGenerator { .append(segment == null ? "null" : segment.toString().toLowerCase()) .append(File.separator); } + relativePathString.append(measurement).append(File.separator); relativePathString.append(objectFileName); return relativePathString.toString(); }
