jixuan1989
/
IoTDB
mirror of https://github.com/apache/iotdb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Load: Added the missing logic for tsFile conversion disable's cherry-picking (#16024) 

* Update TreeSchemaAutoCreatorAndVerifier.java

* Update LoadTsFileTableSchemaCache.java
This commit is contained in:
Caideyipi 2025-07-25 10:28:04 +08:00 committed by GitHub
parent 441f85183a
commit 5b3cd27d5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java
View File

@ -25,7 +25,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.load.LoadAnalyzeException;
import org.apache.iotdb.db.exception.load.LoadAnalyzeTypeMismatchException;
import org.apache.iotdb.db.exception.load.LoadRuntimeOutOfMemoryException;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
@ -356,14 +355,14 @@ public class LoadTsFileTableSchemaCache {
}
} else if (fileColumn.getColumnCategory() == TsTableColumnCategory.FIELD) {
ColumnSchema realColumn = fieldColumnNameToSchema.get(fileColumn.getName());
if (realColumn == null || !fileColumn.getType().equals(realColumn.getType())) {
throw new LoadAnalyzeTypeMismatchException(
String.format(
"Data type mismatch for column %s in table %s, type in TsFile: %s, type in IoTDB: %s",
realColumn.getName(),
realSchema.getTableName(),
fileColumn.getType(),
realColumn.getType()));
if (LOGGER.isDebugEnabled()
&& (realColumn == null || !fileColumn.getType().equals(realColumn.getType()))) {
LOGGER.debug(
"Data type mismatch for column {} in table {}, type in TsFile: {}, type in IoTDB: {}",
realColumn.getName(),
realSchema.getTableName(),
fileColumn.getType(),
realColumn.getType());
}
}
}

30
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/TreeSchemaAutoCreatorAndVerifier.java
View File

@ -439,13 +439,12 @@ public class TreeSchemaAutoCreatorAndVerifier {
// check device schema: is aligned or not
final boolean isAlignedInTsFile = schemaCache.getDeviceIsAligned(device);
final boolean isAlignedInIoTDB = iotdbDeviceSchemaInfo.isAligned();
if (isAlignedInTsFile != isAlignedInIoTDB) {
throw new LoadAnalyzeException(
String.format(
"Device %s in TsFile is %s, but in IoTDB is %s.",
device,
isAlignedInTsFile ? "aligned" : "not aligned",
isAlignedInIoTDB ? "aligned" : "not aligned"));
if (LOGGER.isDebugEnabled() && isAlignedInTsFile != isAlignedInIoTDB) {
LOGGER.debug(
"Device {} in TsFile is {}, but in IoTDB is {}.",
device,
isAlignedInTsFile ? "aligned" : "not aligned",
isAlignedInIoTDB ? "aligned" : "not aligned");
}
// check timeseries schema
@ -463,15 +462,14 @@ public class TreeSchemaAutoCreatorAndVerifier {
}
// check datatype
if (!tsFileSchema.getType().equals(iotdbSchema.getType())) {
throw new LoadAnalyzeTypeMismatchException(
String.format(
"Measurement %s%s%s datatype not match, TsFile: %s, IoTDB: %s",
device,
TsFileConstant.PATH_SEPARATOR,
iotdbSchema.getMeasurementName(),
tsFileSchema.getType(),
iotdbSchema.getType()));
if (LOGGER.isDebugEnabled() && !tsFileSchema.getType().equals(iotdbSchema.getType())) {
LOGGER.debug(
"Measurement {}{}{} datatype not match, TsFile: {}, IoTDB: {}",
device,
TsFileConstant.PATH_SEPARATOR,
iotdbSchema.getMeasurementName(),
tsFileSchema.getType(),
iotdbSchema.getType());
}
// check encoding