This is an automated email from the ASF dual-hosted git repository.
justinchen pushed a commit to branch load_scan
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/load_scan by this push:
new 7e51377d607 load
7e51377d607 is described below
commit 7e51377d6075a276f2890502d371069752abf131
Author: Caideyipi <[email protected]>
AuthorDate: Wed Apr 1 10:16:16 2026 +0800
load
---
.../db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java | 4 ++--
.../db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java | 2 ++
.../iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java | 4 ++--
.../iotdb/db/storageengine/load/memory/LoadTsFileMemoryManager.java | 3 +--
.../iotdb/db/storageengine/load/metrics/LoadTsFileCostMetricsSet.java | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java
index 79ede0f459e..6754468bad5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java
@@ -387,10 +387,10 @@ public class LoadTsFileTableSchemaCache {
&& (realColumn == null ||
!fileColumn.getType().equals(realColumn.getType()))) {
LOGGER.debug(
"Data type mismatch for column {} in table {}, type in TsFile:
{}, type in IoTDB: {}",
- realColumn.getName(),
+ fileColumn.getName(),
realSchema.getTableName(),
fileColumn.getType(),
- realColumn.getType());
+ Objects.nonNull(realColumn) ? realColumn.getType() : null);
}
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java
index e70bf08fd52..ede0745193a 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/load/LoadTsFileNode.java
@@ -152,6 +152,8 @@ public class LoadTsFileNode extends WritePlanNode {
statement.isDeleteAfterLoad(),
statement.getWritePointCount(i),
needDecode4TimeColumn));
+ } else {
+ throw new IllegalStateException("LoadTsFile statement is null during
table model split.");
}
}
return res;
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java
index 8478486781b..4f0156ac0d3 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/config/LoadTsFileConfigurator.java
@@ -83,14 +83,14 @@ public class LoadTsFileConfigurator {
public static void validateDatabaseLevelParam(final String databaseLevel) {
try {
- int level = Integer.parseInt(databaseLevel);
+ final int level = Integer.parseInt(databaseLevel);
if (level < DATABASE_LEVEL_MIN_VALUE) {
throw new SemanticException(
String.format(
"Given database level %d is less than the minimum value %d,
please input a valid database level.",
level, DATABASE_LEVEL_MIN_VALUE));
}
- } catch (Exception e) {
+ } catch (final NumberFormatException e) {
throw new SemanticException(
String.format(
"Given database level %s is not a valid integer, please input a
valid database level.",
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/memory/LoadTsFileMemoryManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/memory/LoadTsFileMemoryManager.java
index 6142d122714..e08a135d312 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/memory/LoadTsFileMemoryManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/memory/LoadTsFileMemoryManager.java
@@ -156,7 +156,7 @@ public class LoadTsFileMemoryManager {
try {
forceAllocateFromQuery(bytesNeeded);
if (LOGGER.isDebugEnabled()) {
- LOGGER.info(
+ LOGGER.debug(
"Load: Force resized LoadTsFileMemoryBlock with memory from query
engine, size added: {}, new size: {}",
bytesNeeded,
newSizeInBytes);
@@ -180,7 +180,6 @@ public class LoadTsFileMemoryManager {
final long actuallyAllocateMemoryInBytes =
tryAllocateFromQuery(MEMORY_TOTAL_SIZE_FROM_QUERY_IN_BYTES >> 2);
dataCacheMemoryBlock = new
LoadTsFileDataCacheMemoryBlock(actuallyAllocateMemoryInBytes);
- usedMemorySizeInBytes.addAndGet(actuallyAllocateMemoryInBytes);
LOGGER.info(
"Create Data Cache Memory Block {}, allocate memory {}",
dataCacheMemoryBlock,
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/metrics/LoadTsFileCostMetricsSet.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/metrics/LoadTsFileCostMetricsSet.java
index 28bd40c2d29..1ce119131ae 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/metrics/LoadTsFileCostMetricsSet.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/metrics/LoadTsFileCostMetricsSet.java
@@ -159,7 +159,7 @@ public class LoadTsFileCostMetricsSet implements IMetricSet
{
stage));
metricService.remove(
- MetricType.RATE,
+ MetricType.COUNTER,
Metric.LOAD_DISK_IO.toString(),
Tag.NAME.toString(),
String.valueOf(IoTDBDescriptor.getInstance().getConfig().getDataNodeId()));
