Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/6fffe936 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/6fffe936 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/6fffe936 Branch: refs/heads/master Commit: 6fffe936bbdfa188892e8e8a9190eb03ec9c17a5 Parents: 6f3541b 9bfbc53 Author: Michael Russo <[email protected]> Authored: Thu Nov 19 20:25:43 2015 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Nov 19 20:25:43 2015 -0800 ---------------------------------------------------------------------- .../asyncevents/EventBuilderImpl.java | 47 +++-- .../usergrid/persistence/graph/GraphFig.java | 2 +- .../impl/EdgeSerializationImpl.java | 61 ++++++- .../shard/impl/EdgeShardSerializationImpl.java | 3 +- .../shard/impl/NodeShardAllocationImpl.java | 11 +- .../shard/impl/ShardGroupColumnIterator.java | 4 +- .../shard/impl/ShardGroupCompactionImpl.java | 5 +- .../impl/shard/impl/ShardGroupDeletionImpl.java | 174 ++++++++++--------- .../graph/GraphManagerShardConsistencyIT.java | 40 +++-- .../impl/shard/EdgeShardSerializationTest.java | 44 +++++ .../impl/shard/NodeShardAllocationTest.java | 6 +- .../impl/shard/ShardEntryGroupTest.java | 31 ++++ .../serialization/impl/shard/ShardTest.java | 65 +++++++ .../model/entity/MapToEntityConverter.java | 7 +- 14 files changed, 351 insertions(+), 149 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/6fffe936/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java ----------------------------------------------------------------------
