Move CassandraFig outside of Astyanax package. Update handling of protocol version for datastax cluster.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/75cc3a43 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/75cc3a43 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/75cc3a43 Branch: refs/heads/master Commit: 75cc3a43edf3bb6efe32b715823a30872453358b Parents: bb225e8 Author: Michael Russo <[email protected]> Authored: Sun Feb 14 18:36:03 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Sun Feb 14 18:36:03 2016 -0800 ---------------------------------------------------------------------- .../index/ApplicationIndexLocationStrategy.java | 2 +- .../index/IndexLocationStrategyFactoryImpl.java | 2 +- .../index/ManagementIndexLocationStrategy.java | 2 +- .../cassandra/AstyanaxLockManagerImpl.java | 1 + .../persistence/cassandra/CassandraService.java | 3 +- .../corepersistence/index/IndexNamingTest.java | 2 +- .../MvccEntitySerializationStrategyImpl.java | 2 +- .../MvccEntitySerializationStrategyV1Impl.java | 2 +- .../MvccEntitySerializationStrategyV2Impl.java | 2 +- .../MvccEntitySerializationStrategyV3Impl.java | 2 +- .../serialization/impl/SettingsValidation.java | 2 +- .../UniqueValueSerializationStrategyImpl.java | 2 +- .../UniqueValueSerializationStrategyV1Impl.java | 2 +- .../UniqueValueSerializationStrategyV2Impl.java | 2 +- ...MvccEntitySerializationStrategyImplTest.java | 2 +- .../MvccEntitySerializationStrategyV2Test.java | 2 +- .../impl/SettingsValidationTest.java | 2 +- .../usergrid/persistence/core/CassandraFig.java | 218 +++++++++++++++++++ .../core/astyanax/CassandraClusterImpl.java | 1 + .../core/astyanax/CassandraConfigImpl.java | 1 + .../persistence/core/astyanax/CassandraFig.java | 213 ------------------ .../persistence/core/datastax/CQLUtils.java | 11 +- .../core/datastax/impl/DatastaxClusterImpl.java | 29 ++- .../persistence/core/guice/CommonModule.java | 1 + .../migration/schema/MigrationManagerImpl.java | 3 +- .../core/astyanax/ColumnNameIteratorTest.java | 2 +- .../MultiKeyColumnNameIteratorTest.java | 4 +- .../astyanax/MultiRowColumnIteratorTest.java | 3 +- .../persistence/core/datastax/CQLUtilsTest.java | 4 +- .../core/datastax/DatastaxClusterTest.java | 3 +- .../persistence/index/impl/EntityIndexTest.java | 2 +- .../persistence/index/impl/GeoPagingTest.java | 2 +- .../index/impl/IndexLoadTestsIT.java | 2 +- .../index/impl/TestIndexIdentifier.java | 3 +- .../queue/impl/SNSQueueManagerImpl.java | 2 +- 35 files changed, 285 insertions(+), 253 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java index e13566d..53d2144 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java @@ -19,7 +19,7 @@ */ package org.apache.usergrid.corepersistence.index; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.guicyfig.ClusterFig; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.index.IndexAlias; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java index 6a99890..93fb677 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexLocationStrategyFactoryImpl.java @@ -21,7 +21,7 @@ package org.apache.usergrid.corepersistence.index; import com.google.inject.Inject; import org.apache.usergrid.corepersistence.util.CpNamingUtils; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.guicyfig.ClusterFig; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.index.IndexFig; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java index 1e13bbf..ffa02cf 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java @@ -20,7 +20,7 @@ package org.apache.usergrid.corepersistence.index; import org.apache.usergrid.corepersistence.util.CpNamingUtils; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.guicyfig.ClusterFig; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.index.IndexAlias; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/core/src/main/java/org/apache/usergrid/locking/cassandra/AstyanaxLockManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/locking/cassandra/AstyanaxLockManagerImpl.java b/stack/core/src/main/java/org/apache/usergrid/locking/cassandra/AstyanaxLockManagerImpl.java index a69aee2..f767042 100644 --- a/stack/core/src/main/java/org/apache/usergrid/locking/cassandra/AstyanaxLockManagerImpl.java +++ b/stack/core/src/main/java/org/apache/usergrid/locking/cassandra/AstyanaxLockManagerImpl.java @@ -33,6 +33,7 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; import org.apache.usergrid.locking.LockPathBuilder; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/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 2431533..2de41bf 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 @@ -17,7 +17,6 @@ package org.apache.usergrid.persistence.cassandra; -import com.google.inject.Inject; import com.google.inject.Injector; import me.prettyprint.cassandra.connection.HConnectionManager; import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel; @@ -36,7 +35,7 @@ import me.prettyprint.hector.api.query.ColumnQuery; import me.prettyprint.hector.api.query.QueryResult; import me.prettyprint.hector.api.query.SliceQuery; import org.apache.usergrid.locking.LockManager; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.hector.CountingMutator; import org.apache.usergrid.utils.MapUtils; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java index 4fea8e2..1661af4 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java @@ -23,7 +23,7 @@ import com.google.inject.Inject; import net.jcip.annotations.NotThreadSafe; import org.apache.usergrid.corepersistence.TestIndexModule; import org.apache.usergrid.corepersistence.util.CpNamingUtils; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.guicyfig.ClusterFig; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java index 3e2d391..2d7892a 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java @@ -41,7 +41,7 @@ import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccEntityImp import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; import org.apache.usergrid.persistence.collection.serialization.impl.util.LegacyScopeUtils; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.ColumnNameIterator; import org.apache.usergrid.persistence.core.astyanax.ColumnParser; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java index 9e29e9c..ee548e3 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV1Impl.java @@ -26,7 +26,7 @@ import java.util.UUID; import org.apache.usergrid.persistence.collection.MvccEntity; import org.apache.usergrid.persistence.collection.exception.DataCorruptionException; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java index 13d9613..e9b0781 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Impl.java @@ -29,7 +29,7 @@ import org.apache.usergrid.persistence.collection.MvccEntity; import org.apache.usergrid.persistence.collection.exception.DataCorruptionException; import org.apache.usergrid.persistence.collection.exception.EntityTooLargeException; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.FieldBuffer; import org.apache.usergrid.persistence.core.astyanax.FieldBufferBuilder; import org.apache.usergrid.persistence.core.astyanax.FieldBufferParser; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java index 2fa5d09..ecd0f5c 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java @@ -32,7 +32,7 @@ import org.apache.usergrid.persistence.collection.exception.EntityTooLargeExcept import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccEntityImpl; import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.ColumnParser; import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidation.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidation.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidation.java index 6715cfb..0f3f6b9 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidation.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidation.java @@ -21,7 +21,7 @@ package org.apache.usergrid.persistence.collection.serialization.impl; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import com.google.common.base.Preconditions; import com.google.inject.Inject; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java index 197fd4e..0f27167 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java @@ -30,7 +30,7 @@ import org.apache.usergrid.persistence.collection.serialization.SerializationFig import org.apache.usergrid.persistence.collection.serialization.UniqueValue; import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy; import org.apache.usergrid.persistence.collection.serialization.UniqueValueSet; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.ColumnNameIterator; import org.apache.usergrid.persistence.core.astyanax.ColumnParser; import org.apache.usergrid.persistence.core.astyanax.ColumnTypes; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java index dafbf2b..2235f63 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV1Impl.java @@ -28,7 +28,7 @@ import org.apache.cassandra.db.marshal.BytesType; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; import org.apache.usergrid.persistence.collection.serialization.impl.util.LegacyScopeUtils; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.ColumnTypes; import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java index 17b8b37..0f233cf 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyV2Impl.java @@ -27,7 +27,7 @@ import java.util.Collections; import org.apache.cassandra.db.marshal.BytesType; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.ColumnTypes; import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java index f6720f9..ef3aabd 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.apache.usergrid.persistence.collection.MvccEntity; import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccEntityImpl; import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.guice.MigrationManagerRule; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Test.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Test.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Test.java index f8b65d9..2dca27d 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Test.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV2Test.java @@ -36,7 +36,7 @@ import org.apache.usergrid.persistence.collection.exception.EntityTooLargeExcept import org.apache.usergrid.persistence.collection.mvcc.entity.impl.MvccEntityImpl; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; import org.apache.usergrid.persistence.collection.util.EntityHelper; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.guicyfig.SetConfigTestBypass; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidationTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidationTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidationTest.java index 273bec0..cf700f3 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidationTest.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/SettingsValidationTest.java @@ -23,7 +23,7 @@ package org.apache.usergrid.persistence.collection.serialization.impl; import org.junit.Test; import org.apache.usergrid.persistence.collection.serialization.SerializationFig; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java new file mode 100644 index 0000000..7a2a9d1 --- /dev/null +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/CassandraFig.java @@ -0,0 +1,218 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.usergrid.persistence.core; + + +import org.safehaus.guicyfig.Default; +import org.safehaus.guicyfig.FigSingleton; +import org.safehaus.guicyfig.GuicyFig; +import org.safehaus.guicyfig.Key; + + +/** + * Cassandra configuration interface. + */ +@FigSingleton +public interface CassandraFig extends GuicyFig { + + // cassndra properties used by datastax driver + String READ_CL = "cassandra.readcl"; + String WRITE_CL = "cassandra.writecl"; + String STRATEGY = "cassandra.strategy"; + String STRATEGY_OPTIONS = "cassandra.strategy.options"; + + // main application cassandra properties + String ASTYANAX_READ_CONSISTENT_CL = "usergrid.consistent.read.cl"; + String ASTYANAX_READ_CL = "usergrid.read.cl"; + String ASTYANAX_WRITE_CL = "usergrid.write.cl"; + String SHARD_VALUES = "cassandra.shardvalues"; + String THRIFT_TRANSPORT_SIZE = "cassandra.thrift.transport.frame"; + + // locks cassandra properties + String LOCKS_KEYSPACE_NAME = "cassandra.lock.keyspace"; + String LOCKS_KEYSPACE_REPLICATION = "cassandra.lock.keyspace.replication"; + String LOCKS_KEYSPACE_STRATEGY = "cassandra.lock.keyspace.strategy"; + String LOCKS_CL = "cassandra.lock.cl"; + String LOCKS_SHARED_POOL_FLAG = "cassandra.lock.use_shared_pool"; + String LOCKS_CONNECTIONS = "cassandra.lock.connections"; + String LOCKS_EXPIRATION = "cassandra.lock.expiration.milliseconds"; + + + + + // re-usable default values + String DEFAULT_CONNECTION_POOLSIZE = "15"; + String DEFAULT_LOCKS_EXPIRATION = "3600000"; // 1 hour + String DEFAULT_LOCAL_DC = ""; + String DEFAULT_USERNAME = ""; + String DEFAULT_PASSWORD = ""; + + + @Key( "cassandra.hosts" ) + String getHosts(); + + /** + * Valid options are 1.2, 2.0, 2.1 + * + * @return + */ + @Key( "cassandra.version" ) + @Default( "2.1" ) + String getVersion(); + + @Key( "cassandra.cluster_name" ) + @Default( "Usergrid" ) + String getClusterName(); + + @Key( "cassandra.keyspace.application" ) + @Default( "Usergrid_Applications" ) + String getApplicationKeyspace(); + + @Key( "cassandra.port" ) + @Default( "9160" ) + int getThriftPort(); + + @Key( "cassandra.username" ) + @Default( DEFAULT_USERNAME ) + String getUsername(); + + @Key( "cassandra.password" ) + @Default( DEFAULT_PASSWORD ) + String getPassword(); + + @Key( "cassandra.datacenter.local" ) + @Default( DEFAULT_LOCAL_DC ) + String getLocalDataCenter(); + + @Key( "cassandra.connections" ) + @Default( DEFAULT_CONNECTION_POOLSIZE ) + int getConnections(); + + @Key( "cassandra.timeout" ) + @Default( "10000" ) + int getTimeout(); + + @Key( "cassandra.timeout.pool" ) + @Default( "5000" ) + int getPoolTimeout(); + + @Key("cassandra.discovery") + @Default( "RING_DESCRIBE" ) + String getDiscoveryType(); + + + @Default("CL_LOCAL_QUORUM") + @Key(ASTYANAX_READ_CL) + String getAstyanaxReadCL(); + + @Default("CL_QUORUM") + @Key(ASTYANAX_READ_CONSISTENT_CL) + String getAstyanaxConsistentReadCL(); + + @Default("CL_LOCAL_QUORUM") + @Key(ASTYANAX_WRITE_CL) + String getAstyanaxWriteCL(); + + + @Default("LOCAL_QUORUM") + @Key(READ_CL) + String getReadCl(); + + @Default("LOCAL_QUORUM") + @Key(WRITE_CL) + String getWriteCl(); + + @Default("SimpleStrategy") + @Key( STRATEGY ) + String getStrategy(); + + @Default("replication_factor:1") + @Key( STRATEGY_OPTIONS ) + String getStrategyOptions(); + + /** + * Return the history of all shard values which are immutable. For instance, if shard values + * are initially set to 20 (the default) then increased to 40, the property should contain the string of + * "20, 40" so that we can read historic data. + * + * @return + */ + @Default("20") + @Key(SHARD_VALUES) + String getShardValues(); + + /** + * Get the thrift transport size. Should be set to what is on the cassandra servers. As we move to CQL, this will become obsolete + * @return + */ + @Key( THRIFT_TRANSPORT_SIZE) + @Default( "15728640" ) + int getThriftBufferSize(); + + + /** + * Returns the name of the keyspace that should be used for Locking + */ + @Key( LOCKS_KEYSPACE_NAME ) + @Default("Locks") + String getLocksKeyspace(); + + /** + * Returns the Astyanax consistency level for writing a Lock + */ + @Key(LOCKS_CL) + @Default("CL_LOCAL_QUORUM") + String getLocksCl(); + + /** + * Returns a flag on whether or not to share the connection pool with other keyspaces + */ + @Key( LOCKS_SHARED_POOL_FLAG ) + @Default("true") + boolean useSharedPoolForLocks(); + + /** + * Returns a flag on whether or not to share the connection pool with other keyspaces + */ + @Key( LOCKS_CONNECTIONS ) + @Default( DEFAULT_CONNECTION_POOLSIZE ) + int getConnectionsLocks(); + + /** + * Returns a flag on whether or not to share the connection pool with other keyspaces + */ + @Key( LOCKS_KEYSPACE_REPLICATION ) + @Default("replication_factor:1") + String getLocksKeyspaceReplication(); + + /** + * Returns a flag on whether or not to share the connection pool with other keyspaces + */ + @Key( LOCKS_KEYSPACE_STRATEGY ) + @Default( "org.apache.cassandra.locator.SimpleStrategy" ) + String getLocksKeyspaceStrategy(); + + /** + * Return the expiration that should be used for expiring a lock if it's not released + */ + @Key( LOCKS_EXPIRATION ) + @Default(DEFAULT_LOCKS_EXPIRATION) + int getLocksExpiration(); + +} http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java index cc52f1b..b433ecc 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraClusterImpl.java @@ -35,6 +35,7 @@ import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl; import com.netflix.astyanax.connectionpool.impl.Slf4jConnectionPoolMonitorImpl; import com.netflix.astyanax.impl.AstyanaxConfigurationImpl; import com.netflix.astyanax.thrift.ThriftFamilyFactory; +import org.apache.usergrid.persistence.core.CassandraFig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfigImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfigImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfigImpl.java index 15f434c..0135c95 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfigImpl.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraConfigImpl.java @@ -26,6 +26,7 @@ import java.beans.PropertyChangeListener; import com.google.inject.Inject; import com.google.inject.Singleton; import com.netflix.astyanax.model.ConsistencyLevel; +import org.apache.usergrid.persistence.core.CassandraFig; /** http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/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 deleted file mode 100644 index 78c4fbc..0000000 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.usergrid.persistence.core.astyanax; - - -import org.safehaus.guicyfig.Default; -import org.safehaus.guicyfig.FigSingleton; -import org.safehaus.guicyfig.GuicyFig; -import org.safehaus.guicyfig.Key; - - -/** - * Cassandra configuration interface. - */ -@FigSingleton -public interface CassandraFig extends GuicyFig { - - // cassndra properties used by datastax driver - String READ_CL = "cassandra.readcl"; - String WRITE_CL = "cassandra.writecl"; - String STRATEGY = "cassandra.strategy"; - String STRATEGY_OPTIONS = "cassandra.strategy.options"; - - // main application cassandra properties - String ASTYANAX_READ_CONSISTENT_CL = "usergrid.consistent.read.cl"; - String ASTYANAX_READ_CL = "usergrid.read.cl"; - String ASTYANAX_WRITE_CL = "usergrid.write.cl"; - String SHARD_VALUES = "cassandra.shardvalues"; - String THRIFT_TRANSPORT_SIZE = "cassandra.thrift.transport.frame"; - - // locks cassandra properties - String LOCKS_KEYSPACE_NAME = "cassandra.lock.keyspace"; - String LOCKS_KEYSPACE_REPLICATION = "cassandra.lock.keyspace.replication"; - String LOCKS_KEYSPACE_STRATEGY = "cassandra.lock.keyspace.strategy"; - String LOCKS_CL = "cassandra.lock.cl"; - String LOCKS_SHARED_POOL_FLAG = "cassandra.lock.use_shared_pool"; - String LOCKS_CONNECTIONS = "cassandra.lock.connections"; - String LOCKS_EXPIRATION = "cassandra.lock.expiration.milliseconds"; - - - - - // re-usable default values - String DEFAULT_CONNECTION_POOLSIZE = "15"; - String DEFAULT_LOCKS_EXPIRATION = "3600000"; // 1 hour - String DEFAULT_LOCAL_DC = ""; - String DEFAULT_USERNAME = ""; - String DEFAULT_PASSWORD = ""; - - - @Key( "cassandra.hosts" ) - String getHosts(); - - @Key( "cassandra.version" ) - @Default( "2.1" ) - String getVersion(); - - @Key( "cassandra.cluster_name" ) - @Default( "Usergrid" ) - String getClusterName(); - - @Key( "cassandra.keyspace.application" ) - @Default( "Usergrid_Applications" ) - String getApplicationKeyspace(); - - @Key( "cassandra.port" ) - @Default( "9160" ) - int getThriftPort(); - - @Key( "cassandra.username" ) - @Default( DEFAULT_USERNAME ) - String getUsername(); - - @Key( "cassandra.password" ) - @Default( DEFAULT_PASSWORD ) - String getPassword(); - - @Key( "cassandra.datacenter.local" ) - @Default( DEFAULT_LOCAL_DC ) - String getLocalDataCenter(); - - @Key( "cassandra.connections" ) - @Default( DEFAULT_CONNECTION_POOLSIZE ) - int getConnections(); - - @Key( "cassandra.timeout" ) - @Default( "10000" ) - int getTimeout(); - - @Key( "cassandra.timeout.pool" ) - @Default( "5000" ) - int getPoolTimeout(); - - @Key("cassandra.discovery") - @Default( "RING_DESCRIBE" ) - String getDiscoveryType(); - - - @Default("CL_LOCAL_QUORUM") - @Key(ASTYANAX_READ_CL) - String getAstyanaxReadCL(); - - @Default("CL_QUORUM") - @Key(ASTYANAX_READ_CONSISTENT_CL) - String getAstyanaxConsistentReadCL(); - - @Default("CL_LOCAL_QUORUM") - @Key(ASTYANAX_WRITE_CL) - String getAstyanaxWriteCL(); - - - @Default("LOCAL_QUORUM") - @Key(READ_CL) - String getReadCl(); - - @Default("LOCAL_QUORUM") - @Key(WRITE_CL) - String getWriteCl(); - - @Default("SimpleStrategy") - @Key( STRATEGY ) - String getStrategy(); - - @Default("replication_factor:1") - @Key( STRATEGY_OPTIONS ) - String getStrategyOptions(); - - /** - * Return the history of all shard values which are immutable. For instance, if shard values - * are initially set to 20 (the default) then increased to 40, the property should contain the string of - * "20, 40" so that we can read historic data. - * - * @return - */ - @Default("20") - @Key(SHARD_VALUES) - String getShardValues(); - - /** - * Get the thrift transport size. Should be set to what is on the cassandra servers. As we move to CQL, this will become obsolete - * @return - */ - @Key( THRIFT_TRANSPORT_SIZE) - @Default( "15728640" ) - int getThriftBufferSize(); - - - /** - * Returns the name of the keyspace that should be used for Locking - */ - @Key( LOCKS_KEYSPACE_NAME ) - @Default("Locks") - String getLocksKeyspace(); - - /** - * Returns the Astyanax consistency level for writing a Lock - */ - @Key(LOCKS_CL) - @Default("CL_LOCAL_QUORUM") - String getLocksCl(); - - /** - * Returns a flag on whether or not to share the connection pool with other keyspaces - */ - @Key( LOCKS_SHARED_POOL_FLAG ) - @Default("true") - boolean useSharedPoolForLocks(); - - /** - * Returns a flag on whether or not to share the connection pool with other keyspaces - */ - @Key( LOCKS_CONNECTIONS ) - @Default( DEFAULT_CONNECTION_POOLSIZE ) - int getConnectionsLocks(); - - /** - * Returns a flag on whether or not to share the connection pool with other keyspaces - */ - @Key( LOCKS_KEYSPACE_REPLICATION ) - @Default("replication_factor:1") - String getLocksKeyspaceReplication(); - - /** - * Returns a flag on whether or not to share the connection pool with other keyspaces - */ - @Key( LOCKS_KEYSPACE_STRATEGY ) - @Default( "org.apache.cassandra.locator.SimpleStrategy" ) - String getLocksKeyspaceStrategy(); - - /** - * Return the expiration that should be used for expiring a lock if it's not released - */ - @Key( LOCKS_EXPIRATION ) - @Default(DEFAULT_LOCKS_EXPIRATION) - int getLocksExpiration(); - -} http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/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 f04e1a9..f65a260 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 @@ -21,7 +21,7 @@ package org.apache.usergrid.persistence.core.datastax; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.util.StringUtils; import java.nio.ByteBuffer; @@ -192,6 +192,10 @@ public class CQLUtils { cacheValue.put("keys", "NONE"); cacheValue.put("rows_per_partition", "NONE"); break; + default: + cacheValue.put("keys", "NONE"); + cacheValue.put("rows_per_partition", "NONE"); + break; } @@ -201,7 +205,7 @@ public class CQLUtils { public static String getLegacyCacheValue( TableDefinition.CacheOption cacheOption ){ - String cacheValue = "none"; // default to no caching + String cacheValue; switch (cacheOption) { case ALL: @@ -219,6 +223,9 @@ public class CQLUtils { case NONE: cacheValue = "none"; break; + default: + cacheValue = "none"; + break; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/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 875c5c2..34cfec8 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 @@ -23,7 +23,7 @@ import com.datastax.driver.core.policies.DCAwareRoundRobinPolicy; import com.datastax.driver.core.policies.LoadBalancingPolicy; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +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; @@ -179,7 +179,7 @@ public class DataStaxClusterImpl implements DataStaxCluster { .withLoadBalancingPolicy(loadBalancingPolicy) .withPoolingOptions(poolingOptions) .withQueryOptions(queryOptions) - .withProtocolVersion(ProtocolVersion.NEWEST_SUPPORTED); + .withProtocolVersion(getProtocolVersion(cassandraFig.getVersion())); // only add auth credentials if they were provided if ( !cassandraFig.getUsername().isEmpty() && !cassandraFig.getPassword().isEmpty() ){ @@ -194,4 +194,29 @@ public class DataStaxClusterImpl implements DataStaxCluster { } + private ProtocolVersion getProtocolVersion(String versionNumber){ + + ProtocolVersion protocolVersion; + switch (versionNumber) { + + case "2.1": + protocolVersion = ProtocolVersion.V3; + break; + case "2.0": + protocolVersion = ProtocolVersion.V2; + break; + case "1.2": + protocolVersion = ProtocolVersion.V1; + break; + default: + protocolVersion = ProtocolVersion.NEWEST_SUPPORTED; + break; + + } + + return protocolVersion; + + + } + } http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java index 460efa5..94aac60 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java @@ -21,6 +21,7 @@ package org.apache.usergrid.persistence.core.guice; import com.datastax.driver.core.Session; import com.netflix.astyanax.Keyspace; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.*; import org.apache.usergrid.persistence.core.datastax.DataStaxCluster; import org.apache.usergrid.persistence.core.datastax.DataStaxSessionProvider; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/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 3630fc8..f5f5d7b 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 @@ -22,8 +22,7 @@ package org.apache.usergrid.persistence.core.migration.schema; import java.util.Collection; import java.util.Set; -import com.datastax.driver.core.Session; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +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.apache.usergrid.persistence.core.datastax.TableDefinition; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java index dccbd45..415eafa 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/ColumnNameIteratorTest.java @@ -24,8 +24,8 @@ package org.apache.usergrid.persistence.core.astyanax; import java.util.HashMap; +import org.apache.usergrid.persistence.core.CassandraFig; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java index d020949..55ed421 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIteratorTest.java @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.Comparator; import java.util.HashMap; +import org.apache.usergrid.persistence.core.CassandraFig; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,8 +50,6 @@ import com.netflix.astyanax.serializers.StringSerializer; import com.netflix.astyanax.util.RangeBuilder; import rx.Observable; -import rx.functions.Action1; -import rx.functions.Func1; import rx.schedulers.Schedulers; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java index 8bcdcb2..d48795e 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIteratorTest.java @@ -28,8 +28,8 @@ import java.util.Comparator; import java.util.HashMap; import java.util.concurrent.CountDownLatch; +import org.apache.usergrid.persistence.core.CassandraFig; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,7 +53,6 @@ import com.netflix.astyanax.util.RangeBuilder; import rx.Observable; import rx.Observer; import rx.functions.Action1; -import rx.functions.Func1; import rx.schedulers.Schedulers; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/CQLUtilsTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/CQLUtilsTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/CQLUtilsTest.java index 5bad54e..34dd370 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/CQLUtilsTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/CQLUtilsTest.java @@ -21,11 +21,10 @@ package org.apache.usergrid.persistence.core.datastax; import com.datastax.driver.core.DataType; import com.google.inject.Inject; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.guice.TestCommonModule; import org.apache.usergrid.persistence.core.test.ITRunner; import org.apache.usergrid.persistence.core.test.UseModules; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; @@ -35,7 +34,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.ExecutionException; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java index 593e71b..ca7f97a 100644 --- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java +++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/datastax/DatastaxClusterTest.java @@ -21,11 +21,10 @@ package org.apache.usergrid.persistence.core.datastax; import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; import com.google.inject.Inject; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.guice.TestCommonModule; import org.apache.usergrid.persistence.core.test.ITRunner; import org.apache.usergrid.persistence.core.test.UseModules; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java index 3978956..2f9b673 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; import com.google.common.base.Optional; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.index.*; import org.apache.usergrid.persistence.model.field.*; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java index eb6651f..3d68fe1 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/GeoPagingTest.java @@ -25,7 +25,7 @@ package org.apache.usergrid.persistence.index.impl; import java.util.*; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.index.*; import org.apache.usergrid.persistence.model.entity.SimpleId; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java index a6cef60..afaebb7 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/IndexLoadTestsIT.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.apache.usergrid.StressTest; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.index.*; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java index 2cc7e62..ffd25f3 100644 --- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java +++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java @@ -20,9 +20,8 @@ package org.apache.usergrid.persistence.index.impl; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.scope.ApplicationScope; -import org.apache.usergrid.persistence.core.util.StringUtils; import org.apache.usergrid.persistence.index.IndexAlias; import org.apache.usergrid.persistence.index.IndexFig; import org.apache.usergrid.persistence.index.IndexLocationStrategy; http://git-wip-us.apache.org/repos/asf/usergrid/blob/75cc3a43/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java index 4028d46..ed22fea 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SNSQueueManagerImpl.java @@ -31,7 +31,7 @@ import java.util.concurrent.ExecutorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; +import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.executor.TaskExecutorFactory; import org.apache.usergrid.persistence.core.guicyfig.ClusterFig; import org.apache.usergrid.persistence.queue.Queue;
