You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/26 02:08:37 UTC
[01/10] incubator-usergrid git commit: [USERGRID-409} Fixed all
commit errors and merged the STATIC_APPLICATION_KEYSPACE and the
SYSTEM_KEYSPACE into a single static ApplicationKeyspace. This allows us to
separate a keyspace for each individual applicati
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-273 ec6d4e8ab -> 48a2be7a6
[USERGRID-409} Fixed all commit errors and merged the STATIC_APPLICATION_KEYSPACE and the SYSTEM_KEYSPACE into a single static ApplicationKeyspace. This allows us to separate a keyspace for each individual application on the system.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f817f524
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f817f524
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f817f524
Branch: refs/heads/USERGRID-273
Commit: f817f52437cfe3202db12c56b9f94b616ac8431c
Parents: 13da256
Author: grey <gr...@apigee.com>
Authored: Mon Feb 23 12:02:26 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Feb 23 12:02:26 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CpSetup.java | 35 ++++++------
.../persistence/cassandra/CassandraService.java | 58 +++++++++++---------
.../cassandra/EntityManagerFactoryImpl.java | 20 +++----
.../persistence/cassandra/SetupImpl.java | 43 +++++++--------
.../main/resources/usergrid-core-context.xml | 1 +
.../core/astyanax/AstyanaxKeyspaceProvider.java | 2 +-
.../persistence/core/astyanax/CassandraFig.java | 10 ++--
.../tokens/cassandra/TokenServiceImpl.java | 14 ++---
8 files changed, 93 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f817f524/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 a09ca49..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
@@ -45,10 +45,9 @@ import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT
import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
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.STATIC_APPLICATION_KEYSPACE;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.SYSTEM_KEYSPACE;
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;
@@ -146,17 +145,17 @@ public class CpSetup implements Setup {
migrate();
- cass.createColumnFamily( SYSTEM_KEYSPACE,
- createColumnFamilyDefinition( SYSTEM_KEYSPACE, APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
- cass.createColumnFamily( SYSTEM_KEYSPACE,
- createColumnFamilyDefinition( SYSTEM_KEYSPACE, PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
- cass.createColumnFamily( SYSTEM_KEYSPACE,
- createColumnFamilyDefinition( SYSTEM_KEYSPACE, TOKENS_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), TOKENS_CF, ComparatorType.BYTESTYPE ) );
- cass.createColumnFamily( SYSTEM_KEYSPACE,
- createColumnFamilyDefinition( SYSTEM_KEYSPACE, PRINCIPAL_TOKEN_CF, ComparatorType.UUIDTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), PRINCIPAL_TOKEN_CF, ComparatorType.UUIDTYPE ) );
logger.info( "System keyspace initialized" );
}
@@ -184,7 +183,7 @@ public class CpSetup implements Setup {
logger.info( "Creating application keyspace " + app_keyspace + " for " + applicationName + " application" );
cass.createColumnFamily( app_keyspace,
- createColumnFamilyDefinition( SYSTEM_KEYSPACE, APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace ) );
@@ -202,17 +201,17 @@ public class CpSetup implements Setup {
if ( USE_VIRTUAL_KEYSPACES ) {
- logger.info( "Creating static application keyspace " + STATIC_APPLICATION_KEYSPACE );
+ logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
- cass.createColumnFamily( STATIC_APPLICATION_KEYSPACE,
- createColumnFamilyDefinition( STATIC_APPLICATION_KEYSPACE, APPLICATIONS_CF,
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
ComparatorType.BYTESTYPE ) );
- cass.createColumnFamilies( STATIC_APPLICATION_KEYSPACE,
- getCfDefs( ApplicationCF.class, STATIC_APPLICATION_KEYSPACE ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
- cass.createColumnFamilies( STATIC_APPLICATION_KEYSPACE,
- getCfDefs( QueuesCF.class, STATIC_APPLICATION_KEYSPACE ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f817f524/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 2322b95..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
@@ -36,9 +36,12 @@ import org.apache.usergrid.persistence.IndexBucketLocator;
import org.apache.usergrid.persistence.IndexBucketLocator.IndexType;
import org.apache.usergrid.persistence.cassandra.index.IndexBucketScanner;
import org.apache.usergrid.persistence.cassandra.index.IndexScanner;
+import org.apache.usergrid.persistence.core.astyanax.CassandraFig;
import org.apache.usergrid.persistence.hector.CountingMutator;
import org.apache.usergrid.utils.MapUtils;
+import com.google.inject.Injector;
+
import me.prettyprint.cassandra.connection.HConnectionManager;
import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel;
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
@@ -90,10 +93,10 @@ import static org.apache.usergrid.utils.MapUtils.filter;
public class CassandraService {
- public static String SYSTEM_KEYSPACE = "Usergrid";
-
- public static String STATIC_APPLICATION_KEYSPACE = "Usergrid_Applications";
+ //make the below two not static
+ // 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";
@@ -137,14 +140,17 @@ public class CassandraService {
public static final UUID NULL_ID = new UUID( 0, 0 );
-
+//Wire guice injector via spring here, just pass the injector in the spring
public CassandraService( Properties properties, Cluster cluster,
- CassandraHostConfigurator cassandraHostConfigurator, LockManager lockManager ) {
+ CassandraHostConfigurator cassandraHostConfigurator, LockManager lockManager,
+ final Injector injector) {
this.properties = properties;
this.cluster = cluster;
chc = cassandraHostConfigurator;
this.lockManager = lockManager;
db_logger.info( "" + cluster.getKnownPoolHosts( false ) );
+ //getInjector
+ applicationKeyspace = injector.getInstance( CassandraFig.class ).getApplicationKeyspace();
}
@@ -158,7 +164,7 @@ public class CassandraService {
accessMap.put( "username", properties.getProperty( "cassandra.username" ) );
accessMap.put( "password", properties.getProperty( "cassandra.password" ) );
systemKeyspace =
- HFactory.createKeyspace( SYSTEM_KEYSPACE, cluster, consistencyLevelPolicy, ON_FAIL_TRY_ALL_AVAILABLE,
+ HFactory.createKeyspace( getApplicationKeyspace() , cluster, consistencyLevelPolicy, ON_FAIL_TRY_ALL_AVAILABLE,
accessMap );
@@ -168,6 +174,9 @@ public class CassandraService {
}
+ public static String getApplicationKeyspace() {
+ return applicationKeyspace;
+ }
public Cluster getCluster() {
return cluster;
@@ -230,7 +239,7 @@ public class CassandraService {
/** @return keyspace for application UUID */
public static String keyspaceForApplication( UUID applicationId ) {
if ( USE_VIRTUAL_KEYSPACES ) {
- return STATIC_APPLICATION_KEYSPACE;
+ return getApplicationKeyspace();
}
else {
return "Application_" + applicationId.toString().replace( '-', '_' );
@@ -271,20 +280,15 @@ public class CassandraService {
/** The Usergrid_Applications keyspace directly */
public Keyspace getUsergridApplicationKeyspace() {
- return getKeyspace( STATIC_APPLICATION_KEYSPACE, null );
- }
-
-
- public Keyspace getSystemKeyspace() {
- return systemKeyspace;
+ return getKeyspace( getApplicationKeyspace(), null );
}
public boolean checkKeyspacesExist() {
boolean exists = false;
try {
- exists = cluster.describeKeyspace( SYSTEM_KEYSPACE ) != null
- && cluster.describeKeyspace( STATIC_APPLICATION_KEYSPACE ) != null;
+ exists = cluster.describeKeyspace( getApplicationKeyspace() ) != null;
+
}
catch ( Exception ex ) {
logger.error( "could not describe keyspaces", ex );
@@ -406,7 +410,7 @@ public class CassandraService {
/**
* Gets the columns.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param key the key
*
@@ -462,7 +466,7 @@ public class CassandraService {
/**
* Gets the columns.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param key the key
* @param start the start
@@ -584,7 +588,7 @@ public class CassandraService {
/**
* Gets the columns.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param keys the keys
*
@@ -623,7 +627,7 @@ public class CassandraService {
/**
* Gets the columns.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param key the key
* @param columnNames the column names
@@ -668,7 +672,7 @@ public class CassandraService {
/**
* Gets the columns.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param keys the keys
* @param columnNames the column names
@@ -711,7 +715,7 @@ public class CassandraService {
/**
* Gets the column.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param key the key
* @param column the column
@@ -827,7 +831,7 @@ public class CassandraService {
/**
* Sets the columns.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param key the key
* @param map the map
@@ -894,7 +898,7 @@ public class CassandraService {
/**
* Delete column.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param key the key
* @param column the column
@@ -915,7 +919,7 @@ public class CassandraService {
/**
* Gets the row keys.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
*
* @return set of keys
@@ -953,7 +957,7 @@ public class CassandraService {
/**
* Gets the row keys as uui ds.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
*
* @return list of row key UUIDs
@@ -985,7 +989,7 @@ public class CassandraService {
/**
* Delete row.
*
- * @param keyspace the keyspace
+ * @param ko the keyspace
* @param columnFamily the column family
* @param key the key
*
@@ -1043,7 +1047,7 @@ public class CassandraService {
-
+
public void destroy() throws Exception {
if (cluster != null) {
HConnectionManager connectionManager = cluster.getConnectionManager();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f817f524/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index 8b5906c..9a90e59 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -192,7 +192,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
String appName = buildAppName( organizationName, name );
HColumn<String, ByteBuffer> column =
- cass.getColumn( cass.getSystemKeyspace(), APPLICATIONS_CF, appName, PROPERTY_UUID );
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, appName, PROPERTY_UUID );
if ( column != null ) {
throw new ApplicationAlreadyExistsException( name );
// UUID uuid = uuid(column.getValue());
@@ -236,7 +236,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
getSetup().setupApplicationKeyspace( applicationId, appName );
- Keyspace ko = cass.getSystemKeyspace();
+ Keyspace ko = cass.getUsergridApplicationKeyspace();
Mutator<ByteBuffer> m = CountingMutator.createFlushingMutator( ko, be );
long timestamp = cass.createTimestamp();
@@ -262,7 +262,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
name = buildAppName( organizationName, name );
HColumn<String, ByteBuffer> column =
- cass.getColumn( cass.getSystemKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
if ( column != null ) {
throw new ApplicationAlreadyExistsException( name );
// UUID uuid = uuid(column.getValue());
@@ -278,7 +278,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
public UUID lookupApplication( String name ) throws Exception {
name = name.toLowerCase();
HColumn<String, ByteBuffer> column =
- cass.getColumn( cass.getSystemKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
if ( column != null ) {
return uuid( column.getValue() );
}
@@ -299,7 +299,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
public Application getApplication( String name ) throws Exception {
name = name.toLowerCase();
HColumn<String, ByteBuffer> column =
- cass.getColumn( cass.getSystemKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
if ( column == null ) {
return null;
}
@@ -314,7 +314,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
@Override
public Map<String, UUID> getApplications() throws Exception {
Map<String, UUID> applications = new TreeMap<String, UUID>( CASE_INSENSITIVE_ORDER );
- Keyspace ko = cass.getSystemKeyspace();
+ Keyspace ko = cass.getUsergridApplicationKeyspace();
RangeSlicesQuery<String, String, UUID> q = createRangeSlicesQuery( ko, se, se, ue );
q.setKeys( "", "\uFFFF" );
q.setColumnFamily( APPLICATIONS_CF );
@@ -333,7 +333,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
@Override
public boolean setServiceProperty( String name, String value ) {
try {
- cass.setColumn( cass.getSystemKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name, value );
+ cass.setColumn( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name, value );
return true;
}
catch ( Exception e ) {
@@ -346,7 +346,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
@Override
public boolean deleteServiceProperty( String name ) {
try {
- cass.deleteColumn( cass.getSystemKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name );
+ cass.deleteColumn( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name );
return true;
}
catch ( Exception e ) {
@@ -359,7 +359,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
@Override
public boolean updateServiceProperties( Map<String, String> properties ) {
try {
- cass.setColumns( cass.getSystemKeyspace(), PROPERTIES_CF, PROPERTIES_CF.getBytes(), properties );
+ cass.setColumns( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF.getBytes(), properties );
return true;
}
catch ( Exception e ) {
@@ -372,7 +372,7 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
@Override
public Map<String, String> getServiceProperties() {
try {
- return asMap( cass.getAllColumns( cass.getSystemKeyspace(), PROPERTIES_CF, PROPERTIES_CF, se, se ) );
+ return asMap( cass.getAllColumns( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, se, se ) );
}
catch ( Exception e ) {
logger.error( "Unable to load properties: " + e.getMessage() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f817f524/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 97a7654..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
@@ -29,10 +29,9 @@ import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT
import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
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.STATIC_APPLICATION_KEYSPACE;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.SYSTEM_KEYSPACE;
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;
import org.slf4j.Logger;
@@ -80,17 +79,17 @@ public class SetupImpl implements Setup {
logger.info( "Initialize system keyspace" );
- cass.createColumnFamily( SYSTEM_KEYSPACE, createColumnFamilyDefinition(
- SYSTEM_KEYSPACE, APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
+ getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
- cass.createColumnFamily( SYSTEM_KEYSPACE, createColumnFamilyDefinition(
- SYSTEM_KEYSPACE, PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
+ getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
- cass.createColumnFamily( SYSTEM_KEYSPACE, createColumnFamilyDefinition(
- SYSTEM_KEYSPACE, TOKENS_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
+ getApplicationKeyspace(), TOKENS_CF, ComparatorType.BYTESTYPE ) );
- cass.createColumnFamily( SYSTEM_KEYSPACE, createColumnFamilyDefinition(
- SYSTEM_KEYSPACE, PRINCIPAL_TOKEN_CF, ComparatorType.UUIDTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
+ getApplicationKeyspace(), PRINCIPAL_TOKEN_CF, ComparatorType.UUIDTYPE ) );
logger.info( "System keyspace initialized" );
}
@@ -115,7 +114,7 @@ public class SetupImpl implements Setup {
+ applicationName + " application" );
cass.createColumnFamily( app_keyspace, createColumnFamilyDefinition(
- SYSTEM_KEYSPACE, APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+ getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace));
cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
@@ -127,16 +126,16 @@ public class SetupImpl implements Setup {
if ( USE_VIRTUAL_KEYSPACES ) {
- logger.info( "Creating static application keyspace " + STATIC_APPLICATION_KEYSPACE );
+ logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
- cass.createColumnFamily( STATIC_APPLICATION_KEYSPACE,
- createColumnFamilyDefinition( STATIC_APPLICATION_KEYSPACE, APPLICATIONS_CF,
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
ComparatorType.BYTESTYPE ) );
- cass.createColumnFamilies( STATIC_APPLICATION_KEYSPACE,
- getCfDefs( ApplicationCF.class, STATIC_APPLICATION_KEYSPACE ) );
- cass.createColumnFamilies( STATIC_APPLICATION_KEYSPACE,
- getCfDefs( QueuesCF.class, STATIC_APPLICATION_KEYSPACE ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
+ cass.createColumnFamilies( getApplicationKeyspace(),
+ getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
}
}
@@ -147,13 +146,13 @@ public class SetupImpl implements Setup {
public static void logCFPermissions() {
- System.out.println( SYSTEM_KEYSPACE + "." + APPLICATIONS_CF + ".<rw>=usergrid" );
- System.out.println( SYSTEM_KEYSPACE + "." + PROPERTIES_CF + ".<rw>=usergrid" );
+ System.out.println( getApplicationKeyspace() + "." + APPLICATIONS_CF + ".<rw>=usergrid" );
+ System.out.println( getApplicationKeyspace() + "." + PROPERTIES_CF + ".<rw>=usergrid" );
for ( CFEnum cf : ApplicationCF.values() ) {
- System.out.println( STATIC_APPLICATION_KEYSPACE + "." + cf + ".<rw>=usergrid" );
+ System.out.println( getApplicationKeyspace() + "." + cf + ".<rw>=usergrid" );
}
for ( CFEnum cf : QueuesCF.values() ) {
- System.out.println( STATIC_APPLICATION_KEYSPACE + "." + cf + ".<rw>=usergrid" );
+ System.out.println( getApplicationKeyspace() + "." + cf + ".<rw>=usergrid" );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f817f524/stack/core/src/main/resources/usergrid-core-context.xml
----------------------------------------------------------------------
diff --git a/stack/core/src/main/resources/usergrid-core-context.xml b/stack/core/src/main/resources/usergrid-core-context.xml
index 60f69af..f0e5bd4 100644
--- a/stack/core/src/main/resources/usergrid-core-context.xml
+++ b/stack/core/src/main/resources/usergrid-core-context.xml
@@ -105,6 +105,7 @@
<constructor-arg ref="cassandraCluster" />
<constructor-arg ref="cassandraHostConfigurator" />
<constructor-arg ref="lockManager" />
+ <constructor-arg ref="injector"/>
<property name="consistencyLevelPolicy" ref="consistencyLevelPolicy"/>
</bean>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f817f524/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java
index 8bd5a9f..5172331 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/AstyanaxKeyspaceProvider.java
@@ -73,7 +73,7 @@ public class AstyanaxKeyspaceProvider implements Provider<Keyspace> {
AstyanaxContext<Keyspace> context =
new AstyanaxContext.Builder().forCluster( cassandraFig.getClusterName() )
- .forKeyspace( cassandraFig.getKeyspaceName() )
+ .forKeyspace( cassandraFig.getApplicationKeyspace())
/*
* TODO tnine Filter this by adding a host supplier. We will get token discovery from cassandra
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f817f524/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java
index df94adc..1208a1a 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java
@@ -53,9 +53,9 @@ public interface CassandraFig extends GuicyFig {
@Default( "Usergrid" )
String getClusterName();
- @Key( "collections.keyspace" )
- @Default( "Usergrid_Collections" )
- String getKeyspaceName();
+ @Key( "cassandra.keyspace.application" )
+ @Default( "Usergrid_Applications" )
+ String getApplicationKeyspace();
@Key( "cassandra.port" )
@Default( "9160" )
@@ -71,8 +71,8 @@ public interface CassandraFig extends GuicyFig {
@Key("cassandra.discovery")
@Default( "RING_DESCRIBE" )
- String getDiscoveryType();
-
+ String getDiscoveryType();
+
@Key("cassandra.embedded")
@Default( "false" )
boolean isEmbedded();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f817f524/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java
index 50156b5..4d8b987 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java
@@ -261,7 +261,7 @@ public class TokenServiceImpl implements TokenService {
long maxTokenTtl = getMaxTtl( TokenCategory.getFromBase64String( token ), tokenInfo.getPrincipal() );
- Mutator<UUID> batch = createMutator( cassandra.getSystemKeyspace(), ue );
+ Mutator<UUID> batch = createMutator( cassandra.getUsergridApplicationKeyspace(), ue );
HColumn<String, Long> col =
createColumn( TOKEN_ACCESSED, now, calcTokenTime( tokenInfo.getExpiration( maxTokenTtl ) ),
@@ -326,7 +326,7 @@ public class TokenServiceImpl implements TokenService {
public void removeTokens( AuthPrincipalInfo principal ) throws Exception {
List<UUID> tokenIds = getTokenUUIDS( principal );
- Mutator<ByteBuffer> batch = createMutator( cassandra.getSystemKeyspace(), be );
+ Mutator<ByteBuffer> batch = createMutator( cassandra.getUsergridApplicationKeyspace(), be );
for ( UUID tokenId : tokenIds ) {
batch.addDeletion( bytebuffer( tokenId ), TOKENS_CF );
@@ -359,7 +359,7 @@ public class TokenServiceImpl implements TokenService {
UUID tokenId = info.getUuid();
- Mutator<ByteBuffer> batch = createMutator( cassandra.getSystemKeyspace(), be );
+ Mutator<ByteBuffer> batch = createMutator( cassandra.getUsergridApplicationKeyspace(), be );
// clean up the link in the principal -> token index if the principal is
// on the token
@@ -380,7 +380,7 @@ public class TokenServiceImpl implements TokenService {
throw new InvalidTokenException( "No token specified" );
}
Map<String, ByteBuffer> columns = getColumnMap( cassandra
- .getColumns( cassandra.getSystemKeyspace(), TOKENS_CF, uuid, TOKEN_PROPERTIES, se,
+ .getColumns( cassandra.getUsergridApplicationKeyspace(), TOKENS_CF, uuid, TOKEN_PROPERTIES, se,
be ) );
if ( !hasKeys( columns, REQUIRED_TOKEN_PROPERTIES ) ) {
throw new InvalidTokenException( "Token not found in database" );
@@ -415,7 +415,7 @@ public class TokenServiceImpl implements TokenService {
ByteBuffer tokenUUID = bytebuffer( tokenInfo.getUuid() );
- Keyspace ko = cassandra.getSystemKeyspace();
+ Keyspace ko = cassandra.getUsergridApplicationKeyspace();
Mutator<ByteBuffer> m = createMutator( ko, be );
@@ -449,7 +449,7 @@ public class TokenServiceImpl implements TokenService {
/*
* write to the PRINCIPAL+TOKEN The format is as follow
- *
+ *
* appid+principalId+principalType :{ tokenuuid: 0x00}
*/
@@ -473,7 +473,7 @@ public class TokenServiceImpl implements TokenService {
ByteBuffer rowKey = principalKey( principal );
List<HColumn<ByteBuffer, ByteBuffer>> cols = cassandra
- .getColumns( cassandra.getSystemKeyspace(), PRINCIPAL_TOKEN_CF, rowKey, null, null, Integer.MAX_VALUE,
+ .getColumns( cassandra.getUsergridApplicationKeyspace(), PRINCIPAL_TOKEN_CF, rowKey, null, null, Integer.MAX_VALUE,
false );
List<UUID> results = new ArrayList<UUID>( cols.size() );
[03/10] incubator-usergrid git commit: Added fix for circular
decencies and added support for multiple key spaces.
Posted by to...@apache.org.
Added fix for circular decencies and added support for multiple key spaces.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/08c1f1d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/08c1f1d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/08c1f1d0
Branch: refs/heads/USERGRID-273
Commit: 08c1f1d08c7c6bb9ce3a4cf979e09fb0d733ef46
Parents: aac4a2f
Author: grey <gr...@apigee.com>
Authored: Mon Feb 23 16:25:31 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Feb 23 16:25:31 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/GuiceFactory.java | 25 ++++++++------------
.../main/resources/usergrid-core-context.xml | 4 ++--
2 files changed, 12 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/08c1f1d0/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java
index 77831fe..566430f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java
@@ -32,6 +32,7 @@ import org.springframework.context.ApplicationContextAware;
import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.persistence.cassandra.CassandraService;
+import org.apache.usergrid.persistence.core.guice.CommonModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -39,6 +40,7 @@ import com.google.inject.Singleton;
import com.netflix.config.ConfigurationManager;
import me.prettyprint.cassandra.service.CassandraHost;
+import me.prettyprint.cassandra.service.CassandraHostConfigurator;
/**
@@ -49,8 +51,7 @@ public class GuiceFactory implements FactoryBean<Injector>, ApplicationContextAw
private static final Logger logger = LoggerFactory.getLogger( GuiceFactory.class );
-
- private final CassandraService cass;
+ private final CassandraHostConfigurator chc;
private final Properties systemProperties;
@@ -61,8 +62,8 @@ public class GuiceFactory implements FactoryBean<Injector>, ApplicationContextAw
- public GuiceFactory( final CassandraService cass, final Properties systemProperties ) {
- this.cass = cass;
+ public GuiceFactory( final CassandraHostConfigurator chc, final Properties systemProperties ) {
+ this.chc = chc;
this.systemProperties = systemProperties;
}
@@ -74,14 +75,12 @@ public class GuiceFactory implements FactoryBean<Injector>, ApplicationContextAw
return injector;
}
-
try {
- cass.init();
logger.info( "Loading Core Persistence properties" );
String hostsString = "";
- CassandraHost[] hosts = cass.getCassandraHostConfigurator().buildCassandraHosts();
+ CassandraHost[] hosts = chc.buildCassandraHosts();
if ( hosts.length == 0 ) {
throw new RuntimeException( "Fatal error: no Cassandra hosts configured" );
}
@@ -101,9 +100,9 @@ public class GuiceFactory implements FactoryBean<Injector>, ApplicationContextAw
// Some Usergrid properties must be mapped to Core Persistence properties
cpProps.put( "cassandra.hosts", hostsString );
cpProps.put( "cassandra.port", hosts[0].getPort() );
- cpProps.put( "cassandra.cluster_name", cass.getProperties().get( "cassandra.cluster" ) );
+ cpProps.put( "cassandra.cluster_name", systemProperties.getProperty( "cassandra.cluster" ) );
- String cassRemoteString = ( String ) cass.getProperties().get( "cassandra.use_remote" );
+ String cassRemoteString = ( String ) systemProperties.getProperty( "cassandra.use_remote" );
if ( cassRemoteString != null && cassRemoteString.equals( "false" ) ) {
cpProps.put( "cassandra.embedded", "true" );
}
@@ -112,21 +111,17 @@ public class GuiceFactory implements FactoryBean<Injector>, ApplicationContextAw
}
cpProps.put( "collections.keyspace.strategy.class",
- cass.getProperties().get( "cassandra.keyspace.strategy" ) );
+ systemProperties.getProperty( "cassandra.keyspace.strategy" ) );
cpProps.put( "collections.keyspace.strategy.options",
- cass.getProperties().get( "cassandra.keyspace.replication" ) );
-
+ systemProperties.getProperty( "cassandra.keyspace.replication" ) );
logger.debug( "Set Cassandra properties for Core Persistence: " + cpProps.toString() );
// Make all Usergrid properties into Core Persistence config
- cpProps.putAll( cass.getProperties() );
cpProps.putAll( systemProperties );
//logger.debug("All properties fed to Core Persistence: " + cpProps.toString() );
-
-
ConfigurationManager.loadProperties( cpProps );
}
catch ( Exception e ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/08c1f1d0/stack/core/src/main/resources/usergrid-core-context.xml
----------------------------------------------------------------------
diff --git a/stack/core/src/main/resources/usergrid-core-context.xml b/stack/core/src/main/resources/usergrid-core-context.xml
index f0e5bd4..1c9aeb1 100644
--- a/stack/core/src/main/resources/usergrid-core-context.xml
+++ b/stack/core/src/main/resources/usergrid-core-context.xml
@@ -95,9 +95,9 @@
<bean id="injector"
class="org.apache.usergrid.corepersistence.GuiceFactory">
- <constructor-arg ref="cassandraService" />
+ <constructor-arg ref="cassandraHostConfigurator" />
<constructor-arg ref="properties" />
- </bean>
+ </bean>
<bean id="cassandraService"
class="org.apache.usergrid.persistence.cassandra.CassandraService" init-method="init" destroy-method="destroy">
[05/10] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
Posted by to...@apache.org.
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
# By Dave Johnson
# Via Dave Johnson
* 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Effort to use arquillian-suite-extension
Adding some JVM options to help with the OOM PermGen problems, and removing all tests from except for one (for now)
changes to get REST tests working with Arquillian: - Add setenv.sh to set memory and debug options for Tomcat - Make Arqillian profile active by default - Add shutdown hook to stop job service when Usergrid is underplayed
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/53e73fbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/53e73fbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/53e73fbe
Branch: refs/heads/USERGRID-273
Commit: 53e73fbeffe8dbe956ed2500918abc6332ef0fbc
Parents: 07755c1 99d694b
Author: grey <gr...@apigee.com>
Authored: Tue Feb 24 12:28:07 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Feb 24 12:28:07 2015 -0800
----------------------------------------------------------------------
stack/rest/catalina_base/bin/setenv.sh | 8 +++
stack/rest/pom.xml | 67 +++++++-----------
.../usergrid/rest/JobServiceBoostrap.java | 4 +-
.../apache/usergrid/rest/ShutdownListener.java | 73 ++++++++++++++++++++
.../applications/ApplicationsResource.java | 1 +
stack/rest/src/main/webapp/WEB-INF/web.xml | 13 ++--
.../apache/usergrid/rest/AbstractRestIT.java | 7 +-
.../java/org/apache/usergrid/rest/BasicIT.java | 5 +-
stack/rest/src/test/resources/arquillian.xml | 14 +---
9 files changed, 123 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
[10/10] incubator-usergrid git commit: Added fix for full use of
virtual keyspaces and for token generation using the getKeyspace method.
Posted by to...@apache.org.
Added fix for full use of virtual keyspaces and for token generation using the getKeyspace method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/48a2be7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/48a2be7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/48a2be7a
Branch: refs/heads/USERGRID-273
Commit: 48a2be7a6e4c7166b2ce392a278eec7c2544d184
Parents: 95ac7af
Author: grey <gr...@apigee.com>
Authored: Wed Feb 25 16:08:08 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 25 16:08:08 2015 -0800
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpSetup.java | 13 -------------
.../persistence/cassandra/CassandraService.java | 11 +++++++++--
.../usergrid/persistence/cassandra/SetupImpl.java | 15 +++------------
3 files changed, 12 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48a2be7a/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..d70c16c 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
@@ -172,19 +172,6 @@ public class CpSetup implements Setup {
public void setupApplicationKeyspace( final UUID applicationId, String applicationName ) throws Exception {
migrate();
-
- // Need this legacy stuff for queues
-
- String app_keyspace = keyspaceForApplication( applicationId );
-
- 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( QueuesCF.class, app_keyspace ) );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48a2be7a/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..96d3fd9 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
@@ -247,8 +247,15 @@ public class CassandraService {
public Keyspace getKeyspace( String keyspace, UUID prefix ) {
- Keyspace ko = createVirtualKeyspace( keyspace, prefix, ue, cluster, consistencyLevelPolicy,
+ Keyspace ko = null;
+ if ( ( 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;
}
@@ -262,7 +269,7 @@ public class CassandraService {
/** The Usergrid_Applications keyspace directly */
public Keyspace getUsergridApplicationKeyspace() {
- return getKeyspace( getApplicationKeyspace(), null );
+ return getKeyspace( getApplicationKeyspace(), null );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48a2be7a/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..23c0489 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
@@ -103,18 +103,9 @@ public class SetupImpl implements Setup {
* @throws Exception the exception
*/
@Override
- public void setupApplicationKeyspace(final UUID applicationId, String applicationName ) throws Exception {
-
- String app_keyspace = keyspaceForApplication( applicationId );
-
- 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( QueuesCF.class, app_keyspace ) );
+ public void setupApplicationKeyspace(
+ final UUID applicationId, String applicationName ) throws Exception {
+ logger.info("This method no longer needed due to using virtual keyspaces all the time.");
}
[07/10] incubator-usergrid git commit: Revert "Removed extraneous CF.
Made the remaining code compile."
Posted by to...@apache.org.
Revert "Removed extraneous CF. Made the remaining code compile."
This reverts commit ded674359eccf08509aa4933892018041a1eeda0.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/35bae268
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/35bae268
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/35bae268
Branch: refs/heads/USERGRID-273
Commit: 35bae2687bb7edd7779395d5aa4c2ede61292def
Parents: ded6743
Author: grey <gr...@apigee.com>
Authored: Wed Feb 25 07:58:05 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 25 07:58:05 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CpSetup.java | 45 +++---
.../persistence/cassandra/CassandraService.java | 31 ++--
.../cassandra/EntityManagerFactoryImpl.java | 147 ++++++++++++++++---
.../persistence/cassandra/SetupImpl.java | 32 +++-
.../cassandra/EntityManagerFactoryImplIT.java | 5 +
5 files changed, 199 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/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 53123bc..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
@@ -39,14 +39,14 @@ import me.prettyprint.hector.api.ddl.ComparatorType;
import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefinition;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
-//import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
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.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.USE_VIRTUAL_KEYSPACES;
import static org.apache.usergrid.persistence.cassandra.CassandraService.getApplicationKeyspace;
import static org.apache.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
@@ -145,11 +145,11 @@ public class CpSetup implements Setup {
migrate();
-// cass.createColumnFamily( getApplicationKeyspace(),
-// createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
-//
-// cass.createColumnFamily( getApplicationKeyspace(),
-// createColumnFamilyDefinition( getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamily( getApplicationKeyspace(),
createColumnFamilyDefinition( getApplicationKeyspace(), TOKENS_CF, ComparatorType.BYTESTYPE ) );
@@ -176,18 +176,19 @@ 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.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace ) );
-//
-// cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
+ 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 ) );
+ }
}
@@ -198,20 +199,20 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
- // if ( USE_VIRTUAL_KEYSPACES ) {
+ if ( USE_VIRTUAL_KEYSPACES ) {
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() ) );
- // }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/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 32174ff..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,10 +97,10 @@ public class CassandraService {
// public static String SYSTEM_KEYSPACE = "Usergrid";
public static String applicationKeyspace;
- //public static final boolean USE_VIRTUAL_KEYSPACES = true;
+ public static final boolean USE_VIRTUAL_KEYSPACES = true;
- //public static final String APPLICATIONS_CF = "Applications";
- //public static final String PROPERTIES_CF = "Properties";
+ public static final String APPLICATIONS_CF = "Applications";
+ public static final String PROPERTIES_CF = "Properties";
public static final String TOKENS_CF = "Tokens";
public static final String PRINCIPAL_TOKEN_CF = "PrincipalTokens";
@@ -238,26 +238,35 @@ public class CassandraService {
/** @return keyspace for application UUID */
public static String keyspaceForApplication( UUID applicationId ) {
- return getApplicationKeyspace();
-
+ 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 ) ) {
+ 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 );
-// }
+ }
+ 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/35bae268/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index f4a151f..9a90e59 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -62,8 +62,8 @@ import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.asMap;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-//import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
-//import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.RETRY_COUNT;
import static org.apache.usergrid.utils.ConversionUtils.uuid;
import static org.apache.usergrid.persistence.cassandra.Serializers.*;
@@ -189,8 +189,22 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
public UUID createApplication( String organizationName, String name, Map<String, Object> properties )
throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+ String appName = buildAppName( organizationName, name );
+ HColumn<String, ByteBuffer> column =
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, appName, PROPERTY_UUID );
+ if ( column != null ) {
+ throw new ApplicationAlreadyExistsException( name );
+ // UUID uuid = uuid(column.getValue());
+ // return uuid;
+ }
+
+ UUID applicationId = UUIDUtils.newTimeUUID();
+ logger.info( "New application id " + applicationId.toString() );
+
+ initializeApplication( organizationName, applicationId, appName, properties );
+
+ return applicationId;
}
@@ -206,20 +220,69 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
}
+ public UUID initializeApplication( String organizationName, UUID applicationId, String name,
+ Map<String, Object> properties ) throws Exception {
+
+ String appName = buildAppName( organizationName, name );
+ // check for pre-existing
+ if ( lookupApplication( appName ) != null ) {
+ throw new ApplicationAlreadyExistsException( appName );
+ }
+ if ( properties == null ) {
+ properties = new TreeMap<String, Object>( CASE_INSENSITIVE_ORDER );
+ }
+
+ properties.put( PROPERTY_NAME, appName );
+
+ getSetup().setupApplicationKeyspace( applicationId, appName );
+
+ Keyspace ko = cass.getUsergridApplicationKeyspace();
+ Mutator<ByteBuffer> m = CountingMutator.createFlushingMutator( ko, be );
+
+ long timestamp = cass.createTimestamp();
+
+ addInsertToMutator( m, APPLICATIONS_CF, appName, PROPERTY_UUID, applicationId, timestamp );
+ addInsertToMutator( m, APPLICATIONS_CF, appName, PROPERTY_NAME, appName, timestamp );
+
+ batchExecute( m, RETRY_COUNT );
+
+ EntityManager em = getEntityManager( applicationId );
+ em.create( TYPE_APPLICATION, APPLICATION_ENTITY_CLASS, properties );
+
+ em.resetRoles();
+
+ return applicationId;
+ }
+
+
@Override
public UUID importApplication( String organizationName, UUID applicationId, String name,
Map<String, Object> properties ) throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+ name = buildAppName( organizationName, name );
+ HColumn<String, ByteBuffer> column =
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ if ( column != null ) {
+ throw new ApplicationAlreadyExistsException( name );
+ // UUID uuid = uuid(column.getValue());
+ // return uuid;
+ }
+
+ return initializeApplication( organizationName, applicationId, name, properties );
}
@Override
@Metered(group = "core", name = "EntityManagerFactory_lookupApplication_byName")
public UUID lookupApplication( String name ) throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
+ name = name.toLowerCase();
+ HColumn<String, ByteBuffer> column =
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ if ( column != null ) {
+ return uuid( column.getValue() );
+ }
+ return null;
}
@@ -234,48 +297,86 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
*/
@Metered(group = "core", name = "EntityManagerFactory_getApplication")
public Application getApplication( String name ) throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+ name = name.toLowerCase();
+ HColumn<String, ByteBuffer> column =
+ cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
+ if ( column == null ) {
+ return null;
+ }
+ UUID applicationId = uuid( column.getValue() );
+
+ EntityManager em = getEntityManager( applicationId );
+ return ( ( EntityManagerImpl ) em ).getEntity( applicationId, Application.class );
}
@Override
public Map<String, UUID> getApplications() throws Exception {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
+ Map<String, UUID> applications = new TreeMap<String, UUID>( CASE_INSENSITIVE_ORDER );
+ Keyspace ko = cass.getUsergridApplicationKeyspace();
+ RangeSlicesQuery<String, String, UUID> q = createRangeSlicesQuery( ko, se, se, ue );
+ q.setKeys( "", "\uFFFF" );
+ q.setColumnFamily( APPLICATIONS_CF );
+ q.setColumnNames( PROPERTY_UUID );
+ q.setRowCount( 10000 );
+ QueryResult<OrderedRows<String, String, UUID>> r = q.execute();
+ Rows<String, String, UUID> rows = r.get();
+ for ( Row<String, String, UUID> row : rows ) {
+ ColumnSlice<String, UUID> slice = row.getColumnSlice();
+ HColumn<String, UUID> column = slice.getColumnByName( PROPERTY_UUID );
+ applications.put( row.getKey(), column.getValue() );
+ }
+ return applications;
}
@Override
public boolean setServiceProperty( String name, String value ) {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
+ try {
+ cass.setColumn( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name, value );
+ return true;
+ }
+ catch ( Exception e ) {
+ logger.error( "Unable to set property " + name + ": " + e.getMessage() );
+ }
+ return false;
}
@Override
public boolean deleteServiceProperty( String name ) {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
- }
-
-
- @Override
- public UUID initializeApplication( final String orgName, final UUID appId, final String appName,
- final Map<String, Object> props ) throws Exception {
- return null;
+ try {
+ cass.deleteColumn( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name );
+ return true;
+ }
+ catch ( Exception e ) {
+ logger.error( "Unable to delete property " + name + ": " + e.getMessage() );
+ }
+ return false;
}
@Override
public boolean updateServiceProperties( Map<String, String> properties ) {
- throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
-
+ try {
+ cass.setColumns( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF.getBytes(), properties );
+ return true;
+ }
+ catch ( Exception e ) {
+ logger.error( "Unable to update properties: " + e.getMessage() );
+ }
+ return false;
}
@Override
public Map<String, String> getServiceProperties() {
-
+ try {
+ return asMap( cass.getAllColumns( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, se, se ) );
+ }
+ catch ( Exception e ) {
+ logger.error( "Unable to load properties: " + e.getMessage() );
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/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 62b85de..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
@@ -23,11 +23,14 @@ import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefin
import org.apache.usergrid.mq.cassandra.QueuesCF;
import org.apache.usergrid.persistence.EntityManagerFactory;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
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;
@@ -77,6 +80,12 @@ public class SetupImpl implements Setup {
logger.info( "Initialize system keyspace" );
cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
+ getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+
+ cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
+ getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
+
+ cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
getApplicationKeyspace(), TOKENS_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
@@ -98,30 +107,36 @@ public class SetupImpl implements Setup {
public void setupApplicationKeyspace(
final UUID applicationId, String applicationName ) throws Exception {
+ if ( !USE_VIRTUAL_KEYSPACES ) {
String app_keyspace = keyspaceForApplication( applicationId );
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( QueuesCF.class, app_keyspace ) );
-
+ }
}
public void setupStaticKeyspace() throws Exception {
-
+ if ( USE_VIRTUAL_KEYSPACES ) {
logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
+ cass.createColumnFamily( getApplicationKeyspace(),
+ createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
+ ComparatorType.BYTESTYPE ) );
+
cass.createColumnFamilies( getApplicationKeyspace(),
getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
cass.createColumnFamilies( getApplicationKeyspace(),
getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
-
+ }
}
@@ -131,7 +146,14 @@ public class SetupImpl implements Setup {
public static void logCFPermissions() {
-
+ System.out.println( getApplicationKeyspace() + "." + APPLICATIONS_CF + ".<rw>=usergrid" );
+ System.out.println( getApplicationKeyspace() + "." + PROPERTIES_CF + ".<rw>=usergrid" );
+ for ( CFEnum cf : ApplicationCF.values() ) {
+ System.out.println( getApplicationKeyspace() + "." + cf + ".<rw>=usergrid" );
+ }
+ for ( CFEnum cf : QueuesCF.values() ) {
+ System.out.println( getApplicationKeyspace() + "." + cf + ".<rw>=usergrid" );
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/35bae268/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 42f2af1..850ac6b 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,8 @@ 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 );
@@ -78,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 );
}
[09/10] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
Posted by to...@apache.org.
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
# By Dave Johnson (6) and Todd Nine (2)
# Via Dave Johnson (2) and Todd Nine (1)
* 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Changes to allow us to fix the old tests that are broken because tests now share the same C* keyspace, and some fixes to the old ApplicationResourceIT.
Removes wait from progress observer, since this is no longer used.
Simple REST tests now working again with Tomcat embedded.
Add jackson-xc back in.
Add jackson-xc back in.
Fixes startup order bug.
Moving back to embedded Tomcat instead of Arquillian.
Back off of Arquillian for now.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/95ac7af1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/95ac7af1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/95ac7af1
Branch: refs/heads/USERGRID-273
Commit: 95ac7af1d964a92d215e225277b8f4d8ecc67c40
Parents: 4be53fb ec6d4e8
Author: grey <gr...@apigee.com>
Authored: Wed Feb 25 15:21:40 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 25 15:21:40 2015 -0800
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 7 +-
.../persistence/EntityManagerFactory.java | 5 -
.../PerformanceEntityRebuildIndexTest.java | 13 +-
.../cassandra/EntityManagerFactoryImplIT.java | 5 -
stack/pom.xml | 1 +
stack/rest/pom.xml | 134 ++++---------
.../org/apache/usergrid/rest/IndexResource.java | 27 +--
.../applications/ApplicationsResource.java | 20 +-
.../resources/usergrid-rest-deploy-context.xml | 2 +-
.../apache/usergrid/rest/AbstractRestIT.java | 188 ++++++++++--------
.../java/org/apache/usergrid/rest/BasicIT.java | 66 +++----
.../java/org/apache/usergrid/rest/ITSetup.java | 57 +-----
.../org/apache/usergrid/rest/SimplestTest.java | 35 ++++
.../org/apache/usergrid/rest/TomcatRuntime.java | 192 +++++++++++++++++++
.../applications/ApplicationResourceIT.java | 174 +++++++----------
.../rest/management/RegistrationIT.java | 9 +-
.../test/resource2point0/AbstractRestIT.java | 77 ++++----
.../resources/usergrid-deployment.properties | 111 -----------
.../resources/usergrid-rest-deploy-context.xml | 26 +++
19 files changed, 571 insertions(+), 578 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/95ac7af1/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
[02/10] incubator-usergrid git commit: Fixed CoreSchemaManager
Posted by to...@apache.org.
Fixed CoreSchemaManager
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/aac4a2fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aac4a2fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aac4a2fc
Branch: refs/heads/USERGRID-273
Commit: aac4a2fc946f957261e7c4cf46838abb4bca4148
Parents: f817f52
Author: grey <gr...@apigee.com>
Authored: Mon Feb 23 12:05:56 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Feb 23 12:05:56 2015 -0800
----------------------------------------------------------------------
.../java/org/apache/usergrid/persistence/CoreSchemaManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aac4a2fc/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
index 5b9adb8..723e971 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/CoreSchemaManager.java
@@ -85,7 +85,7 @@ public class CoreSchemaManager implements SchemaManager {
public void destroy() {
LOG.info( "dropping keyspaces" );
try {
- cluster.dropKeyspace( CassandraService.SYSTEM_KEYSPACE );
+ cluster.dropKeyspace( CassandraService.getApplicationKeyspace() );
}
catch ( RuntimeException ire ) {
//swallow if it just doesn't exist
@@ -93,7 +93,7 @@ public class CoreSchemaManager implements SchemaManager {
try {
- cluster.dropKeyspace( CassandraService.STATIC_APPLICATION_KEYSPACE );
+ cluster.dropKeyspace( CassandraService.getApplicationKeyspace() );
}
catch ( RuntimeException ire ) {
//swallow if it just doesn't exist
[06/10] incubator-usergrid git commit: Removed extraneous CF. Made
the remaining code compile.
Posted by to...@apache.org.
Removed extraneous CF. Made the remaining code compile.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ded67435
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ded67435
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ded67435
Branch: refs/heads/USERGRID-273
Commit: ded674359eccf08509aa4933892018041a1eeda0
Parents: 53e73fb
Author: grey <gr...@apigee.com>
Authored: Tue Feb 24 18:16:18 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Tue Feb 24 18:16:18 2015 -0800
----------------------------------------------------------------------
.../usergrid/corepersistence/CpSetup.java | 45 +++---
.../persistence/cassandra/CassandraService.java | 31 ++--
.../cassandra/EntityManagerFactoryImpl.java | 147 +++----------------
.../persistence/cassandra/SetupImpl.java | 32 +---
.../cassandra/EntityManagerFactoryImplIT.java | 5 -
5 files changed, 61 insertions(+), 199 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ded67435/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..53123bc 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
@@ -39,14 +39,14 @@ import me.prettyprint.hector.api.ddl.ComparatorType;
import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefinition;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
+//import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
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.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.USE_VIRTUAL_KEYSPACES;
import static org.apache.usergrid.persistence.cassandra.CassandraService.getApplicationKeyspace;
import static org.apache.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
@@ -145,11 +145,11 @@ public class CpSetup implements Setup {
migrate();
- cass.createColumnFamily( getApplicationKeyspace(),
- createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
-
- cass.createColumnFamily( getApplicationKeyspace(),
- createColumnFamilyDefinition( getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
+// cass.createColumnFamily( getApplicationKeyspace(),
+// createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
+//
+// cass.createColumnFamily( getApplicationKeyspace(),
+// createColumnFamilyDefinition( getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamily( getApplicationKeyspace(),
createColumnFamilyDefinition( getApplicationKeyspace(), TOKENS_CF, ComparatorType.BYTESTYPE ) );
@@ -176,19 +176,18 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
- if ( !USE_VIRTUAL_KEYSPACES ) {
-
- String app_keyspace = keyspaceForApplication( applicationId );
- 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( QueuesCF.class, app_keyspace ) );
- cass.createColumnFamilies( app_keyspace, getCfDefs( ApplicationCF.class, app_keyspace ) );
-
- cass.createColumnFamilies( app_keyspace, getCfDefs( QueuesCF.class, app_keyspace ) );
- }
}
@@ -199,20 +198,20 @@ public class CpSetup implements Setup {
// Need this legacy stuff for queues
- if ( USE_VIRTUAL_KEYSPACES ) {
+ // if ( USE_VIRTUAL_KEYSPACES ) {
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() ) );
- }
+ // }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ded67435/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..32174ff 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,10 +97,10 @@ public class CassandraService {
// public static String SYSTEM_KEYSPACE = "Usergrid";
public static String applicationKeyspace;
- public static final boolean USE_VIRTUAL_KEYSPACES = true;
+ //public static final boolean USE_VIRTUAL_KEYSPACES = true;
- public static final String APPLICATIONS_CF = "Applications";
- public static final String PROPERTIES_CF = "Properties";
+ //public static final String APPLICATIONS_CF = "Applications";
+ //public static final String PROPERTIES_CF = "Properties";
public static final String TOKENS_CF = "Tokens";
public static final String PRINCIPAL_TOKEN_CF = "PrincipalTokens";
@@ -238,35 +238,26 @@ 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( '-', '_' );
- }
+ return getApplicationKeyspace();
+
}
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 ) ) {
+// 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 );
- }
+// }
+// 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/ded67435/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index 9a90e59..f4a151f 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -62,8 +62,8 @@ import static org.apache.usergrid.persistence.Schema.TYPE_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.asMap;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
+//import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
+//import static org.apache.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.RETRY_COUNT;
import static org.apache.usergrid.utils.ConversionUtils.uuid;
import static org.apache.usergrid.persistence.cassandra.Serializers.*;
@@ -189,22 +189,8 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
public UUID createApplication( String organizationName, String name, Map<String, Object> properties )
throws Exception {
- String appName = buildAppName( organizationName, name );
+ throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
- HColumn<String, ByteBuffer> column =
- cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, appName, PROPERTY_UUID );
- if ( column != null ) {
- throw new ApplicationAlreadyExistsException( name );
- // UUID uuid = uuid(column.getValue());
- // return uuid;
- }
-
- UUID applicationId = UUIDUtils.newTimeUUID();
- logger.info( "New application id " + applicationId.toString() );
-
- initializeApplication( organizationName, applicationId, appName, properties );
-
- return applicationId;
}
@@ -220,69 +206,20 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
}
- public UUID initializeApplication( String organizationName, UUID applicationId, String name,
- Map<String, Object> properties ) throws Exception {
-
- String appName = buildAppName( organizationName, name );
- // check for pre-existing
- if ( lookupApplication( appName ) != null ) {
- throw new ApplicationAlreadyExistsException( appName );
- }
- if ( properties == null ) {
- properties = new TreeMap<String, Object>( CASE_INSENSITIVE_ORDER );
- }
-
- properties.put( PROPERTY_NAME, appName );
-
- getSetup().setupApplicationKeyspace( applicationId, appName );
-
- Keyspace ko = cass.getUsergridApplicationKeyspace();
- Mutator<ByteBuffer> m = CountingMutator.createFlushingMutator( ko, be );
-
- long timestamp = cass.createTimestamp();
-
- addInsertToMutator( m, APPLICATIONS_CF, appName, PROPERTY_UUID, applicationId, timestamp );
- addInsertToMutator( m, APPLICATIONS_CF, appName, PROPERTY_NAME, appName, timestamp );
-
- batchExecute( m, RETRY_COUNT );
-
- EntityManager em = getEntityManager( applicationId );
- em.create( TYPE_APPLICATION, APPLICATION_ENTITY_CLASS, properties );
-
- em.resetRoles();
-
- return applicationId;
- }
-
-
@Override
public UUID importApplication( String organizationName, UUID applicationId, String name,
Map<String, Object> properties ) throws Exception {
- name = buildAppName( organizationName, name );
+ throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
- HColumn<String, ByteBuffer> column =
- cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
- if ( column != null ) {
- throw new ApplicationAlreadyExistsException( name );
- // UUID uuid = uuid(column.getValue());
- // return uuid;
- }
-
- return initializeApplication( organizationName, applicationId, name, properties );
}
@Override
@Metered(group = "core", name = "EntityManagerFactory_lookupApplication_byName")
public UUID lookupApplication( String name ) throws Exception {
- name = name.toLowerCase();
- HColumn<String, ByteBuffer> column =
- cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
- if ( column != null ) {
- return uuid( column.getValue() );
- }
- return null;
+ throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+
}
@@ -297,86 +234,48 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
*/
@Metered(group = "core", name = "EntityManagerFactory_getApplication")
public Application getApplication( String name ) throws Exception {
- name = name.toLowerCase();
- HColumn<String, ByteBuffer> column =
- cass.getColumn( cass.getUsergridApplicationKeyspace(), APPLICATIONS_CF, name, PROPERTY_UUID );
- if ( column == null ) {
- return null;
- }
+ throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
- UUID applicationId = uuid( column.getValue() );
-
- EntityManager em = getEntityManager( applicationId );
- return ( ( EntityManagerImpl ) em ).getEntity( applicationId, Application.class );
}
@Override
public Map<String, UUID> getApplications() throws Exception {
- Map<String, UUID> applications = new TreeMap<String, UUID>( CASE_INSENSITIVE_ORDER );
- Keyspace ko = cass.getUsergridApplicationKeyspace();
- RangeSlicesQuery<String, String, UUID> q = createRangeSlicesQuery( ko, se, se, ue );
- q.setKeys( "", "\uFFFF" );
- q.setColumnFamily( APPLICATIONS_CF );
- q.setColumnNames( PROPERTY_UUID );
- q.setRowCount( 10000 );
- QueryResult<OrderedRows<String, String, UUID>> r = q.execute();
- Rows<String, String, UUID> rows = r.get();
- for ( Row<String, String, UUID> row : rows ) {
- ColumnSlice<String, UUID> slice = row.getColumnSlice();
- HColumn<String, UUID> column = slice.getColumnByName( PROPERTY_UUID );
- applications.put( row.getKey(), column.getValue() );
- }
- return applications;
+ throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+
}
@Override
public boolean setServiceProperty( String name, String value ) {
- try {
- cass.setColumn( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name, value );
- return true;
- }
- catch ( Exception e ) {
- logger.error( "Unable to set property " + name + ": " + e.getMessage() );
- }
- return false;
+ throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+
}
@Override
public boolean deleteServiceProperty( String name ) {
- try {
- cass.deleteColumn( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, name );
- return true;
- }
- catch ( Exception e ) {
- logger.error( "Unable to delete property " + name + ": " + e.getMessage() );
- }
- return false;
+ throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+
+ }
+
+
+ @Override
+ public UUID initializeApplication( final String orgName, final UUID appId, final String appName,
+ final Map<String, Object> props ) throws Exception {
+ return null;
}
@Override
public boolean updateServiceProperties( Map<String, String> properties ) {
- try {
- cass.setColumns( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF.getBytes(), properties );
- return true;
- }
- catch ( Exception e ) {
- logger.error( "Unable to update properties: " + e.getMessage() );
- }
- return false;
+ throw new UnsupportedOperationException( "We no longer support the 1.0 entity manager anymore" );
+
}
@Override
public Map<String, String> getServiceProperties() {
- try {
- return asMap( cass.getAllColumns( cass.getUsergridApplicationKeyspace(), PROPERTIES_CF, PROPERTIES_CF, se, se ) );
- }
- catch ( Exception e ) {
- logger.error( "Unable to load properties: " + e.getMessage() );
- }
+
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ded67435/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..62b85de 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
@@ -23,14 +23,11 @@ import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefin
import org.apache.usergrid.mq.cassandra.QueuesCF;
import org.apache.usergrid.persistence.EntityManagerFactory;
import static org.apache.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
-import static org.apache.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
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;
@@ -80,12 +77,6 @@ public class SetupImpl implements Setup {
logger.info( "Initialize system keyspace" );
cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
- getApplicationKeyspace(), APPLICATIONS_CF, ComparatorType.BYTESTYPE ) );
-
- cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
- getApplicationKeyspace(), PROPERTIES_CF, ComparatorType.BYTESTYPE ) );
-
- cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
getApplicationKeyspace(), TOKENS_CF, ComparatorType.BYTESTYPE ) );
cass.createColumnFamily( getApplicationKeyspace(), createColumnFamilyDefinition(
@@ -107,36 +98,30 @@ public class SetupImpl implements Setup {
public void setupApplicationKeyspace(
final UUID applicationId, String applicationName ) throws Exception {
- if ( !USE_VIRTUAL_KEYSPACES ) {
String app_keyspace = keyspaceForApplication( applicationId );
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( QueuesCF.class, app_keyspace ) );
- }
+
}
public void setupStaticKeyspace() throws Exception {
- if ( USE_VIRTUAL_KEYSPACES ) {
- logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
- cass.createColumnFamily( getApplicationKeyspace(),
- createColumnFamilyDefinition( getApplicationKeyspace(), APPLICATIONS_CF,
- ComparatorType.BYTESTYPE ) );
+ logger.info( "Creating static application keyspace " + getApplicationKeyspace() );
cass.createColumnFamilies( getApplicationKeyspace(),
getCfDefs( ApplicationCF.class, getApplicationKeyspace() ) );
cass.createColumnFamilies( getApplicationKeyspace(),
getCfDefs( QueuesCF.class, getApplicationKeyspace() ) );
- }
+
}
@@ -146,14 +131,7 @@ public class SetupImpl implements Setup {
public static void logCFPermissions() {
- System.out.println( getApplicationKeyspace() + "." + APPLICATIONS_CF + ".<rw>=usergrid" );
- System.out.println( getApplicationKeyspace() + "." + PROPERTIES_CF + ".<rw>=usergrid" );
- for ( CFEnum cf : ApplicationCF.values() ) {
- System.out.println( getApplicationKeyspace() + "." + cf + ".<rw>=usergrid" );
- }
- for ( CFEnum cf : QueuesCF.values() ) {
- System.out.println( getApplicationKeyspace() + "." + cf + ".<rw>=usergrid" );
- }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ded67435/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..42f2af1 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,8 +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 +78,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 );
}
[08/10] incubator-usergrid git commit: Removed all instances of
virtual keyspaces
Posted by to...@apache.org.
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/USERGRID-273
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 );
}
[04/10] incubator-usergrid git commit: Merge branch 'USERGRID-273' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
Posted by to...@apache.org.
Merge branch 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
# By Dave Johnson (3) and Todd Nine (1)
# Via Todd Nine
* 'USERGRID-273' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
Fixes problem with arquillian configuration and plugin scope
Not needed in git.
Don't run two schedulers.
Move back to Guava 14.0.1 to enable JClouds to work properly, plus changes to Arquillian setup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/07755c15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/07755c15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/07755c15
Branch: refs/heads/USERGRID-273
Commit: 07755c15c0d525f10328384aa9f9ffe0fb8393e7
Parents: 08c1f1d b82999e
Author: grey <gr...@apigee.com>
Authored: Mon Feb 23 18:32:43 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Mon Feb 23 18:32:43 2015 -0800
----------------------------------------------------------------------
.../batch/job/AbstractSchedulerRuntimeIT.java | 3 +-
stack/corepersistence/pom.xml | 4 +--
stack/pom.xml | 6 ++--
stack/rest/README.md | 13 +++-----
stack/rest/catalina_base/webapps/ROOT | 1 -
stack/rest/pom.xml | 35 ++++++++------------
.../usergrid/rest/JobServiceBoostrap.java | 3 +-
.../apache/usergrid/rest/AbstractRestIT.java | 18 +++++-----
.../rest/management/ImportResourceIT.java | 3 +-
.../resources/usergrid-custom-test.properties | 8 ++---
.../management/export/ExportServiceIT.java | 3 +-
.../management/importer/ImportCollectionIT.java | 3 +-
.../management/importer/ImportServiceIT.java | 3 +-
13 files changed, 43 insertions(+), 60 deletions(-)
----------------------------------------------------------------------