You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/27 18:21:11 UTC

[24/27] git commit: Merge branch 'asyncqueue' into two-dot-o

Merge branch 'asyncqueue' into two-dot-o


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

Branch: refs/heads/entity-manager
Commit: 17c2ac42f1ad0b1523a42d0105a67cbfe5566dc4
Parents: b516f57 5ded6b5
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 26 13:43:59 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 26 13:43:59 2014 -0700

----------------------------------------------------------------------
 stack/corepersistence/collection/pom.xml        |   13 +
 .../collection/guice/CollectionModule.java      |    8 +-
 .../impl/EntityCollectionManagerImpl.java       |   19 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |   14 +-
 .../collection/rx/CassandraThreadScheduler.java |  107 --
 .../persistence/collection/rx/RxFig.java        |   42 -
 .../stage/write/WriteUniqueVerifyStageTest.java |    3 +-
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |    6 +-
 .../rx/CassandraThreadSchedulerTest.java        |  413 -----
 .../persistence/collection/rx/ParallelTest.java |    6 +-
 .../usergrid/persistence/graph/EdgeManager.java |  163 --
 .../persistence/graph/EdgeManagerFactory.java   |   40 -
 .../usergrid/persistence/graph/GraphFig.java    |   39 +-
 .../persistence/graph/GraphManager.java         |  169 ++
 .../persistence/graph/GraphManagerFactory.java  |   40 +
 .../graph/consistency/AsyncProcessorImpl.java   |   48 +-
 .../graph/consistency/TimeoutTask.java          |    2 +-
 .../persistence/graph/guice/EdgeWrite.java      |   37 -
 .../persistence/graph/guice/GraphModule.java    |   14 +-
 .../graph/hystrix/HystrixGraphObservable.java   |   71 +
 .../graph/impl/CollectionIndexObserver.java     |   14 +-
 .../graph/impl/EdgeDeleteListener.java          |   68 +-
 .../persistence/graph/impl/EdgeManagerImpl.java |  408 -----
 .../graph/impl/EdgeWriteListener.java           |  103 --
 .../graph/impl/GraphManagerImpl.java            |  384 +++++
 .../graph/impl/NodeDeleteListener.java          |  216 ++-
 .../graph/impl/SimpleSearchByEdgeType.java      |   38 +
 .../graph/impl/stage/AbstractEdgeRepair.java    |   47 +-
 .../graph/impl/stage/EdgeDeleteRepairImpl.java  |    4 +-
 .../graph/impl/stage/EdgeMetaRepairImpl.java    |   33 +-
 .../graph/impl/stage/EdgeWriteRepair.java       |   44 -
 .../graph/impl/stage/EdgeWriteRepairImpl.java   |   76 -
 .../graph/serialization/EdgeSerialization.java  |   12 +-
 .../impl/EdgeMetadataSerializationImpl.java     |   19 +-
 .../impl/EdgeSerializationImpl.java             |  256 +--
 .../impl/parse/ColumnNameIterator.java          |   38 +-
 .../impl/parse/ObservableIterator.java          |   26 +-
 .../persistence/graph/EdgeManagerIT.java        | 1468 -----------------
 .../graph/EdgeManagerStressTest.java            |  313 ----
 .../persistence/graph/GraphManagerIT.java       | 1497 ++++++++++++++++++
 .../graph/GraphManagerStressTest.java           |  317 ++++
 .../graph/GraphManagerTimeoutIT.java            |  230 +++
 .../graph/consistency/AsyncProcessorTest.java   |   25 +-
 .../consistency/LocalTimeoutQueueTest.java      |    2 +-
 .../graph/guice/TestGraphModule.java            |    4 +-
 .../graph/impl/NodeDeleteListenerTest.java      |  221 ++-
 .../graph/impl/stage/EdgeDeleteRepairTest.java  |    6 +-
 .../graph/impl/stage/EdgeMetaRepairTest.java    |   83 +-
 .../graph/impl/stage/EdgeWriteRepairTest.java   |  220 ---
 .../EdgeSerializationChopTest.java              |   35 +-
 .../serialization/EdgeSerializationTest.java    |  206 ++-
 .../serialization/NodeSerializationTest.java    |   13 +-
 .../graph/serialization/TestCount.java          |  125 ++
 .../serialization/util/EdgeHasherTest.java      |   14 +-
 .../graph/test/util/EdgeTestUtils.java          |    7 +-
 .../graph/src/test/resources/log4j.properties   |   36 +
 stack/corepersistence/pom.xml                   |    3 +
 57 files changed, 3858 insertions(+), 4007 deletions(-)
----------------------------------------------------------------------