usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [27/52] [abbrv] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Date Wed, 03 Sep 2014 22:11:22 GMT
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o

Conflicts:
	stack/corepersistence/common/src/test/resources/log4j.properties


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/98557279
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/98557279
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/98557279

Branch: refs/heads/two-dot-o-push-notifications
Commit: 9855727992a46bddba05dcbff7d820abe468023a
Parents: dc12e8b b1c7051
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Fri Aug 29 13:48:51 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Fri Aug 29 13:48:51 2014 -0400

----------------------------------------------------------------------
 .gitignore                                      |    4 +-
 .../corepersistence/CpRelationManager.java      |   27 +-
 .../exception/WriteUniqueVerifyException.java   |   18 -
 .../mvcc/entity/impl/MvccLogEntryImpl.java      |    3 +-
 .../UniqueValueSerializationStrategyImpl.java   |    2 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |    7 +-
 .../collection/guice/TestModule.java            |    2 +
 .../mvcc/stage/delete/MarkStartTest.java        |    3 +
 .../collection/mvcc/stage/load/LoadTest.java    |    7 +
 .../collection/util/InvalidIdGenerator.java     |   14 -
 .../src/test/resources/usergrid-UNIT.properties |    1 +
 .../core/astyanax/ColumnNameIterator.java       |   27 +-
 .../persistence/core/astyanax/ColumnSearch.java |   46 +
 .../persistence/core/astyanax/ColumnTypes.java  |    3 +
 .../astyanax/MultiKeyColumnNameIterator.java    |  235 ++++
 .../core/astyanax/MultiRowColumnIterator.java   |  253 +++++
 .../core/astyanax/MultiTennantColumnFamily.java |   13 +-
 .../core/hystrix/HystrixCassandra.java          |   73 +-
 .../persistence/core/rx/ObservableIterator.java |    2 +-
 .../persistence/core/rx/OrderedMerge.java       |  194 ++--
 .../core/scope/ApplicationScopeImpl.java        |    3 +-
 .../core/astyanax/ColumnNameIteratorTest.java   |  205 ++++
 .../MultiKeyColumnNameIteratorTest.java         |  330 ++++++
 .../astyanax/MultiRowColumnIteratorTest.java    |  502 +++++++++
 .../persistence/core/astyanax/TestUtils.java    |   76 ++
 .../core/cassandra/CassandraRule.java           |   24 +-
 .../persistence/core/rx/OrderedMergeTest.java   |  146 ++-
 .../common/src/test/resources/log4j.properties  |   38 +-
 .../src/test/resources/usergrid.properties      |    1 +
 stack/corepersistence/graph/pom.xml             |    7 +
 .../apache/usergrid/persistence/graph/Edge.java |    1 -
 .../usergrid/persistence/graph/GraphFig.java    |   90 +-
 .../persistence/graph/SearchByEdge.java         |    8 +-
 .../persistence/graph/SearchByEdgeType.java     |   18 +-
 .../persistence/graph/guice/GraphModule.java    |   51 +-
 .../persistence/graph/guice/MergedProxy.java    |   34 -
 .../graph/guice/StorageEdgeSerialization.java   |   34 -
 .../graph/impl/CollectionIndexObserver.java     |    2 +-
 .../graph/impl/GraphManagerImpl.java            |   54 +-
 .../persistence/graph/impl/SimpleEdge.java      |    7 +-
 .../graph/impl/SimpleMarkedEdge.java            |    4 +-
 .../graph/impl/SimpleSearchByEdge.java          |   20 +-
 .../graph/impl/SimpleSearchByEdgeType.java      |   22 +-
 .../graph/impl/SimpleSearchByIdType.java        |    6 +-
 .../impl/stage/EdgeDeleteListenerImpl.java      |    3 -
 .../graph/impl/stage/EdgeDeleteRepairImpl.java  |   16 +-
 .../graph/impl/stage/EdgeMetaRepair.java        |    2 -
 .../graph/impl/stage/EdgeMetaRepairImpl.java    |   67 +-
 .../impl/stage/NodeDeleteListenerImpl.java      |   26 +-
 .../EdgeMetadataSerialization.java              |    3 +-
 .../graph/serialization/EdgeSerialization.java  |    3 +-
 .../graph/serialization/NodeSerialization.java  |    3 +-
 .../impl/EdgeMetadataSerializationImpl.java     |    8 +-
 .../impl/EdgeSerializationImpl.java             | 1037 ++++--------------
 .../impl/NodeSerializationImpl.java             |   86 +-
 .../serialization/impl/shard/DirectedEdge.java  |   41 +
 .../impl/shard/DirectedEdgeMeta.java            |  575 ++++++++++
 .../impl/shard/EdgeColumnFamilies.java          |   60 +
 .../serialization/impl/shard/EdgeRowKey.java    |   44 +
 .../impl/shard/EdgeShardSerialization.java      |   24 +-
 .../impl/shard/EdgeShardStrategy.java           |   45 +-
 .../impl/shard/NodeShardAllocation.java         |   21 +-
 .../impl/shard/NodeShardApproximation.java      |   31 +-
 .../impl/shard/NodeShardCache.java              |   21 +-
 .../serialization/impl/shard/NodeType.java      |   66 ++
 .../graph/serialization/impl/shard/RowKey.java  |   55 +
 .../serialization/impl/shard/RowKeyType.java    |   66 ++
 .../graph/serialization/impl/shard/Shard.java   |  143 +++
 .../impl/shard/ShardEntryGroup.java             |  324 ++++++
 .../impl/shard/ShardGroupCompaction.java        |   71 ++
 .../impl/shard/ShardedEdgeSerialization.java    |  186 ++++
 .../serialization/impl/shard/count/Counter.java |    8 +-
 .../shard/count/NodeShardApproximationImpl.java |  177 +--
 .../count/NodeShardCounterSerialization.java    |    2 +-
 .../NodeShardCounterSerializationImpl.java      |   98 +-
 .../impl/shard/count/ShardKey.java              |   53 +-
 .../impl/shard/impl/EdgeRowKey.java             |   46 -
 .../impl/shard/impl/EdgeRowKeySerializer.java   |   58 -
 .../impl/shard/impl/EdgeSearcher.java           |  162 +++
 .../shard/impl/EdgeShardSerializationImpl.java  |   90 +-
 .../shard/impl/NodeShardAllocationImpl.java     |  288 +++--
 .../impl/shard/impl/NodeShardCacheImpl.java     |  254 +++--
 .../shard/impl/ShardEntryGroupIterator.java     |  123 +++
 .../shard/impl/ShardGroupColumnIterator.java    |  130 +++
 .../shard/impl/ShardGroupCompactionImpl.java    |  618 +++++++++++
 .../impl/ShardedEdgeSerializationImpl.java      | 1006 +++++++++++++++++
 .../impl/shard/impl/ShardsColumnIterator.java   |  127 +++
 .../shard/impl/SizebasedEdgeColumnFamilies.java |  154 +++
 .../shard/impl/SizebasedEdgeShardStrategy.java  |   51 +-
 .../impl/shard/impl/SourceEdgeSearcher.java     |   22 +
 .../DescendingTimestampComparator.java          |   43 +
 .../DirectedEdgeDescendingComparator.java       |   69 ++
 .../impl/comparators/OrderedComparator.java     |   52 +
 .../SourceDirectedEdgeDescendingComparator.java |   42 +
 .../TargetDirectedEdgeDescendingComparator.java |   42 +
 .../impl/serialize/EdgeRowKeySerializer.java    |   63 ++
 .../shard/impl/serialize/EdgeSerializer.java    |   77 ++
 .../serialize/EdgeShardRowKeySerializer.java    |  103 ++
 .../shard/impl/serialize/RowSerializer.java     |   63 ++
 .../shard/impl/serialize/RowTypeSerializer.java |   62 ++
 .../graph/serialization/util/EdgeHasher.java    |   86 --
 .../graph/serialization/util/EdgeUtils.java     |  132 ---
 .../serialization/util/GraphValidation.java     |  189 ++++
 .../graph/ComittedGraphManagerIT.java           |  138 ---
 .../graph/CommittedGraphManagerIT.java          |  135 +++
 .../persistence/graph/GraphManagerIT.java       |    3 -
 .../persistence/graph/GraphManagerLoadTest.java |    7 +-
 .../graph/GraphManagerShardConsistencyIT.java   |  563 ++++++++++
 .../graph/GraphManagerShardingIT.java           |   48 +-
 .../graph/GraphManagerStressTest.java           |    9 +-
 .../usergrid/persistence/graph/SimpleTest.java  |   18 +-
 .../graph/StorageGraphManagerIT.java            |    2 +-
 .../graph/impl/EdgeDeleteListenerTest.java      |    4 +-
 .../graph/impl/NodeDeleteListenerTest.java      |    2 -
 .../graph/impl/stage/EdgeDeleteRepairTest.java  |    7 +-
 .../graph/impl/stage/EdgeMetaRepairTest.java    |    2 -
 .../EdgeMetadataSerializationTest.java          |    2 +-
 .../EdgeSerializationChopTest.java              |    7 +-
 .../serialization/NodeSerializationTest.java    |    3 +-
 .../PermanentSerializationTest.java             |    3 -
 .../graph/serialization/TestCount.java          |    1 -
 .../impl/shard/EdgeShardSerializationTest.java  |  108 +-
 .../impl/shard/NodeShardAllocationTest.java     |  620 ++++++++---
 .../impl/shard/NodeShardCacheTest.java          |  235 ++--
 .../impl/shard/ShardEntryGroupTest.java         |  409 +++++++
 .../impl/shard/ShardGroupCompactionTest.java    |  226 ++++
 .../shard/count/NodeShardApproximationTest.java |  130 ++-
 .../NodeShardCounterSerializationTest.java      |    8 +-
 .../shard/impl/ShardEntryGroupIteratorTest.java |  276 +++++
 ...rceDirectedEdgeDescendingComparatorTest.java |  136 +++
 ...getDirectedEdgeDescendingComparatorTest.java |  136 +++
 .../serialization/util/EdgeHasherTest.java      |  501 ---------
 .../graph/test/util/EdgeTestUtils.java          |   12 +-
 .../graph/src/test/resources/log4j.properties   |    1 +
 .../test/resources/usergrid-SHARD.properties    |   23 +
 .../src/test/resources/usergrid-UNIT.properties |    3 +
 .../persistence/model/entity/SimpleIdTest.java  |   73 ++
 stack/corepersistence/pom.xml                   |    6 +-
 138 files changed, 10787 insertions(+), 3204 deletions(-)
----------------------------------------------------------------------



Mime
View raw message