Base local keyspace name off of application keyspace name, plus data center name
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/78fc3fcb Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/78fc3fcb Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/78fc3fcb Branch: refs/heads/usergrid-1318-queue Commit: 78fc3fcb58cf63256e9d4ded5f37852e771132cb Parents: fc68e42 Author: Dave Johnson <[email protected]> Authored: Thu Nov 10 12:30:51 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Thu Nov 10 12:30:51 2016 -0500 ---------------------------------------------------------------------- .../apache/usergrid/persistence/core/CassandraConfigImpl.java | 2 +- .../java/org/apache/usergrid/persistence/core/CassandraFig.java | 5 ----- .../persistence/core/astyanax/ColumnNameIteratorTest.java | 2 +- .../core/astyanax/MultiKeyColumnNameIteratorTest.java | 2 +- .../persistence/core/astyanax/MultiRowColumnIteratorTest.java | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/78fc3fcb/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraConfigImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraConfigImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraConfigImpl.java index b0ce9e3..e9c7d02 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraConfigImpl.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraConfigImpl.java @@ -79,7 +79,7 @@ public class CassandraConfigImpl implements CassandraConfig { this.applicationKeyspace = cassandraFig.getApplicationKeyspace(); this.applicationLocalKeyspace = - cassandraFig.getApplicationLocalKeyspace() + "_" + cassandraFig.getApplicationKeyspace() + "_" + cassandraFig.getLocalDataCenter().replace("-", "_"); logger.info("Application Keyspace: {}", applicationKeyspace); http://git-wip-us.apache.org/repos/asf/usergrid/blob/78fc3fcb/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java index 1faf1e7..8f5223c 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java @@ -91,11 +91,6 @@ public interface CassandraFig extends GuicyFig { @Default( "Usergrid_Applications" ) String getApplicationKeyspace(); - /** Prefix for local keyspace name. Name will be this prefix plus "_" plus local data center name. */ - @Key( "cassandra.keyspace.application.local" ) - @Default( "Usergrid_Applications_Local" ) - String getApplicationLocalKeyspace(); - @Key( "cassandra.port" ) @Default( "9160" ) int getThriftPort(); http://git-wip-us.apache.org/repos/asf/usergrid/blob/78fc3fcb/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java index 00856a5..e40af55 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java @@ -123,7 +123,7 @@ public class ColumnNameIteratorTest { @Override public String getApplicationLocalKeyspace() { - return cassandraFig.getApplicationLocalKeyspace(); + return cassandraFig.getApplicationKeyspace() + "us_east"; } @Override http://git-wip-us.apache.org/repos/asf/usergrid/blob/78fc3fcb/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java index b12ea6f..18c984b 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java @@ -126,7 +126,7 @@ public class MultiKeyColumnNameIteratorTest { @Override public String getApplicationLocalKeyspace() { - return cassandraFig.getApplicationLocalKeyspace(); + return cassandraFig.getApplicationKeyspace() + "us_east"; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/78fc3fcb/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java index e509c45..39a4fa2 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java @@ -130,7 +130,7 @@ public class MultiRowColumnIteratorTest { @Override public String getApplicationLocalKeyspace() { - return cassandraFig.getApplicationLocalKeyspace(); + return cassandraFig.getApplicationKeyspace() + "us_east"; }
