You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by ac...@apache.org on 2012/07/25 01:37:45 UTC
svn commit: r1365352 [4/4] - in /giraph/trunk: ./
giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/
giraph-formats-contrib/src/test/java/org/apache/giraph/format/accumulo/edgemarker/
giraph-formats-contrib/src/test/java/org/apache...
Modified: giraph/trunk/src/main/java/org/apache/giraph/lib/LongDoubleDoubleAdjacencyListVertexInputFormat.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/lib/LongDoubleDoubleAdjacencyListVertexInputFormat.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/lib/LongDoubleDoubleAdjacencyListVertexInputFormat.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/lib/LongDoubleDoubleAdjacencyListVertexInputFormat.java Tue Jul 24 23:37:42 2012
@@ -87,8 +87,8 @@ public class LongDoubleDoubleAdjacencyLi
String s1,
String s2,
Edge<LongWritable, DoubleWritable> textIntWritableEdge) {
- textIntWritableEdge.setDestVertexId(new LongWritable(Long.valueOf(s1)));
- textIntWritableEdge.setEdgeValue(new DoubleWritable(Double.valueOf(s2)));
+ textIntWritableEdge.setTargetVertexId(new LongWritable(Long.valueOf(s1)));
+ textIntWritableEdge.setValue(new DoubleWritable(Double.valueOf(s2)));
}
}
Modified: giraph/trunk/src/main/java/org/apache/giraph/lib/SequenceFileVertexInputFormat.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/lib/SequenceFileVertexInputFormat.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/lib/SequenceFileVertexInputFormat.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/lib/SequenceFileVertexInputFormat.java Tue Jul 24 23:37:42 2012
@@ -17,7 +17,7 @@
*/
package org.apache.giraph.lib;
-import org.apache.giraph.graph.BasicVertex;
+import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.VertexInputFormat;
import org.apache.giraph.graph.VertexReader;
import org.apache.hadoop.io.Writable;
@@ -43,7 +43,7 @@ import java.util.List;
@SuppressWarnings("rawtypes")
public class SequenceFileVertexInputFormat<I extends WritableComparable,
V extends Writable, E extends Writable, M extends Writable,
- X extends BasicVertex<I, V, E, M>>
+ X extends Vertex<I, V, E, M>>
extends VertexInputFormat<I, V, E, M> {
/** Internal input format */
protected SequenceFileInputFormat<I, X> sequenceFileInputFormat =
@@ -73,7 +73,7 @@ public class SequenceFileVertexInputForm
*/
public static class SequenceFileVertexReader<I extends WritableComparable,
V extends Writable, E extends Writable, M extends Writable,
- X extends BasicVertex<I, V, E, M>>
+ X extends Vertex<I, V, E, M>>
implements VertexReader<I, V, E, M> {
/** Internal record reader from {@link SequenceFileInputFormat} */
private final RecordReader<I, X> recordReader;
@@ -97,7 +97,7 @@ public class SequenceFileVertexInputForm
return recordReader.nextKeyValue();
}
- @Override public BasicVertex<I, V, E, M> getCurrentVertex()
+ @Override public Vertex<I, V, E, M> getCurrentVertex()
throws IOException, InterruptedException {
return recordReader.getCurrentValue();
}
Modified: giraph/trunk/src/main/java/org/apache/giraph/lib/TextDoubleDoubleAdjacencyListVertexInputFormat.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/lib/TextDoubleDoubleAdjacencyListVertexInputFormat.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/lib/TextDoubleDoubleAdjacencyListVertexInputFormat.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/lib/TextDoubleDoubleAdjacencyListVertexInputFormat.java Tue Jul 24 23:37:42 2012
@@ -80,8 +80,8 @@ public class TextDoubleDoubleAdjacencyLi
@Override
public void decodeEdge(String s1, String s2,
Edge<Text, DoubleWritable> textIntWritableEdge) {
- textIntWritableEdge.setDestVertexId(new Text(s1));
- textIntWritableEdge.setEdgeValue(new DoubleWritable(Double.valueOf(s2)));
+ textIntWritableEdge.setTargetVertexId(new Text(s1));
+ textIntWritableEdge.setValue(new DoubleWritable(Double.valueOf(s2)));
}
}
Modified: giraph/trunk/src/test/java/org/apache/giraph/TestBspBasic.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/TestBspBasic.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/TestBspBasic.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/TestBspBasic.java Tue Jul 24 23:37:42 2012
@@ -18,15 +18,6 @@
package org.apache.giraph;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.google.common.base.Charsets;
-import com.google.common.collect.Maps;
-import com.google.common.io.Closeables;
-
import org.apache.giraph.aggregators.DoubleMaxAggregator;
import org.apache.giraph.aggregators.DoubleMinAggregator;
import org.apache.giraph.aggregators.LongSumAggregator;
@@ -38,17 +29,17 @@ import org.apache.giraph.examples.Simple
import org.apache.giraph.examples.SimplePageRankVertex;
import org.apache.giraph.examples.SimplePageRankVertex.SimplePageRankVertexInputFormat;
import org.apache.giraph.examples.SimpleShortestPathsVertex;
-import org.apache.giraph.lib.JsonLongDoubleFloatDoubleVertexOutputFormat;
import org.apache.giraph.examples.SimpleSumCombiner;
import org.apache.giraph.examples.SimpleSuperstepVertex;
import org.apache.giraph.examples.SimpleSuperstepVertex.SimpleSuperstepVertexInputFormat;
import org.apache.giraph.examples.SimpleSuperstepVertex.SimpleSuperstepVertexOutputFormat;
-import org.apache.giraph.graph.BasicVertex;
import org.apache.giraph.graph.BspUtils;
import org.apache.giraph.graph.GiraphJob;
import org.apache.giraph.graph.GraphState;
import org.apache.giraph.graph.TextAggregatorWriter;
+import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.VertexInputFormat;
+import org.apache.giraph.lib.JsonLongDoubleFloatDoubleVertexOutputFormat;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileStatus;
@@ -66,6 +57,17 @@ import org.apache.hadoop.mapreduce.JobCo
else[HADOOP_NON_SASL_RPC]*/
import org.apache.hadoop.mapreduce.task.JobContextImpl;
/*end[HADOOP_NON_SASL_RPC]*/
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.Maps;
+import com.google.common.io.Closeables;
+
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
@@ -75,8 +77,6 @@ import java.lang.reflect.InvocationTarge
import java.util.List;
import java.util.Map;
-import org.junit.Test;
-
/**
* Unit test for many simple BSP applications.
*/
@@ -112,7 +112,7 @@ public class TestBspBasic extends BspCas
GraphState<LongWritable, IntWritable, FloatWritable, IntWritable> gs =
new GraphState<LongWritable, IntWritable,
FloatWritable, IntWritable>();
- BasicVertex<LongWritable, IntWritable, FloatWritable, IntWritable> vertex =
+ Vertex<LongWritable, IntWritable, FloatWritable, IntWritable> vertex =
BspUtils.createVertex(job.getConfiguration());
vertex.initialize(null, null, null, null);
System.out.println("testInstantiateVertex: Got vertex " + vertex +
@@ -432,7 +432,7 @@ public class TestBspBasic extends BspCas
fs.delete(valuesFile, false);
}
}
-
+
/**
* Run a sample BSP job locally and test MasterCompute.
*
Modified: giraph/trunk/src/test/java/org/apache/giraph/TestVertexTypes.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/TestVertexTypes.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/TestVertexTypes.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/TestVertexTypes.java Tue Jul 24 23:37:42 2012
@@ -18,15 +18,12 @@
package org.apache.giraph;
-import java.io.IOException;
-import java.util.Iterator;
-
import org.apache.giraph.examples.GeneratedVertexInputFormat;
import org.apache.giraph.examples.SimpleSuperstepVertex.SimpleSuperstepVertexInputFormat;
-import org.apache.giraph.graph.BasicVertex;
import org.apache.giraph.graph.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;
import org.apache.giraph.graph.GraphMapper;
+import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.VertexCombiner;
import org.apache.giraph.graph.VertexInputFormat;
import org.apache.giraph.graph.VertexOutputFormat;
@@ -40,6 +37,8 @@ import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.junit.Test;
+import java.io.IOException;
+
public class TestVertexTypes {
@@ -50,8 +49,8 @@ public class TestVertexTypes {
EdgeListVertex<LongWritable, IntWritable, FloatWritable,
FloatWritable> {
@Override
- public void compute(Iterator<FloatWritable> msgIterator)
- throws IOException {
+ public void compute(Iterable<FloatWritable> messages)
+ throws IOException {
}
}
@@ -68,7 +67,7 @@ public class TestVertexTypes {
EdgeListVertex<LongWritable, FloatWritable, FloatWritable,
FloatWritable> {
@Override
- public void compute(Iterator<FloatWritable> msgIterator)
+ public void compute(Iterable<FloatWritable> messages)
throws IOException {
}
}
@@ -108,7 +107,7 @@ public class TestVertexTypes {
Configuration conf = new Configuration();
conf.setClass(GiraphJob.VERTEX_CLASS,
GeneratedVertexMatch.class,
- BasicVertex.class);
+ Vertex.class);
conf.setClass(GiraphJob.VERTEX_INPUT_FORMAT_CLASS,
SimpleSuperstepVertexInputFormat.class,
VertexInputFormat.class);
@@ -126,7 +125,7 @@ public class TestVertexTypes {
Configuration conf = new Configuration();
conf.setClass(GiraphJob.VERTEX_CLASS,
DerivedVertexMatch.class,
- BasicVertex.class);
+ Vertex.class);
conf.setClass(GiraphJob.VERTEX_INPUT_FORMAT_CLASS,
SimpleSuperstepVertexInputFormat.class,
VertexInputFormat.class);
@@ -141,7 +140,7 @@ public class TestVertexTypes {
Configuration conf = new Configuration();
conf.setClass(GiraphJob.VERTEX_CLASS,
DerivedVertexMatch.class,
- BasicVertex.class);
+ Vertex.class);
conf.setClass(GiraphJob.VERTEX_INPUT_FORMAT_CLASS,
SimpleSuperstepVertexInputFormat.class,
VertexInputFormat.class);
@@ -156,7 +155,7 @@ public class TestVertexTypes {
Configuration conf = new Configuration();
conf.setClass(GiraphJob.VERTEX_CLASS,
GeneratedVertexMismatch.class,
- BasicVertex.class);
+ Vertex.class);
conf.setClass(GiraphJob.VERTEX_INPUT_FORMAT_CLASS,
SimpleSuperstepVertexInputFormat.class,
VertexInputFormat.class);
@@ -176,7 +175,7 @@ public class TestVertexTypes {
Configuration conf = new Configuration();
conf.setClass(GiraphJob.VERTEX_CLASS,
GeneratedVertexMatch.class,
- BasicVertex.class);
+ Vertex.class);
conf.setClass(GiraphJob.VERTEX_INPUT_FORMAT_CLASS,
SimpleSuperstepVertexInputFormat.class,
VertexInputFormat.class);
@@ -199,7 +198,7 @@ public class TestVertexTypes {
Configuration conf = new Configuration();
conf.setClass(GiraphJob.VERTEX_CLASS,
GeneratedVertexMatch.class,
- BasicVertex.class);
+ Vertex.class);
conf.setClass(GiraphJob.VERTEX_INPUT_FORMAT_CLASS,
JsonBase64VertexInputFormat.class,
VertexInputFormat.class);
Modified: giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/comm/RequestTest.java Tue Jul 24 23:37:42 2012
@@ -18,10 +18,10 @@
package org.apache.giraph.comm;
-import org.apache.giraph.graph.BasicVertex;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.graph.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;
+import org.apache.giraph.graph.Vertex;
import org.apache.giraph.graph.VertexMutations;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IntWritable;
@@ -42,7 +42,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
@@ -69,7 +68,7 @@ public class RequestTest {
public static class TestVertex extends EdgeListVertex<IntWritable,
IntWritable, IntWritable, IntWritable> {
@Override
- public void compute(Iterator<IntWritable> msgIterator) throws IOException {
+ public void compute(Iterable<IntWritable> messages) throws IOException {
}
}
@@ -80,8 +79,8 @@ public class RequestTest {
// Setup the conf
conf = new Configuration();
- conf.setClass(GiraphJob.VERTEX_CLASS, TestVertex.class, BasicVertex.class);
- conf.setClass(GiraphJob.VERTEX_INDEX_CLASS,
+ conf.setClass(GiraphJob.VERTEX_CLASS, TestVertex.class, Vertex.class);
+ conf.setClass(GiraphJob.VERTEX_ID_CLASS,
IntWritable.class, WritableComparable.class);
conf.setClass(GiraphJob.VERTEX_VALUE_CLASS,
IntWritable.class, Writable.class);
@@ -92,7 +91,8 @@ public class RequestTest {
// Start the service
serverData =
- new ServerData<IntWritable, IntWritable, IntWritable, IntWritable>(conf);
+ new ServerData<IntWritable, IntWritable, IntWritable,
+ IntWritable>(conf);
server =
new NettyServer<IntWritable, IntWritable, IntWritable, IntWritable>(
conf, serverData);
@@ -107,9 +107,9 @@ public class RequestTest {
public void sendVertexPartition() throws IOException {
// Data to send
int partitionId = 13;
- Collection<BasicVertex<IntWritable, IntWritable, IntWritable,
- IntWritable>> vertices =
- new ArrayList<BasicVertex<IntWritable, IntWritable,
+ Collection<Vertex<IntWritable, IntWritable, IntWritable,
+ IntWritable>> vertices =
+ new ArrayList<Vertex<IntWritable, IntWritable,
IntWritable, IntWritable>>();
for (int i = 0; i < 10; ++i) {
TestVertex vertex = new TestVertex();
@@ -130,16 +130,16 @@ public class RequestTest {
server.stop();
// Check the output
- Map<Integer, Collection<BasicVertex<IntWritable, IntWritable,
+ Map<Integer, Collection<Vertex<IntWritable, IntWritable,
IntWritable, IntWritable>>> partitionVertexMap =
serverData.getPartitionVertexMap();
synchronized (partitionVertexMap) {
assertTrue(partitionVertexMap.containsKey(partitionId));
int total = 0;
- for (BasicVertex<IntWritable, IntWritable,
+ for (Vertex<IntWritable, IntWritable,
IntWritable, IntWritable> vertex :
(partitionVertexMap.get(partitionId))) {
- total += vertex.getVertexId().get();
+ total += vertex.getId().get();
}
assertEquals(total, 45);
}
@@ -245,16 +245,16 @@ public class RequestTest {
synchronized (entry.getValue()) {
keySum += entry.getKey().get();
int vertexValueSum = 0;
- for (BasicVertex<IntWritable, IntWritable, IntWritable, IntWritable>
+ for (Vertex<IntWritable, IntWritable, IntWritable, IntWritable>
vertex : entry.getValue().getAddedVertexList()) {
- vertexValueSum += vertex.getVertexValue().get();
+ vertexValueSum += vertex.getValue().get();
}
assertEquals(3, vertexValueSum);
assertEquals(2, entry.getValue().getRemovedVertexCount());
int removeEdgeValueSum = 0;
for (Edge<IntWritable, IntWritable> edge :
entry.getValue().getAddedEdgeList()) {
- removeEdgeValueSum += edge.getEdgeValue().get();
+ removeEdgeValueSum += edge.getValue().get();
}
assertEquals(20, removeEdgeValueSum);
}
Modified: giraph/trunk/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java Tue Jul 24 23:37:42 2012
@@ -18,28 +18,28 @@
package org.apache.giraph.examples;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Map;
-
+import org.apache.giraph.lib.JsonLongDoubleFloatDoubleVertexInputFormat;
+import org.apache.giraph.lib.JsonLongDoubleFloatDoubleVertexOutputFormat;
import org.apache.giraph.utils.InternalVertexRunner;
import org.apache.giraph.utils.MockUtils;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.LongWritable;
-import org.apache.giraph.lib.JsonLongDoubleFloatDoubleVertexInputFormat;
-import org.apache.giraph.lib.JsonLongDoubleFloatDoubleVertexOutputFormat;
import org.json.JSONArray;
import org.json.JSONException;
import org.junit.Test;
import org.mockito.Mockito;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import java.util.Map;
+
/**
* Contains a simple unit test for {@link SimpleShortestPathsVertex}
*/
@@ -66,10 +66,10 @@ public class SimpleShortestPathsVertexTe
SimpleShortestPathsVertex.SOURCE_ID_DEFAULT)).thenReturn(2L);
vertex.compute(Lists.newArrayList(new DoubleWritable(2),
- new DoubleWritable(1.5)).iterator());
+ new DoubleWritable(1.5)));
assertTrue(vertex.isHalted());
- assertEquals(1.5, vertex.getVertexValue().get());
+ assertEquals(1.5, vertex.getValue().get());
env.verifyMessageSent(new LongWritable(10L), new DoubleWritable(4));
env.verifyMessageSent(new LongWritable(20L), new DoubleWritable(2));
@@ -96,10 +96,10 @@ public class SimpleShortestPathsVertexTe
SimpleShortestPathsVertex.SOURCE_ID_DEFAULT)).thenReturn(2L);
vertex.compute(Lists.newArrayList(new DoubleWritable(2),
- new DoubleWritable(1.5)).iterator());
+ new DoubleWritable(1.5)));
assertTrue(vertex.isHalted());
- assertEquals(0.5, vertex.getVertexValue().get());
+ assertEquals(0.5, vertex.getValue().get());
env.verifyNoMessageSent();
}
Modified: giraph/trunk/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/examples/SimpleTriangleClosingVertexTest.java Tue Jul 24 23:37:42 2012
@@ -70,7 +70,7 @@ public class SimpleTriangleClosingVertex
iaw, false);
vertex.compute(Lists.<IntWritable>newArrayList(
- new IntWritable(83), new IntWritable(42)).iterator());
+ new IntWritable(83), new IntWritable(42)));
env.verifyMessageSent(new IntWritable(5), new IntWritable(5));
env.verifyMessageSent(new IntWritable(5), new IntWritable(7));
Modified: giraph/trunk/src/test/java/org/apache/giraph/graph/TestEdgeListVertex.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/graph/TestEdgeListVertex.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/graph/TestEdgeListVertex.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/graph/TestEdgeListVertex.java Tue Jul 24 23:37:42 2012
@@ -17,21 +17,29 @@
*/
package org.apache.giraph.graph;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import org.apache.giraph.utils.WritableUtils;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.*;
+import org.apache.hadoop.io.DoubleWritable;
+import org.apache.hadoop.io.FloatWritable;
+import org.apache.hadoop.io.IntWritable;
+import org.apache.hadoop.io.LongWritable;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableComparable;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
import java.io.IOException;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.*;
-
/**
* Tests {@link EdgeListVertex}.
*/
@@ -48,8 +56,7 @@ public class TestEdgeListVertex {
EdgeListVertex<IntWritable, FloatWritable, DoubleWritable,
LongWritable> {
@Override
- public void compute(Iterator<LongWritable> msgIterator)
- throws IOException {
+ public void compute(Iterable<LongWritable> messages) throws IOException {
}
}
@@ -62,7 +69,7 @@ public class TestEdgeListVertex {
}
job.setVertexClass(IFDLEdgeListVertex.class);
Configuration conf = job.getConfiguration();
- conf.setClass(GiraphJob.VERTEX_INDEX_CLASS, IntWritable.class,
+ conf.setClass(GiraphJob.VERTEX_ID_CLASS, IntWritable.class,
WritableComparable.class);
conf.setClass(GiraphJob.VERTEX_VALUE_CLASS, FloatWritable.class,
Writable.class);
@@ -87,19 +94,14 @@ public class TestEdgeListVertex {
edgeMap.put(new IntWritable(i), new DoubleWritable(i * 2.0));
}
vertex.initialize(null, null, edgeMap, null);
- assertEquals(vertex.getNumOutEdges(), 1000);
- int expectedIndex = 1;
- for (Iterator<IntWritable> edges = vertex.getOutEdgesIterator();
- edges.hasNext();) {
- IntWritable index = edges.next();
- assertEquals(index.get(), expectedIndex);
- assertEquals(vertex.getEdgeValue(index).get(),
- expectedIndex * 2.0d);
- ++expectedIndex;
+ assertEquals(vertex.getNumEdges(), 1000);
+ for (Edge<IntWritable, DoubleWritable> edge : vertex.getEdges()) {
+ assertEquals(edge.getValue().get(),
+ edge.getTargetVertexId().get() * 2.0d);
}
assertEquals(vertex.removeEdge(new IntWritable(500)),
new DoubleWritable(1000));
- assertEquals(vertex.getNumOutEdges(), 999);
+ assertEquals(vertex.getNumEdges(), 999);
}
@Test
@@ -109,12 +111,12 @@ public class TestEdgeListVertex {
edgeMap.put(new IntWritable(i), new DoubleWritable(i * 3.0));
}
vertex.initialize(null, null, edgeMap, null);
- assertEquals(vertex.getNumOutEdges(), 1000);
+ assertEquals(vertex.getNumEdges(), 1000);
assertEquals(vertex.getEdgeValue(new IntWritable(600)),
new DoubleWritable(600 * 3.0));
assertEquals(vertex.removeEdge(new IntWritable(600)),
new DoubleWritable(600 * 3.0));
- assertEquals(vertex.getNumOutEdges(), 999);
+ assertEquals(vertex.getNumEdges(), 999);
assertEquals(vertex.getEdgeValue(new IntWritable(500)),
new DoubleWritable(500 * 3.0));
assertEquals(vertex.getEdgeValue(new IntWritable(700)),
@@ -125,10 +127,10 @@ public class TestEdgeListVertex {
public void testAddRemoveEdges() {
Map<IntWritable, DoubleWritable> edgeMap = Maps.newHashMap();
vertex.initialize(null, null, edgeMap, null);
- assertEquals(vertex.getNumOutEdges(), 0);
+ assertEquals(vertex.getNumEdges(), 0);
assertTrue(vertex.addEdge(new IntWritable(2),
new DoubleWritable(2.0)));
- assertEquals(vertex.getNumOutEdges(), 1);
+ assertEquals(vertex.getNumEdges(), 1);
assertEquals(vertex.getEdgeValue(new IntWritable(2)),
new DoubleWritable(2.0));
assertTrue(vertex.addEdge(new IntWritable(4),
@@ -137,25 +139,20 @@ public class TestEdgeListVertex {
new DoubleWritable(3.0)));
assertTrue(vertex.addEdge(new IntWritable(1),
new DoubleWritable(1.0)));
- assertEquals(vertex.getNumOutEdges(), 4);
+ assertEquals(vertex.getNumEdges(), 4);
assertNull(vertex.getEdgeValue(new IntWritable(5)));
assertNull(vertex.getEdgeValue(new IntWritable(0)));
- int i = 1;
- for (Iterator<IntWritable> edges = vertex.getOutEdgesIterator();
- edges.hasNext();) {
- IntWritable edgeDestId = edges.next();
- assertEquals(i, edgeDestId.get());
- assertEquals(i * 1.0d, vertex.getEdgeValue(edgeDestId).get());
- ++i;
+ for (Edge<IntWritable, DoubleWritable> edge : vertex.getEdges()) {
+ assertEquals(edge.getTargetVertexId().get() * 1.0d, edge.getValue().get());
}
assertNotNull(vertex.removeEdge(new IntWritable(1)));
- assertEquals(vertex.getNumOutEdges(), 3);
+ assertEquals(vertex.getNumEdges(), 3);
assertNotNull(vertex.removeEdge(new IntWritable(3)));
- assertEquals(vertex.getNumOutEdges(), 2);
+ assertEquals(vertex.getNumEdges(), 2);
assertNotNull(vertex.removeEdge(new IntWritable(2)));
- assertEquals(vertex.getNumOutEdges(), 1);
+ assertEquals(vertex.getNumEdges(), 1);
assertNotNull(vertex.removeEdge(new IntWritable(4)));
- assertEquals(vertex.getNumOutEdges(), 0);
+ assertEquals(vertex.getNumEdges(), 0);
}
@Test
@@ -174,6 +171,11 @@ public class TestEdgeListVertex {
BspUtils.<IntWritable, FloatWritable, DoubleWritable, LongWritable>
createVertex(job.getConfiguration());
WritableUtils.readFieldsFromByteArray(byteArray, readVertex);
- assertEquals(vertex, readVertex);
+ assertEquals(vertex.getId(), readVertex.getId());
+ assertEquals(vertex.getValue(), readVertex.getValue());
+ assertEquals(Lists.newArrayList(vertex.getEdges()),
+ Lists.newArrayList(readVertex.getEdges()));
+ assertEquals(Lists.newArrayList(vertex.getMessages()),
+ Lists.newArrayList(readVertex.getMessages()));
}
}
Modified: giraph/trunk/src/test/java/org/apache/giraph/graph/TestIntIntNullIntVertex.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/graph/TestIntIntNullIntVertex.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/graph/TestIntIntNullIntVertex.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/graph/TestIntIntNullIntVertex.java Tue Jul 24 23:37:42 2012
@@ -34,7 +34,6 @@ import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -47,7 +46,7 @@ public class TestIntIntNullIntVertex {
*/
private static class MyIntIntNullVertex extends IntIntNullIntVertex {
@Override
- public void compute(Iterator<IntWritable> msgIterator) throws IOException {
+ public void compute(Iterable<IntWritable> messages) throws IOException {
}
}
@@ -78,7 +77,7 @@ public class TestIntIntNullIntVertex {
DataInput in = new DataInputStream(inStream);
vertex1.readFields(in);
- assertEquals(2, vertex1.getNumOutEdges());
+ assertEquals(2, vertex1.getNumEdges());
assertEquals(Lists.newArrayList(new IntWritable(943),
new IntWritable(571)), Lists.newArrayList(vertex1.getMessages()));
assertEquals(true, vertex1.isHalted());
Modified: giraph/trunk/src/test/java/org/apache/giraph/lib/TestAdjacencyListTextVertexOutputFormat.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/lib/TestAdjacencyListTextVertexOutputFormat.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/lib/TestAdjacencyListTextVertexOutputFormat.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/lib/TestAdjacencyListTextVertexOutputFormat.java Tue Jul 24 23:37:42 2012
@@ -17,16 +17,8 @@
*/
package org.apache.giraph.lib;
-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 java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-
-import org.apache.giraph.graph.BasicVertex;
+import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.Vertex;
import org.apache.giraph.lib.AdjacencyListTextVertexOutputFormat.AdjacencyListVertexWriter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DoubleWritable;
@@ -37,6 +29,15 @@ import org.apache.hadoop.mapreduce.TaskA
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 java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+
public class TestAdjacencyListTextVertexOutputFormat {
@Test
@@ -45,11 +46,11 @@ public class TestAdjacencyListTextVertex
TaskAttemptContext tac = mock(TaskAttemptContext.class);
when(tac.getConfiguration()).thenReturn(conf);
- BasicVertex vertex = mock(BasicVertex.class);
- when(vertex.getVertexId()).thenReturn(new Text("The Beautiful South"));
- when(vertex.getVertexValue()).thenReturn(new DoubleWritable(32.2d));
- // Create empty iterator == no edges
- when(vertex.getOutEdgesIterator()).thenReturn(new ArrayList<Text>().iterator());
+ Vertex vertex = mock(Vertex.class);
+ when(vertex.getId()).thenReturn(new Text("The Beautiful South"));
+ when(vertex.getValue()).thenReturn(new DoubleWritable(32.2d));
+ // Create empty iterable == no edges
+ when(vertex.getEdges()).thenReturn(new ArrayList<Text>());
RecordWriter<Text, Text> tw = mock(RecordWriter.class);
AdjacencyListVertexWriter writer = new AdjacencyListVertexWriter(tw);
@@ -58,7 +59,7 @@ public class TestAdjacencyListTextVertex
Text expected = new Text("The Beautiful South\t32.2");
verify(tw).write(expected, null);
- verify(vertex, times(1)).getOutEdgesIterator();
+ verify(vertex, times(1)).getEdges();
verify(vertex, times(0)).getEdgeValue(Matchers.<WritableComparable>any());
}
@@ -68,16 +69,19 @@ public class TestAdjacencyListTextVertex
TaskAttemptContext tac = mock(TaskAttemptContext.class);
when(tac.getConfiguration()).thenReturn(conf);
- BasicVertex vertex = mock(BasicVertex.class);
- when(vertex.getVertexId()).thenReturn(new Text("San Francisco"));
- when(vertex.getVertexValue()).thenReturn(new DoubleWritable(0d));
- when(vertex.getNumEdges()).thenReturn(2l);
- ArrayList<Text> cities = new ArrayList<Text>();
- Collections.addAll(cities, new Text("Los Angeles"), new Text("Phoenix"));
-
- when(vertex.getOutEdgesIterator()).thenReturn(cities.iterator());
- mockEdgeValue(vertex, "Los Angeles", 347.16);
- mockEdgeValue(vertex, "Phoenix", 652.48);
+ Vertex vertex = mock(Vertex.class);
+ 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>>();
+ Collections.addAll(cities,
+ new Edge<Text, DoubleWritable>(
+ new Text("Los Angeles"), new DoubleWritable(347.16)),
+ new Edge<Text, DoubleWritable>(
+ new Text("Phoenix"), new DoubleWritable(652.48)));
+
+ when(vertex.getEdges()).thenReturn(cities);
RecordWriter<Text,Text> tw = mock(RecordWriter.class);
AdjacencyListVertexWriter writer = new AdjacencyListVertexWriter(tw);
@@ -87,8 +91,7 @@ public class TestAdjacencyListTextVertex
Text expected = new Text("San Francisco\t0.0\tLos Angeles\t347.16\t" +
"Phoenix\t652.48");
verify(tw).write(expected, null);
- verify(vertex, times(1)).getOutEdgesIterator();
- verify(vertex, times(2)).getEdgeValue(Matchers.<WritableComparable>any());
+ verify(vertex, times(1)).getEdges();
}
@Test
@@ -98,16 +101,19 @@ public class TestAdjacencyListTextVertex
TaskAttemptContext tac = mock(TaskAttemptContext.class);
when(tac.getConfiguration()).thenReturn(conf);
- BasicVertex vertex = mock(BasicVertex.class);
- when(vertex.getVertexId()).thenReturn(new Text("San Francisco"));
- when(vertex.getVertexValue()).thenReturn(new DoubleWritable(0d));
- when(vertex.getNumEdges()).thenReturn(2l);
- ArrayList<Text> cities = new ArrayList<Text>();
- Collections.addAll(cities, new Text("Los Angeles"), new Text("Phoenix"));
-
- when(vertex.getOutEdgesIterator()).thenReturn(cities.iterator());
- mockEdgeValue(vertex, "Los Angeles", 347.16);
- mockEdgeValue(vertex, "Phoenix", 652.48);
+ Vertex vertex = mock(Vertex.class);
+ 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>>();
+ Collections.addAll(cities,
+ new Edge<Text, DoubleWritable>(
+ new Text("Los Angeles"), new DoubleWritable(347.16)),
+ new Edge<Text, DoubleWritable>(
+ new Text("Phoenix"), new DoubleWritable(652.48)));
+
+ when(vertex.getEdges()).thenReturn(cities);
RecordWriter<Text,Text> tw = mock(RecordWriter.class);
AdjacencyListVertexWriter writer = new AdjacencyListVertexWriter(tw);
@@ -117,11 +123,6 @@ public class TestAdjacencyListTextVertex
Text expected = new Text("San Francisco:::0.0:::Los Angeles:::347.16:::" +
"Phoenix:::652.48");
verify(tw).write(expected, null);
- verify(vertex, times(1)).getOutEdgesIterator();
- verify(vertex, times(2)).getEdgeValue(Matchers.<WritableComparable>any());
- }
-
- private void mockEdgeValue(BasicVertex vertex, String s, double d) {
- when(vertex.getEdgeValue(new Text(s))).thenReturn(new DoubleWritable(d));
+ verify(vertex, times(1)).getEdges();
}
}
Modified: giraph/trunk/src/test/java/org/apache/giraph/lib/TestIdWithValueTextOutputFormat.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/lib/TestIdWithValueTextOutputFormat.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/lib/TestIdWithValueTextOutputFormat.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/lib/TestIdWithValueTextOutputFormat.java Tue Jul 24 23:37:42 2012
@@ -18,17 +18,7 @@
package org.apache.giraph.lib;
-import static org.apache.giraph.lib.IdWithValueTextOutputFormat.IdWithValueVertexWriter.LINE_TOKENIZE_VALUE;
-import static org.apache.giraph.lib.IdWithValueTextOutputFormat.IdWithValueVertexWriter.REVERSE_ID_AND_VALUE;
-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 java.io.IOException;
-import java.util.ArrayList;
-
-import org.apache.giraph.graph.BasicVertex;
+import org.apache.giraph.graph.Vertex;
import org.apache.giraph.lib.IdWithValueTextOutputFormat.IdWithValueVertexWriter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DoubleWritable;
@@ -39,6 +29,16 @@ import org.apache.hadoop.mapreduce.TaskA
import org.junit.Test;
import org.mockito.Matchers;
+import static org.apache.giraph.lib.IdWithValueTextOutputFormat.IdWithValueVertexWriter.LINE_TOKENIZE_VALUE;
+import static org.apache.giraph.lib.IdWithValueTextOutputFormat.IdWithValueVertexWriter.REVERSE_ID_AND_VALUE;
+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 java.io.IOException;
+import java.util.ArrayList;
+
public class TestIdWithValueTextOutputFormat {
@Test
public void testHappyPath() throws IOException, InterruptedException {
@@ -72,12 +72,12 @@ public class TestIdWithValueTextOutputFo
TaskAttemptContext tac = mock(TaskAttemptContext.class);
when(tac.getConfiguration()).thenReturn(conf);
- BasicVertex vertex = mock(BasicVertex.class);
- when(vertex.getVertexId()).thenReturn(new Text("Four Tops"));
- when(vertex.getVertexValue()).thenReturn(new DoubleWritable(4d));
+ Vertex vertex = mock(Vertex.class);
+ when(vertex.getId()).thenReturn(new Text("Four Tops"));
+ when(vertex.getValue()).thenReturn(new DoubleWritable(4d));
// Create empty iterator == no edges
- when(vertex.getOutEdgesIterator()).thenReturn(new ArrayList<Text>().iterator());
+ when(vertex.getEdges()).thenReturn(new ArrayList<Text>());
RecordWriter<Text, Text> tw = mock(RecordWriter.class);
IdWithValueVertexWriter writer = new IdWithValueVertexWriter(tw);
@@ -85,7 +85,7 @@ public class TestIdWithValueTextOutputFo
writer.writeVertex(vertex);
verify(tw).write(expected, null);
- verify(vertex, times(0)).getOutEdgesIterator();
+ verify(vertex, times(0)).getEdges();
verify(vertex, times(0)).getEdgeValue(Matchers.<WritableComparable>any());
}
}
Modified: giraph/trunk/src/test/java/org/apache/giraph/lib/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/lib/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/lib/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/lib/TestLongDoubleDoubleAdjacencyListVertexInputFormat.java Tue Jul 24 23:37:42 2012
@@ -18,22 +18,11 @@
package org.apache.giraph.lib;
-import static org.apache.giraph.lib.TestTextDoubleDoubleAdjacencyListVertexInputFormat.assertValidVertex;
-import static org.apache.giraph.lib.TestTextDoubleDoubleAdjacencyListVertexInputFormat.setGraphState;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import org.apache.giraph.graph.BasicVertex;
import org.apache.giraph.graph.Edge;
import org.apache.giraph.graph.EdgeListVertex;
import org.apache.giraph.graph.GiraphJob;
import org.apache.giraph.graph.GraphState;
+import org.apache.giraph.graph.Vertex;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.BooleanWritable;
import org.apache.hadoop.io.DoubleWritable;
@@ -45,6 +34,16 @@ import org.apache.hadoop.mapreduce.TaskA
import org.junit.Before;
import org.junit.Test;
+import static org.apache.giraph.lib.TestTextDoubleDoubleAdjacencyListVertexInputFormat.assertValidVertex;
+import static org.apache.giraph.lib.TestTextDoubleDoubleAdjacencyListVertexInputFormat.setGraphState;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
public class TestLongDoubleDoubleAdjacencyListVertexInputFormat {
private RecordReader<LongWritable, Text> rr;
@@ -57,8 +56,8 @@ public class TestLongDoubleDoubleAdjacen
rr = mock(RecordReader.class);
when(rr.nextKeyValue()).thenReturn(true);
conf = new Configuration();
- conf.setClass(GiraphJob.VERTEX_CLASS, DummyVertex.class, BasicVertex.class);
- conf.setClass(GiraphJob.VERTEX_INDEX_CLASS, LongWritable.class, Writable.class);
+ conf.setClass(GiraphJob.VERTEX_CLASS, DummyVertex.class, Vertex.class);
+ conf.setClass(GiraphJob.VERTEX_ID_CLASS, LongWritable.class, Writable.class);
conf.setClass(GiraphJob.VERTEX_VALUE_CLASS, DoubleWritable.class, Writable.class);
graphState = mock(GraphState.class);
tac = mock(TaskAttemptContext.class);
@@ -114,7 +113,7 @@ public class TestLongDoubleDoubleAdjacen
vr.initialize(null, tac);
assertTrue("Should have been able to read vertex", vr.nextVertex());
- BasicVertex<LongWritable, DoubleWritable, DoubleWritable, BooleanWritable>
+ Vertex<LongWritable, DoubleWritable, DoubleWritable, BooleanWritable>
vertex = vr.getCurrentVertex();
setGraphState(vertex, graphState);
assertValidVertex(conf, graphState, vertex,
@@ -122,7 +121,7 @@ public class TestLongDoubleDoubleAdjacen
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)));
- assertEquals(vertex.getNumOutEdges(), 3);
+ assertEquals(vertex.getNumEdges(), 3);
}
@Test
@@ -136,19 +135,19 @@ public class TestLongDoubleDoubleAdjacen
vr.initialize(null, tac);
assertTrue("Should have been able to read vertex", vr.nextVertex());
- BasicVertex<LongWritable, DoubleWritable, DoubleWritable, BooleanWritable>
+ Vertex<LongWritable, DoubleWritable, DoubleWritable, BooleanWritable>
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)));
- assertEquals(vertex.getNumOutEdges(), 1);
+ assertEquals(vertex.getNumEdges(), 1);
}
public static class DummyVertex
extends EdgeListVertex<LongWritable, DoubleWritable,
DoubleWritable, BooleanWritable> {
@Override
- public void compute(Iterator<BooleanWritable> msgIterator) throws IOException {
+ public void compute(Iterable<BooleanWritable> messages) throws IOException {
// ignore
}
}
Modified: giraph/trunk/src/test/java/org/apache/giraph/lib/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/lib/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/lib/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/lib/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java Tue Jul 24 23:37:42 2012
@@ -17,27 +17,40 @@
*/
package org.apache.giraph.lib;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import org.apache.giraph.graph.*;
+import org.apache.giraph.graph.BspUtils;
+import org.apache.giraph.graph.Edge;
+import org.apache.giraph.graph.EdgeListVertex;
+import org.apache.giraph.graph.GiraphJob;
+import org.apache.giraph.graph.GraphState;
+import org.apache.giraph.graph.Vertex;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.*;
+import org.apache.hadoop.io.BooleanWritable;
+import org.apache.hadoop.io.DoubleWritable;
+import org.apache.hadoop.io.LongWritable;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.mapreduce.RecordReader;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
public class TestTextDoubleDoubleAdjacencyListVertexInputFormat {
private RecordReader<LongWritable, Text> rr;
@@ -50,8 +63,8 @@ public class TestTextDoubleDoubleAdjacen
rr = mock(RecordReader.class);
when(rr.nextKeyValue()).thenReturn(true).thenReturn(false);
conf = new Configuration();
- conf.setClass(GiraphJob.VERTEX_CLASS, DummyVertex.class, BasicVertex.class);
- conf.setClass(GiraphJob.VERTEX_INDEX_CLASS, Text.class, Writable.class);
+ conf.setClass(GiraphJob.VERTEX_CLASS, DummyVertex.class, Vertex.class);
+ conf.setClass(GiraphJob.VERTEX_ID_CLASS, Text.class, Writable.class);
conf.setClass(GiraphJob.VERTEX_VALUE_CLASS, DoubleWritable.class, Writable.class);
graphState = mock(GraphState.class);
tac = mock(TaskAttemptContext.class);
@@ -94,8 +107,8 @@ public class TestTextDoubleDoubleAdjacen
}
}
- public static void setGraphState(BasicVertex vertex, GraphState graphState) throws Exception {
- Class<? extends BasicVertex> c = BasicVertex.class;
+ public static void setGraphState(Vertex vertex, GraphState graphState) throws Exception {
+ Class<? extends Vertex> c = Vertex.class;
Method m = c.getDeclaredMethod("setGraphState", GraphState.class);
m.setAccessible(true);
m.invoke(vertex, graphState);
@@ -103,16 +116,16 @@ public class TestTextDoubleDoubleAdjacen
public static <I extends WritableComparable, V extends Writable,
E extends Writable, M extends Writable> void assertValidVertex(Configuration conf,
- GraphState<I, V, E, M> graphState, BasicVertex<I, V, E, M> actual,
+ GraphState<I, V, E, M> graphState, Vertex<I, V, E, M> actual,
I expectedId, V expectedValue, Edge<I, E>... edges)
throws Exception {
- BasicVertex<I, V, E, M> expected = BspUtils.createVertex(conf);
+ Vertex<I, V, E, M> expected = BspUtils.createVertex(conf);
setGraphState(expected, graphState);
// FIXME! maybe can't work if not instantiated properly
Map<I, E> edgeMap = Maps.newHashMap();
for(Edge<I, E> edge : edges) {
- edgeMap.put(edge.getDestVertexId(), edge.getEdgeValue());
+ edgeMap.put(edge.getTargetVertexId(), edge.getValue());
}
expected.initialize(expectedId, expectedValue, edgeMap, null);
assertValid(expected, actual);
@@ -120,20 +133,14 @@ public class TestTextDoubleDoubleAdjacen
public static
<I extends WritableComparable, V extends Writable, E extends Writable, M extends Writable> void
- assertValid(BasicVertex<I, V, E, M> expected, BasicVertex<I, V, E, M> actual) {
- assertEquals(expected.getVertexId(), actual.getVertexId());
- assertEquals(expected.getVertexValue(), actual.getVertexValue());
- assertEquals(expected.getNumEdges(), actual.getNumEdges());
+ assertValid(Vertex<I, V, E, M> expected, Vertex<I, V, E, M> actual) {
+ assertEquals(expected.getId(), actual.getId());
+ assertEquals(expected.getValue(), actual.getValue());
+ assertEquals(expected.getTotalNumEdges(), actual.getTotalNumEdges());
List<Edge<I, E>> expectedEdges = Lists.newArrayList();
List<Edge<I, E>> actualEdges = Lists.newArrayList();
- for (Iterator<I> edges = actual.getOutEdgesIterator(); edges.hasNext();) {
- I actualDestId = edges.next();
- actualEdges.add(new Edge<I, E>(actualDestId, actual.getEdgeValue(actualDestId)));
- }
- for (Iterator<I> edges = expected.getOutEdgesIterator(); edges.hasNext();) {
- I expectedDestId = edges.next();
- expectedEdges.add(new Edge<I, E>(expectedDestId, expected.getEdgeValue(expectedDestId)));
- }
+ Iterables.addAll(actualEdges, actual.getEdges());
+ Iterables.addAll(expectedEdges, expected.getEdges());
Collections.sort(expectedEdges);
Collections.sort(actualEdges);
for(int i = 0; i < expectedEdges.size(); i++) {
@@ -151,14 +158,14 @@ public class TestTextDoubleDoubleAdjacen
vr.initialize(null, tac);
assertTrue("Should have been able to add a vertex", vr.nextVertex());
- BasicVertex<Text, DoubleWritable, DoubleWritable, BooleanWritable> vertex =
+ Vertex<Text, DoubleWritable, DoubleWritable, BooleanWritable> vertex =
vr.getCurrentVertex();
setGraphState(vertex, graphState);
assertValidVertex(conf, graphState, vertex, new Text("Hi"), new DoubleWritable(0),
new Edge<Text, DoubleWritable>(new Text("Ciao"), new DoubleWritable(1.123d)),
new Edge<Text, DoubleWritable>(new Text("Bomdia"), new DoubleWritable(2.234d)),
new Edge<Text, DoubleWritable>(new Text("Ola"), new DoubleWritable(3.345d)));
- assertEquals(vertex.getNumOutEdges(), 3);
+ assertEquals(vertex.getNumEdges(), 3);
}
@Test
@@ -179,7 +186,7 @@ public class TestTextDoubleDoubleAdjacen
vr.initialize(null, tac);
assertTrue("Should have been able to read vertex", vr.nextVertex());
- BasicVertex<Text, DoubleWritable, DoubleWritable, BooleanWritable> vertex =
+ Vertex<Text, DoubleWritable, DoubleWritable, BooleanWritable> vertex =
vr.getCurrentVertex();
setGraphState(vertex, graphState);
assertValidVertex(conf, graphState, vertex,
@@ -188,7 +195,7 @@ public class TestTextDoubleDoubleAdjacen
new Edge<Text, DoubleWritable>(new Text("TCHAU"), new DoubleWritable(2.0001d)),
new Edge<Text, DoubleWritable>(new Text("ADIOS"), new DoubleWritable(3.00001d)));
- assertEquals(vertex.getNumOutEdges(), 3);
+ assertEquals(vertex.getNumEdges(), 3);
}
@Test
@@ -202,19 +209,19 @@ public class TestTextDoubleDoubleAdjacen
vr.initialize(null, tac);
assertTrue("Should have been able to read vertex", vr.nextVertex());
- BasicVertex<Text, DoubleWritable, DoubleWritable, BooleanWritable> vertex =
+ Vertex<Text, DoubleWritable, DoubleWritable, BooleanWritable> vertex =
vr.getCurrentVertex();
setGraphState(vertex, graphState);
assertValidVertex(conf, graphState, vertex, new Text("alpha"), new DoubleWritable(42d),
new Edge<Text, DoubleWritable>(new Text("beta"), new DoubleWritable(99d)));
- assertEquals(vertex.getNumOutEdges(), 1);
+ assertEquals(vertex.getNumEdges(), 1);
}
public static class DummyVertex
extends EdgeListVertex<Text, DoubleWritable,
DoubleWritable, BooleanWritable> {
@Override
- public void compute(Iterator<BooleanWritable> msgIterator) throws IOException {
+ public void compute(Iterable<BooleanWritable> messages) throws IOException {
// ignore
}
}
Modified: giraph/trunk/src/test/java/org/apache/giraph/utils/MockUtils.java
URL: http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/utils/MockUtils.java?rev=1365352&r1=1365351&r2=1365352&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/utils/MockUtils.java (original)
+++ giraph/trunk/src/test/java/org/apache/giraph/utils/MockUtils.java Tue Jul 24 23:37:42 2012
@@ -20,7 +20,7 @@ package org.apache.giraph.utils;
import org.apache.giraph.comm.WorkerClientServer;
import org.apache.giraph.graph.GraphState;
-import org.apache.giraph.graph.BasicVertex;
+import org.apache.giraph.graph.Vertex;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
@@ -78,8 +78,8 @@ public class MockUtils {
/** assert that the test vertex message has been sent to a particular vertex */
public void verifyMessageSent(I targetVertexId, M message) {
- Mockito.verify(communications).sendMessageReq(targetVertexId,
- message);
+ Mockito.verify(communications).sendMessageRequest(targetVertexId,
+ message);
}
/** assert that the test vertex has sent no message to a particular vertex */
@@ -107,7 +107,7 @@ public class MockUtils {
public static <I extends WritableComparable, V extends Writable,
E extends Writable, M extends Writable>
MockedEnvironment<I, V, E, M> prepareVertex(
- BasicVertex<I, V, E, M> vertex, long superstep, I vertexId,
+ Vertex<I, V, E, M> vertex, long superstep, I vertexId,
V vertexValue, boolean isHalted) throws Exception {
MockedEnvironment<I, V, E, M> env =
@@ -121,8 +121,8 @@ public class MockUtils {
Mockito.when(env.getGraphState().getWorkerCommunications())
.thenReturn(env.getCommunications());
- ReflectionUtils.setField(vertex, "vertexId", vertexId);
- ReflectionUtils.setField(vertex, "vertexValue", vertexValue);
+ ReflectionUtils.setField(vertex, "id", vertexId);
+ ReflectionUtils.setField(vertex, "value", vertexValue);
ReflectionUtils.setField(vertex, "graphState", env.getGraphState());
ReflectionUtils.setField(vertex, "halt", isHalted);