Skip to content

Pipe: Fixed the on committed hook square bug & Trimmed the raw tablet hook & Fixed the premature report for source event & Skipped the parsing of time-covered tsFile #17360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 2 commits into from
Mar 26, 2026
Merged

Pipe: Fixed the on committed hook square bug & Trimmed the raw tablet hook & Fixed the premature report for source event & Skipped the parsing of time-covered tsFile #17360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3c6916
fix-data
Caideyipi Mar 25, 2026
b2f3528
fix
Caideyipi Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions ...c/main/java/org/apache/iotdb/db/pipe/event/common/tablet/PipeRawTabletInsertionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,14 @@ private PipeRawTabletInsertionEvent(
this.allocatedMemoryBlock =
PipeDataNodeResourceManager.memory().forceAllocateForTabletWithRetry(0);

addOnCommittedHook(
() -> {
if (shouldReportOnCommit) {
eliminateProgressIndex();
}
});
if (needToReport) {
addOnCommittedHook(
() -> {
if (shouldReportOnCommit) {
eliminateProgressIndex();
}
});
}
}

public PipeRawTabletInsertionEvent(
Expand Down Expand Up @@ -303,10 +305,8 @@ public boolean internallyDecreaseResourceReferenceCount(final String holderMessa
}

protected void eliminateProgressIndex() {
if (needToReport) {
if (sourceEvent instanceof PipeTsFileInsertionEvent) {
((PipeTsFileInsertionEvent) sourceEvent).eliminateProgressIndex();
}
if (sourceEvent instanceof PipeTsFileInsertionEvent) {
((PipeTsFileInsertionEvent) sourceEvent).eliminateProgressIndex();
}
}

Expand Down Expand Up @@ -387,6 +387,14 @@ public boolean mayEventPathsOverlappedWithPattern() {
}

public void markAsNeedToReport() {
if (!needToReport) {
addOnCommittedHook(
() -> {
if (shouldReportOnCommit) {
eliminateProgressIndex();
}
});
}
this.needToReport = true;
}

Expand All @@ -404,6 +412,11 @@ public EnrichedEvent getSourceEvent() {
return sourceEvent;
}

@Override
public boolean isShouldReportOnCommit() {
return shouldReportOnCommit && needToReport;
}

/////////////////////////// TabletInsertionEvent ///////////////////////////

@Override
Expand Down
11 changes: 11 additions & 0 deletions .../src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@
}

@Override
public void throwIfNoPrivilege() {

Check warning on line 449 in iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/PipeTsFileInsertionEvent.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A "Brain Method" was detected. Refactor it to reduce at least one of the following metrics: LOC from 99 to 64, Complexity from 21 to 14, Nesting Level from 5 to 2, Number of Variables from 13 to 6. 


See more on https://sonarcloud.io/project/issues?id=apache_iotdb&issues=AZ0k4zymF8ivvMx3hAri&open=AZ0k4zymF8ivvMx3hAri&pullRequest=17360
try {
if (AuthorityChecker.SUPER_USER.equals(userName)) {
return;
Expand Down Expand Up @@ -561,6 +561,17 @@
|| startTime <= resource.getFileEndTime() && resource.getFileStartTime() <= endTime;
}

@Override
public boolean shouldParseTime() {
if (!isTimeParsed
&& Objects.nonNull(resource)
&& startTime <= resource.getFileStartTime()
&& resource.getFileEndTime() <= endTime) {
isTimeParsed = true;
}
return !isTimeParsed;
}

@Override
public boolean mayEventPathsOverlappedWithPattern() {
if (Objects.isNull(resource) || !resource.isClosed() || isTableModelEvent()) {
Expand Down
3 changes: 2 additions & 1 deletion ...n/java/org/apache/iotdb/commons/pipe/agent/task/progress/interval/PipeCommitInterval.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeTaskMeta;
import org.apache.iotdb.commons.pipe.datastructure.interval.Interval;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

Expand All @@ -43,7 +44,7 @@ public PipeCommitInterval(
this.pipeTaskMeta = pipeTaskMeta;
this.currentIndex =
Objects.nonNull(currentIndex) ? currentIndex : MinimumProgressIndex.INSTANCE;
this.onCommittedHooks = onCommittedHooks;
this.onCommittedHooks = new ArrayList<>(onCommittedHooks);
}

@Override
Expand Down
Loading