Repository: usergrid Updated Branches: refs/heads/master a51ee2c2e -> d796b68c6
http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/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 9e59dbf..2af62a8 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 @@ -39,8 +39,8 @@ import org.apache.usergrid.persistence.core.astyanax.ColumnSearch; import org.apache.usergrid.persistence.core.astyanax.CompositeFieldSerializer; import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer; import org.apache.usergrid.persistence.core.astyanax.MultiRowColumnIterator; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition; +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.migration.schema.Migration; import org.apache.usergrid.persistence.core.scope.ApplicationScope; @@ -99,23 +99,23 @@ public class EdgeMetadataSerializationV2Impl implements EdgeMetadataSerializatio /** * CFs where the row key contains the source node id */ - private static final MultiTennantColumnFamily<BucketScopedRowKey<Id>, String> CF_SOURCE_EDGE_TYPES = - new MultiTennantColumnFamily<>( "Graph_Source_Edge_Types_V2", ROW_KEY_SER, STRING_SERIALIZER ); + private static final MultiTenantColumnFamily<BucketScopedRowKey<Id>, String> CF_SOURCE_EDGE_TYPES = + new MultiTenantColumnFamily<>( "Graph_Source_Edge_Types_V2", ROW_KEY_SER, STRING_SERIALIZER ); //all target id types for source edge type - private static final MultiTennantColumnFamily<BucketScopedRowKey<EdgeIdTypeKey>, String> CF_SOURCE_EDGE_ID_TYPES = - new MultiTennantColumnFamily<>( "Graph_Source_Edge_Id_Types_V2", EDGE_TYPE_ROW_KEY, STRING_SERIALIZER ); + private static final MultiTenantColumnFamily<BucketScopedRowKey<EdgeIdTypeKey>, String> CF_SOURCE_EDGE_ID_TYPES = + new MultiTenantColumnFamily<>( "Graph_Source_Edge_Id_Types_V2", EDGE_TYPE_ROW_KEY, STRING_SERIALIZER ); /** * CFs where the row key is the target node id */ - private static final MultiTennantColumnFamily<BucketScopedRowKey<Id>, String> CF_TARGET_EDGE_TYPES = - new MultiTennantColumnFamily<>( "Graph_Target_Edge_Types_V2", ROW_KEY_SER, STRING_SERIALIZER ); + private static final MultiTenantColumnFamily<BucketScopedRowKey<Id>, String> CF_TARGET_EDGE_TYPES = + new MultiTenantColumnFamily<>( "Graph_Target_Edge_Types_V2", ROW_KEY_SER, STRING_SERIALIZER ); //all source id types for target edge type - private static final MultiTennantColumnFamily<BucketScopedRowKey<EdgeIdTypeKey>, String> CF_TARGET_EDGE_ID_TYPES = - new MultiTennantColumnFamily<>( "Graph_Target_Edge_Id_Types_V2", EDGE_TYPE_ROW_KEY, STRING_SERIALIZER ); + private static final MultiTenantColumnFamily<BucketScopedRowKey<EdgeIdTypeKey>, String> CF_TARGET_EDGE_ID_TYPES = + new MultiTenantColumnFamily<>( "Graph_Target_Edge_Id_Types_V2", EDGE_TYPE_ROW_KEY, STRING_SERIALIZER ); private static final Comparator<String> STRING_COMPARATOR = new Comparator<String>() { @@ -321,7 +321,7 @@ public class EdgeMetadataSerializationV2Impl implements EdgeMetadataSerializatio */ private MutationBatch removeEdgeType( final ApplicationScope scope, final Id rowKeyId, final String edgeType, final long version, - final MultiTennantColumnFamily<BucketScopedRowKey<Id>, String> cf ) { + final MultiTenantColumnFamily<BucketScopedRowKey<Id>, String> cf ) { //write target<--source edge type meta data @@ -352,7 +352,7 @@ public class EdgeMetadataSerializationV2Impl implements EdgeMetadataSerializatio */ private MutationBatch removeIdType( final ApplicationScope scope, final Id rowId, final String idType, final String edgeType, final long version, - final MultiTennantColumnFamily<BucketScopedRowKey<EdgeIdTypeKey>, String> cf ) { + final MultiTenantColumnFamily<BucketScopedRowKey<EdgeIdTypeKey>, String> cf ) { final EdgeIdTypeKey edgeIdTypeKey = new EdgeIdTypeKey( rowId, edgeType ); @@ -400,7 +400,7 @@ public class EdgeMetadataSerializationV2Impl implements EdgeMetadataSerializatio * @param cf The column family to execute on */ private Iterator<String> getEdgeTypes( final ApplicationScope scope, final SearchEdgeType search, - final MultiTennantColumnFamily<BucketScopedRowKey<Id>, String> cf ) { + final MultiTenantColumnFamily<BucketScopedRowKey<Id>, String> cf ) { ValidationUtils.validateApplicationScope( scope ); GraphValidation.validateSearchEdgeType( search ); @@ -438,7 +438,7 @@ public class EdgeMetadataSerializationV2Impl implements EdgeMetadataSerializatio * @param cf The column family to search */ public Iterator<String> getIdTypes( final ApplicationScope scope, final SearchIdType search, - final MultiTennantColumnFamily<BucketScopedRowKey<EdgeIdTypeKey>, String> cf ) { + final MultiTenantColumnFamily<BucketScopedRowKey<EdgeIdTypeKey>, String> cf ) { ValidationUtils.validateApplicationScope( scope ); GraphValidation.validateSearchEdgeIdType( search ); @@ -465,7 +465,7 @@ public class EdgeMetadataSerializationV2Impl implements EdgeMetadataSerializatio @Override - public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() { + public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() { return Arrays.asList( graphCf( CF_SOURCE_EDGE_TYPES ), graphCf( CF_TARGET_EDGE_TYPES ), graphCf( CF_SOURCE_EDGE_ID_TYPES ), graphCf( CF_TARGET_EDGE_ID_TYPES ) ); } @@ -474,10 +474,10 @@ public class EdgeMetadataSerializationV2Impl implements EdgeMetadataSerializatio /** * Helper to generate an edge definition by the type */ - private MultiTennantColumnFamilyDefinition graphCf( MultiTennantColumnFamily cf ) { - return new MultiTennantColumnFamilyDefinition( cf, BytesType.class.getSimpleName(), + private MultiTenantColumnFamilyDefinition graphCf(MultiTenantColumnFamily cf ) { + return new MultiTenantColumnFamilyDefinition( cf, BytesType.class.getSimpleName(), UTF8Type.class.getSimpleName(), BytesType.class.getSimpleName(), - MultiTennantColumnFamilyDefinition.CacheOption.KEYS ); + MultiTenantColumnFamilyDefinition.CacheOption.KEYS ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/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 18062c4..cd803e8 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 @@ -34,8 +34,8 @@ import org.apache.cassandra.db.marshal.BytesType; import org.apache.usergrid.persistence.core.astyanax.CassandraConfig; import org.apache.usergrid.persistence.core.astyanax.IdRowCompositeSerializer; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition; +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.migration.schema.Migration; @@ -86,8 +86,8 @@ public class NodeSerializationImpl implements NodeSerialization, Migration { * BloomFilter on read. This means our performance will be no worse than checking a distributed cache in RAM for * the existence of a marked node. */ - private static final MultiTennantColumnFamily<ScopedRowKey<Id>, Boolean> GRAPH_DELETE = - new MultiTennantColumnFamily<>( "Graph_Marked_Nodes", + private static final MultiTenantColumnFamily<ScopedRowKey<Id>, Boolean> GRAPH_DELETE = + new MultiTenantColumnFamily<>( "Graph_Marked_Nodes", new ScopedRowKeySerializer<Id>( ROW_SERIALIZER ), BOOLEAN_SERIALIZER ); @@ -103,11 +103,11 @@ public class NodeSerializationImpl implements NodeSerialization, Migration { @Override - public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() { + public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() { return Collections.singleton( - new MultiTennantColumnFamilyDefinition( GRAPH_DELETE, BytesType.class.getSimpleName(), + new MultiTenantColumnFamilyDefinition( GRAPH_DELETE, BytesType.class.getSimpleName(), BooleanType.class.getSimpleName(), BytesType.class.getSimpleName(), - MultiTennantColumnFamilyDefinition.CacheOption.ALL ) ); + MultiTenantColumnFamilyDefinition.CacheOption.ALL ) ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeColumnFamilies.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeColumnFamilies.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeColumnFamilies.java index f1d6e37..762f9d0 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeColumnFamilies.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/EdgeColumnFamilies.java @@ -21,7 +21,7 @@ package org.apache.usergrid.persistence.graph.serialization.impl.shard; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily; +import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; import org.apache.usergrid.persistence.core.migration.schema.Migration; @@ -34,27 +34,27 @@ public interface EdgeColumnFamilies extends Migration{ /** * Get the name of the column family for getting source nodes */ - public MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getSourceNodeCfName(); + public MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getSourceNodeCfName(); /** * Get the name of the column family for getting target nodes */ - public MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getTargetNodeCfName(); + public MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getTargetNodeCfName(); /** * Get the name of the column family for getting source nodes with a target type */ - public MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getSourceNodeTargetTypeCfName(); + public MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getSourceNodeTargetTypeCfName(); /** * Get the name of the column family for getting target nodes with a source type */ - public MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getTargetNodeSourceTypeCfName(); + public MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getTargetNodeSourceTypeCfName(); /** * Get the Graph edge versions cf * @return */ - public MultiTennantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> getGraphEdgeVersions(); + public MultiTenantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> getGraphEdgeVersions(); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/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 2f83d6f..120a15c 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 @@ -30,8 +30,8 @@ import org.apache.usergrid.persistence.core.astyanax.CassandraConfig; import org.apache.usergrid.persistence.core.astyanax.ColumnNameIterator; import org.apache.usergrid.persistence.core.astyanax.ColumnParser; import org.apache.usergrid.persistence.core.astyanax.ColumnTypes; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition; +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.scope.ApplicationScope; @@ -61,8 +61,8 @@ public class EdgeShardSerializationImpl implements EdgeShardSerialization { /** * Edge shards */ - private static final MultiTennantColumnFamily<ScopedRowKey<DirectedEdgeMeta>, Long> EDGE_SHARDS = - new MultiTennantColumnFamily<>( "Edge_Shards", + private static final MultiTenantColumnFamily<ScopedRowKey<DirectedEdgeMeta>, Long> EDGE_SHARDS = + new MultiTenantColumnFamily<>( "Edge_Shards", new ScopedRowKeySerializer<>( EdgeShardRowKeySerializer.INSTANCE ), LongSerializer.get() ); @@ -164,13 +164,13 @@ public class EdgeShardSerializationImpl implements EdgeShardSerialization { @Override - public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() { + public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() { return Collections.singleton( - new MultiTennantColumnFamilyDefinition( EDGE_SHARDS, BytesType.class.getSimpleName(), + new MultiTenantColumnFamilyDefinition( EDGE_SHARDS, BytesType.class.getSimpleName(), ColumnTypes.LONG_TYPE_REVERSED, BytesType.class.getSimpleName(), - MultiTennantColumnFamilyDefinition.CacheOption.KEYS ) ); + MultiTenantColumnFamilyDefinition.CacheOption.KEYS ) ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardedEdgeSerializationImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardedEdgeSerializationImpl.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardedEdgeSerializationImpl.java index bc02c8d..ce0953c 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardedEdgeSerializationImpl.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardedEdgeSerializationImpl.java @@ -30,7 +30,7 @@ import javax.annotation.Nullable; import javax.inject.Inject; import org.apache.usergrid.persistence.core.astyanax.CassandraConfig; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily; +import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; import org.apache.usergrid.persistence.core.consistency.TimeService; import org.apache.usergrid.persistence.core.scope.ApplicationScope; @@ -117,7 +117,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily, final ApplicationScope scope, final RowKey rowKey, final DirectedEdge edge, final Shard shard, final boolean isDeleted ) { @@ -142,7 +142,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily, final ApplicationScope scope, final RowKeyType rowKey, final DirectedEdge edge, final Shard shard, final boolean isDeleted ) { @@ -166,7 +166,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily, final ApplicationScope scope, final RowKey rowKey, final DirectedEdge edge, final Shard shard, final boolean isDeleted ) { @@ -192,7 +192,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily, final ApplicationScope scope, final RowKeyType rowKey, final DirectedEdge edge, final Shard shard, final boolean isDeleted ) { @@ -217,7 +217,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> columnFamily, final ApplicationScope scope, final EdgeRowKey rowKey, final Long column, final Shard shard, final boolean isDeleted ) { batch.withRow( columnFamilies.getGraphEdgeVersions(), ScopedRowKey.fromKey( scope.getApplication(), rowKey ) ) @@ -236,7 +236,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily, final ApplicationScope scope, final RowKey rowKey, final DirectedEdge edge, final Shard shard, final boolean isDeleted ) { @@ -256,7 +256,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily, final ApplicationScope scope, final RowKeyType rowKey, final DirectedEdge edge, final Shard shard, final boolean isDeleted ) { @@ -277,7 +277,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily, final ApplicationScope scope, final RowKey rowKey, final DirectedEdge edge, final Shard shard, final boolean isDeleted ) { @@ -298,7 +298,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily, final ApplicationScope scope, final RowKeyType rowKey, final DirectedEdge edge, final Shard shard, final boolean isDeleted ) { @@ -318,7 +318,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> columnFamily, final ApplicationScope scope, final EdgeRowKey rowKey, final Long column, final Shard shard, final boolean isDeleted ) { batch.withRow( columnFamilies.getGraphEdgeVersions(), ScopedRowKey.fromKey( scope.getApplication(), rowKey ) ) @@ -338,7 +338,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { final Id sourceId = search.sourceNode(); final String type = search.getType(); final long maxTimestamp = search.getMaxTimestamp(); - final MultiTennantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> columnFamily = + final MultiTenantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> columnFamily = columnFamilies.getGraphEdgeVersions(); final Serializer<Long> serializer = columnFamily.getColumnSerializer(); @@ -404,7 +404,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { final Id sourceId = search.getNode(); final String type = search.getType(); final long maxTimestamp = search.getMaxTimestamp(); - final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily = + final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily = columnFamilies.getSourceNodeCfName(); final Serializer<DirectedEdge> serializer = columnFamily.getColumnSerializer(); @@ -469,7 +469,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { final String type = search.getType(); final String targetType = search.getIdType(); final long maxTimestamp = search.getMaxTimestamp(); - final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily = + final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily = columnFamilies.getSourceNodeTargetTypeCfName(); final Serializer<DirectedEdge> serializer = columnFamily.getColumnSerializer(); @@ -526,7 +526,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { final Id targetId = search.getNode(); final String type = search.getType(); final long maxTimestamp = search.getMaxTimestamp(); - final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily = + final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily = columnFamilies.getTargetNodeCfName(); final Serializer<DirectedEdge> serializer = columnFamily.getColumnSerializer(); @@ -587,7 +587,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { final String sourceType = search.getIdType(); final String type = search.getType(); final long maxTimestamp = search.getMaxTimestamp(); - final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily = + final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily = columnFamilies.getTargetNodeSourceTypeCfName(); final Serializer<DirectedEdge> serializer = columnFamily.getColumnSerializer(); @@ -648,7 +648,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { /** * Return the column family used for the write */ - protected abstract MultiTennantColumnFamily<ScopedRowKey<R>, C> getColumnFamily(); + protected abstract MultiTenantColumnFamily<ScopedRowKey<R>, C> getColumnFamily(); /** * Get the row key @@ -670,7 +670,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { * Write the edge with the given data */ abstract void writeEdge( final MutationBatch batch, - final MultiTennantColumnFamily<ScopedRowKey<R>, C> columnFamily, + final MultiTenantColumnFamily<ScopedRowKey<R>, C> columnFamily, final ApplicationScope scope, final R rowKey, final C column, final Shard shard, final boolean isDeleted ); @@ -687,7 +687,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { final C column = getDirectedEdge(); - final MultiTennantColumnFamily<ScopedRowKey<R>, C> columnFamily = getColumnFamily(); + final MultiTenantColumnFamily<ScopedRowKey<R>, C> columnFamily = getColumnFamily(); final boolean isDeleted = isDeleted(); @@ -707,7 +707,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { */ private abstract class SourceWriteOp extends RowOp<RowKey, DirectedEdge> { - private final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily; + private final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily; private final Id sourceNodeId; @@ -732,7 +732,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override - protected MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getColumnFamily() { + protected MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getColumnFamily() { return columnFamily; } @@ -761,7 +761,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { */ private abstract class SourceTargetTypeWriteOp extends RowOp<RowKeyType, DirectedEdge> { - private final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily; + private final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily; private final Id sourceNodeId; private final String type; private Id targetId; @@ -786,7 +786,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override - protected MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getColumnFamily() { + protected MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getColumnFamily() { return columnFamily; } @@ -815,7 +815,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { */ private abstract class TargetWriteOp extends RowOp<RowKey, DirectedEdge> { - private final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily; + private final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> columnFamily; private final Id targetNode; @@ -840,7 +840,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override - protected MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getColumnFamily() { + protected MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getColumnFamily() { return columnFamily; } @@ -869,7 +869,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { */ private abstract class TargetSourceTypeWriteOp extends RowOp<RowKeyType, DirectedEdge> { - private final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily; + private final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> columnFamily; private final Id targetNode; private final Id sourceNode; @@ -897,7 +897,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override - protected MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getColumnFamily() { + protected MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getColumnFamily() { return columnFamily; } @@ -926,7 +926,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { */ private abstract class EdgeVersions extends RowOp<EdgeRowKey, Long> { - private final MultiTennantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> columnFamily; + private final MultiTenantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> columnFamily; private final Id targetNode; private final Id sourceNode; @@ -954,7 +954,7 @@ public class ShardedEdgeSerializationImpl implements ShardedEdgeSerialization { @Override - protected MultiTennantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> getColumnFamily() { + protected MultiTenantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> getColumnFamily() { return columnFamily; } http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardsColumnIterator.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardsColumnIterator.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardsColumnIterator.java index 9e84491..d1000fb 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardsColumnIterator.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/impl/ShardsColumnIterator.java @@ -1,7 +1,6 @@ package org.apache.usergrid.persistence.graph.serialization.impl.shard.impl; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; @@ -9,16 +8,12 @@ import java.util.NoSuchElementException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.usergrid.persistence.core.astyanax.ColumnNameIterator; -import org.apache.usergrid.persistence.core.astyanax.MultiKeyColumnNameIterator; import org.apache.usergrid.persistence.core.astyanax.MultiRowColumnIterator; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily; +import org.apache.usergrid.persistence.core.astyanax.MultiTenantColumnFamily; import org.apache.usergrid.persistence.core.astyanax.ScopedRowKey; -import org.apache.usergrid.persistence.core.scope.ApplicationScope; import com.netflix.astyanax.Keyspace; import com.netflix.astyanax.model.ConsistencyLevel; -import com.netflix.astyanax.query.RowQuery; import com.netflix.astyanax.util.RangeBuilder; @@ -36,7 +31,7 @@ public class ShardsColumnIterator<R, C, T> implements Iterator<T> { private final EdgeSearcher<R, C, T> searcher; - private final MultiTennantColumnFamily<ScopedRowKey<R>, C> cf; + private final MultiTenantColumnFamily<ScopedRowKey<R>, C> cf; private Iterator<T> currentColumnIterator; @@ -47,9 +42,9 @@ public class ShardsColumnIterator<R, C, T> implements Iterator<T> { private final ConsistencyLevel consistencyLevel; - public ShardsColumnIterator( final EdgeSearcher<R, C, T> searcher, - final MultiTennantColumnFamily<ScopedRowKey<R>, C> cf, final Keyspace keyspace, - final ConsistencyLevel consistencyLevel, final int pageSize ) { + public ShardsColumnIterator(final EdgeSearcher<R, C, T> searcher, + final MultiTenantColumnFamily<ScopedRowKey<R>, C> cf, final Keyspace keyspace, + final ConsistencyLevel consistencyLevel, final int pageSize ) { this.searcher = searcher; this.cf = cf; this.keyspace = keyspace; http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/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 f163ecd..9185ac8 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 @@ -28,8 +28,8 @@ import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.DynamicCompositeType; import org.apache.usergrid.persistence.core.astyanax.ColumnTypes; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition; +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.graph.serialization.impl.shard.DirectedEdge; @@ -75,80 +75,80 @@ public class SizebasedEdgeColumnFamilies implements EdgeColumnFamilies { //initialize the CF's from our implementation - private static final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> SOURCE_NODE_EDGES = - new MultiTennantColumnFamily<>( "Graph_Source_Node_Edges", + private static final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> SOURCE_NODE_EDGES = + new MultiTenantColumnFamily<>( "Graph_Source_Node_Edges", new ScopedRowKeySerializer<>( ROW_SERIALIZER ), EDGE_SERIALIZER ); - private static final MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> TARGET_NODE_EDGES = - new MultiTennantColumnFamily<>( "Graph_Target_Node_Edges", + private static final MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> TARGET_NODE_EDGES = + new MultiTenantColumnFamily<>( "Graph_Target_Node_Edges", new ScopedRowKeySerializer<>( ROW_SERIALIZER ), EDGE_SERIALIZER ); - private static final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> SOURCE_NODE_TARGET_TYPE = - new MultiTennantColumnFamily<>( "Graph_Source_Node_Target_Type", + private static final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> SOURCE_NODE_TARGET_TYPE = + new MultiTenantColumnFamily<>( "Graph_Source_Node_Target_Type", new ScopedRowKeySerializer<>( ROW_TYPE_SERIALIZER ), EDGE_SERIALIZER ); /** * The edges that are to the target node with the source type. The target node is the row key */ - private static final MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> TARGET_NODE_SOURCE_TYPE = - new MultiTennantColumnFamily<>( "Graph_Target_Node_Source_Type", + private static final MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> TARGET_NODE_SOURCE_TYPE = + new MultiTenantColumnFamily<>( "Graph_Target_Node_Source_Type", new ScopedRowKeySerializer<>( ROW_TYPE_SERIALIZER ), EDGE_SERIALIZER ); - private static final MultiTennantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> EDGE_VERSIONS = - new MultiTennantColumnFamily<>( "Graph_Edge_Versions", + private static final MultiTenantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> EDGE_VERSIONS = + new MultiTenantColumnFamily<>( "Graph_Edge_Versions", new ScopedRowKeySerializer<>( EDGE_ROW_KEY_SERIALIZER ), LONG_SERIALIZER ); @Override - public MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getSourceNodeCfName() { + public MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getSourceNodeCfName() { return SOURCE_NODE_EDGES; } @Override - public MultiTennantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getTargetNodeCfName() { + public MultiTenantColumnFamily<ScopedRowKey<RowKey>, DirectedEdge> getTargetNodeCfName() { return TARGET_NODE_EDGES; } @Override - public MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getSourceNodeTargetTypeCfName() { + public MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getSourceNodeTargetTypeCfName() { return SOURCE_NODE_TARGET_TYPE; } @Override - public MultiTennantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getTargetNodeSourceTypeCfName() { + public MultiTenantColumnFamily<ScopedRowKey<RowKeyType>, DirectedEdge> getTargetNodeSourceTypeCfName() { return TARGET_NODE_SOURCE_TYPE; } @Override - public MultiTennantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> getGraphEdgeVersions() { + public MultiTenantColumnFamily<ScopedRowKey<EdgeRowKey>, Long> getGraphEdgeVersions() { return EDGE_VERSIONS; } @Override - public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() { + public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() { return Arrays .asList( graphCf( SOURCE_NODE_EDGES ), graphCf( TARGET_NODE_EDGES ), graphCf( SOURCE_NODE_TARGET_TYPE ), graphCf( TARGET_NODE_SOURCE_TYPE ), - new MultiTennantColumnFamilyDefinition( EDGE_VERSIONS, BytesType.class.getSimpleName(), + new MultiTenantColumnFamilyDefinition( EDGE_VERSIONS, BytesType.class.getSimpleName(), ColumnTypes.LONG_TYPE_REVERSED, BytesType.class.getSimpleName(), - MultiTennantColumnFamilyDefinition.CacheOption.ALL ) ); + MultiTenantColumnFamilyDefinition.CacheOption.ALL ) ); } /** * Helper to generate an edge definition by the type */ - private MultiTennantColumnFamilyDefinition graphCf( MultiTennantColumnFamily cf ) { - return new MultiTennantColumnFamilyDefinition( cf, BytesType.class.getSimpleName(), EDGE_DYNAMIC_COMPOSITE_TYPE, - BytesType.class.getSimpleName(), MultiTennantColumnFamilyDefinition.CacheOption.ALL ); + private MultiTenantColumnFamilyDefinition graphCf(MultiTenantColumnFamily cf ) { + return new MultiTenantColumnFamilyDefinition( cf, BytesType.class.getSimpleName(), EDGE_DYNAMIC_COMPOSITE_TYPE, + BytesType.class.getSimpleName(), MultiTenantColumnFamilyDefinition.CacheOption.ALL ); } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/56eb80f8/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 ceeb3ad..f90f80c 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 @@ -34,10 +34,9 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.usergrid.persistence.core.astyanax.BucketScopedRowKey; import org.apache.usergrid.persistence.core.astyanax.BucketScopedRowKeySerializer; import org.apache.usergrid.persistence.core.astyanax.CassandraConfig; -import org.apache.usergrid.persistence.core.astyanax.CassandraFig; import org.apache.usergrid.persistence.core.astyanax.CompositeFieldSerializer; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamily; -import org.apache.usergrid.persistence.core.astyanax.MultiTennantColumnFamilyDefinition; +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.shard.ExpandingShardLocator; @@ -46,7 +45,6 @@ import org.apache.usergrid.persistence.map.MapScope; import com.google.common.base.Preconditions; import com.google.common.hash.Funnel; -import com.google.common.hash.PrimitiveSink; import com.google.inject.Inject; import com.google.inject.Singleton; import com.netflix.astyanax.ColumnListMutation; @@ -89,15 +87,15 @@ public class MapSerializationImpl implements MapSerialization { /** * CFs where the row key contains the source node id */ - public static final MultiTennantColumnFamily<ScopedRowKey<MapEntryKey>, Boolean> MAP_ENTRIES = - new MultiTennantColumnFamily<>( "Map_Entries", MAP_ENTRY_SERIALIZER, BOOLEAN_SERIALIZER ); + public static final MultiTenantColumnFamily<ScopedRowKey<MapEntryKey>, Boolean> MAP_ENTRIES = + new MultiTenantColumnFamily<>( "Map_Entries", MAP_ENTRY_SERIALIZER, BOOLEAN_SERIALIZER ); /** * CFs where the row key contains the source node id */ - public static final MultiTennantColumnFamily<BucketScopedRowKey<String>, String> MAP_KEYS = - new MultiTennantColumnFamily<>( "Map_Keys", MAP_KEY_SERIALIZER, STRING_SERIALIZER ); + public static final MultiTenantColumnFamily<BucketScopedRowKey<String>, String> MAP_KEYS = + new MultiTenantColumnFamily<>( "Map_Keys", MAP_KEY_SERIALIZER, STRING_SERIALIZER ); /** * Number of buckets to hash across. @@ -339,17 +337,17 @@ public class MapSerializationImpl implements MapSerialization { @Override - public Collection<MultiTennantColumnFamilyDefinition> getColumnFamilies() { + public Collection<MultiTenantColumnFamilyDefinition> getColumnFamilies() { - final MultiTennantColumnFamilyDefinition mapEntries = - new MultiTennantColumnFamilyDefinition( MAP_ENTRIES, BytesType.class.getSimpleName(), + final MultiTenantColumnFamilyDefinition mapEntries = + new MultiTenantColumnFamilyDefinition( MAP_ENTRIES, BytesType.class.getSimpleName(), BytesType.class.getSimpleName(), BytesType.class.getSimpleName(), - MultiTennantColumnFamilyDefinition.CacheOption.KEYS ); + MultiTenantColumnFamilyDefinition.CacheOption.KEYS ); - final MultiTennantColumnFamilyDefinition mapKeys = - new MultiTennantColumnFamilyDefinition( MAP_KEYS, BytesType.class.getSimpleName(), + final MultiTenantColumnFamilyDefinition mapKeys = + new MultiTenantColumnFamilyDefinition( MAP_KEYS, BytesType.class.getSimpleName(), UTF8Type.class.getSimpleName(), BytesType.class.getSimpleName(), - MultiTennantColumnFamilyDefinition.CacheOption.KEYS ); + MultiTenantColumnFamilyDefinition.CacheOption.KEYS ); return Arrays.asList( mapEntries, mapKeys ); }
