This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch removeTsFIleModule_v4
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/removeTsFIleModule_v4 by this
push:
new 32354c1bc38 change to IMeasurementSchema and IDeviceID
32354c1bc38 is described below
commit 32354c1bc380574246043b9d9355b5922d91b4f8
Author: Tian Jiang <[email protected]>
AuthorDate: Fri Apr 19 18:16:21 2024 +0800
change to IMeasurementSchema and IDeviceID
---
.../src/main/java/org/apache/iotdb/CountPointProcessor.java | 2 +-
.../org/apache/iotdb/confignode/manager/ConfigManager.java | 4 ++--
.../db/queryengine/common/schematree/DeviceSchemaInfo.java | 2 --
.../execution/fragment/FragmentInstanceContext.java | 2 +-
.../execution/operator/process/DeviceViewIntoOperator.java | 3 ++-
.../queryengine/execution/operator/process/IntoOperator.java | 3 ++-
.../execution/operator/source/FileLoaderUtils.java | 2 +-
.../apache/iotdb/db/queryengine/plan/analyze/Analysis.java | 9 ++++++---
.../iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java | 4 ++--
.../iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java | 2 +-
.../analyze/cache/schema/DeviceUsingTemplateSchemaCache.java | 2 +-
.../queryengine/plan/analyze/schema/ClusterSchemaFetcher.java | 1 -
.../iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java | 4 ++--
.../iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java | 4 ++--
.../db/queryengine/plan/planner/OperatorTreeGenerator.java | 6 +++---
.../queryengine/plan/planner/plan/node/PlanGraphPrinter.java | 8 ++++----
.../planner/plan/node/metedata/write/AlterTimeSeriesNode.java | 2 +-
.../plan/node/metedata/write/CreateTimeSeriesNode.java | 2 +-
.../plan/node/metedata/write/view/CreateLogicalViewNode.java | 4 +++-
.../planner/plan/node/source/AlignedLastQueryScanNode.java | 2 +-
.../plan/planner/plan/node/source/AlignedSeriesScanNode.java | 2 +-
.../iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java | 10 +++++-----
.../apache/iotdb/db/storageengine/dataregion/DataRegion.java | 2 +-
.../executor/readchunk/SingleSeriesCompactionExecutor.java | 4 ++--
.../storageengine/dataregion/modification/Modification.java | 2 +-
.../apache/iotdb/db/queryengine/execution/DataDriverTest.java | 1 -
.../execution/operator/AggregationOperatorTest.java | 1 -
.../execution/operator/DeviceViewOperatorTest.java | 1 -
.../execution/operator/HorizontallyConcatOperatorTest.java | 1 -
.../queryengine/execution/operator/LastQueryOperatorTest.java | 1 -
.../execution/operator/LastQuerySortOperatorTest.java | 1 -
.../db/queryengine/execution/operator/LimitOperatorTest.java | 1 -
.../queryengine/execution/operator/MergeSortOperatorTest.java | 1 -
.../db/queryengine/execution/operator/OffsetOperatorTest.java | 1 -
.../execution/operator/RawDataAggregationOperatorTest.java | 1 -
.../execution/operator/SeriesAggregationScanOperatorTest.java | 1 -
.../execution/operator/SeriesScanOperatorTest.java | 1 -
.../execution/operator/SingleDeviceViewOperatorTest.java | 1 -
.../operator/SlidingWindowAggregationOperatorTest.java | 1 -
.../db/queryengine/execution/operator/SortOperatorTest.java | 1 -
.../db/queryengine/execution/operator/TopKOperatorTest.java | 1 -
.../execution/operator/UpdateLastCacheOperatorTest.java | 1 -
.../execution/operator/sink/IdentitySinkOperatorTest.java | 1 -
.../db/queryengine/plan/optimization/TestPlanBuilder.java | 2 +-
.../plan/planner/logical/SchemaQueryLogicalPlannerTest.java | 8 ++++----
.../dataregion/compaction/utils/CompactionCheckerUtils.java | 2 +-
.../compaction/utils/CompactionFileGeneratorUtils.java | 6 +++---
.../main/java/org/apache/iotdb/commons/path/AlignedPath.java | 11 ++++++-----
.../java/org/apache/iotdb/commons/path/MeasurementPath.java | 9 +++++----
.../main/java/org/apache/iotdb/commons/path/PartialPath.java | 11 ++++++-----
50 files changed, 72 insertions(+), 83 deletions(-)
diff --git
a/example/pipe-count-point-processor/src/main/java/org/apache/iotdb/CountPointProcessor.java
b/example/pipe-count-point-processor/src/main/java/org/apache/iotdb/CountPointProcessor.java
index 838090e7a3a..27781ab83e9 100644
---
a/example/pipe-count-point-processor/src/main/java/org/apache/iotdb/CountPointProcessor.java
+++
b/example/pipe-count-point-processor/src/main/java/org/apache/iotdb/CountPointProcessor.java
@@ -65,7 +65,7 @@ public class CountPointProcessor implements PipeProcessor {
if (event instanceof PipeHeartbeatEvent) {
Tablet tablet =
new Tablet(
- aggregateSeries.getDevice(),
+ aggregateSeries.getIDeviceID(),
Collections.singletonList(
new MeasurementSchema(aggregateSeries.getMeasurement(),
TSDataType.INT64)),
1);
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 6e1a7aac762..5a1c5265c1a 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -642,11 +642,11 @@ public class ConfigManager implements IManager {
}
PartialPath innerPath = innerPathList.get(0);
// The innerPath contains `*` and the only `*` is not in last level
- if (innerPath.getDevice().contains(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD))
{
+ if
(innerPath.getIDeviceID().contains(IoTDBConstant.ONE_LEVEL_PATH_WILDCARD)) {
return new ArrayList<>();
}
return Collections.singletonList(
- getPartitionManager().getSeriesPartitionSlot(innerPath.getDevice()));
+
getPartitionManager().getSeriesPartitionSlot(innerPath.getIDeviceID()));
}
@Override
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/DeviceSchemaInfo.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/DeviceSchemaInfo.java
index 5c21c8d6415..38652b0ce7a 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/DeviceSchemaInfo.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/schematree/DeviceSchemaInfo.java
@@ -23,8 +23,6 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.tsfile.write.schema.MeasurementSchema;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
index 36d9173ad95..ba1bd5a33e3 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceContext.java
@@ -352,7 +352,7 @@ public class FragmentInstanceContext extends QueryContext {
Set<String> selectedDeviceIdSet = new HashSet<>();
for (PartialPath path : sourcePaths) {
pathList.add(path);
- selectedDeviceIdSet.add(path.getDevice());
+ selectedDeviceIdSet.add(path.getIDeviceID());
}
this.sharedQueryDataSource =
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewIntoOperator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewIntoOperator.java
index 677b550e908..ea3c990e19e 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewIntoOperator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewIntoOperator.java
@@ -170,7 +170,8 @@ public class DeviceViewIntoOperator extends
AbstractIntoOperator {
new Binary(sourceTargetPathPair.right.toString(),
TSFileConfig.STRING_CHARSET));
columnBuilders[3].writeInt(
findWritten(
- sourceTargetPathPair.right.getDevice(),
sourceTargetPathPair.right.getMeasurement()));
+ sourceTargetPathPair.right.getIDeviceID(),
+ sourceTargetPathPair.right.getMeasurement()));
resultTsBlockBuilder.declarePosition();
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/IntoOperator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/IntoOperator.java
index cf0b87549f7..913227a3433 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/IntoOperator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/IntoOperator.java
@@ -113,7 +113,8 @@ public class IntoOperator extends AbstractIntoOperator {
new Binary(sourceTargetPathPair.right.toString(),
TSFileConfig.STRING_CHARSET));
columnBuilders[2].writeInt(
findWritten(
- sourceTargetPathPair.right.getDevice(),
sourceTargetPathPair.right.getMeasurement()));
+ sourceTargetPathPair.right.getIDeviceID(),
+ sourceTargetPathPair.right.getMeasurement()));
resultTsBlockBuilder.declarePosition();
}
return resultTsBlockBuilder.build();
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java
index b45990a7f21..2ecbaf476e0 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/FileLoaderUtils.java
@@ -96,7 +96,7 @@ public class FileLoaderUtils {
resource.getTsFilePath(),
new TimeSeriesMetadataCache.TimeSeriesMetadataCacheKey(
resource.getTsFileID(),
- new PlainDeviceID(seriesPath.getDevice()),
+ new PlainDeviceID(seriesPath.getIDeviceID()),
seriesPath.getMeasurement()),
allSensors,
resource.getTimeIndexType() != 1,
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java
index d7e2163eca1..ba47b63fbf7 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java
@@ -310,12 +310,15 @@ public class Analysis implements IAnalysis {
}
public List<TRegionReplicaSet> getPartitionInfo(PartialPath seriesPath,
Filter timefilter) {
- return
dataPartition.getDataRegionReplicaSetWithTimeFilter(seriesPath.getDevice(),
timefilter);
+ return dataPartition.getDataRegionReplicaSetWithTimeFilter(
+ seriesPath.getIDeviceID(), timefilter);
}
public TRegionReplicaSet getPartitionInfo(
PartialPath seriesPath, TTimePartitionSlot tTimePartitionSlot) {
- return dataPartition.getDataRegionReplicaSet(seriesPath.getDevice(),
tTimePartitionSlot).get(0);
+ return dataPartition
+ .getDataRegionReplicaSet(seriesPath.getIDeviceID(), tTimePartitionSlot)
+ .get(0);
}
/**
@@ -324,7 +327,7 @@ public class Analysis implements IAnalysis {
*/
public List<List<TTimePartitionSlot>> getTimePartitionRange(
PartialPath seriesPath, Filter timefilter) {
- return dataPartition.getTimePartitionRange(seriesPath.getDevice(),
timefilter);
+ return dataPartition.getTimePartitionRange(seriesPath.getIDeviceID(),
timefilter);
}
public List<TRegionReplicaSet> getPartitionInfo(String deviceName, Filter
globalTimeFilter) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
index a5bf0314e85..5e13c41eb8b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
@@ -3045,11 +3045,11 @@ public class AnalyzeVisitor extends
StatementVisitor<Analysis, MPPQueryContext>
if (logicalViewSchema.isWritable()) {
sourcePathOfAliasSeries =
logicalViewSchema.getSourcePathIfWritable();
deletePatternSet.add(sourcePathOfAliasSeries);
- deduplicatedDevicePaths.add(sourcePathOfAliasSeries.getDevice());
+
deduplicatedDevicePaths.add(sourcePathOfAliasSeries.getIDeviceID());
}
deletePatternSet.remove(measurementPath);
} else {
- deduplicatedDevicePaths.add(measurementPath.getDevice());
+ deduplicatedDevicePaths.add(measurementPath.getIDeviceID());
}
}
deleteDataStatement.setPathList(new ArrayList<>(deletePatternSet));
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
index 010cf8fcd01..4b7e7b2e0b8 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
@@ -544,7 +544,7 @@ public class ExpressionAnalyzer {
throw new IllegalArgumentException(
"unsupported expression type for source expression: " +
expression.getExpressionType());
}
- return ((TimeSeriesOperand) expression).getPath().getDevice();
+ return ((TimeSeriesOperand) expression).getPath().getIDeviceID();
}
public static Expression getMeasurementExpression(Expression expression,
Analysis analysis) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceUsingTemplateSchemaCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceUsingTemplateSchemaCache.java
index 1ea59da1355..4a09b7ac7b8 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceUsingTemplateSchemaCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/schema/DeviceUsingTemplateSchemaCache.java
@@ -201,7 +201,7 @@ public class DeviceUsingTemplateSchemaCache {
public void invalidateCache(List<PartialPath> partialPathList) {
for (PartialPath path : partialPathList) {
for (PartialPath key : cache.asMap().keySet()) {
- if (key.startsWith(path.getDevice())) {
+ if (key.startsWith(path.getIDeviceID())) {
cache.invalidate(key);
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetcher.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetcher.java
index fccc796c0b8..db14449597f 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetcher.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/ClusterSchemaFetcher.java
@@ -39,7 +39,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.utils.Pair;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import java.util.ArrayList;
import java.util.Arrays;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
index 2a56d0e8140..7d6ba0e88f3 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
@@ -244,7 +244,7 @@ public class LogicalPlanBuilder {
(sourceExpression.isViewExpression()
? sourceExpression.getViewPath()
: ((TimeSeriesOperand) sourceExpression).getPath());
- String outputDevice = outputPath.getDevice();
+ String outputDevice = outputPath.getIDeviceID();
outputPathToSourceExpressionMap
.computeIfAbsent(
outputDevice,
@@ -540,7 +540,7 @@ public class LogicalPlanBuilder {
PartialPath path = ts.getPath();
Pair<List<String>, List<IMeasurementSchema>> pair =
map.computeIfAbsent(
- path.getDevice(), k -> new Pair<>(new ArrayList<>(), new
ArrayList<>()));
+ path.getIDeviceID(), k -> new Pair<>(new ArrayList<>(), new
ArrayList<>()));
pair.left.add(path.getMeasurement());
try {
pair.right.add(path.getMeasurementSchema());
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
index d10897534d0..8f6cb556766 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
@@ -424,8 +424,8 @@ public class LogicalPlanVisitor extends
StatementVisitor<PlanNode, MPPQueryConte
return true;
}
if (StringUtils.isEmpty(alignedDeviceId)) {
- alignedDeviceId = ts.getPath().getDevice();
- } else if
(!alignedDeviceId.equalsIgnoreCase(ts.getPath().getDevice())) {
+ alignedDeviceId = ts.getPath().getIDeviceID();
+ } else if
(!alignedDeviceId.equalsIgnoreCase(ts.getPath().getIDeviceID())) {
// count_time from only one aligned device can use
AlignedSeriesAggScan
return true;
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
index 3b13ac78a9d..da0a7bd9667 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/OperatorTreeGenerator.java
@@ -327,7 +327,7 @@ public class OperatorTreeGenerator extends
PlanVisitor<Operator, LocalExecutionP
SeriesScanOptions.Builder scanOptionsBuilder =
getSeriesScanOptionsBuilder(node, context);
scanOptionsBuilder.withAllSensors(
- context.getAllSensors(seriesPath.getDevice(),
seriesPath.getMeasurement()));
+ context.getAllSensors(seriesPath.getIDeviceID(),
seriesPath.getMeasurement()));
scanOptionsBuilder.withPushDownLimit(node.getPushDownLimit());
scanOptionsBuilder.withPushDownOffset(node.getPushDownOffset());
@@ -547,7 +547,7 @@ public class OperatorTreeGenerator extends
PlanVisitor<Operator, LocalExecutionP
SeriesScanOptions.Builder scanOptionsBuilder =
getSeriesScanOptionsBuilder(node, context);
scanOptionsBuilder.withAllSensors(
- context.getAllSensors(seriesPath.getDevice(),
seriesPath.getMeasurement()));
+ context.getAllSensors(seriesPath.getIDeviceID(),
seriesPath.getMeasurement()));
OperatorContext operatorContext =
context
@@ -2573,7 +2573,7 @@ public class OperatorTreeGenerator extends
PlanVisitor<Operator, LocalExecutionP
SeriesScanOptions.Builder scanOptionsBuilder = new
SeriesScanOptions.Builder();
scanOptionsBuilder.withAllSensors(
- context.getAllSensors(seriesPath.getDevice(),
seriesPath.getMeasurement()));
+ context.getAllSensors(seriesPath.getIDeviceID(),
seriesPath.getMeasurement()));
scanOptionsBuilder.withGlobalTimeFilter(context.getGlobalTimeFilter());
SeriesAggregationScanOperator seriesAggregationScanOperator =
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
index 88a076f4ea3..cdf0923ac93 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
@@ -133,7 +133,7 @@ public class PlanGraphPrinter extends
PlanVisitor<List<String>, PlanGraphPrinter
boxValue.add(
String.format(
"Series: %s%s",
- node.getAlignedPath().getDevice(),
node.getAlignedPath().getMeasurementList()));
+ node.getAlignedPath().getIDeviceID(),
node.getAlignedPath().getMeasurementList()));
long limit = node.getPushDownLimit();
long offset = node.getPushDownOffset();
@@ -178,7 +178,7 @@ public class PlanGraphPrinter extends
PlanVisitor<List<String>, PlanGraphPrinter
boxValue.add(
String.format(
"Series: %s%s",
- node.getAlignedPath().getDevice(),
node.getAlignedPath().getMeasurementList()));
+ node.getAlignedPath().getIDeviceID(),
node.getAlignedPath().getMeasurementList()));
for (int i = 0; i < node.getAggregationDescriptorList().size(); i++) {
AggregationDescriptor descriptor =
node.getAggregationDescriptorList().get(i);
boxValue.add(
@@ -480,7 +480,7 @@ public class PlanGraphPrinter extends
PlanVisitor<List<String>, PlanGraphPrinter
"%s -> %s %s",
sourceTargetPathPair.left,
sourceTargetPathPair.right,
-
targetDeviceToAlignedMap.get(sourceTargetPathPair.right.getDevice())
+
targetDeviceToAlignedMap.get(sourceTargetPathPair.right.getIDeviceID())
? "[ALIGNED]"
: ""));
}
@@ -506,7 +506,7 @@ public class PlanGraphPrinter extends
PlanVisitor<List<String>, PlanGraphPrinter
boxValue.add(
String.format(
"Series: %s%s",
- node.getSeriesPath().getDevice(),
node.getSeriesPath().getMeasurementList()));
+ node.getSeriesPath().getIDeviceID(),
node.getSeriesPath().getMeasurementList()));
if (StringUtil.isNotBlank(node.getOutputViewPath())) {
boxValue.add(String.format("ViewPath: %s", node.getOutputViewPath()));
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/AlterTimeSeriesNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/AlterTimeSeriesNode.java
index 1eb84813cad..3f684a3e8fa 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/AlterTimeSeriesNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/AlterTimeSeriesNode.java
@@ -375,7 +375,7 @@ public class AlterTimeSeriesNode extends WritePlanNode {
@Override
public List<WritePlanNode> splitByPartition(Analysis analysis) {
TRegionReplicaSet regionReplicaSet =
-
analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(path.getDevice());
+
analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(path.getIDeviceID());
setRegionReplicaSet(regionReplicaSet);
return ImmutableList.of(this);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java
index 66ab5d49608..4da869b71b9 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/CreateTimeSeriesNode.java
@@ -388,7 +388,7 @@ public class CreateTimeSeriesNode extends WritePlanNode
implements ICreateTimeSe
@Override
public List<WritePlanNode> splitByPartition(Analysis analysis) {
TRegionReplicaSet regionReplicaSet =
-
analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(path.getDevice());
+
analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(path.getIDeviceID());
setRegionReplicaSet(regionReplicaSet);
return ImmutableList.of(this);
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java
index 9291b60cbed..8d5f6248718 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metedata/write/view/CreateLogicalViewNode.java
@@ -226,7 +226,9 @@ public class CreateLogicalViewNode extends WritePlanNode
implements ICreateLogic
// build a map from TRegionReplicaSet to this entry.
// Please note that getSchemaRegionReplicaSet needs a device path as
parameter.
TRegionReplicaSet regionReplicaSet =
-
analysis.getSchemaPartitionInfo().getSchemaRegionReplicaSet(entry.getKey().getDevice());
+ analysis
+ .getSchemaPartitionInfo()
+ .getSchemaRegionReplicaSet(entry.getKey().getIDeviceID());
// create a map if the key(regionReplicaSet) is not exists,
// then put this entry into this map(from regionReplicaSet to this entry)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedLastQueryScanNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedLastQueryScanNode.java
index 764aaf627f7..5d7769f0849 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedLastQueryScanNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedLastQueryScanNode.java
@@ -220,7 +220,7 @@ public class AlignedLastQueryScanNode extends
LastSeriesSourceNode {
return outputViewPath;
}
if (seriesPath.getMeasurementList().size() > 1) {
- return seriesPath.getDevice();
+ return seriesPath.getIDeviceID();
}
return seriesPath.transformToPartialPath().getFullPath();
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java
index abf9a70a09f..f26e3e03897 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/AlignedSeriesScanNode.java
@@ -126,7 +126,7 @@ public class AlignedSeriesScanNode extends
SeriesScanSourceNode {
@Override
public List<String> getOutputColumnNames() {
List<String> outputColumnNames = new ArrayList<>();
- String deviceName = alignedPath.getDevice();
+ String deviceName = alignedPath.getIDeviceID();
for (String measurement : alignedPath.getMeasurementList()) {
outputColumnNames.add(deviceName.concat(TsFileConstant.PATH_SEPARATOR +
measurement));
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java
index 67fbb6550d7..ed83eef4620 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/utils/MetaUtils.java
@@ -91,7 +91,7 @@ public class MetaUtils {
result.add(measurementPath);
alignedPath = null;
} else {
- if (alignedPath == null ||
!alignedPath.equals(measurementPath.getDevice())) {
+ if (alignedPath == null ||
!alignedPath.equals(measurementPath.getIDeviceID())) {
alignedPath = new AlignedPath(measurementPath);
result.add(alignedPath);
} else {
@@ -140,7 +140,7 @@ public class MetaUtils {
if (!measurementPath.isUnderAlignedEntity()) {
result.add(measurementPath);
} else {
- String deviceName = measurementPath.getDevice();
+ String deviceName = measurementPath.getIDeviceID();
if (!deviceToAlignedPathMap.containsKey(deviceName)) {
AlignedPath alignedPath = new AlignedPath(measurementPath);
deviceToAlignedPathMap.put(deviceName, alignedPath);
@@ -235,10 +235,10 @@ public class MetaUtils {
} else if (((MeasurementPath) seriesPath).isUnderAlignedEntity()) {
// for without value filter
List<Integer> indexes = pathToAggrIndexesMap.remove(seriesPath);
- AlignedPath groupPath = temp.get(seriesPath.getDevice());
+ AlignedPath groupPath = temp.get(seriesPath.getIDeviceID());
if (groupPath == null) {
groupPath = new AlignedPath((MeasurementPath) seriesPath);
- temp.put(seriesPath.getDevice(), groupPath);
+ temp.put(seriesPath.getIDeviceID(), groupPath);
alignedPathToAggrIndexesMap
.computeIfAbsent(groupPath, key -> new ArrayList<>())
.add(indexes);
@@ -266,7 +266,7 @@ public class MetaUtils {
.addAll(pathToAggregations.get(path));
} else {
deviceToAlignedPathsMap
- .computeIfAbsent(path.getDevice(), key -> new ArrayList<>())
+ .computeIfAbsent(path.getIDeviceID(), key -> new ArrayList<>())
.add(measurementPath);
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index 6c62a289902..191baf40a70 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -2066,7 +2066,7 @@ public class DataRegion implements IDataRegionForQuery {
return true;
}
}
- if (databaseName.contentEquals(device.getDevice())) {
+ if (databaseName.contentEquals(device.getIDeviceID())) {
return false;
}
Pair<Long, Long> startAndEndTime =
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/readchunk/SingleSeriesCompactionExecutor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/readchunk/SingleSeriesCompactionExecutor.java
index 01d987846b7..d0d9dd498ee 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/readchunk/SingleSeriesCompactionExecutor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/executor/readchunk/SingleSeriesCompactionExecutor.java
@@ -80,7 +80,7 @@ public class SingleSeriesCompactionExecutor {
LinkedList<Pair<TsFileSequenceReader, List<ChunkMetadata>>>
readerAndChunkMetadataList,
CompactionTsFileWriter fileWriter,
TsFileResource targetResource) {
- this.device = new PlainDeviceID(series.getDevice());
+ this.device = new PlainDeviceID(series.getIDeviceID());
this.series = series;
this.readerAndChunkMetadataList = readerAndChunkMetadataList;
this.fileWriter = fileWriter;
@@ -98,7 +98,7 @@ public class SingleSeriesCompactionExecutor {
CompactionTsFileWriter fileWriter,
TsFileResource targetResource,
CompactionTaskSummary summary) {
- this.device = new PlainDeviceID(series.getDevice());
+ this.device = new PlainDeviceID(series.getIDeviceID());
this.series = series;
this.readerAndChunkMetadataList = readerAndChunkMetadataList;
this.fileWriter = fileWriter;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/Modification.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/Modification.java
index 4ca1f11b6d5..9bf2ec1d206 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/Modification.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/Modification.java
@@ -45,7 +45,7 @@ public abstract class Modification {
}
public String getDevice() {
- return path.getDevice();
+ return path.getIDeviceID();
}
public String getMeasurement() {
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java
index d1db7ae282c..ef2cd39b44d 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/DataDriverTest.java
@@ -54,7 +54,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java
index a22ada674ac..73bb2a2dc63 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/AggregationOperatorTest.java
@@ -52,7 +52,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.utils.TimeDuration;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java
index fdf9c1fc39f..d1767847669 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/DeviceViewOperatorTest.java
@@ -41,7 +41,6 @@ import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java
index ae6371d5eca..c7eca63978b 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/HorizontallyConcatOperatorTest.java
@@ -48,7 +48,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.utils.TimeDuration;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java
index 009e25e4b14..91091415dd7 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQueryOperatorTest.java
@@ -47,7 +47,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.TsBlockBuilder;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java
index 1480e667379..fb43888a9cc 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LastQuerySortOperatorTest.java
@@ -47,7 +47,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.TsBlockBuilder;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java
index 03f70c6f624..a17aea60f14 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/LimitOperatorTest.java
@@ -46,7 +46,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java
index 4f44b8c1870..e5df0902b98 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeSortOperatorTest.java
@@ -65,7 +65,6 @@ import
org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.TsBlockBuilder;
import org.apache.tsfile.read.common.block.column.TimeColumnBuilder;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java
index 0b094ee25fb..c98ecab1883 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/OffsetOperatorTest.java
@@ -47,7 +47,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java
index 5e22d544a50..90a5a8b35dc 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/RawDataAggregationOperatorTest.java
@@ -60,7 +60,6 @@ import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.filter.basic.Filter;
import org.apache.tsfile.read.filter.factory.TimeFilterApi;
import org.apache.tsfile.utils.TimeDuration;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java
index e915f1cb4e9..75b3caf6791 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesAggregationScanOperatorTest.java
@@ -50,7 +50,6 @@ import org.apache.tsfile.read.filter.basic.Filter;
import org.apache.tsfile.read.filter.factory.FilterFactory;
import org.apache.tsfile.read.filter.factory.TimeFilterApi;
import org.apache.tsfile.utils.TimeDuration;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java
index a5242aa0eed..14bb25cc8f5 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SeriesScanOperatorTest.java
@@ -42,7 +42,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java
index c367cc5badb..f8511854959 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SingleDeviceViewOperatorTest.java
@@ -44,7 +44,6 @@ import io.airlift.units.Duration;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java
index ac7d132fad7..b5a677933fe 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SlidingWindowAggregationOperatorTest.java
@@ -51,7 +51,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.utils.TimeDuration;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java
index ddba0139c51..f750934b723 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/SortOperatorTest.java
@@ -50,7 +50,6 @@ import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TopKOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TopKOperatorTest.java
index 84a887bd956..ce3d7fcc6e3 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TopKOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/TopKOperatorTest.java
@@ -59,7 +59,6 @@ import
org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.TsBlockBuilder;
import org.apache.tsfile.read.common.block.column.TimeColumnBuilder;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java
index 3eff03335c2..00fced213bc 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/UpdateLastCacheOperatorTest.java
@@ -47,7 +47,6 @@ import
org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.filter.basic.Filter;
import org.apache.tsfile.read.filter.factory.TimeFilterApi;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
index aa4a8b3ba5b..c2d6a3231e1 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/sink/IdentitySinkOperatorTest.java
@@ -45,7 +45,6 @@ import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.read.common.block.TsBlock;
import org.apache.tsfile.read.common.block.column.IntColumn;
-import org.apache.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
index f60ecb76447..3dda8bc28ca 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
@@ -343,7 +343,7 @@ public class TestPlanBuilder {
public TestPlanBuilder into(String id, PartialPath sourcePath, PartialPath
intoPath) {
IntoPathDescriptor intoPathDescriptor = new IntoPathDescriptor();
intoPathDescriptor.specifyTargetPath(sourcePath.toString(), "", intoPath);
- intoPathDescriptor.specifyDeviceAlignment(intoPath.getDevice(), false);
+ intoPathDescriptor.specifyDeviceAlignment(intoPath.getIDeviceID(), false);
intoPathDescriptor.recordSourceColumnDataType(
sourcePath.toString(), sourcePath.getSeriesType());
this.root = new IntoNode(new PlanNodeId(id), getRoot(),
intoPathDescriptor);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java
index 610b3947727..91aa4fb4c78 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/SchemaQueryLogicalPlannerTest.java
@@ -481,7 +481,7 @@ public class SchemaQueryLogicalPlannerTest {
Assert.assertNotNull(showTimeSeriesNode);
Assert.assertEquals(
new PartialPath("root.ln.wf01.wt01.status"),
showTimeSeriesNode.getPath());
- Assert.assertEquals("root.ln.wf01.wt01",
showTimeSeriesNode.getPath().getDevice());
+ Assert.assertEquals("root.ln.wf01.wt01",
showTimeSeriesNode.getPath().getIDeviceID());
Assert.assertTrue(showTimeSeriesNode.isOrderByHeat());
Assert.assertEquals(
SchemaFilterType.TAGS_FILTER,
showTimeSeriesNode.getSchemaFilter().getSchemaFilterType());
@@ -501,7 +501,7 @@ public class SchemaQueryLogicalPlannerTest {
Assert.assertNotNull(showTimeSeriesNode2);
Assert.assertEquals(
new PartialPath("root.ln.wf01.wt01.status"),
showTimeSeriesNode2.getPath());
- Assert.assertEquals("root.ln.wf01.wt01",
showTimeSeriesNode2.getPath().getDevice());
+ Assert.assertEquals("root.ln.wf01.wt01",
showTimeSeriesNode2.getPath().getIDeviceID());
Assert.assertTrue(showTimeSeriesNode2.isOrderByHeat());
Assert.assertEquals(
@@ -537,7 +537,7 @@ public class SchemaQueryLogicalPlannerTest {
Assert.assertNotNull(showTimeSeriesNode);
Assert.assertEquals(
new PartialPath("root.ln.wf01.wt01.status"),
showTimeSeriesNode.getPath());
- Assert.assertEquals("root.ln.wf01.wt01",
showTimeSeriesNode.getPath().getDevice());
+ Assert.assertEquals("root.ln.wf01.wt01",
showTimeSeriesNode.getPath().getIDeviceID());
Assert.assertTrue(showTimeSeriesNode.isOrderByHeat());
Assert.assertEquals(
SchemaFilterType.PATH_CONTAINS,
@@ -557,7 +557,7 @@ public class SchemaQueryLogicalPlannerTest {
Assert.assertNotNull(showTimeSeriesNode2);
Assert.assertEquals(
new PartialPath("root.ln.wf01.wt01.status"),
showTimeSeriesNode2.getPath());
- Assert.assertEquals("root.ln.wf01.wt01",
showTimeSeriesNode2.getPath().getDevice());
+ Assert.assertEquals("root.ln.wf01.wt01",
showTimeSeriesNode2.getPath().getIDeviceID());
Assert.assertTrue(showTimeSeriesNode2.isOrderByHeat());
Assert.assertEquals(
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionCheckerUtils.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionCheckerUtils.java
index 87f5441a718..d2192836eb9 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionCheckerUtils.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionCheckerUtils.java
@@ -323,7 +323,7 @@ public class CompactionCheckerUtils {
Map<IDeviceID, long[]> devicePointNumMap = new HashMap<>();
for (Entry<String, List<TimeValuePair>> dataEntry : sourceData.entrySet())
{
PartialPath partialPath = new PartialPath(dataEntry.getKey());
- IDeviceID device = new PlainDeviceID(partialPath.getDevice());
+ IDeviceID device = new PlainDeviceID(partialPath.getIDeviceID());
long[] statistics =
devicePointNumMap.computeIfAbsent(
device, k -> new long[] {Long.MAX_VALUE, Long.MIN_VALUE});
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionFileGeneratorUtils.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionFileGeneratorUtils.java
index b708a624ca6..95da3661664 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionFileGeneratorUtils.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionFileGeneratorUtils.java
@@ -164,7 +164,7 @@ public class CompactionFileGeneratorUtils {
PartialPath partialPath = new PartialPath(fullPath);
List<String> sensors =
deviceMeasurementMap.computeIfAbsent(
- new PlainDeviceID(partialPath.getDevice()), (s) -> new
ArrayList<>());
+ new PlainDeviceID(partialPath.getIDeviceID()), (s) -> new
ArrayList<>());
sensors.add(partialPath.getMeasurement());
}
for (Entry<IDeviceID, List<String>> deviceMeasurementEntry :
deviceMeasurementMap.entrySet()) {
@@ -222,7 +222,7 @@ public class CompactionFileGeneratorUtils {
PartialPath partialPath = new PartialPath(fullPath);
List<String> sensors =
deviceMeasurementMap.computeIfAbsent(
- new PlainDeviceID(partialPath.getDevice()), (s) -> new
ArrayList<>());
+ new PlainDeviceID(partialPath.getIDeviceID()), (s) -> new
ArrayList<>());
sensors.add(partialPath.getMeasurement());
}
int currChunksIndex = 0;
@@ -314,7 +314,7 @@ public class CompactionFileGeneratorUtils {
PartialPath partialPath = new PartialPath(fullPath);
List<String> sensors =
deviceMeasurementMap.computeIfAbsent(
- new PlainDeviceID(partialPath.getDevice()), (s) -> new
ArrayList<>());
+ new PlainDeviceID(partialPath.getIDeviceID()), (s) -> new
ArrayList<>());
sensors.add(partialPath.getMeasurement());
}
for (Entry<IDeviceID, List<String>> deviceMeasurementEntry :
deviceMeasurementMap.entrySet()) {
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java
index 7f0ff677600..75fe1136bdb 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/AlignedPath.java
@@ -24,6 +24,7 @@ import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.enums.TSDataType;
+import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.ReadWriteIOUtils;
@@ -70,7 +71,7 @@ public class AlignedPath extends PartialPath {
}
public AlignedPath(
- String vectorPath, List<String> measurementList,
List<IMeasurementSchema> schemaList)
+ IDeviceID vectorPath, List<String> measurementList,
List<IMeasurementSchema> schemaList)
throws IllegalPathException {
super(vectorPath);
// check whether measurement is legal
@@ -137,8 +138,8 @@ public class AlignedPath extends PartialPath {
}
@Override
- public String getDevice() {
- return getFullPath();
+ public IDeviceID getIDeviceID() {
+ return device;
}
@Override
@@ -279,7 +280,7 @@ public class AlignedPath extends PartialPath {
try {
alignedPath =
new AlignedPath(
- this.getDevice(),
+ this.getIDeviceID(),
new ArrayList<>(this.measurementList),
new ArrayList<>(this.schemaList));
} catch (IllegalPathException e) {
@@ -359,7 +360,7 @@ public class AlignedPath extends PartialPath {
alignedPath.measurementList = measurements;
alignedPath.schemaList = measurementSchemas;
alignedPath.nodes = partialPath.getNodes();
- alignedPath.device = partialPath.getDevice();
+ alignedPath.device = partialPath.getIDeviceID();
alignedPath.fullPath = partialPath.getFullPath();
return alignedPath;
}
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/MeasurementPath.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/MeasurementPath.java
index 10f7dd4d196..7be080f9444 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/MeasurementPath.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/MeasurementPath.java
@@ -149,10 +149,10 @@ public class MeasurementPath extends PartialPath {
@Override
public String getFullPathWithAlias() {
- if (getDevice().isEmpty()) {
+ if (getIDeviceID().isEmpty()) {
return measurementAlias;
}
- return getDevice() + IoTDBConstant.PATH_SEPARATOR + measurementAlias;
+ return getIDeviceID().toString() + IoTDBConstant.PATH_SEPARATOR +
measurementAlias;
}
public boolean isUnderAlignedEntity() {
@@ -194,7 +194,8 @@ public class MeasurementPath extends PartialPath {
MeasurementPath newMeasurementPath = null;
try {
newMeasurementPath =
- new MeasurementPath(this.getDevice(), this.getMeasurement(),
this.getMeasurementSchema());
+ new MeasurementPath(
+ this.getIDeviceID(), this.getMeasurement(),
this.getMeasurementSchema());
newMeasurementPath.setUnderAlignedEntity(this.isUnderAlignedEntity);
newMeasurementPath.setMeasurementAlias(this.measurementAlias);
if (tagMap != null) {
@@ -277,7 +278,7 @@ public class MeasurementPath extends PartialPath {
measurementPath.isUnderAlignedEntity =
ReadWriteIOUtils.readBoolObject(byteBuffer);
measurementPath.measurementAlias = ReadWriteIOUtils.readString(byteBuffer);
measurementPath.nodes = partialPath.getNodes();
- measurementPath.device = partialPath.getDevice();
+ measurementPath.device = partialPath.getIDeviceID();
measurementPath.fullPath = partialPath.getFullPath();
return measurementPath;
}
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
index 2ffeca56596..d3eb7ec1a23 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PartialPath.java
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.Validate;
import org.apache.tsfile.common.constant.TsFileConstant;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.IDeviceID;
+import org.apache.tsfile.file.metadata.IDeviceID.Factory;
import org.apache.tsfile.file.metadata.PlainDeviceID;
import org.apache.tsfile.read.common.Path;
import org.apache.tsfile.utils.PublicBAOS;
@@ -730,19 +731,19 @@ public class PartialPath extends Path implements
Comparable<Path>, Cloneable {
}
@Override
- public String getDevice() {
+ public IDeviceID getIDeviceID() {
if (device != null) {
return device;
} else {
if (nodes.length == 1) {
- return "";
+ return Factory.DEFAULT_FACTORY.create("");
}
StringBuilder s = new StringBuilder(nodes[0]);
for (int i = 1; i < nodes.length - 1; i++) {
s.append(TsFileConstant.PATH_SEPARATOR);
s.append(nodes[i]);
}
- device = s.toString();
+ device = Factory.DEFAULT_FACTORY.create(s.toString());
}
return device;
}
@@ -821,7 +822,7 @@ public class PartialPath extends Path implements
Comparable<Path>, Cloneable {
@TestOnly
public Path toTSFilePath() {
- return new Path(getDevice(), getMeasurement(), true);
+ return new Path(getIDeviceID(), getMeasurement(), true);
}
public static List<String> toStringList(List<PartialPath> pathList) {
@@ -913,7 +914,7 @@ public class PartialPath extends Path implements
Comparable<Path>, Cloneable {
}
partialPath.nodes = nodes;
partialPath.setMeasurement(path.getMeasurement());
- partialPath.device = path.getDevice();
+ partialPath.device = path.getIDeviceID();
partialPath.fullPath = path.getFullPath();
return partialPath;
}
