Repository: usergrid Updated Branches: refs/heads/master 0a83ee450 -> ad9d60792
Stop using hector for schema deletion in tests and move to the datastax driver. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ad9d6079 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ad9d6079 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ad9d6079 Branch: refs/heads/master Commit: ad9d60792e5840a5ae3bc86ff2adb78532f6a39f Parents: 0a83ee4 Author: Michael Russo <[email protected]> Authored: Sat Nov 19 22:56:55 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Sat Nov 19 22:56:55 2016 -0800 ---------------------------------------------------------------------- .../usergrid/persistence/CoreSchemaManager.java | 20 ++++++++++++-------- .../test/resources/usergrid-test-context.xml | 1 - .../persistence/core/datastax/CQLUtils.java | 7 ++++--- .../core/datastax/impl/DataStaxClusterImpl.java | 2 +- .../migration/schema/MigrationManagerImpl.java | 2 +- .../test/resources/usergrid-test-context.xml | 1 - .../resources/usergrid-rest-deploy-context.xml | 1 - .../test/resources/usergrid-test-context.xml | 1 - .../test/resources/usergrid-test-context.xml | 1 - .../test/resources/usergrid-test-context.xml | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/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 8054aa5..5488142 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 @@ -18,33 +18,35 @@ package org.apache.usergrid.persistence; import org.apache.usergrid.locking.LockManager; +import org.apache.usergrid.persistence.core.CassandraFig; +import org.apache.usergrid.persistence.core.datastax.CQLUtils; +import org.apache.usergrid.persistence.core.datastax.DataStaxCluster; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.usergrid.cassandra.SchemaManager; import org.apache.usergrid.cassandra.SpringResource; -import org.apache.usergrid.persistence.cassandra.CassandraService; import org.apache.usergrid.persistence.cassandra.Setup; import org.apache.usergrid.persistence.index.impl.EsProvider; import com.google.inject.Injector; -import me.prettyprint.hector.api.Cluster; - /** @author zznate */ public class CoreSchemaManager implements SchemaManager { private static final Logger logger = LoggerFactory.getLogger( CoreSchemaManager.class ); private final Setup setup; - private final Cluster cluster; + private final CassandraFig cassandraFig; private final LockManager lockManager; + private final DataStaxCluster dataStaxCluster; - public CoreSchemaManager( final Setup setup, final Cluster cluster, Injector injector ) { + public CoreSchemaManager( final Setup setup, Injector injector ) { this.setup = setup; - this.cluster = cluster; + this.cassandraFig = injector.getInstance( CassandraFig.class ); this.lockManager = injector.getInstance( LockManager.class ); + this.dataStaxCluster = injector.getInstance( DataStaxCluster.class ); } @@ -80,9 +82,11 @@ public class CoreSchemaManager implements SchemaManager { public void destroy() { logger.info( "dropping keyspaces" ); try { - cluster.dropKeyspace( CassandraService.getApplicationKeyspace(), true ); + dataStaxCluster.getClusterSession() + .execute("DROP KEYSPACE "+ CQLUtils.quote(cassandraFig.getApplicationKeyspace())); + dataStaxCluster.waitForSchemaAgreement(); } - catch ( RuntimeException ire ) { + catch ( Exception e ) { //swallow if it just doesn't exist } logger.info( "keyspaces dropped" ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/core/src/test/resources/usergrid-test-context.xml ---------------------------------------------------------------------- diff --git a/stack/core/src/test/resources/usergrid-test-context.xml b/stack/core/src/test/resources/usergrid-test-context.xml index 5572619..538fd71 100644 --- a/stack/core/src/test/resources/usergrid-test-context.xml +++ b/stack/core/src/test/resources/usergrid-test-context.xml @@ -54,7 +54,6 @@ <!-- Refer to a named schemaManager from the DataControl annotation thusly --> <bean id="coreManager" class="org.apache.usergrid.persistence.CoreSchemaManager"> <constructor-arg ref="setup"/> - <constructor-arg ref="cassandraCluster"/> <constructor-arg ref="injector"/> </bean> </beans> http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/CQLUtils.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/CQLUtils.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/CQLUtils.java index ed5c9e8..cc38458 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/CQLUtils.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/CQLUtils.java @@ -64,12 +64,13 @@ public class CQLUtils { return mapper.writeValueAsString(map).replace("\"", "'"); } - public static String quote( String value){ - + public static String quote( String value ){ return "\"" + value + "\""; - } + public static String unquote( String value ) { + return value.replace("\"", ""); + } public static String spaceSeparatedKeyValue(Map<String, ?> columns){ StringJoiner columnsSchema = new StringJoiner(","); http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java index 0f59688..0fac3f7 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/DataStaxClusterImpl.java @@ -244,7 +244,7 @@ public class DataStaxClusterImpl implements DataStaxCluster { final QueryOptions queryOptions = new QueryOptions() .setConsistencyLevel(defaultConsistencyLevel) - .setMetadataEnabled(false); // don't store metadata state in the driver + .setMetadataEnabled(true); // choose whether to have the driver store metadata such as schema info Cluster.Builder datastaxCluster = Cluster.builder() .withClusterName( cassandraConfig.getClusterName()) http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java index 7d1205b..dfc834d 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java @@ -156,7 +156,7 @@ public class MigrationManagerImpl implements MigrationManager { boolean exists = dataStaxCluster.getClusterSession() .execute("select * from system.schema_columnfamilies where keyspace_name='"+tableDefinition.getKeyspace() - +"' and columnfamily_name='"+tableDefinition.getTableName()+"'").one() != null; + +"' and columnfamily_name='"+CQLUtils.unquote(tableDefinition.getTableName())+"'").one() != null; if( exists ){ logger.info("Not creating table {}, it already exists.", tableDefinition.getTableName()); http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/query-validator/src/test/resources/usergrid-test-context.xml ---------------------------------------------------------------------- diff --git a/stack/query-validator/src/test/resources/usergrid-test-context.xml b/stack/query-validator/src/test/resources/usergrid-test-context.xml index 4ea1482..7affe6d 100644 --- a/stack/query-validator/src/test/resources/usergrid-test-context.xml +++ b/stack/query-validator/src/test/resources/usergrid-test-context.xml @@ -55,7 +55,6 @@ <!-- refer to a named schemaManager from the DataControl annotation thusly --> <bean id="coreManager" class="org.apache.usergrid.persistence.CoreSchemaManager"> <constructor-arg ref="setup"/> - <constructor-arg ref="cassandraCluster"/> <constructor-arg ref="injector"/> </bean> http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml b/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml index 07215ab..23bbdce 100644 --- a/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml +++ b/stack/rest/src/test/resources/usergrid-rest-deploy-context.xml @@ -50,7 +50,6 @@ <!-- refer to a named schemaManager from the DataControl annotation thusly --> <bean id="coreManager" class="org.apache.usergrid.persistence.CoreSchemaManager"> <constructor-arg ref="setup"/> - <constructor-arg ref="cassandraCluster"/> <constructor-arg ref="injector"/> </bean> http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/rest/src/test/resources/usergrid-test-context.xml ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/resources/usergrid-test-context.xml b/stack/rest/src/test/resources/usergrid-test-context.xml index 76b9775..e6d8ce1 100644 --- a/stack/rest/src/test/resources/usergrid-test-context.xml +++ b/stack/rest/src/test/resources/usergrid-test-context.xml @@ -53,7 +53,6 @@ <!-- refer to a named schemaManager from the DataControl annotation thusly --> <bean id="coreManager" class="org.apache.usergrid.persistence.CoreSchemaManager"> <constructor-arg ref="setup"/> - <constructor-arg ref="cassandraCluster"/> <constructor-arg ref="injector"/> </bean> http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/services/src/test/resources/usergrid-test-context.xml ---------------------------------------------------------------------- diff --git a/stack/services/src/test/resources/usergrid-test-context.xml b/stack/services/src/test/resources/usergrid-test-context.xml index 8b31421..ea6516d 100644 --- a/stack/services/src/test/resources/usergrid-test-context.xml +++ b/stack/services/src/test/resources/usergrid-test-context.xml @@ -48,7 +48,6 @@ <!-- refer to a named schemaManager from the DataControl annotation thusly --> <bean id="coreManager" class="org.apache.usergrid.persistence.CoreSchemaManager"> <constructor-arg ref="setup"/> - <constructor-arg ref="cassandraCluster"/> <constructor-arg ref="injector"/> </bean> http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad9d6079/stack/tools/src/test/resources/usergrid-test-context.xml ---------------------------------------------------------------------- diff --git a/stack/tools/src/test/resources/usergrid-test-context.xml b/stack/tools/src/test/resources/usergrid-test-context.xml index 137c050..4207308 100644 --- a/stack/tools/src/test/resources/usergrid-test-context.xml +++ b/stack/tools/src/test/resources/usergrid-test-context.xml @@ -56,7 +56,7 @@ <!-- refer to a named schemaManager from the DataControl annotation thusly --> <bean id="coreManager" class="org.apache.usergrid.persistence.CoreSchemaManager"> <constructor-arg ref="setup"/> - <constructor-arg ref="cassandraCluster"/> + <constructor-arg ref="injector"/> </bean>
