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/25 16:21:41 UTC

[42/43] 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/aae2a8df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aae2a8df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aae2a8df

Branch: refs/heads/asyncqueue
Commit: aae2a8dfb14f54d17e555980f32ef1998a3e0552
Parents: 63b3721 167f7a8
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Mar 25 08:17:41 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Mar 25 08:17:41 2014 -0700

----------------------------------------------------------------------
 stack/corepersistence/collection/pom.xml        |  37 +-
 .../collection/EntityCollectionManager.java     |   3 +
 .../collection/hystrix/CassandraCommand.java    |  74 ---
 .../collection/hystrix/CommandUtils.java        |  28 --
 .../impl/EntityCollectionManagerImpl.java       |   6 +-
 .../mvcc/stage/delete/MarkCommit.java           |   2 +-
 .../collection/mvcc/stage/delete/MarkStart.java |   2 +-
 .../collection/mvcc/stage/load/Load.java        |   2 +-
 .../mvcc/stage/write/WriteCommit.java           |   2 +-
 .../mvcc/stage/write/WriteOptimisticVerify.java |   2 +-
 .../collection/mvcc/stage/write/WriteStart.java |   2 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |   5 +-
 .../collection/rx/CassandraThreadScheduler.java |   2 +-
 .../rx/CassandraThreadSchedulerTest.java        | 130 +++++-
 .../persistence/collection/rx/ParallelTest.java |  67 ++-
 .../src/test/resources/log4j.properties         |   1 +
 .../usergrid/persistence/graph/EdgeManager.java |   2 +-
 .../usergrid/persistence/graph/GraphFig.java    |  26 ++
 .../graph/consistency/AsyncProcessor.java       |  55 ++-
 .../graph/consistency/AsyncProcessorImpl.java   | 134 +++---
 .../graph/consistency/AsynchronousMessage.java  |  18 +
 .../graph/consistency/CompleteListener.java     |  14 +
 .../graph/consistency/ErrorListener.java        |  15 +
 .../graph/consistency/LocalTimeoutQueue.java    | 102 +++++
 .../graph/consistency/MessageListener.java      |  24 +
 .../consistency/SimpleAsynchronousMessage.java  |  31 ++
 .../graph/consistency/SimpleTimeoutEvent.java   |  30 --
 .../graph/consistency/TimeoutEvent.java         |  18 -
 .../graph/consistency/TimeoutQueue.java         |  15 +-
 .../graph/consistency/TimeoutTask.java          |  61 +++
 .../persistence/graph/guice/EdgeDelete.java     |  37 ++
 .../persistence/graph/guice/EdgeWrite.java      |  37 ++
 .../persistence/graph/guice/GraphModule.java    |  45 +-
 .../persistence/graph/guice/NodeDelete.java     |  37 ++
 .../graph/impl/EdgeDeleteListener.java          | 201 +++++++++
 .../persistence/graph/impl/EdgeEvent.java       |  42 ++
 .../persistence/graph/impl/EdgeManagerImpl.java |  99 ++--
 .../graph/impl/EdgeWriteListener.java           | 103 +++++
 .../graph/impl/NodeDeleteListener.java          | 262 +++++++++++
 .../graph/impl/stage/AbstractEdgeRepair.java    | 172 +++++++
 .../graph/impl/stage/EdgeDeleteRepair.java      |  45 ++
 .../graph/impl/stage/EdgeDeleteRepairImpl.java  |  76 ++++
 .../graph/impl/stage/EdgeMetaRepair.java        |  62 +++
 .../graph/impl/stage/EdgeMetaRepairImpl.java    | 336 ++++++++++++++
 .../graph/impl/stage/EdgeWriteRepair.java       |  44 ++
 .../graph/impl/stage/EdgeWriteRepairImpl.java   |  76 ++++
 .../EdgeMetadataSerialization.java              |  78 +++-
 .../graph/serialization/EdgeSerialization.java  |   4 +-
 .../graph/serialization/NodeSerialization.java  |   2 +-
 .../impl/EdgeMetadataSerializationImpl.java     |  61 ++-
 .../impl/EdgeSerializationImpl.java             |  12 +-
 .../impl/parse/ColumnNameIterator.java          |  46 +-
 .../impl/parse/ObservableIterator.java          |  18 +-
 .../graph/EdgeManagerStressTest.java            | 313 +++++++++++++
 .../graph/consistency/AsyncProcessorTest.java   | 183 ++++++--
 .../consistency/LocalTimeoutQueueTest.java      | 164 +++++++
 .../graph/impl/NodeDeleteListenerTest.java      | 220 +++++++++
 .../graph/impl/stage/EdgeDeleteRepairTest.java  | 217 +++++++++
 .../graph/impl/stage/EdgeMetaRepairTest.java    | 451 +++++++++++++++++++
 .../graph/impl/stage/EdgeWriteRepairTest.java   | 220 +++++++++
 .../serialization/EdgeSerializationTest.java    |  61 +++
 ...-cassandra-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 619559 bytes
 ...-cassandra-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 161970 bytes
 ...astyanax-cassandra-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 224466 bytes
 ...astyanax-cassandra-1.56.49-SNAPSHOT-UG-1.pom | 112 +++++
 .../1.56.49-SNAPSHOT/_maven.repositories        |   4 -
 ...yanax-cassandra-1.56.49-SNAPSHOT-javadoc.jar | Bin 629128 -> 0 bytes
 ...x-cassandra-1.56.49-SNAPSHOT-sources.sources | Bin 161845 -> 0 bytes
 .../astyanax-cassandra-1.56.49-SNAPSHOT.jar     | Bin 224329 -> 0 bytes
 .../astyanax-cassandra-1.56.49-SNAPSHOT.pom     | 112 -----
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../1.56.49-SNAPSHOT/resolver-status.properties |   4 -
 .../astyanax-cassandra/maven-metadata-local.xml |   6 +-
 ...ax-contrib-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 33178 bytes
 ...ax-contrib-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 2314 bytes
 .../astyanax-contrib-1.56.49-SNAPSHOT-UG-1.jar  | Bin 0 -> 4842 bytes
 .../astyanax-contrib-1.56.49-SNAPSHOT-UG-1.pom  | 112 +++++
 ...styanax-contrib-1.56.49-SNAPSHOT-javadoc.jar | Bin 32792 -> 0 bytes
 ...nax-contrib-1.56.49-SNAPSHOT-sources.sources | Bin 2314 -> 0 bytes
 .../astyanax-contrib-1.56.49-SNAPSHOT.jar       | Bin 4842 -> 0 bytes
 .../astyanax-contrib-1.56.49-SNAPSHOT.pom       | 112 -----
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../astyanax-contrib/maven-metadata-local.xml   |   6 +-
 ...yanax-core-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 522906 bytes
 ...yanax-core-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 141910 bytes
 .../astyanax-core-1.56.49-SNAPSHOT-UG-1.jar     | Bin 0 -> 212858 bytes
 .../astyanax-core-1.56.49-SNAPSHOT-UG-1.pom     |  88 ++++
 .../1.56.49-SNAPSHOT/_maven.repositories        |   4 -
 .../astyanax-core-1.56.49-SNAPSHOT-javadoc.jar  | Bin 532409 -> 0 bytes
 ...tyanax-core-1.56.49-SNAPSHOT-sources.sources | Bin 141819 -> 0 bytes
 .../astyanax-core-1.56.49-SNAPSHOT.jar          | Bin 212622 -> 0 bytes
 .../astyanax-core-1.56.49-SNAPSHOT.pom          |  88 ----
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../1.56.49-SNAPSHOT/resolver-status.properties |   4 -
 .../astyanax-core/maven-metadata-local.xml      |   6 +-
 ...ity-mapper-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 97513 bytes
 ...ity-mapper-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 30591 bytes
 ...anax-entity-mapper-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 68952 bytes
 ...anax-entity-mapper-1.56.49-SNAPSHOT-UG-1.pom | 118 +++++
 ...x-entity-mapper-1.56.49-SNAPSHOT-javadoc.jar | Bin 97504 -> 0 bytes
 ...tity-mapper-1.56.49-SNAPSHOT-sources.sources | Bin 30591 -> 0 bytes
 .../astyanax-entity-mapper-1.56.49-SNAPSHOT.jar | Bin 68862 -> 0 bytes
 .../astyanax-entity-mapper-1.56.49-SNAPSHOT.pom | 118 -----
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../maven-metadata-local.xml                    |   6 +-
 ...x-examples-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 38284 bytes
 ...x-examples-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 4457 bytes
 .../astyanax-examples-1.56.49-SNAPSHOT-UG-1.jar | Bin 0 -> 8506 bytes
 .../astyanax-examples-1.56.49-SNAPSHOT-UG-1.pom | 106 +++++
 ...tyanax-examples-1.56.49-SNAPSHOT-javadoc.jar | Bin 37847 -> 0 bytes
 ...ax-examples-1.56.49-SNAPSHOT-sources.sources | Bin 4457 -> 0 bytes
 .../astyanax-examples-1.56.49-SNAPSHOT.jar      | Bin 8506 -> 0 bytes
 .../astyanax-examples-1.56.49-SNAPSHOT.pom      | 106 -----
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../astyanax-examples/maven-metadata-local.xml  |   6 +-
 ...anax-queue-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 180462 bytes
 ...anax-queue-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 44057 bytes
 .../astyanax-queue-1.56.49-SNAPSHOT-UG-1.jar    | Bin 0 -> 86586 bytes
 .../astyanax-queue-1.56.49-SNAPSHOT-UG-1.pom    | 112 +++++
 .../astyanax-queue-1.56.49-SNAPSHOT-javadoc.jar | Bin 182179 -> 0 bytes
 ...yanax-queue-1.56.49-SNAPSHOT-sources.sources | Bin 44057 -> 0 bytes
 .../astyanax-queue-1.56.49-SNAPSHOT.jar         | Bin 86544 -> 0 bytes
 .../astyanax-queue-1.56.49-SNAPSHOT.pom         | 112 -----
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../astyanax-queue/maven-metadata-local.xml     |   6 +-
 ...ax-recipes-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 204424 bytes
 ...ax-recipes-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 58161 bytes
 .../astyanax-recipes-1.56.49-SNAPSHOT-UG-1.jar  | Bin 0 -> 100246 bytes
 .../astyanax-recipes-1.56.49-SNAPSHOT-UG-1.pom  | 106 +++++
 ...styanax-recipes-1.56.49-SNAPSHOT-javadoc.jar | Bin 207654 -> 0 bytes
 ...nax-recipes-1.56.49-SNAPSHOT-sources.sources | Bin 58161 -> 0 bytes
 .../astyanax-recipes-1.56.49-SNAPSHOT.jar       | Bin 100070 -> 0 bytes
 .../astyanax-recipes-1.56.49-SNAPSHOT.pom       | 106 -----
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../astyanax-recipes/maven-metadata-local.xml   |   6 +-
 ...nax-thrift-1.56.49-SNAPSHOT-UG-1-javadoc.jar | Bin 0 -> 197342 bytes
 ...nax-thrift-1.56.49-SNAPSHOT-UG-1-sources.jar | Bin 0 -> 76509 bytes
 .../astyanax-thrift-1.56.49-SNAPSHOT-UG-1.jar   | Bin 0 -> 239007 bytes
 .../astyanax-thrift-1.56.49-SNAPSHOT-UG-1.pom   | 112 +++++
 .../1.56.49-SNAPSHOT/_maven.repositories        |   4 -
 ...astyanax-thrift-1.56.49-SNAPSHOT-javadoc.jar | Bin 199736 -> 0 bytes
 ...anax-thrift-1.56.49-SNAPSHOT-sources.sources | Bin 75715 -> 0 bytes
 .../astyanax-thrift-1.56.49-SNAPSHOT.jar        | Bin 235822 -> 0 bytes
 .../astyanax-thrift-1.56.49-SNAPSHOT.pom        | 112 -----
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../1.56.49-SNAPSHOT/resolver-status.properties |   4 -
 .../astyanax-thrift/maven-metadata-local.xml    |   6 +-
 .../astyanax-1.56.49-SNAPSHOT-UG-1-javadoc.jar  | Bin 0 -> 261 bytes
 .../astyanax-1.56.49-SNAPSHOT-UG-1-sources.jar  | Bin 0 -> 261 bytes
 .../astyanax-1.56.49-SNAPSHOT-UG-1.jar          | Bin 0 -> 261 bytes
 .../astyanax-1.56.49-SNAPSHOT-UG-1.pom          | 136 ++++++
 .../astyanax-1.56.49-SNAPSHOT-javadoc.jar       | Bin 261 -> 0 bytes
 .../astyanax-1.56.49-SNAPSHOT-sources.sources   | Bin 261 -> 0 bytes
 .../astyanax-1.56.49-SNAPSHOT.jar               | Bin 261 -> 0 bytes
 .../astyanax-1.56.49-SNAPSHOT.pom               | 136 ------
 .../1.56.49-SNAPSHOT/maven-metadata-local.xml   |  12 -
 .../astyanax/astyanax/maven-metadata-local.xml  |   6 +-
 .../netflix/astyanax/maven-metadata-local.xml   |  12 -
 stack/corepersistence/pom.xml                   |   3 +-
 159 files changed, 5194 insertions(+), 1645 deletions(-)
----------------------------------------------------------------------