Skip to content

[To dev/1.3] Subscription: distinguish between reference count of ack and clean in tsfile batch to avoid cleaning before ack (#15229) #15233

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 1 commit into from
Mar 31, 2025
Merged

[To dev/1.3] Subscription: distinguish between reference count of ack and clean in tsfile batch to avoid cleaning before ack (#15229) #15233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions ...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 @@ -95,13 +95,16 @@ protected List<SubscriptionEvent> generateSubscriptionEvents() throws Exception

final List<SubscriptionEvent> events = new ArrayList<>();
final List<File> tsFiles = batch.sealTsFiles();
final AtomicInteger referenceCount = new AtomicInteger(tsFiles.size());
final AtomicInteger ackReferenceCount = new AtomicInteger(tsFiles.size());
final AtomicInteger cleanReferenceCount = new AtomicInteger(tsFiles.size());
for (final File tsFile : tsFiles) {
final SubscriptionCommitContext commitContext =
prefetchingQueue.generateSubscriptionCommitContext();
events.add(
new SubscriptionEvent(
new SubscriptionPipeTsFileBatchEvents(this, referenceCount), tsFile, commitContext));
new SubscriptionPipeTsFileBatchEvents(this, ackReferenceCount, cleanReferenceCount),
tsFile,
commitContext));
}
return events;
}
Expand Down
16 changes: 10 additions & 6 deletions ...n/java/org/apache/iotdb/db/subscription/event/pipe/SubscriptionPipeTsFileBatchEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,30 @@
public class SubscriptionPipeTsFileBatchEvents implements SubscriptionPipeEvents {

private final SubscriptionPipeTsFileEventBatch batch;
private final AtomicInteger referenceCount; // shared between the same batch
private final AtomicInteger ackReferenceCount; // shared between the same batch
private final AtomicInteger cleanReferenceCount; // shared between the same batch
private final int count; // snapshot the initial reference count, used for event count calculation

public SubscriptionPipeTsFileBatchEvents(
final SubscriptionPipeTsFileEventBatch batch, final AtomicInteger referenceCount) {
final SubscriptionPipeTsFileEventBatch batch,
final AtomicInteger ackReferenceCount,
final AtomicInteger cleanReferenceCount) {
this.batch = batch;
this.referenceCount = referenceCount;
this.count = Math.max(1, referenceCount.get());
this.ackReferenceCount = ackReferenceCount;
this.cleanReferenceCount = cleanReferenceCount;
this.count = Math.max(1, ackReferenceCount.get());
}

@Override
public void ack() {
if (referenceCount.decrementAndGet() == 0) {
if (ackReferenceCount.decrementAndGet() == 0) {
batch.ack();
}
}

@Override
public void cleanUp(final boolean force) {
if (referenceCount.decrementAndGet() == 0) {
if (cleanReferenceCount.decrementAndGet() == 0) {
batch.cleanUp(force);
}
}
Expand Down
Loading