You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/02/26 17:28:00 UTC
[36/50] [abbrv] incubator-usergrid git commit: Removed all instances
of virtual keyspaces
Removed all instances of virtual keyspaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4be53fb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4be53fb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4be53fb1
Branch: refs/heads/two-dot-o
Commit: 4be53fb105150222cfdb2cb9b6e18186a3fb2058
Parents: 35bae26
Author: grey <gr...@apigee.com>
Authored: Wed Feb 25 08:03:17 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 25 08:03:17 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CpSetup.java | 34 ++++++++----------
.../persistence/cassandra/CassandraService.java | 20 +----------
.../persistence/cassandra/SetupImpl.java | 38 +++++++++-----------
.../cassandra/EntityManagerFactoryImplIT.java | 6 ----
4 files changed, 31 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4be53fb1/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 c71c172..345473a 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,7 +46,6 @@ 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;
@@ -176,19 +175,16 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
- if ( !USE_VIRTUAL_KEYSPACES ) {
+ String app_keyspace = keyspaceForApplication( applicationId );
- 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( ApplicationCF.class, app_keyspace ) );
- cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
- }
+ cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
}
@@ -199,20 +195,18 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
- 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( ApplicationCF.class, getApplicationKeyspace() ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
- cass.createColumnFamilies( getApplicationKeyspace(),
- getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4be53fb1/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 2c74e77..38d9555 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,7 +97,6 @@ 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";
@@ -238,35 +237,18 @@ 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 = null;
- if ( USE_VIRTUAL_KEYSPACES && ( prefix != null ) ) {
- ko = createVirtualKeyspace( keyspace, prefix, ue, cluster, consistencyLevelPolicy,
+ Keyspace 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/4be53fb1/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 775f43b..e6c52bd 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,7 +30,6 @@ 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;
@@ -104,39 +103,34 @@ 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 {
- if ( !USE_VIRTUAL_KEYSPACES ) {
- String app_keyspace = keyspaceForApplication( applicationId );
+ 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/4be53fb1/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 850ac6b..3c22d03 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,9 +50,6 @@ 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 );
@@ -80,9 +77,6 @@ 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 );
}