This is an automated email from the ASF dual-hosted git repository.
justinchen 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 87dc62ebba8 [To dev/1.3] Pipe: Fixed the NPE of commit interval
(#16714) (#16723)
87dc62ebba8 is described below
commit 87dc62ebba8d928b7259af2035f41689149e5747
Author: Caideyipi <[email protected]>
AuthorDate: Mon Nov 10 14:18:40 2025 +0800
[To dev/1.3] Pipe: Fixed the NPE of commit interval (#16714) (#16723)
* fix
* fix
---
.../commons/pipe/agent/task/progress/interval/PipeCommitInterval.java | 4 +++-
.../apache/iotdb/commons/pipe/datastructure/PipeCommitQueueTest.java | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/interval/PipeCommitInterval.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/interval/PipeCommitInterval.java
index 46a3d3e2a86..885df4727da 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/interval/PipeCommitInterval.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/agent/task/progress/interval/PipeCommitInterval.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.commons.pipe.agent.task.progress.interval;
import org.apache.iotdb.commons.consensus.index.ProgressIndex;
+import org.apache.iotdb.commons.consensus.index.impl.MinimumProgressIndex;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.datastructure.interval.Interval;
@@ -40,7 +41,8 @@ public class PipeCommitInterval extends
Interval<PipeCommitInterval> {
final PipeTaskMeta pipeTaskMeta) {
super(start, end);
this.pipeTaskMeta = pipeTaskMeta;
- this.currentIndex = currentIndex;
+ this.currentIndex =
+ Objects.nonNull(currentIndex) ? currentIndex :
MinimumProgressIndex.INSTANCE;
this.onCommittedHooks = onCommittedHooks;
}
diff --git
a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/datastructure/PipeCommitQueueTest.java
b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/datastructure/PipeCommitQueueTest.java
index 51f6316c6fd..f787d2f6f57 100644
---
a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/datastructure/PipeCommitQueueTest.java
+++
b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/datastructure/PipeCommitQueueTest.java
@@ -56,6 +56,8 @@ public class PipeCommitQueueTest {
Assert.assertEquals(0, pipeCommitQueue.size());
Assert.assertEquals(new IoTProgressIndex(0, 4L),
pipeTaskMeta.getProgressIndex());
Assert.assertEquals(1, commitHookTestSet.size());
+ // Test null progressIndex
+ pipeCommitQueue.offer(new TestEnrichedEvent(6, null));
}
private class TestEnrichedEvent extends EnrichedEvent {