Skip to content

Subscription: retain tsfile events in tsfile batch to avoid premature commit #15598

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
SteveYurongSu merged 3 commits into from
May 29, 2025
Merged

Subscription: retain tsfile events in tsfile batch to avoid premature commit #15598

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96beccf
try fix
VGalaxies May 28, 2025
18763da
minor improve
VGalaxies May 28, 2025
2da87c2
minor improve
VGalaxies May 28, 2025
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
11 changes: 10 additions & 1 deletion ...n/java/org/apache/iotdb/db/subscription/event/batch/SubscriptionPipeTsFileEventBatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,22 @@ public SubscriptionPipeTsFileEventBatch(
@Override
public synchronized void ack() {
batch.decreaseEventsReferenceCount(this.getClass().getName(), true);
enrichedEvents.stream()
Copy link

Copilot AI May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding an inline comment clarifying why only tsfile events are filtered for reference count decrease in ack(), emphasizing that tablet events are handled separately.

Copilot uses AI. Check for mistakes.
// only decrease reference count for tsfile event, since we already decrease reference count
// for tablet event in batch
.filter(event -> event instanceof PipeTsFileInsertionEvent)
.forEach(event -> event.decreaseReferenceCount(this.getClass().getName(), true));
}

@Override
public synchronized void cleanUp(final boolean force) {
// close batch, it includes clearing the reference count of events
batch.close();

// clear the reference count of events
for (final EnrichedEvent enrichedEvent : enrichedEvents) {
enrichedEvent.clearReferenceCount(this.getClass().getName());
}
enrichedEvents.clear();
}

Expand Down Expand Up @@ -103,7 +113,6 @@ protected void onTsFileInsertionEvent(final TsFileInsertionEvent event) {
} finally {
try {
event.close();
((PipeTsFileInsertionEvent) event).decreaseReferenceCount(this.getClass().getName(), false);
} catch (final Exception ignored) {
// no exceptions will be thrown
}
Expand Down
Loading