Make TableDefinition into an interface, move to cassandra-all 2.1.14
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1574b3af Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1574b3af Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1574b3af Branch: refs/heads/usergrid-1318-queue Commit: 1574b3af4765777f8693c79b6c1bea836812e6bc Parents: a8cd381 Author: Dave Johnson <snoopd...@apache.org> Authored: Fri Sep 9 16:35:38 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Fri Sep 9 16:35:38 2016 -0400 ---------------------------------------------------------------------- .../impl/ScopedCacheSerializationImpl.java | 5 ++-- .../MvccEntitySerializationStrategyImpl.java | 4 +-- ...vccEntitySerializationStrategyProxyImpl.java | 4 +-- .../MvccEntitySerializationStrategyV3Impl.java | 4 +-- .../MvccLogEntrySerializationProxyImpl.java | 4 +-- ...MvccLogEntrySerializationStrategyV1Impl.java | 4 +-- ...MvccLogEntrySerializationStrategyV2Impl.java | 4 +-- .../UniqueValueSerializationStrategyImpl.java | 16 +++--------- ...iqueValueSerializationStrategyProxyImpl.java | 4 +-- .../UniqueValueSerializationStrategyV1Impl.java | 15 ++++++----- .../UniqueValueSerializationStrategyV2Impl.java | 15 ++++++----- .../persistence/core/datastax/CQLUtils.java | 4 ++- .../core/datastax/impl/TableDefinitionImpl.java | 6 ++--- .../data/MigrationInfoSerializationImpl.java | 4 +-- .../migration/schema/MigrationManagerImpl.java | 27 +++++++++----------- .../EdgeMetadataSerializationProxyImpl.java | 4 +-- .../impl/EdgeMetadataSerializationV1Impl.java | 4 +-- .../impl/EdgeMetadataSerializationV2Impl.java | 4 +-- .../impl/NodeSerializationImpl.java | 4 +-- .../shard/impl/EdgeShardSerializationImpl.java | 4 +-- .../shard/impl/SizebasedEdgeColumnFamilies.java | 4 +-- .../map/impl/MapSerializationImpl.java | 10 +++++--- stack/corepersistence/pom.xml | 2 +- .../persistence/queue/QueueManager.java | 2 +- 24 files changed, 76 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java index 29503fa..7e4adb0 100644 --- a/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java +++ b/stack/corepersistence/cache/src/main/java/org/apache/usergrid/persistence/cache/impl/ScopedCacheSerializationImpl.java @@ -32,6 +32,7 @@ import org.apache.usergrid.persistence.cache.CacheScope; import org.apache.usergrid.persistence.core.CassandraConfig; import org.apache.usergrid.persistence.core.astyanax.*; import org.apache.usergrid.persistence.core.datastax.CQLUtils; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; import org.apache.usergrid.persistence.core.shard.ExpandingShardLocator; import org.apache.usergrid.persistence.core.shard.StringHashUtils; @@ -276,9 +277,9 @@ public class ScopedCacheSerializationImpl<K,V> implements ScopedCacheSerializati } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { - final TableDefinitionImpl scopedCache = + final TableDefinition scopedCache = new TableDefinitionImpl( SCOPED_CACHE_TABLE, SCOPED_CACHE_PARTITION_KEYS, SCOPED_CACHE_COLUMN_KEYS, SCOPED_CACHE_COLUMNS, TableDefinitionImpl.CacheOption.KEYS, SCOPED_CACHE_CLUSTERING_ORDER); http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/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 5f37491..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 @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.UUID; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -344,7 +344,7 @@ public abstract class MvccEntitySerializationStrategyImpl implements MvccEntityS } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java index 395ed97..19735cc 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyProxyImpl.java @@ -27,7 +27,7 @@ import org.apache.usergrid.persistence.collection.MvccEntity; import org.apache.usergrid.persistence.collection.serialization.MvccEntitySerializationStrategy; import org.apache.usergrid.persistence.collection.serialization.impl.migration.CollectionMigrationPlugin; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.migration.data.MigrationInfoCache; import org.apache.usergrid.persistence.core.migration.data.MigrationRelationship; import org.apache.usergrid.persistence.core.migration.data.VersionedMigrationSet; @@ -188,7 +188,7 @@ public class MvccEntitySerializationStrategyProxyImpl implements MvccEntitySeria } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/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 140d953..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 @@ -16,7 +16,7 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.netflix.astyanax.serializers.StringSerializer; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.metrics.MetricsFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -306,7 +306,7 @@ public class MvccEntitySerializationStrategyV3Impl implements MvccEntitySerializ } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java index 4e87f6d..b27651d 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationProxyImpl.java @@ -30,7 +30,7 @@ import org.apache.usergrid.persistence.collection.VersionSet; import org.apache.usergrid.persistence.collection.serialization.MvccLogEntrySerializationStrategy; import org.apache.usergrid.persistence.collection.serialization.impl.migration.CollectionMigrationPlugin; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.migration.data.MigrationInfoCache; import org.apache.usergrid.persistence.core.migration.data.MigrationRelationship; import org.apache.usergrid.persistence.core.migration.data.VersionedMigrationSet; @@ -148,7 +148,7 @@ public class MvccLogEntrySerializationProxyImpl implements MvccLogEntrySerializa } @Override - public Collection<TableDefinitionImpl> getTables(){ + public Collection<TableDefinition> getTables(){ return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java index 0bf48d7..62c35bb 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV1Impl.java @@ -35,7 +35,7 @@ import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.model.entity.Id; import com.google.inject.Inject; @@ -118,7 +118,7 @@ public class MvccLogEntrySerializationStrategyV1Impl } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java index 28e0723..325762d 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccLogEntrySerializationStrategyV2Impl.java @@ -35,7 +35,7 @@ import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.model.entity.Id; import com.google.inject.Inject; @@ -106,7 +106,7 @@ public class MvccLogEntrySerializationStrategyV2Impl extends MvccLogEntrySeriali } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/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 14639cf..450c098 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 @@ -29,7 +29,7 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; import com.datastax.driver.core.querybuilder.Using; import org.apache.usergrid.persistence.core.CassandraConfig; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.model.entity.SimpleId; import org.apache.usergrid.persistence.model.field.*; @@ -62,10 +62,6 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey> private final String TABLE_UNIQUE_VALUES; private final String TABLE_UNIQUE_VALUES_LOG; - private final Map COLUMNS_UNIQUE_VALUES; - private final Map COLUMNS_UNIQUE_VALUES_LOG; - - public static final int COL_VALUE = 0x0; private final Comparator<UniqueValue> uniqueValueComparator = new UniqueValueComparator(); @@ -96,10 +92,6 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey> TABLE_UNIQUE_VALUES = getUniqueValuesTable().getTableName(); TABLE_UNIQUE_VALUES_LOG = getEntityUniqueLogTable().getTableName(); - - COLUMNS_UNIQUE_VALUES = getUniqueValuesTable().getColumns(); - COLUMNS_UNIQUE_VALUES_LOG = getEntityUniqueLogTable().getColumns(); - } @Override @@ -495,12 +487,12 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey> public abstract Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies(); @Override - public abstract Collection<TableDefinitionImpl> getTables(); + public abstract Collection<TableDefinition> getTables(); /** * Get the CQL table definition for the unique values log table */ - protected abstract TableDefinitionImpl getUniqueValuesTable(); + protected abstract TableDefinition getUniqueValuesTable(); protected abstract List<Object> deserializePartitionKey(ByteBuffer bb); @@ -522,7 +514,7 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey> /** * Get the CQL table definition for the unique values log table */ - protected abstract TableDefinitionImpl getEntityUniqueLogTable(); + protected abstract TableDefinition getEntityUniqueLogTable(); public class AllUniqueFieldsIterator implements Iterable<UniqueValue>, Iterator<UniqueValue> { http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java index 6bb03ac..61f0f80 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyProxyImpl.java @@ -31,7 +31,7 @@ import org.apache.usergrid.persistence.collection.serialization.UniqueValueSeria import org.apache.usergrid.persistence.collection.serialization.UniqueValueSet; import org.apache.usergrid.persistence.collection.serialization.impl.migration.CollectionMigrationPlugin; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.migration.data.MigrationInfoCache; import org.apache.usergrid.persistence.core.migration.data.MigrationRelationship; import org.apache.usergrid.persistence.core.migration.data.VersionedMigrationSet; @@ -164,7 +164,7 @@ public class UniqueValueSerializationStrategyProxyImpl implements UniqueValueSer } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/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 9f59906..4ee5b70 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 @@ -33,6 +33,7 @@ import org.apache.usergrid.persistence.core.CassandraConfig; import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.datastax.CQLUtils; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; import org.apache.usergrid.persistence.model.entity.Id; import org.apache.usergrid.persistence.model.field.Field; @@ -73,11 +74,11 @@ public class UniqueValueSerializationStrategyV1Impl extends UniqueValueSerializ new HashMap<String, String>(){{ put( "column1", "ASC" ); }}; - private final static TableDefinitionImpl uniqueValues = + private final static TableDefinition uniqueValues = new TableDefinitionImpl( UNIQUE_VALUES_TABLE, UNIQUE_VALUES_PARTITION_KEYS, UNIQUE_VALUES_COLUMN_KEYS, UNIQUE_VALUES_COLUMNS, TableDefinitionImpl.CacheOption.KEYS, UNIQUE_VALUES_CLUSTERING_ORDER); - private final static TableDefinitionImpl uniqueValuesLog = + private final static TableDefinition uniqueValuesLog = new TableDefinitionImpl( UNIQUE_VALUES_LOG_TABLE, UNIQUE_VALUES_LOG_PARTITION_KEYS, UNIQUE_VALUES_LOG_COLUMN_KEYS, UNIQUE_VALUES_LOG_COLUMNS, TableDefinitionImpl.CacheOption.KEYS, UNIQUE_VALUES_LOG_CLUSTERING_ORDER); @@ -106,10 +107,10 @@ public class UniqueValueSerializationStrategyV1Impl extends UniqueValueSerializ } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { - final TableDefinitionImpl uniqueValues = getUniqueValuesTable(); - final TableDefinitionImpl uniqueValuesLog = getEntityUniqueLogTable(); + final TableDefinition uniqueValues = getUniqueValuesTable(); + final TableDefinition uniqueValuesLog = getEntityUniqueLogTable(); return Arrays.asList( uniqueValues, uniqueValuesLog ); @@ -118,14 +119,14 @@ public class UniqueValueSerializationStrategyV1Impl extends UniqueValueSerializ @Override - protected TableDefinitionImpl getUniqueValuesTable(){ + protected TableDefinition getUniqueValuesTable(){ return uniqueValues; } @Override - protected TableDefinitionImpl getEntityUniqueLogTable(){ + protected TableDefinition getEntityUniqueLogTable(){ return uniqueValuesLog; http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/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 1af4846..522dad9 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 @@ -32,6 +32,7 @@ import org.apache.usergrid.persistence.core.CassandraConfig; import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.datastax.CQLUtils; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; import org.apache.usergrid.persistence.model.entity.Id; @@ -68,11 +69,11 @@ public class UniqueValueSerializationStrategyV2Impl extends UniqueValueSerializ private static final Map<String, String> UNIQUE_VALUES_LOG_CLUSTERING_ORDER = new HashMap<String, String>(){{ put( "column1", "ASC" );}}; - private final static TableDefinitionImpl uniqueValues = + private final static TableDefinition uniqueValues = new TableDefinitionImpl( UNIQUE_VALUES_TABLE, UNIQUE_VALUES_PARTITION_KEYS, UNIQUE_VALUES_COLUMN_KEYS, UNIQUE_VALUES_COLUMNS, TableDefinitionImpl.CacheOption.KEYS, UNIQUE_VALUES_CLUSTERING_ORDER); - private final static TableDefinitionImpl uniqueValuesLog = + private final static TableDefinition uniqueValuesLog = new TableDefinitionImpl( UNIQUE_VALUES_LOG_TABLE, UNIQUE_VALUES_LOG_PARTITION_KEYS, UNIQUE_VALUES_LOG_COLUMN_KEYS, UNIQUE_VALUES_LOG_COLUMNS, TableDefinitionImpl.CacheOption.KEYS, UNIQUE_VALUES_LOG_CLUSTERING_ORDER); @@ -101,10 +102,10 @@ public class UniqueValueSerializationStrategyV2Impl extends UniqueValueSerializ } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { - final TableDefinitionImpl uniqueValues = getUniqueValuesTable(); - final TableDefinitionImpl uniqueValuesLog = getEntityUniqueLogTable(); + final TableDefinition uniqueValues = getUniqueValuesTable(); + final TableDefinition uniqueValuesLog = getEntityUniqueLogTable(); return Arrays.asList( uniqueValues, uniqueValuesLog ); @@ -112,13 +113,13 @@ public class UniqueValueSerializationStrategyV2Impl extends UniqueValueSerializ @Override - protected TableDefinitionImpl getUniqueValuesTable(){ + protected TableDefinition getUniqueValuesTable(){ return uniqueValues; } @Override - protected TableDefinitionImpl getEntityUniqueLogTable(){ + protected TableDefinition getEntityUniqueLogTable(){ return uniqueValuesLog; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/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 698915b..082f2d5 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 @@ -26,7 +26,9 @@ import org.apache.usergrid.persistence.core.CassandraFig; import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; import java.nio.ByteBuffer; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.StringJoiner; public class CQLUtils { http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/TableDefinitionImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/TableDefinitionImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/TableDefinitionImpl.java index a5a92e2..a39c47e 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/TableDefinitionImpl.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/datastax/impl/TableDefinitionImpl.java @@ -23,7 +23,6 @@ package org.apache.usergrid.persistence.core.datastax.impl; import com.datastax.driver.core.DataType; import com.google.common.base.Preconditions; import org.apache.usergrid.persistence.core.CassandraFig; -import org.apache.usergrid.persistence.core.datastax.CQLUtils; import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.util.StringUtils; @@ -32,9 +31,8 @@ import java.util.HashMap; import java.util.Map; import java.util.StringJoiner; -import static org.apache.usergrid.persistence.core.datastax.CQLUtils.getCachingOptions; -import static org.apache.usergrid.persistence.core.datastax.CQLUtils.getMapAsCQLString; -import static org.apache.usergrid.persistence.core.datastax.CQLUtils.spaceSeparatedKeyValue; +import static org.apache.usergrid.persistence.core.datastax.CQLUtils.*; + public class TableDefinitionImpl implements TableDefinition { http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java index 2fe24a9..ee04293 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/MigrationInfoSerializationImpl.java @@ -27,7 +27,7 @@ import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.usergrid.persistence.core.astyanax.*; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.migration.util.AstyanaxUtils; import org.apache.usergrid.persistence.model.entity.Id; import org.apache.usergrid.persistence.model.entity.SimpleId; @@ -208,7 +208,7 @@ public class MigrationInfoSerializationImpl implements MigrationInfoSerializatio } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/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 71b35e0..f5ec8ac 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 @@ -19,26 +19,23 @@ package org.apache.usergrid.persistence.core.migration.schema; -import java.util.Collection; -import java.util.Set; - import com.datastax.driver.core.KeyspaceMetadata; +import com.google.inject.Inject; +import com.google.inject.Singleton; +import com.netflix.astyanax.Keyspace; +import com.netflix.astyanax.connectionpool.exceptions.ConnectionException; +import com.netflix.astyanax.ddl.ColumnFamilyDefinition; +import com.netflix.astyanax.ddl.KeyspaceDefinition; import org.apache.usergrid.persistence.core.CassandraFig; +import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.datastax.CQLUtils; import org.apache.usergrid.persistence.core.datastax.DataStaxCluster; import org.apache.usergrid.persistence.core.datastax.TableDefinition; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; - -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.netflix.astyanax.Keyspace; -import com.netflix.astyanax.connectionpool.exceptions.ConnectionException; -import com.netflix.astyanax.ddl.ColumnFamilyDefinition; -import com.netflix.astyanax.ddl.KeyspaceDefinition; +import java.util.Collection; +import java.util.Set; /** @@ -80,7 +77,7 @@ public class MigrationManagerImpl implements MigrationManager { final Collection<MultiTenantColumnFamilyDefinition> columnFamilies = migration.getColumnFamilies(); - final Collection<TableDefinitionImpl> tables = migration.getTables(); + final Collection<TableDefinition> tables = migration.getTables(); if ((columnFamilies == null || columnFamilies.size() == 0) && @@ -101,7 +98,7 @@ public class MigrationManagerImpl implements MigrationManager { if ( tables != null && !tables.isEmpty() ) { - for (TableDefinitionImpl tableDefinition : tables) { + for (TableDefinition tableDefinition : tables) { createTable(tableDefinition); @@ -143,7 +140,7 @@ public class MigrationManagerImpl implements MigrationManager { } - private void createTable(TableDefinitionImpl tableDefinition ) throws Exception { + private void createTable(TableDefinition tableDefinition ) throws Exception { KeyspaceMetadata keyspaceMetadata = dataStaxCluster.getClusterSession().getCluster().getMetadata() .getKeyspace(CQLUtils.quote(cassandraFig.getApplicationKeyspace())); http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java index 5e90d8f..46acd1c 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationProxyImpl.java @@ -26,7 +26,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Iterator; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -290,7 +290,7 @@ public class EdgeMetadataSerializationProxyImpl implements EdgeMetadataSerializa } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java index b1049f2..d7a5c80 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV1Impl.java @@ -37,7 +37,7 @@ import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefi import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; import org.apache.usergrid.persistence.core.astyanax.StringColumnParser; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.migration.schema.Migration; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.util.ValidationUtils; @@ -379,7 +379,7 @@ public class EdgeMetadataSerializationV1Impl implements EdgeMetadataSerializatio } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV2Impl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV2Impl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV2Impl.java index 34cb1d2..1f81864 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV2Impl.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgeMetadataSerializationV2Impl.java @@ -37,7 +37,7 @@ import org.apache.usergrid.persistence.core.astyanax.MultiRowColumnIterator; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.astyanax.StringColumnParser; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.migration.schema.Migration; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.shard.ExpandingShardLocator; @@ -467,7 +467,7 @@ public class EdgeMetadataSerializationV2Impl implements EdgeMetadataSerializatio } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/NodeSerializationImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/NodeSerializationImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/NodeSerializationImpl.java index 12e9237..2429d5a 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/NodeSerializationImpl.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/NodeSerializationImpl.java @@ -38,7 +38,7 @@ import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.migration.schema.Migration; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.util.ValidationUtils; @@ -112,7 +112,7 @@ public class NodeSerializationImpl implements NodeSerialization, Migration { } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeShardSerializationImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeShardSerializationImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeShardSerializationImpl.java index 764536e..098c152 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeShardSerializationImpl.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/EdgeShardSerializationImpl.java @@ -34,7 +34,7 @@ import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.scope.ApplicationScope; import org.apache.usergrid.persistence.core.util.ValidationUtils; import org.apache.usergrid.persistence.graph.GraphFig; @@ -188,7 +188,7 @@ public class EdgeShardSerializationImpl implements EdgeShardSerialization { } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java index 9d0b157..f4e19d6 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/SizebasedEdgeColumnFamilies.java @@ -33,7 +33,7 @@ import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKeySerializer; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; -import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.graph.serialization.impl.shard.DirectedEdge; import org.apache.usergrid.persistence.graph.serialization.impl.shard.EdgeColumnFamilies; import org.apache.usergrid.persistence.graph.serialization.impl.shard.EdgeRowKey; @@ -146,7 +146,7 @@ public class SizebasedEdgeColumnFamilies implements EdgeColumnFamilies { } @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { return Collections.emptyList(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java b/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java index 6253cec..6e50c75 100644 --- a/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java +++ b/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java @@ -31,6 +31,7 @@ import com.datastax.driver.core.querybuilder.Using; import org.apache.usergrid.persistence.core.CassandraConfig; import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamilyDefinition; import org.apache.usergrid.persistence.core.datastax.CQLUtils; +import org.apache.usergrid.persistence.core.datastax.TableDefinition; import org.apache.usergrid.persistence.core.datastax.impl.TableDefinitionImpl; import org.apache.usergrid.persistence.core.shard.ExpandingShardLocator; import org.apache.usergrid.persistence.core.shard.StringHashUtils; @@ -306,13 +307,13 @@ public class MapSerializationImpl implements MapSerialization { @Override - public Collection<TableDefinitionImpl> getTables() { + public Collection<TableDefinition> getTables() { - final TableDefinitionImpl mapEntries = + final TableDefinition mapEntries = new TableDefinitionImpl( MAP_ENTRIES_TABLE, MAP_ENTRIES_PARTITION_KEYS, MAP_ENTRIES_COLUMN_KEYS, MAP_ENTRIES_COLUMNS, TableDefinitionImpl.CacheOption.KEYS, MAP_ENTRIES_CLUSTERING_ORDER); - final TableDefinitionImpl mapKeys = + final TableDefinition mapKeys = new TableDefinitionImpl( MAP_KEYS_TABLE, MAP_KEYS_PARTITION_KEYS, MAP_KEYS_COLUMN_KEYS, MAP_KEYS_COLUMNS, TableDefinitionImpl.CacheOption.KEYS, MAP_KEYS_CLUSTERING_ORDER); @@ -381,7 +382,8 @@ public class MapSerializationImpl implements MapSerialization { - private <T> T getValuesCQL( final MapScope scope, final Collection<String> keys, final ResultsBuilderCQL<T> builder ) { + private <T> T getValuesCQL( + final MapScope scope, final Collection<String> keys, final ResultsBuilderCQL<T> builder ) { final List<ByteBuffer> serializedKeys = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml index fe976bc..b67f307 100644 --- a/stack/corepersistence/pom.xml +++ b/stack/corepersistence/pom.xml @@ -74,7 +74,7 @@ limitations under the License. <antlr.version>3.5.2</antlr.version> <archaius.version>0.5.12</archaius.version> <astyanax.version>3.9.0</astyanax.version> - <cassandra.version>1.2.18</cassandra.version> + <cassandra.version>2.1.14</cassandra.version> <!-- <chop.version>1.0</chop.version>--> <commons.codec.version>1.6</commons.codec.version> <commons.collections.version>3.2.1</commons.collections.version> http://git-wip-us.apache.org/repos/asf/usergrid/blob/1574b3af/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueManager.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueManager.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueManager.java index 18909e4..d2e29cb 100644 --- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueManager.java +++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/QueueManager.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.Serializable; import java.util.List; -/** +/**ctor * Manages queues for usergrid. Current implementation is sqs based. */ public interface QueueManager {
