chibenwa commented on code in PR #2792:
URL: https://github.com/apache/james-project/pull/2792#discussion_r2498683988
##########
server/data/data-jmap-cassandra/src/main/java/org/apache/james/jmap/cassandra/projections/CassandraEmailQueryView.java:
##########
@@ -227,28 +232,77 @@ public CassandraEmailQueryView(CqlSession session) {
public Flux<MessageId> listMailboxContentSortedBySentAt(MailboxId
mailboxId, Limit limit, boolean collapseThreads) {
Preconditions.checkArgument(!limit.isUnlimited(), "Limit should be
defined");
- Limit limitFetch = defineLimitFetch(limit, collapseThreads);
- CassandraId cassandraId = (CassandraId) mailboxId;
+ Limit backendFetchLimit = backendLimitFetch(limit, collapseThreads);
+ return listMailboxContentSortedBySentAtWithBackendLimit((CassandraId)
mailboxId, limit, collapseThreads, backendFetchLimit);
+ }
+ private Flux<MessageId>
listMailboxContentSortedBySentAtWithBackendLimit(CassandraId mailboxId, Limit
limit, boolean collapseThreads, Limit backendFetchLimit) {
Flux<EmailEntry> baseEntries =
executor.executeRows(listMailboxContentBySentAt.bind()
- .set(MAILBOX_ID, cassandraId.asUuid(), TypeCodecs.UUID)
- .setInt(LIMIT_MARKER, limitFetch.getLimit().get()))
- .map(this::getEmailSentAtEntry);
+ .set(MAILBOX_ID, mailboxId.asUuid(), TypeCodecs.UUID)
+ .setInt(LIMIT_MARKER, backendFetchLimit.getLimit().get()))
+ .map(asEmailEntry(SENT_AT));
- return maybeCollapseThreads(baseEntries, collapseThreads)
- .map(EmailEntry::getMessageId)
- .take(limit.getLimit().get());
+ if (collapseThreads) {
+ return baseEntries.collectList()
+ .flatMapMany(results -> {
+ List<EmailEntry> distinctByThreadId =
distinctByThreadId(results);
+ boolean hasEnoughResults = distinctByThreadId.size() >=
limit.getLimit().get();
+ boolean isExhaustive = results.size() <
backendFetchLimit.getLimit().get();
+ if (hasEnoughResults || isExhaustive) {
+ return Flux.fromIterable(distinctByThreadId)
+ .take(limit.getLimit().get())
+ .map(EmailEntry::getMessageId);
+ }
+ Limit newBackendFetchLimit =
Limit.from(backendFetchLimit.getLimit().get() *
COLLAPSE_THREADS_LIMIT_MULTIPLIER);
+ return
listMailboxContentSortedBySentAtWithBackendLimit(mailboxId, limit,
collapseThreads, newBackendFetchLimit);
+ });
Review Comment:
We need an abstraction not to repeat this piece of code.
Refactorig?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
