From e78316e36f6de23c865fe3c1bffcb9be0e8ab4c3 Mon Sep 17 00:00:00 2001
From: Caideyipi <87789683+Caideyipi@users.noreply.github.com>
Date: Fri, 1 May 2026 15:05:03 +0800
Subject: [PATCH 1/2] fix

---
 .../schemaregion/attribute/DeviceAttributeStore.java           | 3 +++
 1 file changed, 3 insertions(+)

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 1f22c306303c..17bb82bee04b 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,6 +138,9 @@ public synchronized int createAttribute(
     long memUsage = MAP_SIZE + RamUsageEstimator.NUM_BYTES_OBJECT_REF;
     final Map<String, Binary> attributeMap = new HashMap<>();
     for (int i = 0; i < nameList.size(); i++) {
+        if (valueList.length <= i) {
+            break;
+      }
       if (valueList[i] == null || valueList[i] == Constants.NONE) {
         continue;
       }

From 080602a6e0a31cc1dcfcd0ffb16f7395a819d421 Mon Sep 17 00:00:00 2001
From: Caideyipi <87789683+Caideyipi@users.noreply.github.com>
Date: Fri, 1 May 2026 17:18:36 +0800
Subject: [PATCH 2/2] Update DeviceAttributeStore.java

---
 .../schemaregion/attribute/DeviceAttributeStore.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 17bb82bee04b..81bb311483e6 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,8 +138,8 @@ public synchronized int createAttribute(
     long memUsage = MAP_SIZE + RamUsageEstimator.NUM_BYTES_OBJECT_REF;
     final Map<String, Binary> attributeMap = new HashMap<>();
     for (int i = 0; i < nameList.size(); i++) {
-        if (valueList.length <= i) {
-            break;
+      if (valueList.length <= i) {
+        break;
       }
       if (valueList[i] == null || valueList[i] == Constants.NONE) {
         continue;