vttranlina commented on a change in pull request #578:
URL: https://github.com/apache/james-project/pull/578#discussion_r688365535
##########
File path:
mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
##########
@@ -243,7 +244,15 @@ private PreparedStatement
prepareSelectUidRangeLimited(Session session) {
ComposedMessageId composedMessageId =
metadata.getComposedMessageId().getComposedMessageId();
Flags flags = metadata.getComposedMessageId().getFlags();
ThreadId threadId = metadata.getComposedMessageId().getThreadId();
- return cassandraAsyncExecutor.executeVoid(insert.bind()
+
+ BoundStatement boundStatement = insert.bind();
+ if (metadata.getComposedMessageId().getFlags().getUserFlags().length
== 0) {
Review comment:
`flags.getUserFlags()`
##########
File path:
mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
##########
@@ -243,7 +244,15 @@ private PreparedStatement
prepareSelectUidRangeLimited(Session session) {
ComposedMessageId composedMessageId =
metadata.getComposedMessageId().getComposedMessageId();
Flags flags = metadata.getComposedMessageId().getFlags();
ThreadId threadId = metadata.getComposedMessageId().getThreadId();
- return cassandraAsyncExecutor.executeVoid(insert.bind()
+
+ BoundStatement boundStatement = insert.bind();
+ if (metadata.getComposedMessageId().getFlags().getUserFlags().length
== 0) {
+ boundStatement.unset(USER_FLAGS);
Review comment:
The if-else is necessary?
When `length=0`, so it is equivalent to
`boundStatement.setSet(USER_FLAGS, ImmutableSet.of());`, It still good?
##########
File path:
mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAO.java
##########
@@ -148,7 +149,24 @@ private PreparedStatement prepareInsert(Session session) {
if (cassandraConfiguration.isMessageWriteStrongConsistency()) {
return session.prepare(insert.ifNotExists());
Review comment:
Should we move `Insert insert = ... ` into the `if` block.
##########
File path:
mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAO.java
##########
@@ -271,21 +277,68 @@ private PreparedStatement
prepareSelectUidRangeLimited(Session session) {
.setString(HEADER_CONTENT,
metadata.getHeaderContent().get().asString()));
}
- public Mono<Void> updateMetadata(ComposedMessageIdWithMetaData
composedMessageIdWithMetaData) {
- ComposedMessageId composedMessageId =
composedMessageIdWithMetaData.getComposedMessageId();
- Flags flags = composedMessageIdWithMetaData.getFlags();
- return cassandraAsyncExecutor.executeVoid(update.bind()
- .setLong(MOD_SEQ,
composedMessageIdWithMetaData.getModSeq().asLong())
- .setBool(ANSWERED, flags.contains(Flag.ANSWERED))
- .setBool(DELETED, flags.contains(Flag.DELETED))
- .setBool(DRAFT, flags.contains(Flag.DRAFT))
- .setBool(FLAGGED, flags.contains(Flag.FLAGGED))
- .setBool(RECENT, flags.contains(Flag.RECENT))
- .setBool(SEEN, flags.contains(Flag.SEEN))
- .setBool(USER, flags.contains(Flag.USER))
- .setSet(USER_FLAGS, ImmutableSet.copyOf(flags.getUserFlags()))
- .setUUID(MAILBOX_ID, ((CassandraId)
composedMessageId.getMailboxId()).asUuid())
- .setLong(IMAP_UID, composedMessageId.getUid().asLong()));
+ public Mono<Void> updateMetadata(ComposedMessageId composedMessageId,
UpdatedFlags updatedFlags) {
+ return
cassandraAsyncExecutor.executeVoid(updateBoundStatement(composedMessageId,
updatedFlags));
+ }
+
+ private BoundStatement updateBoundStatement(ComposedMessageId id,
UpdatedFlags updatedFlags) {
+ final BoundStatement boundStatement = update.bind()
+ .setLong(MOD_SEQ, updatedFlags.getModSeq().asLong())
Review comment:
If `update PrepareStatement` is simpler
Example:
```java
private PreparedStatement prepareUpdate(Session session) {
return session.prepare(update(TABLE_NAME)
.with(set(MOD_SEQ, bindMarker(MOD_SEQ)))
.where(eq(MAILBOX_ID, bindMarker(MAILBOX_ID)))
.and(eq(IMAP_UID, bindMarker(IMAP_UID))));
}
```
So, we don't need to check `else` statement, don't need `unset`
--
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]
