This is an automated email from the ASF dual-hosted git repository.
Caideyipi pushed a commit to branch multi-fix
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/multi-fix by this push:
new 8144bee218c fix
8144bee218c is described below
commit 8144bee218c0a4e4b992088ab1a5983887a8ebce
Author: Caideyipi <[email protected]>
AuthorDate: Thu Apr 30 16:09:53 2026 +0800
fix
---
.../consensus/request/ConfigPhysicalPlanSerDeTest.java | 4 ++--
.../persistence/pipe/PipeTaskInfoConsensusPipeTest.java | 11 ++++++++---
.../procedure/impl/pipe/task/StopPipeProcedureV2Test.java | 3 +--
.../schemaregion/attribute/DeviceAttributeStore.java | 11 ++++++-----
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
index 3dc898ccd24..d6a3d7e3fd7 100644
---
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
+++
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/consensus/request/ConfigPhysicalPlanSerDeTest.java
@@ -997,8 +997,8 @@ public class ConfigPhysicalPlanSerDeTest {
final SetPipeStatusWithStoppedByRuntimeExceptionPlanV2
setPipeStatusWithStoppedByRuntimeExceptionPlanV21 =
(SetPipeStatusWithStoppedByRuntimeExceptionPlanV2)
- ConfigPhysicalPlan.Factory.create(
-
setPipeStatusWithStoppedByRuntimeExceptionPlanV2.serializeToByteBuffer());
+ ConfigPhysicalPlan.Factory.create(
+
setPipeStatusWithStoppedByRuntimeExceptionPlanV2.serializeToByteBuffer());
Assert.assertEquals(
setPipeStatusWithStoppedByRuntimeExceptionPlanV2.getPipeName(),
setPipeStatusWithStoppedByRuntimeExceptionPlanV21.getPipeName());
diff --git
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfoConsensusPipeTest.java
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfoConsensusPipeTest.java
index 929eb7ade21..95f03683336 100644
---
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfoConsensusPipeTest.java
+++
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/pipe/PipeTaskInfoConsensusPipeTest.java
@@ -213,11 +213,15 @@ public class PipeTaskInfoConsensusPipeTest {
final String pipeName = "userPipe";
createPipe(pipeName, PipeStatus.STOPPED);
-
pipeTaskInfo.getPipeMetaByPipeName(pipeName).getRuntimeMeta().setIsStoppedByRuntimeException(true);
+ pipeTaskInfo
+ .getPipeMetaByPipeName(pipeName)
+ .getRuntimeMeta()
+ .setIsStoppedByRuntimeException(true);
Assert.assertTrue(pipeTaskInfo.autoRestart());
Assert.assertEquals(
- PipeStatus.RUNNING,
pipeTaskInfo.getPipeMetaByPipeName(pipeName).getRuntimeMeta().getStatus().get());
+ PipeStatus.RUNNING,
+
pipeTaskInfo.getPipeMetaByPipeName(pipeName).getRuntimeMeta().getStatus().get());
pipeTaskInfo.setPipeStatusWithStoppedByRuntimeException(
new SetPipeStatusWithStoppedByRuntimeExceptionPlanV2(pipeName,
PipeStatus.STOPPED, false));
@@ -226,6 +230,7 @@ public class PipeTaskInfoConsensusPipeTest {
Assert.assertTrue(pipeTaskInfo.isPipeStoppedByUser(pipeName));
Assert.assertFalse(pipeTaskInfo.autoRestart());
Assert.assertEquals(
- PipeStatus.STOPPED,
pipeTaskInfo.getPipeMetaByPipeName(pipeName).getRuntimeMeta().getStatus().get());
+ PipeStatus.STOPPED,
+
pipeTaskInfo.getPipeMetaByPipeName(pipeName).getRuntimeMeta().getStatus().get());
}
}
diff --git
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2Test.java
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2Test.java
index 14838c01485..f448383e3a0 100644
---
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2Test.java
+++
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/impl/pipe/task/StopPipeProcedureV2Test.java
@@ -129,8 +129,7 @@ public class StopPipeProcedureV2Test {
Mockito.verify(consensusManager,
Mockito.times(2)).write(planCaptor.capture());
assertEquals(
- new SetPipeStatusWithStoppedByRuntimeExceptionPlanV2(
- pipeName, PipeStatus.STOPPED, false),
+ new SetPipeStatusWithStoppedByRuntimeExceptionPlanV2(pipeName,
PipeStatus.STOPPED, false),
planCaptor.getAllValues().get(0));
assertEquals(
new SetPipeStatusWithStoppedByRuntimeExceptionPlanV2(pipeName,
PipeStatus.RUNNING, true),
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/DeviceAttributeStore.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/DeviceAttributeStore.java
index 4349a7a49f1..1f22c306303 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/DeviceAttributeStore.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/attribute/DeviceAttributeStore.java
@@ -138,12 +138,13 @@ public class DeviceAttributeStore implements
IDeviceAttributeStore {
long memUsage = MAP_SIZE + RamUsageEstimator.NUM_BYTES_OBJECT_REF;
final Map<String, Binary> attributeMap = new HashMap<>();
for (int i = 0; i < nameList.size(); i++) {
- final Binary value = (Binary) valueList[i];
- if (valueList[i] != null) {
- attributeMap.put(nameList.get(i), value);
- memUsage += MemUsageUtil.computeKVMemUsageInMap(nameList.get(i),
value);
- addTableAttributeMemory(tableName, value.ramBytesUsed());
+ if (valueList[i] == null || valueList[i] == Constants.NONE) {
+ continue;
}
+ final Binary value = (Binary) valueList[i];
+ attributeMap.put(nameList.get(i), value);
+ memUsage += MemUsageUtil.computeKVMemUsageInMap(nameList.get(i), value);
+ addTableAttributeMemory(tableName, value.ramBytesUsed());
}
deviceAttributeList.add(attributeMap);
requestMemory(memUsage);
