Repository: james-project Updated Branches: refs/heads/master 34592441c -> 0ecf6d6a0
MAILBOX-289 Cassandra subscription should not rely on secondary 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/0ecf6d6a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0ecf6d6a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0ecf6d6a Branch: refs/heads/master Commit: 0ecf6d6a044d025c8206290b7011a0c10b055af4 Parents: 3459244 Author: benwa <btell...@linagora.com> Authored: Tue Mar 7 09:29:32 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Mon Mar 13 09:42:15 2017 +0700 ---------------------------------------------------------------------- .../modules/CassandraSubscriptionModule.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/0ecf6d6a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java index 8406df6..4b5f597 100644 --- a/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java +++ b/mailbox/cassandra/src/main/java/org/apache/james/mailbox/cassandra/modules/CassandraSubscriptionModule.java @@ -20,13 +20,14 @@ package org.apache.james.mailbox.cassandra.modules; import com.datastax.driver.core.schemabuilder.SchemaBuilder; +import com.google.common.collect.ImmutableList; + import org.apache.james.backends.cassandra.components.CassandraIndex; import org.apache.james.backends.cassandra.components.CassandraModule; import org.apache.james.backends.cassandra.components.CassandraTable; import org.apache.james.backends.cassandra.components.CassandraType; import org.apache.james.mailbox.cassandra.table.CassandraSubscriptionTable; -import java.util.Collections; import java.util.List; import static com.datastax.driver.core.DataType.text; @@ -38,19 +39,14 @@ public class CassandraSubscriptionModule implements CassandraModule { private final List<CassandraType> types; public CassandraSubscriptionModule() { - tables = Collections.singletonList( + tables = ImmutableList.of( new CassandraTable(CassandraSubscriptionTable.TABLE_NAME, SchemaBuilder.createTable(CassandraSubscriptionTable.TABLE_NAME) .ifNotExists() - .addPartitionKey(CassandraSubscriptionTable.MAILBOX, text()) - .addClusteringColumn(CassandraSubscriptionTable.USER, text()))); - index = Collections.singletonList( - new CassandraIndex( - SchemaBuilder.createIndex(CassandraIndex.INDEX_PREFIX + CassandraSubscriptionTable.USER) - .ifNotExists() - .onTable(CassandraSubscriptionTable.TABLE_NAME) - .andColumn(CassandraSubscriptionTable.USER))); - types = Collections.emptyList(); + .addPartitionKey(CassandraSubscriptionTable.USER, text()) + .addClusteringColumn(CassandraSubscriptionTable.MAILBOX, text()))); + index = ImmutableList.of(); + types = ImmutableList.of(); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
