JAMES-1929 Remove useless column and indexes
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3176d37b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3176d37b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3176d37b Branch: refs/heads/master Commit: 3176d37bdcca2846301fbe388a7955c13feaec7f Parents: e007c1d Author: Benoit Tellier <[email protected]> Authored: Tue Feb 14 15:24:44 2017 +0700 Committer: Antoine Duprat <[email protected]> Committed: Wed Feb 15 13:12:39 2017 +0100 ---------------------------------------------------------------------- .../mailbox/cassandra/mail/CassandraMailboxDAO.java | 9 ++------- .../cassandra/modules/CassandraMailboxModule.java | 15 ++------------- .../cassandra/table/CassandraMailboxTable.java | 3 +-- 3 files changed, 5 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/3176d37b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java index 9966151..3f6f86c 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxDAO.java @@ -29,7 +29,6 @@ import static org.apache.james.mailbox.cassandra.table.CassandraMailboxTable.FIE import static org.apache.james.mailbox.cassandra.table.CassandraMailboxTable.ID; import static org.apache.james.mailbox.cassandra.table.CassandraMailboxTable.MAILBOX_BASE; import static org.apache.james.mailbox.cassandra.table.CassandraMailboxTable.NAME; -import static org.apache.james.mailbox.cassandra.table.CassandraMailboxTable.PATH; import static org.apache.james.mailbox.cassandra.table.CassandraMailboxTable.TABLE_NAME; import static org.apache.james.mailbox.cassandra.table.CassandraMailboxTable.UIDVALIDITY; @@ -88,15 +87,13 @@ public class CassandraMailboxDAO { .value(ID, bindMarker(ID)) .value(NAME, bindMarker(NAME)) .value(UIDVALIDITY, bindMarker(UIDVALIDITY)) - .value(MAILBOX_BASE, bindMarker(MAILBOX_BASE)) - .value(PATH, bindMarker(PATH))); + .value(MAILBOX_BASE, bindMarker(MAILBOX_BASE))); } private PreparedStatement prepareUpdate(Session session) { return session.prepare(update(TABLE_NAME) .with(set(MAILBOX_BASE, bindMarker(MAILBOX_BASE))) .and(set(NAME, bindMarker(NAME))) - .and(set(PATH, bindMarker(PATH))) .where(eq(ID, bindMarker(ID)))); } @@ -121,14 +118,12 @@ public class CassandraMailboxDAO { .setUUID(ID, cassandraId.asUuid()) .setString(NAME, mailbox.getName()) .setLong(UIDVALIDITY, mailbox.getUidValidity()) - .setUDTValue(MAILBOX_BASE, mailboxBaseTupleUtil.createMailboxBaseUDT(mailbox.getNamespace(), mailbox.getUser())) - .setString(PATH, mailbox.generateAssociatedPath().asString())); + .setUDTValue(MAILBOX_BASE, mailboxBaseTupleUtil.createMailboxBaseUDT(mailbox.getNamespace(), mailbox.getUser()))); } public CompletableFuture<Void> updatePath(CassandraId mailboxId, MailboxPath mailboxPath) { return executor.executeVoid(updateStatement.bind() .setUUID(ID, mailboxId.asUuid()) - .setString(PATH, mailboxPath.asString()) .setString(NAME, mailboxPath.getName()) .setUDTValue(MAILBOX_BASE, mailboxBaseTupleUtil.createMailboxBaseUDT(mailboxPath.getNamespace(), mailboxPath.getUser()))); } http://git-wip-us.apache.org/repos/asf/james-project/blob/3176d37b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java index 8858504..566992a 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraMailboxModule.java @@ -51,7 +51,6 @@ public class CassandraMailboxModule implements CassandraModule { .addPartitionKey(CassandraMailboxTable.ID, timeuuid()) .addUDTColumn(CassandraMailboxTable.MAILBOX_BASE, SchemaBuilder.frozen(CassandraMailboxTable.MAILBOX_BASE)) .addColumn(CassandraMailboxTable.NAME, text()) - .addColumn(CassandraMailboxTable.PATH, text()) .addColumn(CassandraMailboxTable.UIDVALIDITY, bigint())), new CassandraTable(CassandraMailboxPathTable.TABLE_NAME, SchemaBuilder.createTable(CassandraMailboxPathTable.TABLE_NAME) @@ -59,18 +58,8 @@ public class CassandraMailboxModule implements CassandraModule { .addUDTPartitionKey(CassandraMailboxPathTable.NAMESPACE_AND_USER, SchemaBuilder.frozen(CassandraMailboxTable.MAILBOX_BASE)) .addClusteringColumn(CassandraMailboxPathTable.MAILBOX_NAME, text()) .addColumn(CassandraMailboxPathTable.MAILBOX_ID, timeuuid()))); - index = Arrays.asList( - new CassandraIndex( - SchemaBuilder.createIndex(CassandraIndex.INDEX_PREFIX + CassandraMailboxTable.TABLE_NAME) - .ifNotExists() - .onTable(CassandraMailboxTable.TABLE_NAME) - .andColumn(CassandraMailboxTable.PATH)), - new CassandraIndex( - SchemaBuilder.createIndex(CassandraIndex.INDEX_PREFIX + CassandraMailboxTable.MAILBOX_BASE) - .ifNotExists() - .onTable(CassandraMailboxTable.TABLE_NAME) - .andColumn(CassandraMailboxTable.MAILBOX_BASE))); - types = Collections.singletonList( + index = ImmutableList.of(); + types = ImmutableList.of( new CassandraType(CassandraMailboxTable.MAILBOX_BASE, SchemaBuilder.createType(CassandraMailboxTable.MAILBOX_BASE) .ifNotExists() http://git-wip-us.apache.org/repos/asf/james-project/blob/3176d37b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMailboxTable.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMailboxTable.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMailboxTable.java index c9687ba..e301552 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMailboxTable.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/table/CassandraMailboxTable.java @@ -23,11 +23,10 @@ package org.apache.james.mailbox.cassandra.table; public interface CassandraMailboxTable { String TABLE_NAME = "mailbox"; String ID = "id"; - String PATH = "path"; String MAILBOX_BASE = "mailboxbase"; String UIDVALIDITY = "uidvalidity"; String NAME = "name"; - String[] FIELDS = { ID, MAILBOX_BASE, UIDVALIDITY, NAME, PATH }; + String[] FIELDS = { ID, MAILBOX_BASE, UIDVALIDITY, NAME }; interface MailboxBase { String USER = "user"; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
