Skip to content

[FIX] MOVE/COPY should not exceed batch size in published events (sam… #3047

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

Open
chibenwa wants to merge 2 commits into
base: master
Choose a base branch
from
+79 −88
Open

[FIX] MOVE/COPY should not exceed batch size in published events (sam… #3047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3ce302
[FIX] MOVE/COPY should not exceed batch size in published events (sam…
chibenwa May 22, 2026
698376a
fixup! [FIX] MOVE/COPY should not exceed batch size in published even…
chibenwa May 22, 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
167 changes: 79 additions & 88 deletions mailbox/store/src/main/java/org/apache/james/mailbox/store/StoreMessageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.apache.commons.lang3.tuple.Pair;
import org.apache.james.events.EventBus;
import org.apache.james.events.EventListener;
import org.apache.james.events.RegistrationKey;
import org.apache.james.mailbox.MailboxManager;
import org.apache.james.mailbox.MailboxManager.MessageCapabilities;
import org.apache.james.mailbox.MailboxPathLocker;
Expand Down Expand Up @@ -745,49 +746,47 @@ public Flux<MessageRange> copyTo(List<MessageRange> sets, StoreMessageManager to
}

private Mono<SortedMap<MessageUid, MessageMetaData>> copyAll(List<MessageRange> sets, StoreMessageManager to, MailboxSession session) {
MessageMoves messageMoves = MessageMoves.builder()
.previousMailboxIds(getMailboxEntity().getMailboxId())
.targetMailboxIds(to.getMailboxEntity().getMailboxId(), getMailboxEntity().getMailboxId())
.build();
ImmutableSet<RegistrationKey> registrationKeys = messageMoves.impactedMailboxIds()
.<RegistrationKey>map(MailboxIdRegistrationKey::new)
.collect(ImmutableSet.toImmutableSet());

return Flux.fromIterable(sets)
.concatMap(set -> retrieveOriginalRows(set, session))
.window(batchSizes.getCopyBatchSize().orElse(Integer.MAX_VALUE))
.concatMap(window -> window.collectList()
.flatMap(originalRows -> to.copy(originalRows, session).collectList()
.map(copyResult -> Pair.of(
collectMetadata(copyResult.iterator()),
originalRows.stream()
.flatMap(copyResult -> {
SortedMap<MessageUid, MessageMetaData> copiedUids = collectMetadata(copyResult.iterator());
ImmutableList<MessageId> messageIds = originalRows.stream()
.map(org.apache.james.mailbox.store.mail.model.Message::getMessageId)
.collect(ImmutableList.toImmutableList())))))
.collectList()
.flatMap(allResults -> {
if (allResults.isEmpty()) {
return Mono.just(ImmutableSortedMap.of());
}
SortedMap<MessageUid, MessageMetaData> allCopiedUids = new TreeMap<>();
List<MessageId> allMessageIds = new ArrayList<>();
for (Pair<SortedMap<MessageUid, MessageMetaData>, ImmutableList<MessageId>> result : allResults) {
allCopiedUids.putAll(result.getLeft());
allMessageIds.addAll(result.getRight());
}
MessageMoves messageMoves = MessageMoves.builder()
.previousMailboxIds(getMailboxEntity().getMailboxId())
.targetMailboxIds(to.getMailboxEntity().getMailboxId(), getMailboxEntity().getMailboxId())
.build();
EventBus.EventWithRegistrationKey added = new EventBus.EventWithRegistrationKey(
EventFactory.added()
.randomEventId()
.mailboxSession(session)
.mailbox(to.getMailboxEntity())
.metaData(allCopiedUids)
.isDelivery(!IS_DELIVERY)
.isAppended(!IS_APPENDED)
.build(),
ImmutableSet.of(new MailboxIdRegistrationKey(to.getMailboxEntity().getMailboxId())));
EventBus.EventWithRegistrationKey moved = new EventBus.EventWithRegistrationKey(
EventFactory.moved()
.messageMoves(messageMoves)
.messageId(allMessageIds)
.session(session)
.build(),
messageMoves.impactedMailboxIds().map(MailboxIdRegistrationKey::new).collect(ImmutableSet.toImmutableSet()));
return Mono.from(eventBus.dispatch(ImmutableList.of(added, moved))).thenReturn(allCopiedUids);
.collect(ImmutableList.toImmutableList());
EventBus.EventWithRegistrationKey added = new EventBus.EventWithRegistrationKey(
EventFactory.added()
.randomEventId()
.mailboxSession(session)
.mailbox(to.getMailboxEntity())
.metaData(copiedUids)
.isDelivery(!IS_DELIVERY)
.isAppended(!IS_APPENDED)
.build(),
ImmutableSet.of(new MailboxIdRegistrationKey(to.getMailboxEntity().getMailboxId())));
EventBus.EventWithRegistrationKey moved = new EventBus.EventWithRegistrationKey(
EventFactory.moved()
.messageMoves(messageMoves)
.messageId(messageIds)
.session(session)
.build(),
registrationKeys);
return Mono.from(eventBus.dispatch(ImmutableList.of(added, moved)))
.thenReturn(copiedUids);
})))
.reduce(new TreeMap<>(), (acc, batchUids) -> {
acc.putAll(batchUids);
return acc;
});
}

Expand Down Expand Up @@ -834,63 +833,55 @@ public Flux<MessageRange> moveTo(List<MessageRange> sets, StoreMessageManager to
}

private Mono<SortedMap<MessageUid, MessageMetaData>> moveAll(List<MessageRange> sets, StoreMessageManager to, MailboxSession session) {
MessageMoves messageMoves = MessageMoves.builder()
.previousMailboxIds(getMailboxEntity().getMailboxId())
.targetMailboxIds(to.getMailboxEntity().getMailboxId())
.build();
ImmutableSet<RegistrationKey> registrationKeys = messageMoves.impactedMailboxIds()
.<RegistrationKey>map(MailboxIdRegistrationKey::new)
.collect(ImmutableSet.toImmutableSet());

return Flux.fromIterable(sets)
.concatMap(set -> retrieveOriginalRows(set, session))
.window(batchSizes.getCopyBatchSize().orElse(Integer.MAX_VALUE))
.concatMap(window -> window
.collectList()
.flatMap(originalRows -> to.move(originalRows, session)
.map(moveResult -> Pair.of(moveResult, originalRows))))
.collectList()
.flatMap(allResults -> {
if (allResults.isEmpty()) {
return Mono.just(ImmutableSortedMap.of());
}

SortedMap<MessageUid, MessageMetaData> allMoveUids = new TreeMap<>();
List<MessageMetaData> allOriginalMessages = new ArrayList<>();
List<MessageId> allMessageIds = new ArrayList<>();

for (Pair<MoveResult, List<MailboxMessage>> result : allResults) {
allMoveUids.putAll(collectMetadata(result.getLeft().getMovedMessages().iterator()));
allOriginalMessages.addAll(result.getLeft().getOriginalMessages());
result.getRight().stream()
.map(org.apache.james.mailbox.store.mail.model.Message::getMessageId)
.forEach(allMessageIds::add);
}

MessageMoves messageMoves = MessageMoves.builder()
.previousMailboxIds(getMailboxEntity().getMailboxId())
.targetMailboxIds(to.getMailboxEntity().getMailboxId())
.build();

EventBus.EventWithRegistrationKey added = new EventBus.EventWithRegistrationKey(EventFactory.added()
.randomEventId()
.mailboxSession(session)
.mailbox(to.getMailboxEntity())
.metaData(allMoveUids)
.isDelivery(!IS_DELIVERY)
.isAppended(!IS_APPENDED)
.movedFrom(getId())
.build(),
ImmutableSet.of(new MailboxIdRegistrationKey(to.getMailboxEntity().getMailboxId())));
EventBus.EventWithRegistrationKey expunged = new EventBus.EventWithRegistrationKey(EventFactory.expunged()
.randomEventId()
.mailboxSession(session)
.mailbox(getMailboxEntity())
.addMetaData(allOriginalMessages)
.movedTo(to.getId())
.build(),
ImmutableSet.of(new MailboxIdRegistrationKey(mailbox.getMailboxId())));
EventBus.EventWithRegistrationKey moved = new EventBus.EventWithRegistrationKey(EventFactory.moved()
.messageMoves(messageMoves)
.messageId(allMessageIds)
.session(session)
.build(),
messageMoves.impactedMailboxIds().map(MailboxIdRegistrationKey::new).collect(ImmutableSet.toImmutableSet()));

return Mono.from(eventBus.dispatch(ImmutableList.of(added, expunged, moved)))
.thenReturn(allMoveUids);
.flatMap(moveResult -> {
SortedMap<MessageUid, MessageMetaData> moveUids = collectMetadata(moveResult.getMovedMessages().iterator());
ImmutableList<MessageId> messageIds = originalRows.stream()
.map(org.apache.james.mailbox.store.mail.model.Message::getMessageId)
.collect(ImmutableList.toImmutableList());
EventBus.EventWithRegistrationKey added = new EventBus.EventWithRegistrationKey(EventFactory.added()
.randomEventId()
.mailboxSession(session)
.mailbox(to.getMailboxEntity())
.metaData(moveUids)
.isDelivery(!IS_DELIVERY)
.isAppended(!IS_APPENDED)
.movedFrom(getId())
.build(),
ImmutableSet.of(new MailboxIdRegistrationKey(to.getMailboxEntity().getMailboxId())));
EventBus.EventWithRegistrationKey expunged = new EventBus.EventWithRegistrationKey(EventFactory.expunged()
.randomEventId()
.mailboxSession(session)
.mailbox(getMailboxEntity())
.addMetaData(moveResult.getOriginalMessages())
.movedTo(to.getId())
.build(),
ImmutableSet.of(new MailboxIdRegistrationKey(mailbox.getMailboxId())));
EventBus.EventWithRegistrationKey moved = new EventBus.EventWithRegistrationKey(EventFactory.moved()
.messageMoves(messageMoves)
.messageId(messageIds)
.session(session)
.build(),
registrationKeys);
return Mono.from(eventBus.dispatch(ImmutableList.of(added, expunged, moved)))
.thenReturn(moveUids);
})))
.reduce(new TreeMap<>(), (acc, batchUids) -> {
acc.putAll(batchUids);
return acc;
});
}

Expand Down