You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/02/25 20:11:05 UTC
incubator-usergrid git commit: Revert "Removed all instances of
virtual keyspaces"
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-409 540dc709c -> ef24f3dac
Revert "Removed all instances of virtual keyspaces"
This reverts commit 4be53fb105150222cfdb2cb9b6e18186a3fb2058.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ef24f3da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ef24f3da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ef24f3da
Branch: refs/heads/USERGRID-409
Commit: ef24f3dac3d3528378c832e890ad40b326453596
Parents: 540dc70
Author: grey <gr...@apigee.com>
Authored: Wed Feb 25 11:10:52 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 25 11:10:52 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CpSetup.java | 34 ++++++++++--------
.../persistence/cassandra/CassandraService.java | 20 ++++++++++-
.../persistence/cassandra/SetupImpl.java | 38 +++++++++++---------
.../cassandra/EntityManagerFactoryImplIT.java | 6 ++++
4 files changed, 67 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ef24f3da/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
index 345473a..c71c172 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpSetup.java
@@ -46,6 +46,7 @@ import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEM
import static org.apache.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.USE_VIRTUAL_KEYSPACES;
import static org.apache.usergrid.persistence.cassandra.CassandraService.getApplicationKeyspace;
import static org.apache.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
@@ -175,16 +176,19 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
- String app_keyspace = keyspaceForApplication( applicationId );
+ if ( !USE_VIRTUAL_KEYSPACES ) {
- logger.info( "Creating application keyspace " + app_keyspace + " for " + applicationName + " application" );
+ String app_keyspace = keyspaceForApplication( applicationId );
- cass.createColumnFamily( app_keyspace,
- createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+ logger.info( "Creating application keyspace " + app_keyspace + " for " + applicationName + " application" );
+
+ cass.createColumnFamily( app_keyspace,
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
- cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace ) );
+ cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace ) );
- cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
+ cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
+ }
}
@@ -195,18 +199,20 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
- logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
+ if ( USE_VIRTUAL_KEYSPACES ) {
- cass.createColumnFamily( getApplicationKeyspace(),
- createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
- ComparatorType.BYTESTYPE ) );
+ logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
- cass.createColumnFamilies( getApplicationKeyspace(),
- getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
+ ComparatorType.BYTESTYPE ) );
- cass.createColumnFamilies( getApplicationKeyspace(),
- getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ef24f3da/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
index 38d9555..2c74e77 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/CassandraService.java
@@ -97,6 +97,7 @@ public class CassandraService {
// public static String SYSTEM_KEYSPACE = "Usergrid";
public static String applicationKeyspace;
+ public static final boolean USE_VIRTUAL_KEYSPACES = true;
public static final String APPLICATIONS_CF = "Applications";
public static final String PROPERTIES_CF = "Properties";
@@ -237,18 +238,35 @@ public class CassandraService {
/** @return keyspace for application UUID */
public static String keyspaceForApplication( UUID applicationId ) {
+ if ( USE_VIRTUAL_KEYSPACES ) {
return getApplicationKeyspace();
+ }
+ else {
+ return "Application_" + applicationId.toString().replace( '-', '_' );
+ }
}
public static UUID prefixForApplication( UUID applicationId ) {
+ if ( USE_VIRTUAL_KEYSPACES ) {
return applicationId;
+ }
+ else {
+ return null;
+ }
}
public Keyspace getKeyspace( String keyspace, UUID prefix ) {
- Keyspace ko = createVirtualKeyspace( keyspace, prefix, ue, cluster, consistencyLevelPolicy,
+ Keyspace ko = null;
+ if ( USE_VIRTUAL_KEYSPACES && ( prefix != null ) ) {
+ ko = createVirtualKeyspace( keyspace, prefix, ue, cluster, consistencyLevelPolicy,
ON_FAIL_TRY_ALL_AVAILABLE, accessMap );
+ }
+ else {
+ ko = HFactory.createKeyspace( keyspace, cluster, consistencyLevelPolicy, ON_FAIL_TRY_ALL_AVAILABLE,
+ accessMap );
+ }
return ko;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ef24f3da/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java
index e6c52bd..775f43b 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/SetupImpl.java
@@ -30,6 +30,7 @@ import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEM
import static org.apache.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.USE_VIRTUAL_KEYSPACES;
import static org.apache.usergrid.persistence.cassandra.CassandraService.getApplicationKeyspace;
import static org.apache.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
import org.apache.usergrid.persistence.entities.Application;
@@ -103,34 +104,39 @@ public class SetupImpl implements Setup {
* @throws Exception the exception
*/
@Override
- public void setupApplicationKeyspace(final UUID applicationId, String applicationName ) throws Exception {
+ public void setupApplicationKeyspace(
+ final UUID applicationId, String applicationName ) throws Exception {
- String app_keyspace = keyspaceForApplication( applicationId );
+ if ( !USE_VIRTUAL_KEYSPACES ) {
+ String app_keyspace = keyspaceForApplication( applicationId );
- logger.info( "Creating application keyspace " + app_keyspace + " for "
- + applicationName + " application" );
+ logger.info( "Creating application keyspace " + app_keyspace + " for "
+ + applicationName + " application" );
- cass.createColumnFamily( app_keyspace, createColumnFamilyDefinition(
- getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( app_keyspace, createColumnFamilyDefinition(
+ getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
- cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace));
- cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
+ cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace));
+ cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
+ }
}
public void setupStaticKeyspace() throws Exception {
+ if ( USE_VIRTUAL_KEYSPACES ) {
- logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
+ logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
- cass.createColumnFamily( getApplicationKeyspace(),
- createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
- ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
+ ComparatorType.BYTESTYPE ) );
- cass.createColumnFamilies( getApplicationKeyspace(),
- getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
- cass.createColumnFamilies( getApplicationKeyspace(),
- getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ef24f3da/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
index c3bc020..d224440 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
@@ -50,6 +50,9 @@ import static org.junit.Assert.assertTrue;
public class EntityManagerFactoryImplIT extends AbstractCoreIT {
+ @SuppressWarnings("PointlessBooleanExpression")
+ public static final boolean USE_DEFAULT_DOMAIN = !CassandraService.USE_VIRTUAL_KEYSPACES;
+
private static final Logger logger = LoggerFactory.getLogger( EntityManagerFactoryImplIT.class );
@@ -77,6 +80,9 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT {
public UUID createApplication( String organizationName, String applicationName ) throws Exception {
+ if ( USE_DEFAULT_DOMAIN ) {
+ return emf.getDefaultAppId();
+ }
return emf.createApplication( organizationName, applicationName );
}