This is an automated email from the ASF dual-hosted git repository.
jt2594838 pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new 9442a1cbb7e Fix tree model load type mismatch conversion (#17949)
(#17957)
9442a1cbb7e is described below
commit 9442a1cbb7ecbb97a432c7aea5fd7a8614f6d7b7
Author: Caideyipi <[email protected]>
AuthorDate: Thu Jun 18 11:02:06 2026 +0800
Fix tree model load type mismatch conversion (#17949) (#17957)
* Fix tree load type mismatch conversion
* Fix load-and-alter expected count
---
.../plan/analyze/load/LoadTsFileAnalyzer.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java
index b6d4fb0043b..5902c342ec5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileAnalyzer.java
@@ -897,14 +897,15 @@ public class LoadTsFileAnalyzer implements AutoCloseable {
}
// check datatype
- if (LOGGER.isInfoEnabled() &&
!tsFileSchema.getType().equals(iotdbSchema.getType())) {
- LOGGER.info(
- "Measurement {}{}{} datatype not match, TsFile: {}, IoTDB: {}",
- device,
- TsFileConstant.PATH_SEPARATOR,
- iotdbSchema.getMeasurementId(),
- tsFileSchema.getType(),
- iotdbSchema.getType());
+ if (!tsFileSchema.getType().equals(iotdbSchema.getType())) {
+ throw new LoadAnalyzeTypeMismatchException(
+ String.format(
+ "Data type mismatch for measurement %s%s%s, type in
TsFile: %s, type in IoTDB: %s",
+ device,
+ TsFileConstant.PATH_SEPARATOR,
+ iotdbSchema.getMeasurementId(),
+ tsFileSchema.getType(),
+ iotdbSchema.getType()));
}
// check encoding