Author: aching
Date: Mon Jul 2 08:20:25 2012
New Revision: 1356104
URL: http://svn.apache.org/viewvc?rev=1356104&view=rev
Log:
GIRAPH-221: Make iteration over edges more explicit (apresta via aching).
Modified:
giraph/trunk/CHANGELOG
giraph/trunk/src/main/java/org/apache/giraph/benchmark/PseudoRandomVertexInputFormat.java
giraph/trunk/src/main/java/org/apache/giraph/examples/ConnectedComponentsVertex.java
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleShortestPathsVertex.java
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
giraph/trunk/src/main/java/org/apache/giraph/examples/VerifyMessage.java
giraph/trunk/src/main/java/org/apache/giraph/graph/BasicVertex.java
giraph/trunk/src/main/java/org/apache/giraph/graph/EdgeListVertex.java
giraph/trunk/src/main/java/org/apache/giraph/graph/HashMapVertex.java
giraph/trunk/src/main/java/org/apache/giraph/graph/IntIntNullIntVertex.java
giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java
giraph/trunk/src/main/java/org/apache/giraph/lib/AdjacencyListTextVertexOutputFormat.java
giraph/trunk/src/main/java/org/apache/giraph/lib/JsonBase64VertexOutputFormat.java
giraph/trunk/src/main/java/org/apache/giraph/lib/JsonLongDoubleFloatDoubleVertexOutputFormat.java
giraph/trunk/src/test/java/org/apache/giraph/graph/TestEdgeListVertex.java
giraph/trunk/src/test/java/org/apache/giraph/lib/TestAdjacencyListTextVertexOutputFormat.java
giraph/trunk/src/test/java/org/apache/giraph/lib/TestIdWithValueTextOutputFormat.java
giraph/trunk/src/test/java/org/apache/giraph/lib/TestTextDoubleDoubleAdjacencyListVertexInputFormat.java
Modified: giraph/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Mon Jul 2 08:20:25 2012
@@ -2,6 +2,8 @@ Giraph Change Log
Release 0.2.0 - unreleased
+ GIRAPH-221: Make iteration over edges more explicit (apresta via aching).
+
GIRAPH-225: Guava version in POM.XML is really old. Updated to version 12.0.
(Eli Reisman via hyunsik)
Modified:
giraph/trunk/src/main/java/org/apache/giraph/benchmark/PseudoRandomVertexInputFormat.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/benchmark/PseudoRandomVertexInputFormat.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/benchmark/PseudoRandomVertexInputFormat.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/benchmark/PseudoRandomVertexInputFormat.java
Mon Jul 2 08:20:25 2012
@@ -174,7 +174,7 @@ public class PseudoRandomVertexInputForm
LOG.debug("next: Return vertexId=" +
vertex.getVertexId().get() +
", vertexValue=" + vertex.getVertexValue() +
- ", edgeMap=" + vertex.iterator());
+ ", edgeMap=" + vertex.getOutEdgesIterator());
}
return vertex;
}
Modified:
giraph/trunk/src/main/java/org/apache/giraph/examples/ConnectedComponentsVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/examples/ConnectedComponentsVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/examples/ConnectedComponentsVertex.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/examples/ConnectedComponentsVertex.java
Mon Jul 2 08:20:25 2012
@@ -54,7 +54,8 @@ public class ConnectedComponentsVertex e
// First superstep is special, because we can simply look at the neighbors
if (getSuperstep() == 0) {
- for (Iterator<IntWritable> edges = iterator(); edges.hasNext();) {
+ for (Iterator<IntWritable> edges = getOutEdgesIterator();
+ edges.hasNext();) {
int neighbor = edges.next().get();
if (neighbor < currentComponent) {
currentComponent = neighbor;
@@ -63,7 +64,7 @@ public class ConnectedComponentsVertex e
// Only need to send value if it is not the own id
if (currentComponent != getVertexValue().get()) {
setVertexValue(new IntWritable(currentComponent));
- for (Iterator<IntWritable> edges = iterator();
+ for (Iterator<IntWritable> edges = getOutEdgesIterator();
edges.hasNext();) {
int neighbor = edges.next().get();
if (neighbor > currentComponent) {
Modified:
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleCheckpointVertex.java
Mon Jul 2 08:20:25 2012
@@ -105,7 +105,9 @@ public class SimpleCheckpointVertex exte
LOG.info("compute: vertex " + getVertexId() +
" has value " + getVertexValue() +
" on superstep " + getSuperstep());
- for (LongWritable targetVertexId : this) {
+ for (Iterator<LongWritable> edges = getOutEdgesIterator();
+ edges.hasNext();) {
+ LongWritable targetVertexId = edges.next();
FloatWritable edgeValue = getEdgeValue(targetVertexId);
LOG.info("compute: vertex " + getVertexId() +
" sending edgeValue " + edgeValue +
Modified:
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleShortestPathsVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleShortestPathsVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleShortestPathsVertex.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleShortestPathsVertex.java
Mon Jul 2 08:20:25 2012
@@ -66,7 +66,9 @@ public class SimpleShortestPathsVertex e
}
if (minDist < getVertexValue().get()) {
setVertexValue(new DoubleWritable(minDist));
- for (LongWritable targetVertexId : this) {
+ for (Iterator<LongWritable> edges = getOutEdgesIterator();
+ edges.hasNext();) {
+ LongWritable targetVertexId = edges.next();
FloatWritable edgeValue = getEdgeValue(targetVertexId);
if (LOG.isDebugEnabled()) {
LOG.debug("Vertex " + getVertexId() + " sent to " +
Modified:
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/examples/SimpleTriangleClosingVertex.java
Mon Jul 2 08:20:25 2012
@@ -23,7 +23,6 @@ import org.apache.hadoop.io.NullWritable
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.ArrayWritable;
import org.apache.giraph.graph.EdgeListVertex;
-import org.apache.giraph.examples.SimpleTriangleClosingVertex.IntArrayWritable;
import java.util.Iterator;
import java.util.Map;
@@ -75,7 +74,7 @@ public class SimpleTriangleClosingVertex
public void compute(Iterator<IntWritable> msgIterator) {
if (getSuperstep() == 0) {
// obtain list of all out-edges from THIS vertex
- Iterator<IntWritable> iterator = iterator();
+ Iterator<IntWritable> iterator = getOutEdgesIterator();
while (iterator.hasNext()) {
sendMsgToAllEdges(iterator.next());
}
Modified:
giraph/trunk/src/main/java/org/apache/giraph/examples/VerifyMessage.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/examples/VerifyMessage.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/examples/VerifyMessage.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/examples/VerifyMessage.java
Mon Jul 2 08:20:25 2012
@@ -189,7 +189,9 @@ public class VerifyMessage {
" has value " + getVertexValue() +
" on superstep " + getSuperstep());
}
- for (LongWritable targetVertexId : this) {
+ for (Iterator<LongWritable> edges = getOutEdgesIterator();
+ edges.hasNext();) {
+ LongWritable targetVertexId = edges.next();
FloatWritable edgeValue = getEdgeValue(targetVertexId);
if (LOG.isDebugEnabled()) {
LOG.debug("compute: vertex " + getVertexId() +
Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/BasicVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/BasicVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/BasicVertex.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/BasicVertex.java Mon Jul
2 08:20:25 2012
@@ -39,7 +39,7 @@ import java.util.Map;
@SuppressWarnings("rawtypes")
public abstract class BasicVertex<I extends WritableComparable,
V extends Writable, E extends Writable, M extends Writable>
- implements AggregatorUsage, Iterable<I>, Writable, Configurable {
+ implements AggregatorUsage, Writable, Configurable {
/** If true, do not do anymore computation on this vertex. */
protected boolean halt = false;
/** Global graph state **/
@@ -124,8 +124,7 @@ public abstract class BasicVertex<I exte
*
* @return the out edges (sort order determined by subclass implementation).
*/
- @Override
- public abstract Iterator<I> iterator();
+ public abstract Iterator<I> getOutEdgesIterator();
/**
* Get the edge value associated with a target vertex id.
@@ -175,7 +174,7 @@ public abstract class BasicVertex<I exte
* @param msg Message sent to all edges.
*/
public void sendMsgToAllEdges(M msg) {
- for (Iterator<I> edges = iterator(); edges.hasNext();) {
+ for (Iterator<I> edges = getOutEdgesIterator(); edges.hasNext();) {
sendMsg(edges.next(), msg);
}
}
Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/EdgeListVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/EdgeListVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/EdgeListVertex.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/EdgeListVertex.java Mon
Jul 2 08:20:25 2012
@@ -115,7 +115,8 @@ public abstract class EdgeListVertex<I e
otherVertex.getMessages())) {
return false;
}
- return ComparisonUtils.equal(iterator(), otherVertex.iterator());
+ return ComparisonUtils.equal(getOutEdgesIterator(),
+ otherVertex.getOutEdgesIterator());
}
return false;
}
@@ -203,7 +204,7 @@ public abstract class EdgeListVertex<I e
* of the vertex ids
*/
@Override
- public Iterator<I> iterator() {
+ public Iterator<I> getOutEdgesIterator() {
return destEdgeIndexList.iterator();
}
Modified: giraph/trunk/src/main/java/org/apache/giraph/graph/HashMapVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/HashMapVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/HashMapVertex.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/HashMapVertex.java Mon
Jul 2 08:20:25 2012
@@ -142,7 +142,7 @@ public abstract class HashMapVertex<I ex
* of the vertex ids
*/
@Override
- public Iterator<I> iterator() {
+ public Iterator<I> getOutEdgesIterator() {
return destEdgeMap.keySet().iterator();
}
Modified:
giraph/trunk/src/main/java/org/apache/giraph/graph/IntIntNullIntVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/IntIntNullIntVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/graph/IntIntNullIntVertex.java
(original)
+++ giraph/trunk/src/main/java/org/apache/giraph/graph/IntIntNullIntVertex.java
Mon Jul 2 08:20:25 2012
@@ -83,7 +83,7 @@ public abstract class IntIntNullIntVerte
}
@Override
- public Iterator<IntWritable> iterator() {
+ public Iterator<IntWritable> getOutEdgesIterator() {
return new UnmodifiableIntArrayIterator(neighbors);
}
Modified:
giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/graph/LongDoubleFloatDoubleVertex.java
Mon Jul 2 08:20:25 2012
@@ -163,7 +163,7 @@ public abstract class LongDoubleFloatDou
}
@Override
- public Iterator<LongWritable> iterator() {
+ public Iterator<LongWritable> getOutEdgesIterator() {
final long[] destVertices = verticesWithEdgeValues.keys().elements();
final int destVerticesSize = verticesWithEdgeValues.size();
return new Iterator<LongWritable>() {
Modified:
giraph/trunk/src/main/java/org/apache/giraph/lib/AdjacencyListTextVertexOutputFormat.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/lib/AdjacencyListTextVertexOutputFormat.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/lib/AdjacencyListTextVertexOutputFormat.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/lib/AdjacencyListTextVertexOutputFormat.java
Mon Jul 2 08:20:25 2012
@@ -26,6 +26,7 @@ import org.apache.hadoop.mapreduce.Recor
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import java.io.IOException;
+import java.util.Iterator;
/**
* OutputFormat to write out the graph nodes as text, value-separated (by
@@ -79,7 +80,8 @@ public class AdjacencyListTextVertexOutp
sb.append(delimiter);
sb.append(vertex.getVertexValue().toString());
- for (I edge : vertex) {
+ for (Iterator<I> edges = vertex.getOutEdgesIterator(); edges.hasNext();)
{
+ I edge = edges.next();
sb.append(delimiter).append(edge);
sb.append(delimiter).append(vertex.getEdgeValue(edge));
}
Modified:
giraph/trunk/src/main/java/org/apache/giraph/lib/JsonBase64VertexOutputFormat.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/lib/JsonBase64VertexOutputFormat.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/lib/JsonBase64VertexOutputFormat.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/lib/JsonBase64VertexOutputFormat.java
Mon Jul 2 08:20:25 2012
@@ -35,6 +35,7 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.util.Iterator;
/**
* Simple way to represent the structure of the graph with a JSON object.
@@ -97,7 +98,9 @@ public class JsonBase64VertexOutputForma
"writerVertex: Failed to insert vertex value", e);
}
JSONArray edgeArray = new JSONArray();
- for (I targetVertexId : vertex) {
+ for (Iterator<I> edges = vertex.getOutEdgesIterator();
+ edges.hasNext();) {
+ I targetVertexId = edges.next();
Edge<I, E> edge = new Edge<I, E>(
targetVertexId, vertex.getEdgeValue(targetVertexId));
edge.setConf(getContext().getConfiguration());
Modified:
giraph/trunk/src/main/java/org/apache/giraph/lib/JsonLongDoubleFloatDoubleVertexOutputFormat.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/lib/JsonLongDoubleFloatDoubleVertexOutputFormat.java?rev=1356104&r1=1356103&r2=1356104&view=diff
==============================================================================
---
giraph/trunk/src/main/java/org/apache/giraph/lib/JsonLongDoubleFloatDoubleVertexOutputFormat.java
(original)
+++
giraph/trunk/src/main/java/org/apache/giraph/lib/JsonLongDoubleFloatDoubleVertexOutputFormat.java
Mon Jul 2 08:20:25 2012
@@ -18,17 +18,19 @@
package org.apache.giraph.lib;
+import org.apache.giraph.graph.BasicVertex;
import org.apache.giraph.graph.VertexWriter;
-import org.json.JSONArray;
-import org.json.JSONException;
import org.apache.hadoop.io.DoubleWritable;
import org.apache.hadoop.io.FloatWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.giraph.graph.BasicVertex;
+import org.json.JSONArray;
+import org.json.JSONException;
+
import java.io.IOException;
+import java.util.Iterator;
/**
* VertexOutputFormat that supports JSON encoded vertices featuring
@@ -71,7 +73,9 @@ public class JsonLongDoubleFloatDoubleVe
jsonVertex.put(vertex.getVertexId().get());
jsonVertex.put(vertex.getVertexValue().get());
JSONArray jsonEdgeArray = new JSONArray();
- for (LongWritable targetVertexId : vertex) {
+ for (Iterator<LongWritable> edges = vertex.getOutEdgesIterator();
+ edges.hasNext();) {
+ LongWritable targetVertexId = edges.next();
JSONArray jsonEdge = new JSONArray();
jsonEdge.put(targetVertexId.get());
jsonEdge.put(vertex.getEdgeValue(targetVertexId).get());
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=1356104&r1=1356103&r2=1356104&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
Mon Jul 2 08:20:25 2012
@@ -17,29 +17,20 @@
*/
package org.apache.giraph.graph;
-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 org.apache.giraph.utils.WritableUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.*;
+import org.junit.Before;
+import org.junit.Test;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.giraph.utils.WritableUtils;
-import org.apache.hadoop.conf.Configuration;
-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 com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import static org.junit.Assert.*;
/**
* Tests {@link EdgeListVertex}.
@@ -98,7 +89,9 @@ public class TestEdgeListVertex {
vertex.initialize(null, null, edgeMap, null);
assertEquals(vertex.getNumOutEdges(), 1000);
int expectedIndex = 1;
- for (IntWritable index : vertex) {
+ for (Iterator<IntWritable> edges = vertex.getOutEdgesIterator();
+ edges.hasNext();) {
+ IntWritable index = edges.next();
assertEquals(index.get(), expectedIndex);
assertEquals(vertex.getEdgeValue(index).get(),
expectedIndex * 2.0d);
@@ -148,7 +141,9 @@ public class TestEdgeListVertex {
assertNull(vertex.getEdgeValue(new IntWritable(5)));
assertNull(vertex.getEdgeValue(new IntWritable(0)));
int i = 1;
- for (IntWritable edgeDestId : vertex) {
+ 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;
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=1356104&r1=1356103&r2=1356104&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
Mon Jul 2 08:20:25 2012
@@ -49,7 +49,7 @@ public class TestAdjacencyListTextVertex
when(vertex.getVertexId()).thenReturn(new Text("The Beautiful South"));
when(vertex.getVertexValue()).thenReturn(new DoubleWritable(32.2d));
// Create empty iterator == no edges
- when(vertex.iterator()).thenReturn(new ArrayList<Text>().iterator());
+ when(vertex.getOutEdgesIterator()).thenReturn(new
ArrayList<Text>().iterator());
RecordWriter<Text, Text> tw = mock(RecordWriter.class);
AdjacencyListVertexWriter writer = new AdjacencyListVertexWriter(tw);
@@ -58,7 +58,7 @@ public class TestAdjacencyListTextVertex
Text expected = new Text("The Beautiful South\t32.2");
verify(tw).write(expected, null);
- verify(vertex, times(1)).iterator();
+ verify(vertex, times(1)).getOutEdgesIterator();
verify(vertex, times(0)).getEdgeValue(Matchers.<WritableComparable>any());
}
@@ -75,7 +75,7 @@ public class TestAdjacencyListTextVertex
ArrayList<Text> cities = new ArrayList<Text>();
Collections.addAll(cities, new Text("Los Angeles"), new Text("Phoenix"));
- when(vertex.iterator()).thenReturn(cities.iterator());
+ when(vertex.getOutEdgesIterator()).thenReturn(cities.iterator());
mockEdgeValue(vertex, "Los Angeles", 347.16);
mockEdgeValue(vertex, "Phoenix", 652.48);
@@ -87,7 +87,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)).iterator();
+ verify(vertex, times(1)).getOutEdgesIterator();
verify(vertex, times(2)).getEdgeValue(Matchers.<WritableComparable>any());
}
@@ -105,7 +105,7 @@ public class TestAdjacencyListTextVertex
ArrayList<Text> cities = new ArrayList<Text>();
Collections.addAll(cities, new Text("Los Angeles"), new Text("Phoenix"));
- when(vertex.iterator()).thenReturn(cities.iterator());
+ when(vertex.getOutEdgesIterator()).thenReturn(cities.iterator());
mockEdgeValue(vertex, "Los Angeles", 347.16);
mockEdgeValue(vertex, "Phoenix", 652.48);
@@ -117,7 +117,7 @@ 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)).iterator();
+ verify(vertex, times(1)).getOutEdgesIterator();
verify(vertex, times(2)).getEdgeValue(Matchers.<WritableComparable>any());
}
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=1356104&r1=1356103&r2=1356104&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
Mon Jul 2 08:20:25 2012
@@ -77,7 +77,7 @@ public class TestIdWithValueTextOutputFo
when(vertex.getVertexValue()).thenReturn(new DoubleWritable(4d));
// Create empty iterator == no edges
- when(vertex.iterator()).thenReturn(new ArrayList<Text>().iterator());
+ when(vertex.getOutEdgesIterator()).thenReturn(new
ArrayList<Text>().iterator());
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)).iterator();
+ verify(vertex, times(0)).getOutEdgesIterator();
verify(vertex, times(0)).getEdgeValue(Matchers.<WritableComparable>any());
}
}
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=1356104&r1=1356103&r2=1356104&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
Mon Jul 2 08:20:25 2012
@@ -17,11 +17,15 @@
*/
package org.apache.giraph.lib;
-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.Lists;
+import com.google.common.collect.Maps;
+import org.apache.giraph.graph.*;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.*;
+import org.apache.hadoop.mapreduce.RecordReader;
+import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.junit.Before;
+import org.junit.Test;
import java.io.IOException;
import java.lang.reflect.Method;
@@ -30,26 +34,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.giraph.graph.BasicVertex;
-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.hadoop.conf.Configuration;
-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 com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class TestTextDoubleDoubleAdjacencyListVertexInputFormat {
@@ -139,10 +126,12 @@ public class TestTextDoubleDoubleAdjacen
assertEquals(expected.getNumEdges(), actual.getNumEdges());
List<Edge<I, E>> expectedEdges = Lists.newArrayList();
List<Edge<I, E>> actualEdges = Lists.newArrayList();
- for(I actualDestId : actual) {
+ for (Iterator<I> edges = actual.getOutEdgesIterator(); edges.hasNext();) {
+ I actualDestId = edges.next();
actualEdges.add(new Edge<I, E>(actualDestId,
actual.getEdgeValue(actualDestId)));
}
- for(I expectedDestId : expected) {
+ for (Iterator<I> edges = expected.getOutEdgesIterator(); edges.hasNext();)
{
+ I expectedDestId = edges.next();
expectedEdges.add(new Edge<I, E>(expectedDestId,
expected.getEdgeValue(expectedDestId)));
}
Collections.sort(expectedEdges);
