This is an automated email from the ASF dual-hosted git repository.

Caideyipi 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 99f4cef411e Fixed the insertion NPE bug with out of ttl and pipe 
(#19124) (#19145)
99f4cef411e is described below

commit 99f4cef411e6161a05430d1501c0760d31d08e17
Author: Caideyipi <[email protected]>
AuthorDate: Fri Nov 6 09:51:03 2026 +0800

    Fixed the insertion NPE bug with out of ttl and pipe (#19124) (#19145)
    
    * Primitive
    
    * Update TsFileEpochManagerTest.java
    
    * Update IoTDBInsertTableIT.java
    
    * Update IoTDBInsertTableIT.java
    
    * Update IoTDBInsertTableIT.java
    
    (cherry picked from commit 4a8017182766b23f507d9df9be7540d571927852)
---
 .../source/dataregion/realtime/epoch/TsFileEpochManager.java     | 5 ++++-
 .../source/dataregion/realtime/epoch/TsFileEpochManagerTest.java | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/epoch/TsFileEpochManager.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/epoch/TsFileEpochManager.java
index 8a7616cb1d5..d4eca3c074a 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/epoch/TsFileEpochManager.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/epoch/TsFileEpochManager.java
@@ -99,7 +99,10 @@ public class TsFileEpochManager {
     // Keep one set per repeated device instead and materialize its array only 
once.
     for (final InsertNode insertRowNode : 
insertRowsNode.getInsertRowNodeList()) {
       final String device = insertRowNode.getDevicePath().getFullPath();
-      final String[] measurements = 
Objects.requireNonNull(insertRowNode.getMeasurements());
+      final String[] measurements = insertRowNode.getMeasurements();
+      if (measurements == null) {
+        continue;
+      }
       final String[] firstMeasurements = 
device2Measurements.putIfAbsent(device, measurements);
       if (firstMeasurements == null) {
         continue;
diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/epoch/TsFileEpochManagerTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/epoch/TsFileEpochManagerTest.java
index 4a11f2dec32..4e3a76df6e4 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/epoch/TsFileEpochManagerTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/source/dataregion/realtime/epoch/TsFileEpochManagerTest.java
@@ -85,15 +85,18 @@ public class TsFileEpochManagerTest {
         new String[] {"s1", "s3", null, "s2"}, 
device2Measurements.get(device));
   }
 
-  @Test(expected = NullPointerException.class)
-  public void testNullMeasurementsAreRejected() {
+  @Test
+  public void testNullMeasurementsAreSkipped() {
     final String device = "root.test.d1";
     final InsertRowsNode rows = mock(InsertRowsNode.class);
     final List<InsertRowNode> insertRowNodes =
         Arrays.asList(mockRow(device, "s1"), mockRow(device, (String[]) null));
     when(rows.getInsertRowNodeList()).thenReturn(insertRowNodes);
 
-    TsFileEpochManager.getDevice2MeasurementsMapFromInsertRowsNode(rows);
+    final Map<String, String[]> device2Measurements =
+        TsFileEpochManager.getDevice2MeasurementsMapFromInsertRowsNode(rows);
+
+    Assert.assertArrayEquals(new String[] {"s1"}, 
device2Measurements.get(device));
   }
 
   private static InsertRowNode mockRow(final String device, final String... 
measurements) {

Reply via email to