Merge commit 'refs/pull/493/head' of github.com:apache/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/e64fa350 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e64fa350 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e64fa350 Branch: refs/heads/release-2.1.1 Commit: e64fa3503069f41b66e3942a946b14d7222e1525 Parents: 10e2be7 39351f1 Author: Michael Russo <[email protected]> Authored: Wed Mar 23 10:32:30 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Wed Mar 23 10:32:30 2016 -0700 ---------------------------------------------------------------------- .../asyncevents/AsyncEventServiceImpl.java | 18 +- .../usergrid/corepersistence/index/RxTest.java | 129 ++++++ .../persistence/core/astyanax/ColumnSearch.java | 7 +- .../core/astyanax/MultiRowColumnIterator.java | 37 +- .../astyanax/MultiRowShardColumnIterator.java | 430 +++++++++++++++++++ .../persistence/core/shard/SmartShard.java | 52 +++ .../astyanax/MultiRowColumnIteratorTest.java | 14 +- .../impl/EdgeMetadataSerializationV2Impl.java | 4 +- .../impl/shard/NodeShardCache.java | 7 +- .../graph/serialization/impl/shard/Shard.java | 33 +- .../impl/shard/impl/EdgeSearcher.java | 86 +++- .../shard/impl/EdgeShardSerializationImpl.java | 57 ++- .../shard/impl/NodeShardAllocationImpl.java | 38 +- .../impl/shard/impl/NodeShardCacheImpl.java | 14 +- .../shard/impl/ShardEntryGroupIterator.java | 12 + .../shard/impl/ShardGroupCompactionImpl.java | 179 ++++++-- .../impl/ShardedEdgeSerializationImpl.java | 9 + .../impl/shard/impl/ShardsColumnIterator.java | 49 ++- .../shard/impl/serialize/ShardSerializer.java | 99 +++++ .../graph/GraphManagerShardConsistencyIT.java | 215 ++++++---- .../impl/shard/EdgeShardSerializationTest.java | 12 +- .../impl/shard/NodeShardAllocationTest.java | 44 +- .../impl/shard/ShardGroupCompactionTest.java | 4 +- .../graph/src/test/resources/log4j.properties | 6 + stack/corepersistence/pom.xml | 2 +- .../index/impl/IndexOperationMessage.java | 2 +- 26 files changed, 1303 insertions(+), 256 deletions(-) ----------------------------------------------------------------------
