You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 18:27:30 UTC
[4/4] git commit: Merge branch 'key-row-sharding' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
key-row-sharding
Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fd4b22f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fd4b22f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fd4b22f3
Branch: refs/heads/key-row-sharding
Commit: fd4b22f3e8ebac8a3172f992887296bbc20054ba
Parents: aba5121 42d43ef
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 30 17:09:46 2014 +0000
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 30 17:09:46 2014 +0000
----------------------------------------------------------------------
portal/config.js | 3 +-
.../dist/init_instance/install_cassandra.sh | 7 +-
.../main/groovy/configure_elasticsearch.groovy | 3 +
.../src/main/groovy/configure_usergrid.groovy | 3 +
.../corepersistence/CpEntityManagerFactory.java | 22 +
.../usergrid/corepersistence/CpSetup.java | 5 +-
.../usergrid/corepersistence/GuiceModule.java | 8 +
.../HybridEntityManagerFactory.java | 19 +
.../migration/GraphShardVersionMigration.java | 43 ++
.../corepersistence/migration/Versions.java | 37 ++
.../persistence/EntityManagerFactory.java | 18 +
.../cassandra/EntityManagerFactoryImpl.java | 19 +
.../usergrid/ConcurrentCoreTestSuite.java | 4 +-
.../java/org/apache/usergrid/CoreTestSuite.java | 4 +-
.../SimpleIndexBucketLocatorImplTest.java | 177 ------
.../SimpleIndexShardLocatorImplTest.java | 177 ++++++
stack/corepersistence/collection/pom.xml | 7 +-
.../impl/CollectionPrefixedKey.java | 100 +++
.../impl/CollectionScopedRowKeySerializer.java | 25 +-
.../MvccEntitySerializationStrategyImpl.java | 88 ++-
.../MvccLogEntrySerializationStrategyImpl.java | 66 +-
.../serialization/impl/SerializationModule.java | 2 +-
.../UniqueValueSerializationStrategyImpl.java | 31 +-
.../collection/CollectionContextImplTest.java | 3 -
.../EntityCollectionManagerFactoryTest.java | 6 +-
.../collection/EntityCollectionManagerIT.java | 4 +-
.../EntityCollectionManagerStressTest.java | 6 +-
.../EntityCollectionManagerSyncIT.java | 4 +-
.../collection/guice/MigrationManagerRule.java | 4 +-
.../collection/guice/TestCollectionModule.java | 3 +-
.../collection/guice/TestModule.java | 48 --
...niqueValueSerializationStrategyImplTest.java | 4 +-
.../stage/write/WriteOptimisticVerifyTest.java | 2 +-
.../mvcc/stage/write/WriteUniqueVerifyIT.java | 4 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 4 +-
...MvccEntitySerializationStrategyImplTest.java | 14 +-
.../impl/MvccLESSTransientTest.java | 78 ++-
...ccLogEntrySerializationStrategyImplTest.java | 4 +-
.../impl/ScopedRowKeySerializerTest.java | 18 +-
stack/corepersistence/common/pom.xml | 15 +-
.../core/astyanax/BucketScopedRowKey.java | 114 ++++
.../astyanax/BucketScopedRowKeySerializer.java | 91 +++
.../core/astyanax/CassandraConfig.java | 6 +
.../core/astyanax/CassandraConfigImpl.java | 23 +
.../persistence/core/astyanax/CassandraFig.java | 14 +
.../persistence/core/astyanax/ColumnSearch.java | 13 +-
.../core/astyanax/CompositeFieldSerializer.java | 1 +
.../core/astyanax/IdRowCompositeSerializer.java | 1 +
.../core/astyanax/MultiRowColumnIterator.java | 236 +++++--
.../core/astyanax/MultiTennantColumnFamily.java | 8 +-
.../OrganizationScopedRowKeySerializer.java | 85 ---
.../persistence/core/astyanax/ScopedRowKey.java | 13 +-
.../core/astyanax/ScopedRowKeySerializer.java | 83 +++
.../astyanax/StringRowCompositeSerializer.java | 68 ++
.../persistence/core/guice/CommonModule.java | 43 +-
.../persistence/core/guice/CurrentImpl.java | 42 ++
.../persistence/core/guice/PreviousImpl.java | 42 ++
.../persistence/core/guice/ProxyImpl.java | 42 ++
.../persistence/core/migration/Migration.java | 36 --
.../core/migration/MigrationException.java | 37 --
.../core/migration/MigrationManager.java | 34 -
.../core/migration/MigrationManagerFig.java | 22 -
.../core/migration/MigrationManagerImpl.java | 196 ------
.../core/migration/data/DataMigration.java | 84 +++
.../migration/data/DataMigrationException.java | 39 ++
.../migration/data/DataMigrationManager.java | 55 ++
.../data/DataMigrationManagerImpl.java | 258 ++++++++
.../data/MigrationInfoSerialization.java | 66 ++
.../data/MigrationInfoSerializationImpl.java | 178 ++++++
.../core/migration/schema/Migration.java | 36 ++
.../migration/schema/MigrationException.java | 37 ++
.../core/migration/schema/MigrationManager.java | 34 +
.../migration/schema/MigrationManagerFig.java | 22 +
.../migration/schema/MigrationManagerImpl.java | 196 ++++++
.../core/shard/ExpandingShardLocator.java | 95 +++
.../persistence/core/shard/ShardLocator.java | 77 +++
.../persistence/core/shard/StringHashUtils.java | 54 ++
.../core/astyanax/ColumnNameIteratorTest.java | 6 +
.../MultiKeyColumnNameIteratorTest.java | 6 +
.../astyanax/MultiRowColumnIteratorTest.java | 42 ++
.../core/cassandra/CassandraRule.java | 2 +-
.../persistence/core/cassandra/ITRunner.java | 60 --
.../core/guice/MigrationManagerRule.java | 4 +-
.../core/guice/TestCommonModule.java | 34 +
.../persistence/core/guice/TestModule.java | 48 ++
.../data/DataMigrationManagerImplTest.java | 220 +++++++
.../data/MigrationInfoSerializationTest.java | 105 ++++
.../core/shard/ExpandingShardLocatorTest.java | 65 ++
.../core/shard/ShardLocatorTest.java | 64 ++
.../persistence/core/test/ITRunner.java | 116 ++++
.../persistence/core/test/UseModules.java | 69 ++
stack/corepersistence/graph/pom.xml | 15 +-
.../persistence/graph/guice/GraphModule.java | 34 +-
.../graph/impl/GraphManagerImpl.java | 13 +-
.../graph/impl/stage/EdgeMetaRepairImpl.java | 3 +-
.../impl/stage/NodeDeleteListenerImpl.java | 3 +-
.../EdgeMetadataSerialization.java | 2 +-
.../graph/serialization/NodeSerialization.java | 2 +-
.../impl/EdgeMetadataSerializationImpl.java | 476 --------------
.../EdgeMetadataSerializationProxyImpl.java | 276 ++++++++
.../impl/EdgeMetadataSerializationV1Impl.java | 478 ++++++++++++++
.../impl/EdgeMetadataSerializationV2Impl.java | 627 +++++++++++++++++++
.../impl/NodeSerializationImpl.java | 36 +-
.../impl/shard/EdgeColumnFamilies.java | 14 +-
.../impl/shard/EdgeShardSerialization.java | 2 +-
.../count/NodeShardCounterSerialization.java | 2 +-
.../NodeShardCounterSerializationImpl.java | 10 +-
.../impl/shard/impl/EdgeSearcher.java | 18 +-
.../shard/impl/EdgeShardSerializationImpl.java | 14 +-
.../impl/ShardedEdgeSerializationImpl.java | 76 +--
.../impl/shard/impl/ShardsColumnIterator.java | 21 +-
.../shard/impl/SizebasedEdgeColumnFamilies.java | 34 +-
.../impl/shard/impl/SourceEdgeSearcher.java | 22 -
.../serialize/EdgeShardRowKeySerializer.java | 2 +
.../shard/impl/serialize/RowSerializer.java | 2 +-
.../shard/impl/serialize/RowTypeSerializer.java | 3 +-
.../graph/CommittedGraphManagerIT.java | 4 +-
.../persistence/graph/GraphManagerIT.java | 9 +-
.../persistence/graph/GraphManagerLoadTest.java | 4 +-
.../graph/GraphManagerShardConsistencyIT.java | 5 +-
.../graph/GraphManagerShardingIT.java | 4 +-
.../graph/GraphManagerStressTest.java | 4 +-
.../usergrid/persistence/graph/SimpleTest.java | 4 +-
.../graph/StorageGraphManagerIT.java | 4 +-
.../graph/guice/TestGraphModule.java | 2 +-
.../graph/impl/EdgeDeleteListenerTest.java | 6 +-
.../graph/impl/NodeDeleteListenerTest.java | 6 +-
.../graph/impl/stage/EdgeDeleteRepairTest.java | 4 +-
.../graph/impl/stage/EdgeMetaRepairTest.java | 6 +-
.../EdgeMetaDataSerializationProxyV1Test.java | 85 +++
.../EdgeMetaDataSerializationProxyV2Test.java | 83 +++
.../EdgeMetaDataSerializationV1Test.java | 69 ++
.../EdgeMetaDataSerializationV2Test.java | 52 ++
.../EdgeMetadataSerializationTest.java | 33 +-
.../EdgeSerializationChopTest.java | 4 +-
.../serialization/EdgeSerializationTest.java | 50 +-
.../serialization/NodeSerializationTest.java | 10 +-
.../PermanentSerializationTest.java | 9 +-
.../graph/serialization/TestCount.java | 52 +-
.../impl/shard/EdgeShardSerializationTest.java | 35 +-
.../impl/shard/NodeShardAllocationTest.java | 15 +-
.../impl/shard/NodeShardCacheTest.java | 118 ++--
.../impl/shard/ShardEntryGroupTest.java | 57 +-
.../impl/shard/ShardGroupCompactionTest.java | 181 +++---
.../shard/count/NodeShardApproximationTest.java | 18 +-
.../NodeShardCounterSerializationTest.java | 10 +-
.../shard/impl/ShardEntryGroupIteratorTest.java | 9 +-
...rceDirectedEdgeDescendingComparatorTest.java | 4 +-
stack/corepersistence/map/pom.xml | 6 -
.../persistence/map/guice/MapModule.java | 2 +-
.../persistence/map/impl/MapSerialization.java | 2 +-
.../map/impl/MapSerializationImpl.java | 97 ++-
.../persistence/map/MapManagerTest.java | 4 +-
.../persistence/map/guice/TestMapModule.java | 2 +-
stack/corepersistence/pom.xml | 4 +-
stack/corepersistence/queryindex/pom.xml | 11 -
.../index/guice/TestIndexModule.java | 2 +-
.../impl/EntityConnectionIndexImplTest.java | 4 +-
.../persistence/index/impl/EntityIndexTest.java | 7 +-
stack/corepersistence/queue/pom.xml | 9 -
.../usergrid/persistence/queue/QueueFig.java | 4 +-
.../persistence/queue/QueueManagerTest.java | 6 +-
.../queue/guice/TestQueueModule.java | 2 +-
.../apache/usergrid/rest/SystemResource.java | 94 ++-
164 files changed, 5823 insertions(+), 1985 deletions(-)
----------------------------------------------------------------------