This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9e7f3357fc69ca39468bad163cd0e6a6ed0ee96d Author: Gautier DI FOLCO <[email protected]> AuthorDate: Wed Feb 20 12:00:32 2019 +0100 MAILBOX-374 Serialize CassandraMessageMapper.updateFlags to avoid modSeq conflicts --- .../org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java | 2 +- .../org/apache/james/mailbox/store/mail/model/MessageMapperTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java index dee5b98..73f55e7 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java @@ -319,7 +319,7 @@ public class CassandraMessageMapper implements MessageMapper { private Mono<FlagsUpdateStageResult> runUpdateStage(CassandraId mailboxId, Flux<ComposedMessageIdWithMetaData> toBeUpdated, FlagsUpdateCalculator flagsUpdateCalculator) { Mono<Long> newModSeq = computeNewModSeq(mailboxId); return toBeUpdated - .limitRate(cassandraConfiguration.getFlagsUpdateChunkSize()) + .limitRate(1) .flatMapSequential(metadata -> newModSeq.flatMap(modSeq -> tryFlagsUpdate(flagsUpdateCalculator, modSeq, metadata))) .reduce(FlagsUpdateStageResult.none(), FlagsUpdateStageResult::merge) .flatMap(result -> updateIndexesForUpdatesResult(mailboxId, result)); diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java index 622e6ba..acc55b0 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/MessageMapperTest.java @@ -31,6 +31,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.function.Consumer; import javax.mail.Flags; import javax.mail.Flags.Flag; @@ -59,6 +60,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import com.github.fge.lambdas.Throwing; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
