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/01/31 17:17:35 UTC
[2/2] git commit: GIRAPH-494: Make Edge an interface (nitay)
Updated Branches:
refs/heads/trunk 6fd9f12da -> 10ad3c025
GIRAPH-494: Make Edge an interface (nitay)
Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/10ad3c02
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/10ad3c02
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/10ad3c02
Branch: refs/heads/trunk
Commit: 10ad3c025fb501a1c79d349de115f9605c5e1e0b
Parents: 6fd9f12
Author: Nitay Joffe <ni...@apache.org>
Authored: Wed Jan 30 16:15:09 2013 -0500
Committer: Nitay Joffe <ni...@apache.org>
Committed: Thu Jan 31 11:17:26 2013 -0500
----------------------------------------------------------------------
CHANGELOG | 2 +
.../edgemarker/AccumuloEdgeInputFormat.java | 5 +-
.../org/apache/giraph/comm/SendMutationsCache.java | 8 +-
.../giraph/comm/WorkerClientRequestProcessor.java | 4 +-
.../netty/NettyWorkerClientRequestProcessor.java | 10 +-
.../conf/ImmutableClassesGiraphConfiguration.java | 13 ++-
.../LongDoubleFloatDoubleTextInputFormat.java | 5 +-
...lizingLongDoubleFloatDoubleTextInputFormat.java | 5 +-
.../apache/giraph/examples/RandomWalkVertex.java | 6 +-
.../giraph/examples/SimpleCheckpointVertex.java | 11 +-
.../giraph/examples/SimpleInDegreeCountVertex.java | 8 +-
.../giraph/examples/SimpleMutateGraphVertex.java | 4 +-
.../giraph/examples/SimplePageRankVertex.java | 11 +-
.../giraph/examples/SimpleSuperstepVertex.java | 7 +-
.../examples/SimpleTriangleClosingVertex.java | 8 +-
.../org/apache/giraph/examples/VerifyMessage.java | 6 +-
.../java/org/apache/giraph/graph/DefaultEdge.java | 107 +++++++++++++++
.../main/java/org/apache/giraph/graph/Edge.java | 93 +------------
.../java/org/apache/giraph/graph/EdgeNoValue.java | 91 ++++++++++++
.../java/org/apache/giraph/graph/MutableEdge.java | 47 +++++++
.../org/apache/giraph/graph/VertexChanges.java | 4 +-
.../org/apache/giraph/graph/VertexMutations.java | 30 +++--
.../io/formats/IntIntNullIntTextInputFormat.java | 6 +-
.../io/formats/JsonBase64VertexInputFormat.java | 3 +-
...JsonLongDoubleFloatDoubleVertexInputFormat.java | 3 +-
...DoubleDoubleAdjacencyListVertexInputFormat.java | 7 +-
.../io/formats/PseudoRandomEdgeInputFormat.java | 4 +-
.../io/formats/PseudoRandomVertexInputFormat.java | 7 +-
...DoubleDoubleAdjacencyListVertexInputFormat.java | 3 +-
.../giraph/io/formats/TextEdgeInputFormat.java | 6 +-
.../giraph/io/formats/TextVertexInputFormat.java | 7 +-
.../org/apache/giraph/utils/EdgeIterables.java | 8 +-
.../UnmodifiableLongFloatEdgeArrayIterable.java | 7 +-
.../UnmodifiableLongNullEdgeArrayIterable.java | 8 +-
.../apache/giraph/vertex/EdgeListVertexBase.java | 9 +-
.../org/apache/giraph/vertex/HashMapVertex.java | 11 +-
.../giraph/vertex/IntNullNullNullVertex.java | 4 +-
.../LongDoubleFloatDoubleEdgeListVertex.java | 4 +-
.../giraph/vertex/LongDoubleFloatDoubleVertex.java | 7 +-
.../giraph/vertex/LongDoubleNullDoubleVertex.java | 4 +-
.../giraph/vertex/RepresentativeVertexBase.java | 17 ++-
.../apache/giraph/vertex/SimpleMutableVertex.java | 16 +-
.../org/apache/giraph/vertex/SimpleVertex.java | 4 +-
.../main/java/org/apache/giraph/vertex/Vertex.java | 8 +-
.../java/org/apache/giraph/comm/RequestTest.java | 16 +-
.../examples/SimpleShortestPathsVertexTest.java | 10 +-
.../examples/SimpleTriangleClosingVertexTest.java | 12 +-
.../TestAdjacencyListTextVertexOutputFormat.java | 28 ++--
...DoubleDoubleAdjacencyListVertexInputFormat.java | 10 +-
...DoubleDoubleAdjacencyListVertexInputFormat.java | 35 +++--
.../partition/TestGiraphTransferRegulator.java | 20 ++--
.../giraph/vertex/TestIntIntNullIntVertex.java | 11 +-
.../apache/giraph/vertex/TestMultiGraphVertex.java | 20 ++--
.../apache/giraph/vertex/TestMutableVertex.java | 29 +++--
.../io/hbase/edgemarker/TableEdgeInputFormat.java | 5 +-
.../io/hcatalog/HCatalogEdgeInputFormat.java | 92 +++++++++++-
.../io/hcatalog/HCatalogVertexInputFormat.java | 8 +-
57 files changed, 613 insertions(+), 321 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 5177255..aec8fdf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-494: Make Edge an interface (nitay)
+
GIRAPH-492: Saving vertices has no status report, making it hard to
find DFS issues (aching)
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-accumulo/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-accumulo/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java b/giraph-accumulo/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java
index 4f0d253..8586dae 100644
--- a/giraph-accumulo/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java
+++ b/giraph-accumulo/src/test/java/org/apache/giraph/io/accumulo/edgemarker/AccumuloEdgeInputFormat.java
@@ -19,10 +19,11 @@ package org.apache.giraph.io.accumulo.edgemarker;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.io.VertexReader;
import org.apache.giraph.io.accumulo.AccumuloVertexInputFormat;
+import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.InputSplit;
@@ -86,7 +87,7 @@ public class AccumuloEdgeInputFormat
List<Edge<Text, Text>> edges = Lists.newLinkedList();
String edge = new String(value.get());
Text edgeId = new Text(edge);
- edges.add(new Edge<Text, Text>(edgeId, uselessEdgeValue));
+ edges.add(new DefaultEdge<Text, Text>(edgeId, uselessEdgeValue));
vertex.initialize(vertexId, new Text(), edges);
return vertex;
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/comm/SendMutationsCache.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/SendMutationsCache.java b/giraph-core/src/main/java/org/apache/giraph/comm/SendMutationsCache.java
index f39d991..9ea968a 100644
--- a/giraph-core/src/main/java/org/apache/giraph/comm/SendMutationsCache.java
+++ b/giraph-core/src/main/java/org/apache/giraph/comm/SendMutationsCache.java
@@ -17,15 +17,15 @@
*/
package org.apache.giraph.comm;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.graph.VertexMutations;
+import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Aggregates the mutations to be sent to partitions so they can be sent in
* bulk.
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/comm/WorkerClientRequestProcessor.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/WorkerClientRequestProcessor.java b/giraph-core/src/main/java/org/apache/giraph/comm/WorkerClientRequestProcessor.java
index 0ab95f4..0c043e2 100644
--- a/giraph-core/src/main/java/org/apache/giraph/comm/WorkerClientRequestProcessor.java
+++ b/giraph-core/src/main/java/org/apache/giraph/comm/WorkerClientRequestProcessor.java
@@ -18,10 +18,10 @@
package org.apache.giraph.comm;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.Vertex;
-import org.apache.giraph.worker.WorkerInfo;
import org.apache.giraph.partition.Partition;
import org.apache.giraph.partition.PartitionOwner;
+import org.apache.giraph.vertex.Vertex;
+import org.apache.giraph.worker.WorkerInfo;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientRequestProcessor.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientRequestProcessor.java b/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientRequestProcessor.java
index 3db41bb..2a4ee8d 100644
--- a/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientRequestProcessor.java
+++ b/giraph-core/src/main/java/org/apache/giraph/comm/netty/NettyWorkerClientRequestProcessor.java
@@ -17,6 +17,7 @@
*/
package org.apache.giraph.comm.netty;
+import org.apache.giraph.bsp.BspService;
import org.apache.giraph.bsp.CentralizedServiceWorker;
import org.apache.giraph.comm.SendMessageCache;
import org.apache.giraph.comm.SendMutationsCache;
@@ -33,17 +34,16 @@ import org.apache.giraph.comm.requests.WorkerRequest;
import org.apache.giraph.comm.requests.WritableRequest;
import org.apache.giraph.conf.GiraphConstants;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
-import org.apache.giraph.bsp.BspService;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.graph.VertexMutations;
-import org.apache.giraph.worker.WorkerInfo;
-import org.apache.giraph.partition.Partition;
-import org.apache.giraph.partition.PartitionOwner;
import org.apache.giraph.metrics.GiraphMetrics;
import org.apache.giraph.metrics.ValueGauge;
+import org.apache.giraph.partition.Partition;
+import org.apache.giraph.partition.PartitionOwner;
import org.apache.giraph.utils.ByteArrayVertexIdMessages;
import org.apache.giraph.utils.PairList;
+import org.apache.giraph.vertex.Vertex;
+import org.apache.giraph.worker.WorkerInfo;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Mapper;
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/conf/ImmutableClassesGiraphConfiguration.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/conf/ImmutableClassesGiraphConfiguration.java b/giraph-core/src/main/java/org/apache/giraph/conf/ImmutableClassesGiraphConfiguration.java
index 1f47039..2513d8f 100644
--- a/giraph-core/src/main/java/org/apache/giraph/conf/ImmutableClassesGiraphConfiguration.java
+++ b/giraph-core/src/main/java/org/apache/giraph/conf/ImmutableClassesGiraphConfiguration.java
@@ -434,15 +434,24 @@ public class ImmutableClassesGiraphConfiguration<I extends WritableComparable,
}
/**
+ * Tell if we are using NullWritable for Edge value.
+ *
+ * @return true if NullWritable is class for
+ */
+ public boolean isEdgeValueNullWritable() {
+ return getEdgeValueClass() == NullWritable.class;
+ }
+
+ /**
* Create a user edge value
*
* @return Instantiated user edge value
*/
public E createEdgeValue() {
- Class<E> klass = getEdgeValueClass();
- if (klass == NullWritable.class) {
+ if (isEdgeValueNullWritable()) {
return (E) NullWritable.get();
} else {
+ Class<E> klass = getEdgeValueClass();
try {
return klass.newInstance();
} catch (InstantiationException e) {
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/LongDoubleFloatDoubleTextInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/LongDoubleFloatDoubleTextInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/examples/LongDoubleFloatDoubleTextInputFormat.java
index 53e83a4..100687b 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/LongDoubleFloatDoubleTextInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/LongDoubleFloatDoubleTextInputFormat.java
@@ -19,9 +19,10 @@
package org.apache.giraph.examples;
import org.apache.giraph.bsp.BspUtils;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.io.formats.TextVertexInputFormat;
+import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.LongWritable;
@@ -73,7 +74,7 @@ public class LongDoubleFloatDoubleTextInputFormat
Lists.newArrayListWithCapacity(tokens.length - 1);
float weight = 1.0f / (tokens.length - 1);
for (int n = 1; n < tokens.length; n++) {
- edges.add(new Edge<LongWritable, FloatWritable>(
+ edges.add(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(Long.parseLong(tokens[n])),
new FloatWritable(weight)));
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/NormalizingLongDoubleFloatDoubleTextInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/NormalizingLongDoubleFloatDoubleTextInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/examples/NormalizingLongDoubleFloatDoubleTextInputFormat.java
index 65bc636..592d78a 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/NormalizingLongDoubleFloatDoubleTextInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/NormalizingLongDoubleFloatDoubleTextInputFormat.java
@@ -19,9 +19,10 @@
package org.apache.giraph.examples;
import org.apache.giraph.bsp.BspUtils;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.io.formats.TextVertexInputFormat;
+import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.LongWritable;
@@ -93,7 +94,7 @@ public class NormalizingLongDoubleFloatDoubleTextInputFormat
Collection<Edge<LongWritable, FloatWritable>> edges) {
for (int n = 1; n < tokens.length; n++) {
String[] parts = weightSeparator.split(tokens[n]);
- edges.add(new Edge<LongWritable, FloatWritable>(
+ edges.add(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(Long.parseLong(parts[0])),
new FloatWritable(Float.parseFloat(parts[1]))));
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/RandomWalkVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/RandomWalkVertex.java b/giraph-core/src/main/java/org/apache/giraph/examples/RandomWalkVertex.java
index 3c0abe7..5669cf2 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/RandomWalkVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/RandomWalkVertex.java
@@ -18,17 +18,17 @@
package org.apache.giraph.examples;
-import java.io.IOException;
-
import org.apache.giraph.aggregators.DoubleSumAggregator;
-import org.apache.giraph.master.DefaultMasterCompute;
import org.apache.giraph.graph.Edge;
+import org.apache.giraph.master.DefaultMasterCompute;
import org.apache.giraph.vertex.LongDoubleFloatDoubleEdgeListVertex;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.log4j.Logger;
+import java.io.IOException;
+
/**
* Base class for executing a random walk on the graph
*/
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java
index b23a163..ee62c99 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java
@@ -24,13 +24,14 @@ import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
import org.apache.giraph.aggregators.LongSumAggregator;
-import org.apache.giraph.master.DefaultMasterCompute;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;
-import org.apache.giraph.worker.WorkerContext;
import org.apache.giraph.io.formats.GeneratedVertexInputFormat;
import org.apache.giraph.io.formats.IdWithValueTextOutputFormat;
+import org.apache.giraph.master.DefaultMasterCompute;
+import org.apache.giraph.vertex.EdgeListVertex;
+import org.apache.giraph.worker.WorkerContext;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.FloatWritable;
@@ -113,8 +114,8 @@ public class SimpleCheckpointVertex implements Tool {
FloatWritable newEdgeValue = new FloatWritable(edge.getValue().get() +
(float) vertexValue);
Edge<LongWritable, FloatWritable> newEdge =
- new Edge<LongWritable, FloatWritable>(edge.getTargetVertexId(),
- newEdgeValue);
+ new DefaultEdge<LongWritable, FloatWritable>(
+ edge.getTargetVertexId(), newEdgeValue);
LOG.info("compute: vertex " + getId() +
" sending edgeValue " + edge.getValue() +
" vertexValue " + vertexValue +
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/SimpleInDegreeCountVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleInDegreeCountVertex.java b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleInDegreeCountVertex.java
index 605d9d5..e05da3e 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleInDegreeCountVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleInDegreeCountVertex.java
@@ -19,9 +19,9 @@
package org.apache.giraph.examples;
import org.apache.giraph.graph.Edge;
-import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.DoubleWritable;
import org.apache.giraph.vertex.EdgeListVertex;
+import org.apache.hadoop.io.DoubleWritable;
+import org.apache.hadoop.io.LongWritable;
/**
* Simple function to return the out degree for each vertex.
@@ -30,8 +30,7 @@ import org.apache.giraph.vertex.EdgeListVertex;
name = "Indegree Count"
)
public class SimpleInDegreeCountVertex extends EdgeListVertex<
- LongWritable, LongWritable,
- DoubleWritable, DoubleWritable> {
+ LongWritable, LongWritable, DoubleWritable, DoubleWritable> {
@Override
public void compute(Iterable<DoubleWritable> messages) {
@@ -49,7 +48,6 @@ public class SimpleInDegreeCountVertex extends EdgeListVertex<
vertexValue.set(sum);
setValue(vertexValue);
voteToHalt();
- return;
}
}
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/SimpleMutateGraphVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleMutateGraphVertex.java b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleMutateGraphVertex.java
index 5d7deb7..d3bd33d 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleMutateGraphVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleMutateGraphVertex.java
@@ -18,7 +18,7 @@
package org.apache.giraph.examples;
-import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.vertex.EdgeListVertex;
import org.apache.giraph.worker.WorkerContext;
import org.apache.hadoop.io.DoubleWritable;
@@ -87,7 +87,7 @@ public class SimpleMutateGraphVertex extends EdgeListVertex<
addVertexRequest(vertexIndex, new DoubleWritable(0.0));
// Add edges to those remote vertices as well
addEdgeRequest(vertexIndex,
- new Edge<LongWritable, FloatWritable>(
+ new DefaultEdge<LongWritable, FloatWritable>(
getId(), new FloatWritable(0.0f)));
} else if (getSuperstep() == 4) {
LOG.debug("Reached superstep " + getSuperstep());
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/SimplePageRankVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/SimplePageRankVertex.java b/giraph-core/src/main/java/org/apache/giraph/examples/SimplePageRankVertex.java
index c3b79b4..ba0242d 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/SimplePageRankVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/SimplePageRankVertex.java
@@ -21,14 +21,15 @@ package org.apache.giraph.examples;
import org.apache.giraph.aggregators.DoubleMaxAggregator;
import org.apache.giraph.aggregators.DoubleMinAggregator;
import org.apache.giraph.aggregators.LongSumAggregator;
-import org.apache.giraph.master.DefaultMasterCompute;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.LongDoubleFloatDoubleVertex;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.io.VertexReader;
-import org.apache.giraph.worker.WorkerContext;
import org.apache.giraph.io.formats.GeneratedVertexInputFormat;
import org.apache.giraph.io.formats.TextVertexOutputFormat;
+import org.apache.giraph.master.DefaultMasterCompute;
+import org.apache.giraph.vertex.LongDoubleFloatDoubleVertex;
+import org.apache.giraph.vertex.Vertex;
+import org.apache.giraph.worker.WorkerContext;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.LongWritable;
@@ -195,7 +196,7 @@ public class SimplePageRankVertex extends LongDoubleFloatDoubleVertex {
(inputSplit.getNumSplits() * totalRecords);
float edgeValue = vertexId.get() * 100f;
List<Edge<LongWritable, FloatWritable>> edges = Lists.newLinkedList();
- edges.add(new Edge<LongWritable, FloatWritable>(
+ edges.add(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(targetVertexId),
new FloatWritable(edgeValue)));
vertex.initialize(vertexId, vertexValue, edges);
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/SimpleSuperstepVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleSuperstepVertex.java b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleSuperstepVertex.java
index 2837a57..09efe88 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleSuperstepVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleSuperstepVertex.java
@@ -18,12 +18,13 @@
package org.apache.giraph.examples;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.EdgeListVertex;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.io.VertexReader;
import org.apache.giraph.io.formats.GeneratedVertexInputFormat;
import org.apache.giraph.io.formats.TextVertexOutputFormat;
+import org.apache.giraph.vertex.EdgeListVertex;
+import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
@@ -97,7 +98,7 @@ public class SimpleSuperstepVertex extends
(vertexId.get() + 1) %
(inputSplit.getNumSplits() * totalRecords);
float edgeValue = vertexId.get() * 100f;
- edges.add(new Edge<LongWritable, FloatWritable>(
+ edges.add(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(targetVertexId),
new FloatWritable(edgeValue)));
vertex.initialize(vertexId, vertexValue, edges);
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
index 484dd8a..469de85 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
@@ -19,17 +19,17 @@
package org.apache.giraph.examples;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.EdgeListVertex;
import org.apache.giraph.utils.ArrayListWritable;
+import org.apache.giraph.vertex.EdgeListVertex;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.NullWritable;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
import java.util.Map;
import java.util.Set;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Maps;
-
/**
* Demonstrates triangle closing in simple,
* unweighted graphs for Giraph.
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/examples/VerifyMessage.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/examples/VerifyMessage.java b/giraph-core/src/main/java/org/apache/giraph/examples/VerifyMessage.java
index 2914360..507a56b 100644
--- a/giraph-core/src/main/java/org/apache/giraph/examples/VerifyMessage.java
+++ b/giraph-core/src/main/java/org/apache/giraph/examples/VerifyMessage.java
@@ -19,8 +19,9 @@
package org.apache.giraph.examples;
import org.apache.giraph.aggregators.LongSumAggregator;
-import org.apache.giraph.master.DefaultMasterCompute;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
+import org.apache.giraph.master.DefaultMasterCompute;
import org.apache.giraph.vertex.EdgeListVertex;
import org.apache.giraph.worker.WorkerContext;
import org.apache.hadoop.io.FloatWritable;
@@ -186,7 +187,8 @@ public class VerifyMessage {
FloatWritable newEdgeValue = new FloatWritable(
edge.getValue().get() + (float) vertexValue);
Edge<LongWritable, FloatWritable> newEdge =
- new Edge<LongWritable, FloatWritable>(edge.getTargetVertexId(),
+ new DefaultEdge<LongWritable, FloatWritable>(
+ edge.getTargetVertexId(),
newEdgeValue);
if (LOG.isDebugEnabled()) {
LOG.debug("compute: vertex " + getId() +
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/graph/DefaultEdge.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/DefaultEdge.java b/giraph-core/src/main/java/org/apache/giraph/graph/DefaultEdge.java
new file mode 100644
index 0000000..46e15f8
--- /dev/null
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/DefaultEdge.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.giraph.graph;
+
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableComparable;
+
+import java.util.Objects;
+
+/**
+ * A complete edge, the target vertex and the edge value. Can only be one
+ * edge with a destination vertex id per edge map.
+ *
+ * @param <I> Vertex index
+ * @param <E> Edge value
+ */
+@SuppressWarnings("rawtypes")
+public class DefaultEdge<I extends WritableComparable, E extends Writable>
+ implements MutableEdge<I, E> {
+ /** Target vertex id */
+ private I targetVertexId = null;
+ /** Edge value */
+ private E value = null;
+
+ /**
+ * Constructor for reflection
+ */
+ public DefaultEdge() { }
+
+ /**
+ * Create the edge with final values
+ *
+ * @param targetVertexId Desination vertex id.
+ * @param value Value of the edge.
+ */
+ public DefaultEdge(I targetVertexId, E value) {
+ this.targetVertexId = targetVertexId;
+ this.value = value;
+ }
+
+ @Override
+ public I getTargetVertexId() {
+ return targetVertexId;
+ }
+
+ @Override
+ public E getValue() {
+ return value;
+ }
+
+ @Override
+ public void setTargetVertexId(I targetVertexId) {
+ this.targetVertexId = targetVertexId;
+ }
+
+ @Override
+ public void setValue(E value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return "(TargetVertexId = " + targetVertexId + ", " +
+ "value = " + value + ")";
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public int compareTo(Edge<I, E> edge) {
+ return targetVertexId.compareTo(edge.getTargetVertexId());
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ DefaultEdge edge = (DefaultEdge) o;
+ return Objects.equals(targetVertexId, edge.targetVertexId) &&
+ Objects.equals(value, edge.value);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(targetVertexId, value);
+ }
+}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/graph/Edge.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/Edge.java b/giraph-core/src/main/java/org/apache/giraph/graph/Edge.java
index b8c4004..185e3c3 100644
--- a/giraph-core/src/main/java/org/apache/giraph/graph/Edge.java
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/Edge.java
@@ -28,104 +28,19 @@ import org.apache.hadoop.io.WritableComparable;
* @param <I> Vertex index
* @param <E> Edge value
*/
-@SuppressWarnings("rawtypes")
-public class Edge<I extends WritableComparable, E extends Writable>
- implements Comparable<Edge<I, E>> {
- /** Target vertex id */
- private I targetVertexId = null;
- /** Edge value */
- private E value = null;
-
- /**
- * Constructor for reflection
- */
- public Edge() { }
-
- /**
- * Create the edge with final values
- *
- * @param targetVertexId Desination vertex id.
- * @param value Value of the edge.
- */
- public Edge(I targetVertexId, E value) {
- this.targetVertexId = targetVertexId;
- this.value = value;
- }
-
+public interface Edge<I extends WritableComparable, E extends Writable>
+ extends Comparable<Edge<I, E>> {
/**
* Get the target vertex index of this edge
*
* @return Target vertex index of this edge
*/
- public I getTargetVertexId() {
- return targetVertexId;
- }
+ I getTargetVertexId();
/**
* Get the edge value of the edge
*
* @return Edge value of this edge
*/
- public E getValue() {
- return value;
- }
-
- /**
- * Set the destination vertex index of this edge.
- *
- * @param targetVertexId new destination vertex
- */
- public void setTargetVertexId(I targetVertexId) {
- this.targetVertexId = targetVertexId;
- }
-
- /**
- * Set the value for this edge.
- *
- * @param value new edge value
- */
- public void setValue(E value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "(TargetVertexId = " + targetVertexId + ", " +
- "value = " + value + ")";
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public int compareTo(Edge<I, E> edge) {
- return targetVertexId.compareTo(edge.getTargetVertexId());
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- Edge edge = (Edge) o;
-
- if (targetVertexId != null ? !targetVertexId.equals(edge.targetVertexId) :
- edge.targetVertexId != null) {
- return false;
- }
- if (value != null ? !value.equals(edge.value) : edge.value != null) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = targetVertexId != null ? targetVertexId.hashCode() : 0;
- result = 31 * result + (value != null ? value.hashCode() : 0);
- return result;
- }
+ E getValue();
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/graph/EdgeNoValue.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/EdgeNoValue.java b/giraph-core/src/main/java/org/apache/giraph/graph/EdgeNoValue.java
new file mode 100644
index 0000000..75a35aa
--- /dev/null
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/EdgeNoValue.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.giraph.graph;
+
+import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.io.WritableComparable;
+
+import java.util.Objects;
+
+/**
+ * An edge that has no value.
+ *
+ * @param <I> Vertex ID
+ */
+public class EdgeNoValue<I extends WritableComparable>
+ implements MutableEdge<I, NullWritable> {
+ /** Target vertex id */
+ private I targetVertexId = null;
+
+ /** Empty constructor */
+ public EdgeNoValue() {
+ // do nothing
+ }
+
+ /**
+ * Constructor with target vertex ID
+ * @param targetVertexId vertex ID
+ */
+ public EdgeNoValue(I targetVertexId) {
+ this.targetVertexId = targetVertexId;
+ }
+
+ @Override
+ public void setTargetVertexId(I targetVertexId) {
+ this.targetVertexId = targetVertexId;
+ }
+
+ @Override
+ public void setValue(NullWritable value) {
+ // do nothing
+ }
+
+ @Override
+ public I getTargetVertexId() {
+ return targetVertexId;
+ }
+
+ @Override
+ public NullWritable getValue() {
+ return NullWritable.get();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ EdgeNoValue edge = (EdgeNoValue) o;
+ return Objects.equals(targetVertexId, edge.targetVertexId);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(targetVertexId);
+ }
+
+ @Override
+ public int compareTo(Edge<I, NullWritable> o) {
+ return targetVertexId.compareTo(o.getTargetVertexId());
+ }
+}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/graph/MutableEdge.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/MutableEdge.java b/giraph-core/src/main/java/org/apache/giraph/graph/MutableEdge.java
new file mode 100644
index 0000000..52e4c47
--- /dev/null
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/MutableEdge.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.giraph.graph;
+
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableComparable;
+
+/**
+ * A complete edge, the target vertex and the edge value. Can only be one
+ * edge with a destination vertex id per edge map. This edge can be mutated,
+ * that is you can set it's target vertex ID and edge value.
+ *
+ * @param <I> Vertex index
+ * @param <E> Edge value
+ */
+public interface MutableEdge<I extends WritableComparable, E extends Writable>
+ extends Edge<I, E> {
+ /**
+ * Set the destination vertex index of this edge.
+ *
+ * @param targetVertexId new destination vertex
+ */
+ void setTargetVertexId(I targetVertexId);
+
+ /**
+ * Set the value for this edge.
+ *
+ * @param value new edge value
+ */
+ void setValue(E value);
+}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/graph/VertexChanges.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/VertexChanges.java b/giraph-core/src/main/java/org/apache/giraph/graph/VertexChanges.java
index b529202..ef61dbb 100644
--- a/giraph-core/src/main/java/org/apache/giraph/graph/VertexChanges.java
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/VertexChanges.java
@@ -18,12 +18,12 @@
package org.apache.giraph.graph;
-import java.util.List;
-
import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
+import java.util.List;
+
/**
* Structure to hold all the possible graph mutations that can occur during a
* superstep.
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/graph/VertexMutations.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/graph/VertexMutations.java b/giraph-core/src/main/java/org/apache/giraph/graph/VertexMutations.java
index d9be165..431d1cf 100644
--- a/giraph-core/src/main/java/org/apache/giraph/graph/VertexMutations.java
+++ b/giraph-core/src/main/java/org/apache/giraph/graph/VertexMutations.java
@@ -18,12 +18,6 @@
package org.apache.giraph.graph;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.giraph.conf.ImmutableClassesGiraphConfigurable;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
import org.apache.giraph.vertex.Vertex;
@@ -32,6 +26,13 @@ import org.apache.hadoop.io.WritableComparable;
import org.json.JSONException;
import org.json.JSONObject;
+import com.google.common.collect.Lists;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.List;
+
/**
* Structure to hold all the possible graph mutations that can occur during a
* superstep.
@@ -47,14 +48,13 @@ public class VertexMutations<I extends WritableComparable,
M extends Writable> implements VertexChanges<I, V, E, M>,
Writable, ImmutableClassesGiraphConfigurable {
/** List of added vertices during the last superstep */
- private final List<Vertex<I, V, E, M>> addedVertexList =
- new ArrayList<Vertex<I, V, E, M>>();
+ private final List<Vertex<I, V, E, M>> addedVertexList = Lists.newArrayList();
/** Count of remove vertex requests */
private int removedVertexCount = 0;
/** List of added edges */
- private final List<Edge<I, E>> addedEdgeList = new ArrayList<Edge<I, E>>();
+ private final List<Edge<I, E>> addedEdgeList = Lists.newArrayList();
/** List of removed edges */
- private final List<I> removedEdgeList = new ArrayList<I>();
+ private final List<I> removedEdgeList = Lists.newArrayList();
/** Configuration */
private ImmutableClassesGiraphConfiguration<I, V, E, M> conf;
@@ -95,9 +95,13 @@ public class VertexMutations<I extends WritableComparable,
for (int i = 0; i < addedEdgeListSize; ++i) {
I destVertex = conf.createVertexId();
destVertex.readFields(input);
- E edgeValue = conf.createEdgeValue();
- edgeValue.readFields(input);
- addedEdgeList.add(new Edge<I, E>(destVertex, edgeValue));
+ if (conf.isEdgeValueNullWritable()) {
+ addedEdgeList.add((Edge<I, E>) new EdgeNoValue<I>(destVertex));
+ } else {
+ E edgeValue = conf.createEdgeValue();
+ edgeValue.readFields(input);
+ addedEdgeList.add(new DefaultEdge<I, E>(destVertex, edgeValue));
+ }
}
int removedEdgeListSize = input.readInt();
for (int i = 0; i < removedEdgeListSize; ++i) {
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntNullIntTextInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntNullIntTextInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntNullIntTextInputFormat.java
index 755cf17..d4d9e61 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntNullIntTextInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/IntIntNullIntTextInputFormat.java
@@ -19,6 +19,7 @@
package org.apache.giraph.io.formats;
import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.EdgeNoValue;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Text;
@@ -83,9 +84,8 @@ public class IntIntNullIntTextInputFormat extends
List<Edge<IntWritable, NullWritable>> edges =
Lists.newArrayListWithCapacity(tokens.length - 1);
for (int n = 1; n < tokens.length; n++) {
- edges.add(new Edge<IntWritable, NullWritable>(
- new IntWritable(Integer.parseInt(tokens[n])),
- NullWritable.get()));
+ edges.add(new EdgeNoValue<IntWritable>(
+ new IntWritable(Integer.parseInt(tokens[n]))));
}
return edges;
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonBase64VertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonBase64VertexInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonBase64VertexInputFormat.java
index a6e17ec..34e6059 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonBase64VertexInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonBase64VertexInputFormat.java
@@ -18,6 +18,7 @@
package org.apache.giraph.io.formats;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
@@ -141,7 +142,7 @@ public class JsonBase64VertexInputFormat<I extends WritableComparable,
targetVertexId.readFields(input);
E edgeValue = getConf().createEdgeValue();
edgeValue.readFields(input);
- edges.add(new Edge<I, E>(targetVertexId, edgeValue));
+ edges.add(new DefaultEdge<I, E>(targetVertexId, edgeValue));
}
return edges;
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonLongDoubleFloatDoubleVertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonLongDoubleFloatDoubleVertexInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonLongDoubleFloatDoubleVertexInputFormat.java
index 443c79a..3a8d5de 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonLongDoubleFloatDoubleVertexInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/JsonLongDoubleFloatDoubleVertexInputFormat.java
@@ -17,6 +17,7 @@
*/
package org.apache.giraph.io.formats;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.io.DoubleWritable;
@@ -89,7 +90,7 @@ public class JsonLongDoubleFloatDoubleVertexInputFormat extends
Lists.newArrayListWithCapacity(jsonEdgeArray.length());
for (int i = 0; i < jsonEdgeArray.length(); ++i) {
JSONArray jsonEdge = jsonEdgeArray.getJSONArray(i);
- edges.add(new Edge<LongWritable, FloatWritable>(
+ edges.add(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(jsonEdge.getLong(0)),
new FloatWritable((float) jsonEdge.getDouble(1))));
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
index ee3dc38..7463777 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/LongDoubleDoubleAdjacencyListVertexInputFormat.java
@@ -17,6 +17,7 @@
*/
package org.apache.giraph.io.formats;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.LongWritable;
@@ -72,10 +73,8 @@ public class LongDoubleDoubleAdjacencyListVertexInputFormat<M extends Writable>
}
@Override
- public Edge<LongWritable, DoubleWritable> decodeEdge(
- String s1,
- String s2) {
- return new Edge<LongWritable, DoubleWritable>(
+ public Edge<LongWritable, DoubleWritable> decodeEdge(String s1, String s2) {
+ return new DefaultEdge<LongWritable, DoubleWritable>(
new LongWritable(Long.valueOf(s1)),
new DoubleWritable(Double.valueOf(s2)));
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomEdgeInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomEdgeInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomEdgeInputFormat.java
index 4428688..9196f18 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomEdgeInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomEdgeInputFormat.java
@@ -21,7 +21,7 @@ package org.apache.giraph.io.formats;
import com.google.common.collect.Sets;
import org.apache.giraph.bsp.BspInputSplit;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
-import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.io.EdgeInputFormat;
import org.apache.giraph.io.EdgeReader;
import org.apache.giraph.graph.EdgeWithSource;
@@ -180,7 +180,7 @@ public class PseudoRandomEdgeInputFormat
}
return new EdgeWithSource<LongWritable, DoubleWritable>(
currentVertexId,
- new Edge<LongWritable, DoubleWritable>(
+ new DefaultEdge<LongWritable, DoubleWritable>(
destVertexId,
new DoubleWritable(random.nextDouble())));
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomVertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomVertexInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomVertexInputFormat.java
index db1b38a..7aae427 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomVertexInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/PseudoRandomVertexInputFormat.java
@@ -18,12 +18,13 @@
package org.apache.giraph.io.formats;
-import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
import org.apache.giraph.bsp.BspInputSplit;
+import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.io.VertexInputFormat;
import org.apache.giraph.io.VertexReader;
+import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Writable;
@@ -171,7 +172,7 @@ public class PseudoRandomVertexInputFormat<M extends Writable> extends
new LongWritable(Math.abs(rand.nextLong()) %
aggregateVertices);
} while (destVertices.contains(destVertexId));
- edges.add(new Edge<LongWritable, DoubleWritable>(
+ edges.add(new DefaultEdge<LongWritable, DoubleWritable>(
destVertexId, new DoubleWritable(rand.nextDouble())));
destVertices.add(destVertexId);
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java
index 2b7abd8..14862f7 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextDoubleDoubleAdjacencyListVertexInputFormat.java
@@ -17,6 +17,7 @@
*/
package org.apache.giraph.io.formats;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.Text;
@@ -70,7 +71,7 @@ public class TextDoubleDoubleAdjacencyListVertexInputFormat<M extends Writable>
@Override
public Edge<Text, DoubleWritable> decodeEdge(String s1, String s2) {
- return new Edge<Text, DoubleWritable>(new Text(s1),
+ return new DefaultEdge<Text, DoubleWritable>(new Text(s1),
new DoubleWritable(Double.valueOf(s2)));
}
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeInputFormat.java
index 293bd0e..45ea61a 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextEdgeInputFormat.java
@@ -19,7 +19,7 @@
package org.apache.giraph.io.formats;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
-import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.io.EdgeInputFormat;
import org.apache.giraph.io.EdgeReader;
import org.apache.giraph.graph.EdgeWithSource;
@@ -159,7 +159,7 @@ public abstract class TextEdgeInputFormat<I extends WritableComparable,
I targetVertexId = getTargetVertexId(line);
E edgeValue = getValue(line);
return new EdgeWithSource<I, E>(sourceVertexId,
- new Edge<I, E>(targetVertexId, edgeValue));
+ new DefaultEdge<I, E>(targetVertexId, edgeValue));
}
@Override
@@ -223,7 +223,7 @@ public abstract class TextEdgeInputFormat<I extends WritableComparable,
I targetVertexId = getTargetVertexId(processed);
E edgeValue = getValue(processed);
return new EdgeWithSource<I, E>(sourceVertexId,
- new Edge<I, E>(targetVertexId, edgeValue));
+ new DefaultEdge<I, E>(targetVertexId, edgeValue));
}
@Override
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/io/formats/TextVertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextVertexInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextVertexInputFormat.java
index 7beddb8..af68300 100644
--- a/giraph-core/src/main/java/org/apache/giraph/io/formats/TextVertexInputFormat.java
+++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/TextVertexInputFormat.java
@@ -20,10 +20,9 @@ package org.apache.giraph.io.formats;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.io.VertexInputFormat;
import org.apache.giraph.io.VertexReader;
-import org.apache.hadoop.conf.Configuration;
+import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
@@ -300,8 +299,7 @@ public abstract class TextVertexInputFormat<I extends WritableComparable,
* @throws IOException
* exception that can be thrown while reading
*/
- protected abstract Iterable<Edge<I, E>> getEdges(T line) throws
- IOException;
+ protected abstract Iterable<Edge<I, E>> getEdges(T line) throws IOException;
}
@@ -334,7 +332,6 @@ public abstract class TextVertexInputFormat<I extends WritableComparable,
T processed = null;
try {
processed = preprocessLine(line);
- Configuration conf = getContext().getConfiguration();
vertex = getConf().createVertex();
vertex.initialize(getId(processed), getValue(processed),
getEdges(processed));
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/utils/EdgeIterables.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/EdgeIterables.java b/giraph-core/src/main/java/org/apache/giraph/utils/EdgeIterables.java
index cf1ea99..51f7409 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/EdgeIterables.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/EdgeIterables.java
@@ -18,13 +18,15 @@
package org.apache.giraph.utils;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.EdgeNoValue;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+
/**
* Utilities for converting between edge iterables and neighbor iterables.
*/
@@ -66,7 +68,7 @@ public class EdgeIterables {
new Function<I, Edge<I, NullWritable>>() {
@Override
public Edge<I, NullWritable> apply(I neighbor) {
- return new Edge<I, NullWritable>(neighbor, NullWritable.get());
+ return new EdgeNoValue<I>(neighbor);
}
});
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongFloatEdgeArrayIterable.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongFloatEdgeArrayIterable.java b/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongFloatEdgeArrayIterable.java
index 759db58..fca4d45 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongFloatEdgeArrayIterable.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongFloatEdgeArrayIterable.java
@@ -18,14 +18,15 @@
package org.apache.giraph.utils;
-import java.util.Iterator;
-
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.LongWritable;
import com.google.common.collect.UnmodifiableIterator;
+import java.util.Iterator;
+
/**
* {@link UnmodifiableIterator} over a pair of primitive long-float arrays.
*/
@@ -59,7 +60,7 @@ public class UnmodifiableLongFloatEdgeArrayIterable extends
@Override
public Edge<LongWritable, FloatWritable> next() {
Edge<LongWritable, FloatWritable> retval =
- new Edge<LongWritable, FloatWritable>(new LongWritable(
+ new DefaultEdge<LongWritable, FloatWritable>(new LongWritable(
longArray[offset]), new FloatWritable(floatArray[offset]));
offset++;
return retval;
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongNullEdgeArrayIterable.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongNullEdgeArrayIterable.java b/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongNullEdgeArrayIterable.java
index bff4f3c..5cc940c 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongNullEdgeArrayIterable.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/UnmodifiableLongNullEdgeArrayIterable.java
@@ -17,14 +17,15 @@
*/
package org.apache.giraph.utils;
-import java.util.Iterator;
-
import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.EdgeNoValue;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.NullWritable;
import com.google.common.collect.UnmodifiableIterator;
+import java.util.Iterator;
+
/**
* {@link UnmodifiableIterator} over a primitive long array with NullWritable
* edges.
@@ -59,8 +60,7 @@ public class UnmodifiableLongNullEdgeArrayIterable extends
@Override
public Edge<LongWritable, NullWritable> next() {
Edge<LongWritable, NullWritable> retval =
- new Edge<LongWritable, NullWritable>(
- new LongWritable(longArray[offset]), NullWritable.get());
+ new EdgeNoValue<LongWritable>(new LongWritable(longArray[offset]));
offset++;
return retval;
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/EdgeListVertexBase.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/EdgeListVertexBase.java b/giraph-core/src/main/java/org/apache/giraph/vertex/EdgeListVertexBase.java
index 3f785ff..6f3918c 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/EdgeListVertexBase.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/EdgeListVertexBase.java
@@ -18,14 +18,15 @@
package org.apache.giraph.vertex;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.log4j.Logger;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -88,7 +89,7 @@ public abstract class EdgeListVertexBase<I extends WritableComparable,
targetVertexId.readFields(in);
E edgeValue = getConf().createEdgeValue();
edgeValue.readFields(in);
- edgeList.add(new Edge<I, E>(targetVertexId, edgeValue));
+ edgeList.add(new DefaultEdge<I, E>(targetVertexId, edgeValue));
}
readHaltBoolean(in);
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/HashMapVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/HashMapVertex.java b/giraph-core/src/main/java/org/apache/giraph/vertex/HashMapVertex.java
index a1b3adf..6bf266e 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/HashMapVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/HashMapVertex.java
@@ -18,15 +18,16 @@
package org.apache.giraph.vertex;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.log4j.Logger;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -96,7 +97,7 @@ public abstract class HashMapVertex<I extends WritableComparable,
@Override
public Edge<I, E> apply(Map.Entry<I, E> edge) {
- return new Edge<I, E>(edge.getKey(), edge.getValue());
+ return new DefaultEdge<I, E>(edge.getKey(), edge.getValue());
}
});
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/IntNullNullNullVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/IntNullNullNullVertex.java b/giraph-core/src/main/java/org/apache/giraph/vertex/IntNullNullNullVertex.java
index ff4f5d9..f36f6db 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/IntNullNullNullVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/IntNullNullNullVertex.java
@@ -18,12 +18,12 @@
package org.apache.giraph.vertex;
-import com.google.common.collect.ImmutableList;
-
import org.apache.giraph.graph.Edge;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.NullWritable;
+import com.google.common.collect.ImmutableList;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleEdgeListVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleEdgeListVertex.java b/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleEdgeListVertex.java
index aabc91a..9d4f6e7 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleEdgeListVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleEdgeListVertex.java
@@ -18,14 +18,14 @@
package org.apache.giraph.vertex;
-import com.google.common.collect.Iterables;
-
import org.apache.giraph.graph.Edge;
import org.apache.giraph.utils.UnmodifiableLongFloatEdgeArrayIterable;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.LongWritable;
+import com.google.common.collect.Iterables;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleVertex.java b/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleVertex.java
index feb67a6..628b215 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleFloatDoubleVertex.java
@@ -17,8 +17,7 @@
*/
package org.apache.giraph.vertex;
-import com.google.common.collect.UnmodifiableIterator;
-
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
@@ -28,6 +27,8 @@ import org.apache.mahout.math.function.LongFloatProcedure;
import org.apache.mahout.math.list.DoubleArrayList;
import org.apache.mahout.math.map.OpenLongFloatHashMap;
+import com.google.common.collect.UnmodifiableIterator;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -101,7 +102,7 @@ public abstract class LongDoubleFloatDoubleVertex
@Override
public Edge<LongWritable, FloatWritable> next() {
long targetVertex = targetVertices[offset++];
- return new Edge<LongWritable, FloatWritable>(
+ return new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(targetVertex),
new FloatWritable(targetVertex));
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleNullDoubleVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleNullDoubleVertex.java b/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleNullDoubleVertex.java
index b86e29f..63f1d28 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleNullDoubleVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/LongDoubleNullDoubleVertex.java
@@ -18,14 +18,14 @@
package org.apache.giraph.vertex;
-import com.google.common.collect.Iterables;
-
import org.apache.giraph.graph.Edge;
import org.apache.giraph.utils.UnmodifiableLongNullEdgeArrayIterable;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.NullWritable;
+import com.google.common.collect.Iterables;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/RepresentativeVertexBase.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/RepresentativeVertexBase.java b/giraph-core/src/main/java/org/apache/giraph/vertex/RepresentativeVertexBase.java
index 2dc840b..4de6ed8 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/RepresentativeVertexBase.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/RepresentativeVertexBase.java
@@ -18,7 +18,9 @@
package org.apache.giraph.vertex;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.MutableEdge;
import org.apache.giraph.utils.ExtendedDataInput;
import org.apache.giraph.utils.ExtendedDataOutput;
import org.apache.hadoop.io.Writable;
@@ -48,7 +50,7 @@ public abstract class RepresentativeVertexBase<
private static final Logger LOG =
Logger.getLogger(RepresentativeVertex.class);
/** Representative edge */
- private final Edge<I, E> representativeEdge = new Edge<I, E>();
+ private final MutableEdge<I, E> representativeEdge = new DefaultEdge<I, E>();
/** Serialized edges */
private byte[] serializedEdges;
/** Byte used in serializedEdges */
@@ -149,18 +151,23 @@ public abstract class RepresentativeVertexBase<
@Override
public final void initialize(I id, V value, Iterable<Edge<I, E>> edges) {
- // Make sure the initial values exist
- representativeEdge.setTargetVertexId(getConf().createVertexId());
- representativeEdge.setValue(getConf().createEdgeValue());
+ setInitialEdgeData();
super.initialize(id, value, edges);
}
@Override
public final void initialize(I id, V value) {
+ setInitialEdgeData();
+ super.initialize(id, value);
+ }
+
+ /**
+ * Initialize representative edge data.
+ */
+ private void setInitialEdgeData() {
// Make sure the initial values exist
representativeEdge.setTargetVertexId(getConf().createVertexId());
representativeEdge.setValue(getConf().createEdgeValue());
- super.initialize(id, value);
}
/**
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleMutableVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleMutableVertex.java b/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleMutableVertex.java
index 9def05d..c5734c4 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleMutableVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleMutableVertex.java
@@ -18,14 +18,15 @@
package org.apache.giraph.vertex;
-import com.google.common.collect.Lists;
-
import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.EdgeNoValue;
import org.apache.giraph.utils.EdgeIterables;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
+import com.google.common.collect.Lists;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -92,24 +93,23 @@ public abstract class SimpleMutableVertex<I extends WritableComparable,
*/
public void addEdgeRequest(I sourceVertexId) throws IOException {
getGraphState().getWorkerClientRequestProcessor().
- addEdgeRequest(sourceVertexId, new Edge<I,
- NullWritable>(sourceVertexId, NullWritable.get()));
+ addEdgeRequest(sourceVertexId, new EdgeNoValue<I>(sourceVertexId));
}
@Override
public void readFields(DataInput in) throws IOException {
- I vertexId = (I) getConf().createVertexId();
+ I vertexId = getConf().createVertexId();
vertexId.readFields(in);
- V vertexValue = (V) getConf().createVertexValue();
+ V vertexValue = getConf().createVertexValue();
vertexValue.readFields(in);
int numEdges = in.readInt();
List<Edge<I, NullWritable>> edges =
Lists.newArrayListWithCapacity(numEdges);
for (int i = 0; i < numEdges; ++i) {
- I targetVertexId = (I) getConf().createVertexId();
+ I targetVertexId = getConf().createVertexId();
targetVertexId.readFields(in);
- edges.add(new Edge<I, NullWritable>(targetVertexId, NullWritable.get()));
+ edges.add(new EdgeNoValue<I>(targetVertexId));
}
initialize(vertexId, vertexValue, edges);
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleVertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleVertex.java b/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleVertex.java
index 38485de..ecea3fb 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleVertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/SimpleVertex.java
@@ -18,14 +18,14 @@
package org.apache.giraph.vertex;
-import com.google.common.collect.Lists;
-
import org.apache.giraph.graph.Edge;
import org.apache.giraph.utils.EdgeIterables;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
+import com.google.common.collect.Lists;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/main/java/org/apache/giraph/vertex/Vertex.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/vertex/Vertex.java b/giraph-core/src/main/java/org/apache/giraph/vertex/Vertex.java
index 4db024f..974232e 100644
--- a/giraph-core/src/main/java/org/apache/giraph/vertex/Vertex.java
+++ b/giraph-core/src/main/java/org/apache/giraph/vertex/Vertex.java
@@ -18,10 +18,9 @@
package org.apache.giraph.vertex;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
import org.apache.giraph.conf.ImmutableClassesGiraphConfigurable;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.graph.GraphState;
import org.apache.giraph.partition.PartitionOwner;
@@ -32,6 +31,9 @@ import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.Mapper;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -360,7 +362,7 @@ public abstract class Vertex<I extends WritableComparable,
targetVertexId.readFields(in);
E edgeValue = (E) getConf().createEdgeValue();
edgeValue.readFields(in);
- edges.add(new Edge<I, E>(targetVertexId, edgeValue));
+ edges.add(new DefaultEdge<I, E>(targetVertexId, edgeValue));
}
initialize(vertexId, vertexValue, edges);
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/test/java/org/apache/giraph/comm/RequestTest.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/comm/RequestTest.java b/giraph-core/src/test/java/org/apache/giraph/comm/RequestTest.java
index 3c0cd85..7187928 100644
--- a/giraph-core/src/test/java/org/apache/giraph/comm/RequestTest.java
+++ b/giraph-core/src/test/java/org/apache/giraph/comm/RequestTest.java
@@ -27,16 +27,17 @@ import org.apache.giraph.comm.requests.SendWorkerMessagesRequest;
import org.apache.giraph.conf.GiraphConfiguration;
import org.apache.giraph.conf.GiraphConstants;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.EdgeListVertex;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.graph.VertexMutations;
-import org.apache.giraph.worker.WorkerInfo;
import org.apache.giraph.partition.Partition;
import org.apache.giraph.partition.PartitionStore;
import org.apache.giraph.utils.ByteArrayVertexIdMessages;
import org.apache.giraph.utils.MockUtils;
import org.apache.giraph.utils.PairList;
+import org.apache.giraph.vertex.EdgeListVertex;
+import org.apache.giraph.vertex.Vertex;
+import org.apache.giraph.worker.WorkerInfo;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.mapreduce.Mapper.Context;
import org.junit.Before;
@@ -206,9 +207,8 @@ public class RequestTest {
Maps.newHashMap();
for (int i = 0; i < 11; ++i) {
VertexMutations<IntWritable, IntWritable, IntWritable, IntWritable>
- mutations =
- new VertexMutations<IntWritable, IntWritable,
- IntWritable, IntWritable>();
+ mutations = new VertexMutations<IntWritable, IntWritable,
+ IntWritable, IntWritable>();
for (int j = 0; j < 3; ++j) {
TestVertex vertex = new TestVertex();
vertex.initialize(new IntWritable(i), new IntWritable(j));
@@ -219,7 +219,7 @@ public class RequestTest {
}
for (int j = 0; j < 5; ++j) {
Edge<IntWritable, IntWritable> edge =
- new Edge<IntWritable, IntWritable>(
+ new DefaultEdge<IntWritable, IntWritable>(
new IntWritable(i), new IntWritable(2*j));
mutations.addEdge(edge);
}
@@ -260,7 +260,7 @@ public class RequestTest {
assertEquals(2, entry.getValue().getRemovedVertexCount());
int removeEdgeValueSum = 0;
for (Edge<IntWritable, IntWritable> edge :
- entry.getValue().getAddedEdgeList()) {
+ entry.getValue().getAddedEdgeList()) {
removeEdgeValueSum += edge.getValue().get();
}
assertEquals(20, removeEdgeValueSum);
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java b/giraph-core/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
index 8037e9e..7a7b148 100644
--- a/giraph-core/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
+++ b/giraph-core/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
@@ -22,7 +22,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.giraph.conf.GiraphClasses;
-import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.io.formats.JsonLongDoubleFloatDoubleVertexInputFormat;
import org.apache.giraph.io.formats.JsonLongDoubleFloatDoubleVertexOutputFormat;
import org.apache.giraph.utils.InternalVertexRunner;
@@ -52,9 +52,9 @@ public class SimpleShortestPathsVertexTest {
SimpleShortestPathsVertex vertex = new SimpleShortestPathsVertex();
vertex.initialize(null, null);
- vertex.addEdge(new Edge<LongWritable, FloatWritable>(
+ vertex.addEdge(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(10L), new FloatWritable(2.5f)));
- vertex.addEdge(new Edge<LongWritable, FloatWritable>(
+ vertex.addEdge(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(20L), new FloatWritable(0.5f)));
MockUtils.MockedEnvironment<LongWritable, DoubleWritable, FloatWritable,
@@ -85,9 +85,9 @@ public class SimpleShortestPathsVertexTest {
SimpleShortestPathsVertex vertex = new SimpleShortestPathsVertex();
vertex.initialize(new LongWritable(0), new DoubleWritable(0.0));
- vertex.addEdge(new Edge<LongWritable, FloatWritable>(
+ vertex.addEdge(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(10L), new FloatWritable(2.5f)));
- vertex.addEdge(new Edge<LongWritable, FloatWritable>(
+ vertex.addEdge(new DefaultEdge<LongWritable, FloatWritable>(
new LongWritable(20L), new FloatWritable(0.5f)));
MockUtils.MockedEnvironment<LongWritable, DoubleWritable, FloatWritable,
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java b/giraph-core/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java
index 6af7339..7e7b13d 100644
--- a/giraph-core/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java
+++ b/giraph-core/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java
@@ -18,16 +18,16 @@
package org.apache.giraph.examples;
-import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.EdgeNoValue;
import org.apache.giraph.utils.MockUtils;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.NullWritable;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
import com.google.common.collect.Lists;
+import static org.junit.Assert.assertEquals;
+
/**
* Contains a simple unit test for {@link SimpleTriangleClosingVertex}
*/
@@ -45,10 +45,8 @@ public class SimpleTriangleClosingVertexTest {
SimpleTriangleClosingVertex.IntArrayListWritable alw =
new SimpleTriangleClosingVertex.IntArrayListWritable();
vertex.initialize(null, null);
- vertex.addEdge(new Edge<IntWritable, NullWritable>(new IntWritable(5),
- NullWritable.get()));
- vertex.addEdge(new Edge<IntWritable, NullWritable>(new IntWritable(7),
- NullWritable.get()));
+ vertex.addEdge(new EdgeNoValue<IntWritable>(new IntWritable(5)));
+ vertex.addEdge(new EdgeNoValue<IntWritable>(new IntWritable(7)));
MockUtils.MockedEnvironment<IntWritable,
SimpleTriangleClosingVertex.IntArrayListWritable,
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/test/java/org/apache/giraph/io/TestAdjacencyListTextVertexOutputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/io/TestAdjacencyListTextVertexOutputFormat.java b/giraph-core/src/test/java/org/apache/giraph/io/TestAdjacencyListTextVertexOutputFormat.java
index 76686a0..3a258d9 100644
--- a/giraph-core/src/test/java/org/apache/giraph/io/TestAdjacencyListTextVertexOutputFormat.java
+++ b/giraph-core/src/test/java/org/apache/giraph/io/TestAdjacencyListTextVertexOutputFormat.java
@@ -17,9 +17,10 @@
*/
package org.apache.giraph.io;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.graph.Edge;
-import org.apache.giraph.vertex.Vertex;
import org.apache.giraph.io.formats.AdjacencyListTextVertexOutputFormat;
+import org.apache.giraph.vertex.Vertex;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.Text;
@@ -29,14 +30,17 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.junit.Test;
import org.mockito.Matchers;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
public class TestAdjacencyListTextVertexOutputFormat extends AdjacencyListTextVertexOutputFormat<Text, DoubleWritable, DoubleWritable> {
@@ -85,12 +89,11 @@ public class TestAdjacencyListTextVertexOutputFormat extends AdjacencyListTextVe
when(vertex.getId()).thenReturn(new Text("San Francisco"));
when(vertex.getValue()).thenReturn(new DoubleWritable(0d));
when(vertex.getTotalNumEdges()).thenReturn(2l);
- ArrayList<Edge<Text, DoubleWritable>> cities = new ArrayList<Edge<Text,
- DoubleWritable>>();
+ List<Edge<Text, DoubleWritable>> cities = Lists.newArrayList();
Collections.addAll(cities,
- new Edge<Text, DoubleWritable>(
+ new DefaultEdge<Text, DoubleWritable>(
new Text("Los Angeles"), new DoubleWritable(347.16)),
- new Edge<Text, DoubleWritable>(
+ new DefaultEdge<Text, DoubleWritable>(
new Text("Phoenix"), new DoubleWritable(652.48)));
when(vertex.getEdges()).thenReturn(cities);
@@ -117,12 +120,11 @@ public class TestAdjacencyListTextVertexOutputFormat extends AdjacencyListTextVe
when(vertex.getId()).thenReturn(new Text("San Francisco"));
when(vertex.getValue()).thenReturn(new DoubleWritable(0d));
when(vertex.getTotalNumEdges()).thenReturn(2l);
- ArrayList<Edge<Text, DoubleWritable>> cities = new ArrayList<Edge<Text,
- DoubleWritable>>();
+ List<Edge<Text, DoubleWritable>> cities = Lists.newArrayList();
Collections.addAll(cities,
- new Edge<Text, DoubleWritable>(
+ new DefaultEdge<Text, DoubleWritable>(
new Text("Los Angeles"), new DoubleWritable(347.16)),
- new Edge<Text, DoubleWritable>(
+ new DefaultEdge<Text, DoubleWritable>(
new Text("Phoenix"), new DoubleWritable(652.48)));
when(vertex.getEdges()).thenReturn(cities);
http://git-wip-us.apache.org/repos/asf/giraph/blob/10ad3c02/giraph-core/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java b/giraph-core/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java
index 1b1ebb0..824e09e 100644
--- a/giraph-core/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java
+++ b/giraph-core/src/test/java/org/apache/giraph/io/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java
@@ -19,7 +19,7 @@ package org.apache.giraph.io;
import org.apache.giraph.conf.GiraphConstants;
-import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.DefaultEdge;
import org.apache.giraph.io.formats.AdjacencyListTextVertexInputFormat;
import org.apache.giraph.io.formats.LongDoubleDoubleAdjacencyListVertexInputFormat;
import org.apache.giraph.vertex.EdgeListVertex;
@@ -138,9 +138,9 @@ public class TestLongDoubleDoubleAdjacencyListVertexInputFormat extends LongDoub
setGraphState(vertex, graphState);
assertValidVertex(conf, graphState, vertex,
new LongWritable(42), new DoubleWritable(0.1),
- new Edge<LongWritable, DoubleWritable>(new LongWritable(99), new DoubleWritable(0.2)),
- new Edge<LongWritable, DoubleWritable>(new LongWritable(2000), new DoubleWritable(0.3)),
- new Edge<LongWritable, DoubleWritable>(new LongWritable(4000), new DoubleWritable(0.4)));
+ new DefaultEdge<LongWritable, DoubleWritable>(new LongWritable(99), new DoubleWritable(0.2)),
+ new DefaultEdge<LongWritable, DoubleWritable>(new LongWritable(2000), new DoubleWritable(0.3)),
+ new DefaultEdge<LongWritable, DoubleWritable>(new LongWritable(4000), new DoubleWritable(0.4)));
assertEquals(vertex.getNumEdges(), 3);
}
@@ -158,7 +158,7 @@ public class TestLongDoubleDoubleAdjacencyListVertexInputFormat extends LongDoub
vertex = vr.getCurrentVertex();
setGraphState(vertex, graphState);
assertValidVertex(conf, graphState, vertex, new LongWritable(12345), new DoubleWritable(42.42),
- new Edge<LongWritable, DoubleWritable>(new LongWritable(9999999), new DoubleWritable(99.9)));
+ new DefaultEdge<LongWritable, DoubleWritable>(new LongWritable(9999999), new DoubleWritable(99.9)));
assertEquals(vertex.getNumEdges(), 1);
}