You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ro...@apache.org on 2018/12/19 08:24:45 UTC
[8/8] james-project git commit: JAMES-2608 Remove MESSAGE_SIZE from
MailRepositoryTableV2
JAMES-2608 Remove MESSAGE_SIZE from MailRepositoryTableV2
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/1ebe3fde
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/1ebe3fde
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/1ebe3fde
Branch: refs/heads/master
Commit: 1ebe3fde75d170129c5d5e90a68f2174c3d464df
Parents: 31dd1b2
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Dec 13 14:26:18 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Dec 19 09:24:12 2018 +0100
----------------------------------------------------------------------
.../cassandra/CassandraMailRepositoryMailDaoV2.java | 3 ---
.../james/mailrepository/cassandra/MailRepositoryTableV2.java | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ebe3fde/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java
index 10b44b1..156fa85 100644
--- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java
+++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/CassandraMailRepositoryMailDaoV2.java
@@ -36,7 +36,6 @@ import static org.apache.james.mailrepository.cassandra.MailRepositoryTableV2.He
import static org.apache.james.mailrepository.cassandra.MailRepositoryTableV2.LAST_UPDATED;
import static org.apache.james.mailrepository.cassandra.MailRepositoryTableV2.MAIL_KEY;
import static org.apache.james.mailrepository.cassandra.MailRepositoryTableV2.MAIL_PROPERTIES;
-import static org.apache.james.mailrepository.cassandra.MailRepositoryTableV2.MESSAGE_SIZE;
import static org.apache.james.mailrepository.cassandra.MailRepositoryTableV2.PER_RECIPIENT_SPECIFIC_HEADERS;
import static org.apache.james.mailrepository.cassandra.MailRepositoryTableV2.RECIPIENTS;
import static org.apache.james.mailrepository.cassandra.MailRepositoryTableV2.REMOTE_ADDR;
@@ -118,7 +117,6 @@ public class CassandraMailRepositoryMailDaoV2 implements CassandraMailRepository
return session.prepare(insertInto(CONTENT_TABLE_NAME)
.value(REPOSITORY_NAME, bindMarker(REPOSITORY_NAME))
.value(MAIL_KEY, bindMarker(MAIL_KEY))
- .value(MESSAGE_SIZE, bindMarker(MESSAGE_SIZE))
.value(STATE, bindMarker(STATE))
.value(SENDER, bindMarker(SENDER))
.value(RECIPIENTS, bindMarker(RECIPIENTS))
@@ -152,7 +150,6 @@ public class CassandraMailRepositoryMailDaoV2 implements CassandraMailRepository
.setString(ERROR_MESSAGE, mail.getErrorMessage())
.setString(REMOTE_ADDR, mail.getRemoteAddr())
.setString(REMOTE_HOST, mail.getRemoteHost())
- .setLong(MESSAGE_SIZE, mail.getMessageSize())
.setTimestamp(LAST_UPDATED, mail.getLastUpdated())
.setMap(ATTRIBUTES, toRawAttributeMap(mail))
.setList(PER_RECIPIENT_SPECIFIC_HEADERS, toTupleList(mail.getPerRecipientSpecificHeaders()))
http://git-wip-us.apache.org/repos/asf/james-project/blob/1ebe3fde/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MailRepositoryTableV2.java
----------------------------------------------------------------------
diff --git a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MailRepositoryTableV2.java b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MailRepositoryTableV2.java
index 54e2e45..30b9ea5 100644
--- a/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MailRepositoryTableV2.java
+++ b/server/mailrepository/mailrepository-cassandra/src/main/java/org/apache/james/mailrepository/cassandra/MailRepositoryTableV2.java
@@ -25,7 +25,6 @@ public interface MailRepositoryTableV2 {
String REPOSITORY_NAME = "name";
String MAIL_KEY = "mailKey";
- String MESSAGE_SIZE = "messageSize";
String HEADER_BLOB_ID = "headerBlobId";
String BODY_BLOB_ID = "bodyBlobId";
String STATE = "state";
@@ -44,6 +43,6 @@ public interface MailRepositoryTableV2 {
int HEADER_VALUE_INDEX = 2;
}
- String[] MAIL_PROPERTIES = { MAIL_KEY, MESSAGE_SIZE, STATE, SENDER, RECIPIENTS, ATTRIBUTES, ERROR_MESSAGE, REMOTE_ADDR,
+ String[] MAIL_PROPERTIES = { MAIL_KEY, STATE, SENDER, RECIPIENTS, ATTRIBUTES, ERROR_MESSAGE, REMOTE_ADDR,
REMOTE_HOST, LAST_UPDATED, PER_RECIPIENT_SPECIFIC_HEADERS, HEADER_BLOB_ID, BODY_BLOB_ID };
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org