Merge commit 'refs/pull/407/head' of apache.github.com:apache/usergrid into 2.1-release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0604247f Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0604247f Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0604247f Branch: refs/heads/2.1-release Commit: 0604247f690db09b1a25feef9532cb5e58929437 Parents: 1fe1d1a 48161a1 Author: Mike Dunker <mdun...@apigee.com> Authored: Thu Oct 22 11:27:59 2015 -0700 Committer: Mike Dunker <mdun...@apigee.com> Committed: Thu Oct 22 11:27:59 2015 -0700 ---------------------------------------------------------------------- .../corepersistence/index/IndexServiceImpl.java | 3 +- .../persistence/core/astyanax/CassandraFig.java | 2 +- .../core/astyanax/MultiRowColumnIterator.java | 46 +-- .../usergrid/persistence/graph/GraphFig.java | 2 +- .../persistence/graph/guice/GraphModule.java | 11 +- .../impl/EdgeSerializationImpl.java | 17 +- .../impl/shard/AsyncTaskExecutor.java | 34 ++ .../graph/serialization/impl/shard/Shard.java | 15 + .../impl/shard/ShardEntryGroup.java | 13 +- .../impl/shard/ShardGroupCompaction.java | 4 - .../impl/shard/ShardGroupDeletion.java | 78 ++++ .../impl/shard/impl/AsyncTaskExecutorImpl.java | 53 +++ .../shard/impl/NodeShardAllocationImpl.java | 81 ++-- .../shard/impl/ShardGroupColumnIterator.java | 72 ++-- .../shard/impl/ShardGroupCompactionImpl.java | 10 +- .../impl/shard/impl/ShardGroupDeletionImpl.java | 219 +++++++++++ .../impl/shard/impl/ShardsColumnIterator.java | 10 + .../graph/GraphManagerShardConsistencyIT.java | 378 ++++++++++++++----- .../impl/shard/ShardEntryGroupTest.java | 14 + .../impl/shard/ShardGroupCompactionTest.java | 30 +- .../shard/impl/ShardGroupDeletionImplTest.java | 341 +++++++++++++++++ .../index/impl/EsEntityIndexImpl.java | 45 ++- .../usergrid/persistence/queue/QueueFig.java | 2 +- .../rest/applications/ApplicationResource.java | 50 +++ .../cassandra/ManagementServiceImpl.java | 3 +- 25 files changed, 1307 insertions(+), 226 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/0604247f/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/CassandraFig.java ----------------------------------------------------------------------