Updated Branches: refs/heads/trunk 2bdc23892 -> 9b59a345f
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/giraph into trunk Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/9b59a345 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/9b59a345 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/9b59a345 Branch: refs/heads/trunk Commit: 9b59a345f2100b943b188c58739d1ddff856935a Parents: 88fc6a2 2bdc238 Author: Claudio Martella <[email protected]> Authored: Sun Feb 17 22:29:46 2013 +0100 Committer: Claudio Martella <[email protected]> Committed: Sun Feb 17 22:29:46 2013 +0100 ---------------------------------------------------------------------- CHANGELOG | 6 + .../edgemarker/AccumuloEdgeInputFormat.java | 4 +- .../main/java/org/apache/giraph/GiraphRunner.java | 236 ++--------- .../ByteArrayVertexPageRankBenchmark.java | 39 ++ ...MultiGraphByteArrayVertexPageRankBenchmark.java | 39 ++ .../apache/giraph/benchmark/PageRankBenchmark.java | 16 +- .../java/org/apache/giraph/comm/SendCache.java | 179 ++++++++ .../java/org/apache/giraph/comm/SendEdgeCache.java | 97 +++++ .../org/apache/giraph/comm/SendMessageCache.java | 138 +------ .../java/org/apache/giraph/comm/ServerData.java | 11 + .../giraph/comm/WorkerClientRequestProcessor.java | 13 + .../java/org/apache/giraph/comm/WorkerServer.java | 7 - .../messages/ByteArrayMessagesPerVertexStore.java | 16 +- .../netty/NettyWorkerClientRequestProcessor.java | 71 +++- .../giraph/comm/netty/NettyWorkerServer.java | 11 +- .../apache/giraph/comm/requests/RequestType.java | 2 + .../comm/requests/SendWorkerDataRequest.java | 111 +++++ .../comm/requests/SendWorkerEdgesRequest.java | 76 ++++ .../comm/requests/SendWorkerMessagesRequest.java | 73 +--- .../apache/giraph/conf/GiraphConfiguration.java | 18 +- .../org/apache/giraph/conf/GiraphConstants.java | 50 ++- .../conf/ImmutableClassesGiraphConfiguration.java | 45 ++- .../java/org/apache/giraph/graph/DefaultEdge.java | 4 +- .../java/org/apache/giraph/graph/EdgeFactory.java | 89 ++++ .../java/org/apache/giraph/graph/EdgeNoValue.java | 9 +- .../java/org/apache/giraph/graph/EdgeStore.java | 176 ++++++++ .../org/apache/giraph/graph/VertexMutations.java | 13 +- .../giraph/io/formats/GiraphFileInputFormat.java | 13 +- .../io/formats/IntIntNullIntTextInputFormat.java | 4 +- .../io/formats/IntNullTextEdgeInputFormat.java | 3 +- .../io/formats/JsonBase64VertexInputFormat.java | 4 +- ...JsonLongDoubleFloatDoubleVertexInputFormat.java | 5 +- ...DoubleDoubleAdjacencyListVertexInputFormat.java | 5 +- .../io/formats/PseudoRandomEdgeInputFormat.java | 4 +- .../io/formats/PseudoRandomVertexInputFormat.java | 6 +- ...DoubleDoubleAdjacencyListVertexInputFormat.java | 4 +- .../giraph/io/formats/TextEdgeInputFormat.java | 10 +- .../giraph/job/GiraphConfigurationValidator.java | 330 +++++++++++++++ .../main/java/org/apache/giraph/job/GiraphJob.java | 53 +--- .../org/apache/giraph/job/GiraphTypeValidator.java | 282 ------------ .../giraph/partition/ByteArrayPartition.java | 18 +- .../giraph/partition/DiskBackedPartitionStore.java | 29 +- .../org/apache/giraph/utils/ByteArrayEdges.java | 290 +++++++++++++ .../apache/giraph/utils/ByteArrayVertexIdData.java | 226 ++++++++++ .../giraph/utils/ByteArrayVertexIdEdges.java | 84 ++++ .../giraph/utils/ByteArrayVertexIdMessages.java | 240 +++--------- .../apache/giraph/utils/ConfigurationUtils.java | 325 ++++++++++++++ .../org/apache/giraph/utils/EdgeIterables.java | 7 +- .../apache/giraph/utils/InternalVertexRunner.java | 4 +- .../UnmodifiableLongFloatEdgeArrayIterable.java | 6 +- .../UnmodifiableLongNullEdgeArrayIterable.java | 4 +- .../org/apache/giraph/utils/VertexIdIterator.java | 85 ++++ .../org/apache/giraph/utils/WritableUtils.java | 33 ++ .../org/apache/giraph/vertex/ByteArrayVertex.java | 63 +++ .../apache/giraph/vertex/ByteArrayVertexBase.java | 126 ++++++ .../org/apache/giraph/vertex/EdgeListVertex.java | 2 +- .../apache/giraph/vertex/EdgeListVertexBase.java | 10 +- .../org/apache/giraph/vertex/HashMapVertex.java | 4 +- .../giraph/vertex/LongDoubleFloatDoubleVertex.java | 5 +- .../giraph/vertex/MultiGraphByteArrayVertex.java | 49 +++ .../apache/giraph/vertex/SimpleMutableVertex.java | 6 +- .../main/java/org/apache/giraph/vertex/Vertex.java | 4 +- .../org/apache/giraph/worker/BspServiceWorker.java | 6 +- .../giraph/worker/EdgeInputSplitsCallable.java | 2 +- .../org/apache/giraph/comm/RequestFailureTest.java | 6 +- .../java/org/apache/giraph/comm/RequestTest.java | 11 +- .../TestAdjacencyListTextVertexOutputFormat.java | 14 +- .../org/apache/giraph/io/TestJsonBase64Format.java | 3 +- ...DoubleDoubleAdjacencyListVertexInputFormat.java | 15 +- ...DoubleDoubleAdjacencyListVertexInputFormat.java | 16 +- .../partition/TestGiraphTransferRegulator.java | 13 +- .../java/org/apache/giraph/utils/MockUtils.java | 1 + .../giraph/vertex/TestIntIntNullIntVertex.java | 6 +- .../apache/giraph/vertex/TestMultiGraphVertex.java | 40 +- .../apache/giraph/vertex/TestMutableVertex.java | 24 +- .../LongDoubleFloatDoubleTextInputFormat.java | 4 +- ...lizingLongDoubleFloatDoubleTextInputFormat.java | 5 +- .../giraph/examples/SimpleCheckpointVertex.java | 7 +- .../giraph/examples/SimpleMutateGraphVertex.java | 5 +- .../giraph/examples/SimplePageRankVertex.java | 5 +- .../giraph/examples/SimpleSuperstepVertex.java | 5 +- .../org/apache/giraph/examples/VerifyMessage.java | 6 +- .../examples/SimpleShortestPathsVertexTest.java | 23 +- .../examples/SimpleTriangleClosingVertexTest.java | 6 +- .../org/apache/giraph/vertex/TestVertexTypes.java | 63 ++-- .../io/hbase/edgemarker/TableEdgeInputFormat.java | 4 +- .../io/hcatalog/HCatalogEdgeInputFormat.java | 7 +- .../io/hcatalog/HCatalogVertexInputFormat.java | 10 +- 88 files changed, 2973 insertions(+), 1226 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/9b59a345/giraph-core/src/main/java/org/apache/giraph/conf/GiraphConstants.java ----------------------------------------------------------------------
