Author: btellier
Date: Fri Jul 3 14:55:40 2015
New Revision: 1689030
URL: http://svn.apache.org/r1689030
Log:
MAILBOX-208 Improve Cassandra message table
Added:
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MessageDeletedDuringFlagsUpdateException.java
Removed:
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MessageDeletedDuringFlagsUpdate.java
Modified:
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMessageTable.java
Modified:
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java?rev=1689030&r1=1689029&r2=1689030&view=diff
==============================================================================
---
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
(original)
+++
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageMapper.java
Fri Jul 3 14:55:40 2015
@@ -54,7 +54,7 @@ import static org.apache.james.mailbox.c
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
-import java.util.Arrays;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -75,7 +75,7 @@ import org.apache.james.mailbox.cassandr
import org.apache.james.mailbox.cassandra.CassandraTypesProvider;
import org.apache.james.mailbox.cassandra.CassandraTypesProvider.TYPE;
import org.apache.james.mailbox.cassandra.mail.utils.FunctionRunnerWithRetry;
-import
org.apache.james.mailbox.cassandra.mail.utils.MessageDeletedDuringFlagsUpdate;
+import
org.apache.james.mailbox.cassandra.mail.utils.MessageDeletedDuringFlagsUpdateException;
import org.apache.james.mailbox.cassandra.table.CassandraMailboxCountersTable;
import org.apache.james.mailbox.cassandra.table.CassandraMessageTable;
import
org.apache.james.mailbox.cassandra.table.CassandraMessageTable.Properties;
@@ -166,6 +166,7 @@ public class CassandraMessageMapper impl
public Iterator<Message<CassandraId>> findInMailbox(Mailbox<CassandraId>
mailbox, MessageRange set, FetchType ftype, int max) throws MailboxException {
return convertToStream(session.execute(buildQuery(mailbox, set)))
.map(this::message)
+ .sorted(Comparator.comparingLong(Message::getUid))
.iterator();
}
@@ -301,16 +302,13 @@ public class CassandraMessageMapper impl
}
private Flags getFlags(Row row) {
- return Arrays.stream(CassandraMessageTable.Flag.ALL)
- .filter(row::getBool)
- .map(JAVAX_MAIL_FLAG::get)
- .reduce(new Flags(), (flags, flag) -> {
- flags.add(flag);
- return flags;
- }, (flags1, flags2) -> {
- flags1.add(flags2);
- return flags1;
- });
+ Flags flags = new Flags();
+ for (String flag : CassandraMessageTable.Flag.ALL) {
+ if (row.getBool(flag)) {
+
flags.add(CassandraMessageTable.Flag.JAVAX_MAIL_FLAG.get(flag));
+ }
+ }
+ return flags;
}
private PropertyBuilder getPropertyBuilder(Row row) {
@@ -397,7 +395,7 @@ public class CassandraMessageMapper impl
return Optional.of(
new FunctionRunnerWithRetry(maxRetries)
.executeAndRetrieveObject(() ->
retryMessageFlagsUpdate(mailbox, uid, flagUpdateCalculator)));
- } catch (MessageDeletedDuringFlagsUpdate e) {
+ } catch (MessageDeletedDuringFlagsUpdateException e) {
mailboxSession.getLog().warn(e.getMessage());
return Optional.empty();
} catch (MailboxException e) {
@@ -406,9 +404,10 @@ public class CassandraMessageMapper impl
}
private Optional<UpdatedFlags>
retryMessageFlagsUpdate(Mailbox<CassandraId> mailbox, long uid,
FlagsUpdateCalculator flagUpdateCalculator) {
- return Optional.ofNullable(session.execute(selectMessage(mailbox,
uid)).one())
- .map((row) -> tryMessageFlagsUpdate(flagUpdateCalculator, mailbox,
message(row)))
- .orElseThrow(() -> new
MessageDeletedDuringFlagsUpdate(mailbox.getMailboxId(), uid));
+ return tryMessageFlagsUpdate(flagUpdateCalculator,
+ mailbox,
+ message(Optional.ofNullable(session.execute(selectMessage(mailbox,
uid)).one())
+ .orElseThrow(() -> new
MessageDeletedDuringFlagsUpdateException(mailbox.getMailboxId(), uid))));
}
private boolean conditionalSave(Message<CassandraId> message, long
oldModSeq) {
Added:
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MessageDeletedDuringFlagsUpdateException.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MessageDeletedDuringFlagsUpdateException.java?rev=1689030&view=auto
==============================================================================
---
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MessageDeletedDuringFlagsUpdateException.java
(added)
+++
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/utils/MessageDeletedDuringFlagsUpdateException.java
Fri Jul 3 14:55:40 2015
@@ -0,0 +1,29 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.mailbox.cassandra.mail.utils;
+
+import org.apache.james.mailbox.cassandra.CassandraId;
+
+public class MessageDeletedDuringFlagsUpdateException extends RuntimeException
{
+
+ public MessageDeletedDuringFlagsUpdateException(CassandraId id, long uid) {
+ super("Can not perform flag update as message was deleted for mailbox
" + id.serialize() + " and message " + uid);
+ }
+}
Modified:
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMessageTable.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMessageTable.java?rev=1689030&r1=1689029&r2=1689030&view=diff
==============================================================================
---
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMessageTable.java
(original)
+++
james/mailbox/trunk/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMessageTable.java
Fri Jul 3 14:55:40 2015
@@ -19,8 +19,9 @@
package org.apache.james.mailbox.cassandra.table;
+import javax.mail.Flags;
+
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
public interface CassandraMessageTable {
@@ -48,9 +49,15 @@ public interface CassandraMessageTable {
String USER = "flagUser";
String[] ALL = { ANSWERED, DELETED, DRAFT, RECENT, SEEN, FLAGGED, USER
};
- ImmutableMap<String, javax.mail.Flags.Flag> JAVAX_MAIL_FLAG = new
Builder<String, javax.mail.Flags.Flag>().put(ANSWERED,
javax.mail.Flags.Flag.ANSWERED).put(DELETED,
javax.mail.Flags.Flag.DELETED).put(DRAFT,
javax.mail.Flags.Flag.DRAFT).put(RECENT, javax.mail.Flags.Flag.RECENT)
- .put(SEEN, javax.mail.Flags.Flag.SEEN).put(FLAGGED,
javax.mail.Flags.Flag.FLAGGED).put(USER, javax.mail.Flags.Flag.USER).build();
-
+ ImmutableMap<String, Flags.Flag> JAVAX_MAIL_FLAG =
ImmutableMap.<String, Flags.Flag>builder()
+ .put(ANSWERED, Flags.Flag.ANSWERED)
+ .put(DELETED, Flags.Flag.DELETED)
+ .put(DRAFT, Flags.Flag.DRAFT)
+ .put(RECENT, Flags.Flag.RECENT)
+ .put(SEEN, Flags.Flag.SEEN)
+ .put(FLAGGED, Flags.Flag.FLAGGED)
+ .put(USER, Flags.Flag.USER)
+ .build();
}
interface Properties {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
