You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ni...@apache.org on 2013/03/21 18:15:50 UTC

[4/6] git commit: Merge branch 'me-master' into partition-values

Merge branch 'me-master' into partition-values


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/86153fd3
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/86153fd3
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/86153fd3

Branch: refs/heads/partition-values-575
Commit: 86153fd3ad9bea1c50a43afd2332a4ab72cffceb
Parents: 1bed236 5bb956c
Author: Nitay Joffe <ni...@apache.org>
Authored: Wed Mar 20 17:36:14 2013 -0400
Committer: Nitay Joffe <ni...@apache.org>
Committed: Wed Mar 20 17:36:14 2013 -0400

----------------------------------------------------------------------
 CHANGELOG                                          |    6 +
 .../comm/aggregators/AllAggregatorServerData.java  |   34 ++--
 .../aggregators/OwnerAggregatorServerData.java     |   18 +-
 .../giraph/comm/netty/NettyMasterClient.java       |    3 +-
 .../NettyWorkerAggregatorRequestProcessor.java     |    6 +-
 .../requests/ByteArrayWithSenderTaskIdRequest.java |   71 ++++++
 .../requests/SendAggregatorsToOwnerRequest.java    |   12 +-
 .../requests/SendAggregatorsToWorkerRequest.java   |   10 +-
 .../requests/SendWorkerAggregatorsRequest.java     |   10 +-
 .../conf/ImmutableClassesGiraphConfiguration.java  |   29 ++-
 .../org/apache/giraph/edge/ArrayListEdges.java     |   11 +-
 .../org/apache/giraph/edge/ByteArrayEdges.java     |    4 +-
 .../java/org/apache/giraph/edge/DefaultEdge.java   |    2 +-
 .../java/org/apache/giraph/edge/EdgeFactory.java   |   14 +-
 .../java/org/apache/giraph/edge/EdgeNoValue.java   |    2 +-
 .../java/org/apache/giraph/edge/EdgeStore.java     |    3 +-
 .../java/org/apache/giraph/edge/HashMapEdges.java  |   35 ++-
 .../org/apache/giraph/edge/HashMultimapEdges.java  |    4 +-
 .../apache/giraph/edge/LongDoubleArrayEdges.java   |   76 ++++++-
 .../apache/giraph/edge/LongDoubleHashMapEdges.java |   80 ++++++-
 .../org/apache/giraph/edge/LongNullArrayEdges.java |   44 +++--
 .../apache/giraph/edge/LongNullHashSetEdges.java   |   30 ++-
 .../org/apache/giraph/edge/MapMutableEdge.java     |   61 +++++
 .../java/org/apache/giraph/edge/MutableEdge.java   |   12 +-
 .../apache/giraph/edge/MutableEdgesIterable.java   |  102 ++++++++
 .../apache/giraph/edge/MutableEdgesWrapper.java    |  183 +++++++++++++++
 .../org/apache/giraph/edge/MutableVertexEdges.java |   42 ++++
 .../java/org/apache/giraph/edge/ReusableEdge.java  |   43 ++++
 .../giraph/edge/StrictRandomAccessVertexEdges.java |    9 +
 .../org/apache/giraph/graph/ComputeCallable.java   |    2 +
 .../main/java/org/apache/giraph/graph/Vertex.java  |   66 ++++++
 .../giraph/utils/ByteArrayVertexIdEdges.java       |    2 +-
 .../org/apache/giraph/utils/ExpectedBarrier.java   |  125 ----------
 .../org/apache/giraph/utils/PairListWritable.java  |   76 ------
 .../apache/giraph/utils/TaskIdsPermitsBarrier.java |  155 ++++++++++++
 .../giraph/worker/WorkerAggregatorHandler.java     |   31 ++-
 .../org/apache/giraph/edge/TestNullValueEdges.java |   46 ++++-
 .../giraph/edge/TestStrictRandomAccessEdges.java   |    3 +
 .../apache/giraph/graph/TestVertexAndEdges.java    |  169 +++++++++++++-
 .../LongDoubleNullDoubleTextInputFormat.java       |  106 +++++++++
 .../org/apache/giraph/examples/PageRankVertex.java |   56 +++++
 .../apache/giraph/examples/RandomWalkVertex.java   |   98 ++++++--
 .../examples/RandomWalkWithRestartVertex.java      |   36 ++--
 .../giraph/examples/RandomWalkWorkerContext.java   |   26 ++-
 ...texWithDoubleValueNullEdgeTextOutputFormat.java |   59 +++++
 .../apache/giraph/examples/PageRankVertexTest.java |   89 +++++++
 .../giraph/examples/RandomWalkTestUtils.java       |   46 ++++
 .../examples/RandomWalkWithRestartVertexTest.java  |   46 ++---
 .../giraph/hive/input/edge/HiveEdgeReader.java     |   10 +-
 49 files changed, 1792 insertions(+), 411 deletions(-)
----------------------------------------------------------------------