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 2013/04/16 07:21:12 UTC
[3/6] GIRAPH-633: Rename VertexEdges to OutEdges (apresta)
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/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 6703b22..5d293eb 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
@@ -25,7 +25,7 @@ import java.util.Random;
import java.util.Set;
import org.apache.giraph.bsp.BspInputSplit;
import org.apache.giraph.edge.EdgeFactory;
-import org.apache.giraph.edge.VertexEdges;
+import org.apache.giraph.edge.OutEdges;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.io.VertexInputFormat;
import org.apache.giraph.io.VertexReader;
@@ -144,9 +144,9 @@ public class PseudoRandomVertexInputFormat extends
Random rand = new Random(vertexId);
DoubleWritable vertexValue = new DoubleWritable(rand.nextDouble());
// In order to save memory and avoid copying, we add directly to a
- // VertexEdges instance.
- VertexEdges<LongWritable, DoubleWritable> edges =
- getConf().createAndInitializeVertexEdges(edgesPerVertex);
+ // OutEdges instance.
+ OutEdges<LongWritable, DoubleWritable> edges =
+ getConf().createAndInitializeOutEdges(edgesPerVertex);
Set<LongWritable> destVertices = Sets.newHashSet();
for (long i = 0; i < edgesPerVertex; ++i) {
LongWritable destVertexId = new LongWritable();
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/main/java/org/apache/giraph/job/GiraphConfigurationValidator.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/job/GiraphConfigurationValidator.java b/giraph-core/src/main/java/org/apache/giraph/job/GiraphConfigurationValidator.java
index 54b6bbd..cc6b126 100644
--- a/giraph-core/src/main/java/org/apache/giraph/job/GiraphConfigurationValidator.java
+++ b/giraph-core/src/main/java/org/apache/giraph/job/GiraphConfigurationValidator.java
@@ -21,7 +21,7 @@ package org.apache.giraph.job;
import org.apache.giraph.combiner.Combiner;
import org.apache.giraph.conf.GiraphConstants;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
-import org.apache.giraph.edge.VertexEdges;
+import org.apache.giraph.edge.OutEdges;
import org.apache.giraph.graph.DefaultVertexResolver;
import org.apache.giraph.graph.DefaultVertexValueFactory;
import org.apache.giraph.graph.Vertex;
@@ -118,7 +118,7 @@ public class GiraphConfigurationValidator<I extends WritableComparable,
vertexValueType = classList.get(VALUE_PARAM_INDEX);
edgeValueType = classList.get(EDGE_PARAM_INDEX);
messageValueType = classList.get(MSG_PARAM_INDEX);
- verifyVertexEdgesGenericTypes();
+ verifyOutEdgesGenericTypes();
verifyVertexInputFormatGenericTypes();
verifyEdgeInputFormatGenericTypes();
verifyVertexOutputFormatGenericTypes();
@@ -165,7 +165,7 @@ public class GiraphConfigurationValidator<I extends WritableComparable,
VERTEX_RESOLVER_CLASS.getDefaultClass().getCanonicalName());
}
}
- if (conf.getVertexEdgesClass() == null) {
+ if (conf.getOutEdgesClass() == null) {
if (LOG.isInfoEnabled()) {
LOG.info("checkConfiguration: No class found for " +
VERTEX_EDGES_CLASS.getKey() + ", defaulting to " +
@@ -175,15 +175,15 @@ public class GiraphConfigurationValidator<I extends WritableComparable,
}
/**
- * Verify matching generic types for a specific VertexEdges class.
+ * Verify matching generic types for a specific OutEdges class.
*
- * @param vertexEdgesClass {@link VertexEdges} class to check
+ * @param outEdgesClass {@link org.apache.giraph.edge.OutEdges} class to check
*/
- private void verifyVertexEdgesGenericTypesClass(
- Class<? extends VertexEdges<I, E>> vertexEdgesClass) {
+ private void verifyOutEdgesGenericTypesClass(
+ Class<? extends OutEdges<I, E>> outEdgesClass) {
List<Class<?>> classList = ReflectionUtils.getTypeArguments(
- VertexEdges.class, vertexEdgesClass);
- // VertexEdges implementations can be generic, in which case there are no
+ OutEdges.class, outEdgesClass);
+ // OutEdges implementations can be generic, in which case there are no
// types to check.
if (classList.isEmpty()) {
return;
@@ -205,14 +205,14 @@ public class GiraphConfigurationValidator<I extends WritableComparable,
}
}
- /** Verify matching generic types in VertexEdges. */
- private void verifyVertexEdgesGenericTypes() {
- Class<? extends VertexEdges<I, E>> vertexEdgesClass =
- conf.getVertexEdgesClass();
- Class<? extends VertexEdges<I, E>> inputVertexEdgesClass =
- conf.getInputVertexEdgesClass();
- verifyVertexEdgesGenericTypesClass(vertexEdgesClass);
- verifyVertexEdgesGenericTypesClass(inputVertexEdgesClass);
+ /** Verify matching generic types in OutEdges. */
+ private void verifyOutEdgesGenericTypes() {
+ Class<? extends OutEdges<I, E>> outEdgesClass =
+ conf.getOutEdgesClass();
+ Class<? extends OutEdges<I, E>> inputOutEdgesClass =
+ conf.getInputOutEdgesClass();
+ verifyOutEdgesGenericTypesClass(outEdgesClass);
+ verifyOutEdgesGenericTypesClass(inputOutEdgesClass);
}
/** Verify matching generic types in VertexInputFormat. */
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/main/java/org/apache/giraph/partition/ByteArrayPartition.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/partition/ByteArrayPartition.java b/giraph-core/src/main/java/org/apache/giraph/partition/ByteArrayPartition.java
index 7c7fc2b..c4669d3 100644
--- a/giraph-core/src/main/java/org/apache/giraph/partition/ByteArrayPartition.java
+++ b/giraph-core/src/main/java/org/apache/giraph/partition/ByteArrayPartition.java
@@ -73,7 +73,7 @@ public class ByteArrayPartition<I extends WritableComparable,
representativeVertex.initialize(
getConf().createVertexId(),
getConf().createVertexValue(),
- getConf().createVertexEdges());
+ getConf().createOutEdges());
useUnsafeSerialization = getConf().useUnsafeSerialization();
}
@@ -194,7 +194,7 @@ public class ByteArrayPartition<I extends WritableComparable,
representativeVertex.initialize(
getConf().createVertexId(),
getConf().createVertexValue(),
- getConf().createVertexEdges());
+ getConf().createOutEdges());
useUnsafeSerialization = getConf().useUnsafeSerialization();
for (int i = 0; i < size; ++i) {
progress();
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java b/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
index 53b9dd4..2d30bf9 100644
--- a/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
+++ b/giraph-core/src/main/java/org/apache/giraph/partition/DiskBackedPartitionStore.java
@@ -19,7 +19,7 @@
package org.apache.giraph.partition;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
-import org.apache.giraph.edge.VertexEdges;
+import org.apache.giraph.edge.OutEdges;
import org.apache.giraph.graph.Vertex;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
@@ -381,12 +381,12 @@ public class DiskBackedPartitionStore<I extends WritableComparable,
* @throws IOException
*/
@SuppressWarnings("unchecked")
- private void writeVertexEdges(
+ private void writeOutEdges(
DataOutput output,
Vertex<I, V, E, M> vertex)
throws IOException {
vertex.getId().write(output);
- ((VertexEdges<I, E>) vertex.getEdges()).write(output);
+ ((OutEdges<I, E>) vertex.getEdges()).write(output);
}
/**
@@ -417,12 +417,12 @@ public class DiskBackedPartitionStore<I extends WritableComparable,
* @param partition The partition owning the vertex
* @throws IOException
*/
- private void readVertexEdges(DataInput in, Partition<I, V, E, M> partition)
+ private void readOutEdges(DataInput in, Partition<I, V, E, M> partition)
throws IOException {
I id = conf.createVertexId();
id.readFields(in);
Vertex<I, V, E, M> v = partition.getVertex(id);
- VertexEdges<I, E> edges = conf.createVertexEdges();
+ OutEdges<I, E> edges = conf.createOutEdges();
edges.readFields(in);
v.setEdges(edges);
}
@@ -454,7 +454,7 @@ public class DiskBackedPartitionStore<I extends WritableComparable,
inputStream = new DataInputStream(
new BufferedInputStream(new FileInputStream(file)));
for (int i = 0; i < numVertices; ++i) {
- readVertexEdges(inputStream, partition);
+ readOutEdges(inputStream, partition);
}
inputStream.close();
/*
@@ -501,7 +501,7 @@ public class DiskBackedPartitionStore<I extends WritableComparable,
outputStream = new DataOutputStream(
new BufferedOutputStream(new FileOutputStream(file)));
for (Vertex<I, V, E, M> vertex : partition) {
- writeVertexEdges(outputStream, vertex);
+ writeOutEdges(outputStream, vertex);
}
outputStream.close();
}
@@ -530,7 +530,7 @@ public class DiskBackedPartitionStore<I extends WritableComparable,
outputStream = new DataOutputStream(
new BufferedOutputStream(new FileOutputStream(file, true)));
for (Vertex<I, V, E, M> vertex : partition) {
- writeVertexEdges(outputStream, vertex);
+ writeOutEdges(outputStream, vertex);
}
outputStream.close();
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java b/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java
index c9a52d1..6016ba4 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java
@@ -30,6 +30,7 @@ import org.apache.giraph.aggregators.AggregatorWriter;
import org.apache.giraph.combiner.Combiner;
import org.apache.giraph.conf.GiraphConfiguration;
import org.apache.giraph.conf.GiraphConstants;
+import org.apache.giraph.edge.OutEdges;
import org.apache.giraph.graph.VertexValueFactory;
import org.apache.giraph.io.EdgeInputFormat;
import org.apache.giraph.io.VertexInputFormat;
@@ -39,7 +40,6 @@ import org.apache.giraph.job.GiraphConfigurationValidator;
import org.apache.giraph.master.MasterCompute;
import org.apache.giraph.partition.Partition;
import org.apache.giraph.graph.Vertex;
-import org.apache.giraph.edge.VertexEdges;
import org.apache.giraph.worker.WorkerContext;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -91,7 +91,7 @@ public final class ConfigurationUtils {
OPTIONS.addOption("eip", "edgeInputPath", true, "Edge input path");
OPTIONS.addOption("op", "outputPath", true, "Vertex output path");
OPTIONS.addOption("c", "combiner", true, "Combiner class");
- OPTIONS.addOption("ve", "vertexEdges", true, "Vertex edges class");
+ OPTIONS.addOption("ve", "outEdges", true, "Vertex edges class");
OPTIONS.addOption("wc", "workerContext", true, "WorkerContext class");
OPTIONS.addOption("aw", "aggregatorWriter", true, "AggregatorWriter class");
OPTIONS.addOption("mc", "masterCompute", true, "MasterCompute class");
@@ -214,13 +214,13 @@ public final class ConfigurationUtils {
(Class<? extends Combiner>) Class.forName(cmd.getOptionValue("c")));
}
if (cmd.hasOption("ve")) {
- giraphConfiguration.setVertexEdgesClass(
- (Class<? extends VertexEdges>)
+ giraphConfiguration.setOutEdgesClass(
+ (Class<? extends OutEdges>)
Class.forName(cmd.getOptionValue("ve")));
}
if (cmd.hasOption("ive")) {
- giraphConfiguration.setInputVertexEdgesClass(
- (Class<? extends VertexEdges>)
+ giraphConfiguration.setInputOutEdgesClass(
+ (Class<? extends OutEdges>)
Class.forName(cmd.getOptionValue("ive")));
}
if (cmd.hasOption("wc")) {
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/main/java/org/apache/giraph/utils/WritableUtils.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/utils/WritableUtils.java b/giraph-core/src/main/java/org/apache/giraph/utils/WritableUtils.java
index 5391aa0..c607ca3 100644
--- a/giraph-core/src/main/java/org/apache/giraph/utils/WritableUtils.java
+++ b/giraph-core/src/main/java/org/apache/giraph/utils/WritableUtils.java
@@ -20,7 +20,7 @@ package org.apache.giraph.utils;
import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
import org.apache.giraph.edge.Edge;
-import org.apache.giraph.edge.VertexEdges;
+import org.apache.giraph.edge.OutEdges;
import org.apache.giraph.graph.Vertex;
import org.apache.giraph.zk.ZooKeeperExt;
import org.apache.giraph.zk.ZooKeeperExt.PathStat;
@@ -477,7 +477,7 @@ public class WritableUtils {
throws IOException {
vertex.getId().readFields(input);
vertex.getValue().readFields(input);
- ((VertexEdges<I, E>) vertex.getEdges()).readFields(input);
+ ((OutEdges<I, E>) vertex.getEdges()).readFields(input);
if (input.readBoolean()) {
vertex.voteToHalt();
} else {
@@ -506,7 +506,7 @@ public class WritableUtils {
Vertex<I, V, E, M> vertex = conf.createVertex();
I id = conf.createVertexId();
V value = conf.createVertexValue();
- VertexEdges<I, E> edges = conf.createVertexEdges();
+ OutEdges<I, E> edges = conf.createOutEdges();
vertex.initialize(id, value, edges);
reinitializeVertexFromDataInput(input, vertex, conf);
return vertex;
@@ -533,7 +533,7 @@ public class WritableUtils {
throws IOException {
vertex.getId().write(output);
vertex.getValue().write(output);
- ((VertexEdges<I, E>) vertex.getEdges()).write(output);
+ ((OutEdges<I, E>) vertex.getEdges()).write(output);
output.writeBoolean(vertex.isHalted());
}
}
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiGraphEdges.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiGraphEdges.java b/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiGraphEdges.java
index 4eeff01..2bb3292 100644
--- a/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiGraphEdges.java
+++ b/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiGraphEdges.java
@@ -27,15 +27,15 @@ import org.junit.Test;
import java.util.Collection;
import java.util.List;
-import static org.apache.giraph.graph.TestVertexAndEdges.instantiateVertexEdges;
+import static org.apache.giraph.graph.TestVertexAndEdges.instantiateOutEdges;
import static org.junit.Assert.assertEquals;
/**
- * Tests {@link VertexEdges} implementations that allow parallel edges.
+ * Tests {@link OutEdges} implementations that allow parallel edges.
*/
public class TestMultiGraphEdges {
- /** {@link VertexEdges} classes to be tested. */
- private Collection<Class<? extends VertexEdges>> edgesClasses =
+ /** {@link OutEdges} classes to be tested. */
+ private Collection<Class<? extends OutEdges>> edgesClasses =
Lists.newArrayList();
@Before
@@ -47,20 +47,20 @@ public class TestMultiGraphEdges {
}
/**
- * Ensures that all multigraph {@link VertexEdges} implementations allow
+ * Ensures that all multigraph {@link OutEdges} implementations allow
* parallel edges.
*/
@Test
public void testParallelEdges() {
- for (Class<? extends VertexEdges> edgesClass : edgesClasses) {
+ for (Class<? extends OutEdges> edgesClass : edgesClasses) {
testParallelEdgesClass(edgesClass);
}
}
private void testParallelEdgesClass(
- Class<? extends VertexEdges> edgesClass) {
- VertexEdges<LongWritable, DoubleWritable> edges =
- instantiateVertexEdges(edgesClass);
+ Class<? extends OutEdges> edgesClass) {
+ OutEdges<LongWritable, DoubleWritable> edges =
+ instantiateOutEdges(edgesClass);
// Initial edges list contains parallel edges.
List<Edge<LongWritable, DoubleWritable>> initialEdges = Lists.newArrayList(
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiRandomAccessEdges.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiRandomAccessEdges.java b/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiRandomAccessEdges.java
index b86f409..c300d11 100644
--- a/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiRandomAccessEdges.java
+++ b/giraph-core/src/test/java/org/apache/giraph/edge/TestMultiRandomAccessEdges.java
@@ -28,15 +28,15 @@ import org.junit.Test;
import java.util.Collection;
import java.util.List;
-import static org.apache.giraph.graph.TestVertexAndEdges.instantiateVertexEdges;
+import static org.apache.giraph.graph.TestVertexAndEdges.instantiateOutEdges;
import static org.junit.Assert.assertEquals;
/**
- * Tests {@link MultiRandomAccessVertexEdges} implementations.
+ * Tests {@link MultiRandomAccessOutEdges} implementations.
*/
public class TestMultiRandomAccessEdges {
- /** {@link MultiRandomAccessVertexEdges} classes to be tested. */
- private Collection<Class<? extends MultiRandomAccessVertexEdges>>
+ /** {@link MultiRandomAccessOutEdges} classes to be tested. */
+ private Collection<Class<? extends MultiRandomAccessOutEdges>>
edgesClasses = Lists.newArrayList();
@Before
@@ -45,22 +45,22 @@ public class TestMultiRandomAccessEdges {
}
/**
- * Ensures that all {@link MultiRandomAccessVertexEdges} implementations
+ * Ensures that all {@link MultiRandomAccessOutEdges} implementations
* correctly return edge values.
*/
@Test
public void testParallelEdges() {
- for (Class<? extends MultiRandomAccessVertexEdges> edgesClass :
+ for (Class<? extends MultiRandomAccessOutEdges> edgesClass :
edgesClasses) {
testParallelEdgesClass(edgesClass);
}
}
private void testParallelEdgesClass(
- Class<? extends MultiRandomAccessVertexEdges> edgesClass) {
- MultiRandomAccessVertexEdges<LongWritable, DoubleWritable> edges =
- (MultiRandomAccessVertexEdges<LongWritable, DoubleWritable>)
- instantiateVertexEdges(edgesClass);
+ Class<? extends MultiRandomAccessOutEdges> edgesClass) {
+ MultiRandomAccessOutEdges<LongWritable, DoubleWritable> edges =
+ (MultiRandomAccessOutEdges<LongWritable, DoubleWritable>)
+ instantiateOutEdges(edgesClass);
// Initial edges list contains parallel edges.
List<Edge<LongWritable, DoubleWritable>> initialEdges = Lists.newArrayList(
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/edge/TestNullValueEdges.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/edge/TestNullValueEdges.java b/giraph-core/src/test/java/org/apache/giraph/edge/TestNullValueEdges.java
index 79bf093..99a104d 100644
--- a/giraph-core/src/test/java/org/apache/giraph/edge/TestNullValueEdges.java
+++ b/giraph-core/src/test/java/org/apache/giraph/edge/TestNullValueEdges.java
@@ -28,15 +28,15 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import static org.apache.giraph.graph.TestVertexAndEdges.instantiateVertexEdges;
+import static org.apache.giraph.graph.TestVertexAndEdges.instantiateOutEdges;
import static org.junit.Assert.assertEquals;
/**
- * Tests {@link VertexEdges} implementations with null edge values.
+ * Tests {@link OutEdges} implementations with null edge values.
*/
public class TestNullValueEdges {
- /** {@link VertexEdges} classes to be tested. */
- private Collection<Class<? extends MutableVertexEdges>>
+ /** {@link OutEdges} classes to be tested. */
+ private Collection<Class<? extends MutableOutEdges>>
edgesClasses = Lists.newArrayList();
@Before
@@ -47,16 +47,16 @@ public class TestNullValueEdges {
@Test
public void testEdges() {
- for (Class<? extends VertexEdges> edgesClass : edgesClasses) {
+ for (Class<? extends OutEdges> edgesClass : edgesClasses) {
testEdgesClass(edgesClass);
}
}
private void testEdgesClass(
- Class<? extends VertexEdges> edgesClass) {
- VertexEdges<LongWritable, NullWritable> edges =
- (VertexEdges<LongWritable, NullWritable>)
- instantiateVertexEdges(edgesClass);
+ Class<? extends OutEdges> edgesClass) {
+ OutEdges<LongWritable, NullWritable> edges =
+ (OutEdges<LongWritable, NullWritable>)
+ instantiateOutEdges(edgesClass);
List<Edge<LongWritable, NullWritable>> initialEdges = Lists.newArrayList(
EdgeFactory.create(new LongWritable(1)),
@@ -79,16 +79,16 @@ public class TestNullValueEdges {
*/
@Test
public void testMutateEdges() {
- for (Class<? extends MutableVertexEdges> edgesClass : edgesClasses) {
+ for (Class<? extends MutableOutEdges> edgesClass : edgesClasses) {
testMutateEdgesClass(edgesClass);
}
}
private void testMutateEdgesClass(
- Class<? extends MutableVertexEdges> edgesClass) {
- MutableVertexEdges<LongWritable, NullWritable> edges =
- (MutableVertexEdges<LongWritable, NullWritable>)
- instantiateVertexEdges(edgesClass);
+ Class<? extends MutableOutEdges> edgesClass) {
+ MutableOutEdges<LongWritable, NullWritable> edges =
+ (MutableOutEdges<LongWritable, NullWritable>)
+ instantiateOutEdges(edgesClass);
edges.initialize();
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictGraphEdges.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictGraphEdges.java b/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictGraphEdges.java
index 3c57281..a06de0a 100644
--- a/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictGraphEdges.java
+++ b/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictGraphEdges.java
@@ -27,15 +27,15 @@ import org.junit.Test;
import java.util.Collection;
import java.util.List;
-import static org.apache.giraph.graph.TestVertexAndEdges.instantiateVertexEdges;
+import static org.apache.giraph.graph.TestVertexAndEdges.instantiateOutEdges;
import static org.junit.Assert.assertEquals;
/**
- * Tests {@link VertexEdges} implementations that disallow parallel edges.
+ * Tests {@link OutEdges} implementations that disallow parallel edges.
*/
public class TestStrictGraphEdges {
- /** {@link VertexEdges} classes to be tested. */
- private Collection<Class<? extends VertexEdges>> edgesClasses =
+ /** {@link OutEdges} classes to be tested. */
+ private Collection<Class<? extends OutEdges>> edgesClasses =
Lists.newArrayList();
@Before
@@ -45,20 +45,20 @@ public class TestStrictGraphEdges {
}
/**
- * Ensures that all strict graph {@link VertexEdges} implementations
+ * Ensures that all strict graph {@link OutEdges} implementations
* disallow parallel edges.
*/
@Test
public void testParallelEdges() {
- for (Class<? extends VertexEdges> edgesClass : edgesClasses) {
+ for (Class<? extends OutEdges> edgesClass : edgesClasses) {
testParallelEdgesClass(edgesClass);
}
}
private void testParallelEdgesClass(
- Class<? extends VertexEdges> edgesClass) {
- VertexEdges<LongWritable, DoubleWritable> edges =
- instantiateVertexEdges(edgesClass);
+ Class<? extends OutEdges> edgesClass) {
+ OutEdges<LongWritable, DoubleWritable> edges =
+ instantiateOutEdges(edgesClass);
// Initial edges list contains parallel edges.
List<Edge<LongWritable, DoubleWritable>> initialEdges = Lists.newArrayList(
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictRandomAccessEdges.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictRandomAccessEdges.java b/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictRandomAccessEdges.java
index d3ad069..74d7054 100644
--- a/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictRandomAccessEdges.java
+++ b/giraph-core/src/test/java/org/apache/giraph/edge/TestStrictRandomAccessEdges.java
@@ -27,16 +27,16 @@ import org.junit.Test;
import java.util.Collection;
import java.util.List;
-import static org.apache.giraph.graph.TestVertexAndEdges.instantiateVertexEdges;
+import static org.apache.giraph.graph.TestVertexAndEdges.instantiateOutEdges;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
/**
- * Tests {@link StrictRandomAccessVertexEdges} implementations.
+ * Tests {@link StrictRandomAccessOutEdges} implementations.
*/
public class TestStrictRandomAccessEdges {
- /** {@link StrictRandomAccessVertexEdges} classes to be tested. */
- private Collection<Class<? extends StrictRandomAccessVertexEdges>>
+ /** {@link StrictRandomAccessOutEdges} classes to be tested. */
+ private Collection<Class<? extends StrictRandomAccessOutEdges>>
edgesClasses = Lists.newArrayList();
@Before
@@ -46,22 +46,22 @@ public class TestStrictRandomAccessEdges {
}
/**
- * Ensures that all {@link StrictRandomAccessVertexEdges} implementations
+ * Ensures that all {@link StrictRandomAccessOutEdges} implementations
* correctly return edge values.
*/
@Test
public void testParallelEdges() {
- for (Class<? extends StrictRandomAccessVertexEdges> edgesClass :
+ for (Class<? extends StrictRandomAccessOutEdges> edgesClass :
edgesClasses) {
testParallelEdgesClass(edgesClass);
}
}
private void testParallelEdgesClass(
- Class<? extends StrictRandomAccessVertexEdges> edgesClass) {
- StrictRandomAccessVertexEdges<LongWritable, DoubleWritable> edges =
- (StrictRandomAccessVertexEdges<LongWritable, DoubleWritable>)
- instantiateVertexEdges(edgesClass);
+ Class<? extends StrictRandomAccessOutEdges> edgesClass) {
+ StrictRandomAccessOutEdges<LongWritable, DoubleWritable> edges =
+ (StrictRandomAccessOutEdges<LongWritable, DoubleWritable>)
+ instantiateOutEdges(edgesClass);
// Initial edges list contains parallel edges.
List<Edge<LongWritable, DoubleWritable>> initialEdges = Lists.newArrayList(
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/graph/TestVertexAndEdges.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/graph/TestVertexAndEdges.java b/giraph-core/src/test/java/org/apache/giraph/graph/TestVertexAndEdges.java
index 8a048fd..15d2bb0 100644
--- a/giraph-core/src/test/java/org/apache/giraph/graph/TestVertexAndEdges.java
+++ b/giraph-core/src/test/java/org/apache/giraph/graph/TestVertexAndEdges.java
@@ -29,7 +29,7 @@ import org.apache.giraph.edge.HashMultimapEdges;
import org.apache.giraph.edge.LongDoubleArrayEdges;
import org.apache.giraph.edge.LongDoubleHashMapEdges;
import org.apache.giraph.edge.MutableEdge;
-import org.apache.giraph.edge.VertexEdges;
+import org.apache.giraph.edge.OutEdges;
import org.apache.giraph.time.SystemTime;
import org.apache.giraph.time.Time;
import org.apache.giraph.time.Times;
@@ -57,14 +57,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
- * Test {@link Vertex} functionality across the provided {@link VertexEdges}
+ * Test {@link Vertex} functionality across the provided {@link org.apache.giraph.edge.OutEdges}
* classes.
*/
public class TestVertexAndEdges {
/** Number of repetitions. */
public static final int REPS = 100;
- /** {@link org.apache.giraph.edge.VertexEdges} classes to be tested. */
- private Collection<Class<? extends VertexEdges>> edgesClasses =
+ /** {@link org.apache.giraph.edge.OutEdges} classes to be tested. */
+ private Collection<Class<? extends OutEdges>> edgesClasses =
Lists.newArrayList();
/**
@@ -77,12 +77,12 @@ public class TestVertexAndEdges {
}
/**
- * A basic {@link VertexEdges} implementation that doesn't provide any
+ * A basic {@link org.apache.giraph.edge.OutEdges} implementation that doesn't provide any
* special functionality. Used to test the default implementations of
* Vertex#getEdgeValue(), Vertex#getMutableEdges(), etc.
*/
- public static class TestVertexEdges
- implements VertexEdges<LongWritable, DoubleWritable> {
+ public static class TestOutEdges
+ implements OutEdges<LongWritable, DoubleWritable> {
private List<Edge<LongWritable, DoubleWritable>> edgeList;
@@ -151,7 +151,7 @@ public class TestVertexAndEdges {
@Before
public void setUp() {
- edgesClasses.add(TestVertexEdges.class);
+ edgesClasses.add(TestOutEdges.class);
edgesClasses.add(ByteArrayEdges.class);
edgesClasses.add(ArrayListEdges.class);
edgesClasses.add(HashMapEdges.class);
@@ -161,10 +161,10 @@ public class TestVertexAndEdges {
}
private Vertex<LongWritable, FloatWritable, DoubleWritable, LongWritable>
- instantiateVertex(Class<? extends VertexEdges> edgesClass) {
+ instantiateVertex(Class<? extends OutEdges> edgesClass) {
GiraphConfiguration giraphConfiguration = new GiraphConfiguration();
giraphConfiguration.setVertexClass(TestVertex.class);
- giraphConfiguration.setVertexEdgesClass(edgesClass);
+ giraphConfiguration.setOutEdgesClass(edgesClass);
ImmutableClassesGiraphConfiguration immutableClassesGiraphConfiguration =
new ImmutableClassesGiraphConfiguration(giraphConfiguration);
return immutableClassesGiraphConfiguration.createVertex();
@@ -185,34 +185,34 @@ public class TestVertexAndEdges {
assertEquals(5.5f, vertex.getValue().get(), 0d);
}
- public static VertexEdges
- instantiateVertexEdges(Class<? extends VertexEdges> edgesClass) {
+ public static OutEdges
+ instantiateOutEdges(Class<? extends OutEdges> edgesClass) {
GiraphConfiguration giraphConfiguration = new GiraphConfiguration();
// Needed to extract type arguments in ReflectionUtils.
giraphConfiguration.setVertexClass(TestVertex.class);
- giraphConfiguration.setVertexEdgesClass(edgesClass);
+ giraphConfiguration.setOutEdgesClass(edgesClass);
ImmutableClassesGiraphConfiguration immutableClassesGiraphConfiguration =
new ImmutableClassesGiraphConfiguration(giraphConfiguration);
- return immutableClassesGiraphConfiguration.createVertexEdges();
+ return immutableClassesGiraphConfiguration.createOutEdges();
}
/**
- * Test the provided {@link VertexEdges} implementations for instantiation,
+ * Test the provided {@link org.apache.giraph.edge.OutEdges} implementations for instantiation,
* initialization, edge addition, and edge removal.
*/
@Test
public void testEdges() {
- for (Class<? extends VertexEdges> edgesClass : edgesClasses) {
+ for (Class<? extends OutEdges> edgesClass : edgesClasses) {
testEdgesClass(edgesClass);
}
}
- private void testEdgesClass(Class<? extends VertexEdges> edgesClass) {
+ private void testEdgesClass(Class<? extends OutEdges> edgesClass) {
Vertex<LongWritable, FloatWritable, DoubleWritable, LongWritable> vertex =
instantiateVertex(edgesClass);
- VertexEdges<LongWritable, DoubleWritable> vertexEdges =
- instantiateVertexEdges(edgesClass);
- assertNotNull(vertexEdges);
+ OutEdges<LongWritable, DoubleWritable> outEdges =
+ instantiateOutEdges(edgesClass);
+ assertNotNull(outEdges);
List<Edge<LongWritable, DoubleWritable>> edges = Lists.newLinkedList();
for (int i = 1000; i > 0; --i) {
@@ -220,8 +220,8 @@ public class TestVertexAndEdges {
new DoubleWritable(i * 2.0)));
}
- vertexEdges.initialize(edges);
- vertex.initialize(new LongWritable(1), new FloatWritable(1), vertexEdges);
+ outEdges.initialize(edges);
+ vertex.initialize(new LongWritable(1), new FloatWritable(1), outEdges);
assertEquals(20.0, vertex.getEdgeValue(new LongWritable(10)).get(), 0.0);
@@ -246,19 +246,19 @@ public class TestVertexAndEdges {
*/
@Test
public void testMutateEdges() {
- for (Class<? extends VertexEdges> edgesClass : edgesClasses) {
+ for (Class<? extends OutEdges> edgesClass : edgesClasses) {
testMutateEdgesClass(edgesClass);
}
}
- private void testMutateEdgesClass(Class<? extends VertexEdges> edgesClass) {
+ private void testMutateEdgesClass(Class<? extends OutEdges> edgesClass) {
Vertex<LongWritable, FloatWritable, DoubleWritable, LongWritable> vertex =
instantiateVertex(edgesClass);
- VertexEdges<LongWritable, DoubleWritable> vertexEdges =
- instantiateVertexEdges(edgesClass);
+ OutEdges<LongWritable, DoubleWritable> outEdges =
+ instantiateOutEdges(edgesClass);
- vertexEdges.initialize();
- vertex.initialize(new LongWritable(0), new FloatWritable(0), vertexEdges);
+ outEdges.initialize();
+ vertex.initialize(new LongWritable(0), new FloatWritable(0), outEdges);
// Add 10 edges with id i, value i for i = 0..9
for (int i = 0; i < 10; ++i) {
@@ -327,24 +327,24 @@ public class TestVertexAndEdges {
}
/**
- * Test {@link Vertex} and {@link VertexEdges} serialization.
+ * Test {@link Vertex} and {@link org.apache.giraph.edge.OutEdges} serialization.
* @throws IOException
*/
@Test
public void testSerialize() throws IOException {
- for (Class<? extends VertexEdges> edgesClass : edgesClasses) {
- testSerializeVertexEdgesClass(edgesClass);
- testDynamicChannelBufferSerializeVertexEdgesClass(edgesClass);
- testUnsafeSerializeVertexEdgesClass(edgesClass);
+ for (Class<? extends OutEdges> edgesClass : edgesClasses) {
+ testSerializeOutEdgesClass(edgesClass);
+ testDynamicChannelBufferSerializeOutEdgesClass(edgesClass);
+ testUnsafeSerializeOutEdgesClass(edgesClass);
}
}
private Vertex<LongWritable, FloatWritable, DoubleWritable, LongWritable>
- buildVertex(Class<? extends VertexEdges> edgesClass) {
+ buildVertex(Class<? extends OutEdges> edgesClass) {
Vertex<LongWritable, FloatWritable, DoubleWritable, LongWritable> vertex =
instantiateVertex(edgesClass);
- VertexEdges<LongWritable, DoubleWritable> vertexEdges =
- instantiateVertexEdges(edgesClass);
+ OutEdges<LongWritable, DoubleWritable> outEdges =
+ instantiateOutEdges(edgesClass);
int edgesCount = 200;
List<Edge<LongWritable, DoubleWritable>> edges =
@@ -354,14 +354,14 @@ public class TestVertexAndEdges {
new DoubleWritable(i * 2.0)));
}
- vertexEdges.initialize(edges);
+ outEdges.initialize(edges);
vertex.initialize(new LongWritable(2), new FloatWritable(3.0f),
- vertexEdges);
+ outEdges);
return vertex;
}
- private void testSerializeVertexEdgesClass(
- Class<? extends VertexEdges> edgesClass) {
+ private void testSerializeOutEdgesClass(
+ Class<? extends OutEdges> edgesClass) {
Vertex<LongWritable, FloatWritable, DoubleWritable, LongWritable> vertex =
buildVertex(edgesClass);
@@ -404,8 +404,8 @@ public class TestVertexAndEdges {
assertTrue(EdgeIterables.sameEdges(vertex.getEdges(), readVertex.getEdges()));
}
- private void testDynamicChannelBufferSerializeVertexEdgesClass(
- Class<? extends VertexEdges> edgesClass)
+ private void testDynamicChannelBufferSerializeOutEdgesClass(
+ Class<? extends OutEdges> edgesClass)
throws IOException {
Vertex<LongWritable, FloatWritable, DoubleWritable, LongWritable> vertex =
buildVertex(edgesClass);
@@ -423,7 +423,7 @@ public class TestVertexAndEdges {
serializeNanosStart);
}
serializeNanos /= REPS;
- System.out.println("testDynamicChannelBufferSerializeVertexEdgesClass: " +
+ System.out.println("testDynamicChannelBufferSerializeOutEdgesClass: " +
"Serializing took " + serializeNanos + " ns for " +
outputStream.getDynamicChannelBuffer().writerIndex() + " bytes " +
(outputStream.getDynamicChannelBuffer().writerIndex() * 1f *
@@ -447,7 +447,7 @@ public class TestVertexAndEdges {
outputStream.getDynamicChannelBuffer().readerIndex(0);
}
deserializeNanos /= REPS;
- System.out.println("testDynamicChannelBufferSerializeVertexEdgesClass: " +
+ System.out.println("testDynamicChannelBufferSerializeOutEdgesClass: " +
"Deserializing took " + deserializeNanos + " ns for " +
outputStream.getDynamicChannelBuffer().writerIndex() + " bytes " +
(outputStream.getDynamicChannelBuffer().writerIndex() * 1f *
@@ -459,8 +459,8 @@ public class TestVertexAndEdges {
assertTrue(EdgeIterables.sameEdges(vertex.getEdges(), readVertex.getEdges()));
}
- private void testUnsafeSerializeVertexEdgesClass(
- Class<? extends VertexEdges> edgesClass)
+ private void testUnsafeSerializeOutEdgesClass(
+ Class<? extends OutEdges> edgesClass)
throws IOException {
Vertex<LongWritable, FloatWritable, DoubleWritable, LongWritable> vertex =
buildVertex(edgesClass);
@@ -478,7 +478,7 @@ public class TestVertexAndEdges {
serializeNanosStart);
}
serializeNanos /= REPS;
- System.out.println("testUnsafeSerializeVertexEdgesClass: " +
+ System.out.println("testUnsafeSerializeOutEdgesClass: " +
"Serializing took " +
serializeNanos +
" ns for " + outputStream.getPos()
@@ -503,7 +503,7 @@ public class TestVertexAndEdges {
deserializeNanosStart);
}
deserializeNanos /= REPS;
- System.out.println("testUnsafeSerializeVertexEdgesClass: " +
+ System.out.println("testUnsafeSerializeOutEdgesClass: " +
"Deserializing took " +
deserializeNanos +
" ns for " + outputStream.getPos() +
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/io/TestEdgeInput.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/io/TestEdgeInput.java b/giraph-core/src/test/java/org/apache/giraph/io/TestEdgeInput.java
index ede76f0..07d4cc8 100644
--- a/giraph-core/src/test/java/org/apache/giraph/io/TestEdgeInput.java
+++ b/giraph-core/src/test/java/org/apache/giraph/io/TestEdgeInput.java
@@ -65,7 +65,7 @@ public class TestEdgeInput extends BspCase {
GiraphConfiguration conf = new GiraphConfiguration();
conf.setVertexClass(TestVertexWithNumEdges.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setEdgeInputFormatClass(IntNullTextEdgeInputFormat.class);
conf.setVertexOutputFormatClass(IdWithValueTextOutputFormat.class);
Iterable<String> results = InternalVertexRunner.run(conf, null, edges);
@@ -94,7 +94,7 @@ public class TestEdgeInput extends BspCase {
GiraphConfiguration conf = new GiraphConfiguration();
conf.setVertexClass(TestVertexWithNumEdges.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setEdgeInputFormatClass(IntNullReverseTextEdgeInputFormat.class);
conf.setVertexOutputFormatClass(IdWithValueTextOutputFormat.class);
Iterable<String> results = InternalVertexRunner.run(conf, null, edges);
@@ -130,7 +130,7 @@ public class TestEdgeInput extends BspCase {
GiraphConfiguration conf = new GiraphConfiguration();
conf.setVertexClass(TestVertexDoNothing.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setVertexInputFormatClass(IntIntTextVertexValueInputFormat.class);
conf.setEdgeInputFormatClass(IntNullTextEdgeInputFormat.class);
conf.setVertexOutputFormatClass(IdWithValueTextOutputFormat.class);
@@ -161,7 +161,7 @@ public class TestEdgeInput extends BspCase {
conf = new GiraphConfiguration();
conf.setVertexClass(TestVertexWithNumEdges.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setVertexInputFormatClass(IntIntTextVertexValueInputFormat.class);
conf.setEdgeInputFormatClass(IntNullTextEdgeInputFormat.class);
conf.setVertexOutputFormatClass(IdWithValueTextOutputFormat.class);
@@ -179,7 +179,7 @@ public class TestEdgeInput extends BspCase {
assertEquals(1, (int) values.get(5));
}
- // It should use the specified input VertexEdges class.
+ // It should use the specified input OutEdges class.
@Test
public void testDifferentInputEdgesClass() throws Exception {
String[] edges = new String[] {
@@ -191,8 +191,8 @@ public class TestEdgeInput extends BspCase {
GiraphConfiguration conf = new GiraphConfiguration();
conf.setVertexClass(TestVertexCheckEdgesType.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
- conf.setInputVertexEdgesClass(TestVertexEdgesFilterEven.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
+ conf.setInputOutEdgesClass(TestOutEdgesFilterEven.class);
conf.setEdgeInputFormatClass(IntNullTextEdgeInputFormat.class);
conf.setVertexOutputFormatClass(IdWithValueTextOutputFormat.class);
Iterable<String> results = InternalVertexRunner.run(conf, null, edges);
@@ -221,7 +221,7 @@ public class TestEdgeInput extends BspCase {
public static class TestVertexCheckEdgesType extends TestVertexWithNumEdges {
@Override
public void compute(Iterable<NullWritable> messages) throws IOException {
- assertFalse(getEdges() instanceof TestVertexEdgesFilterEven);
+ assertFalse(getEdges() instanceof TestOutEdgesFilterEven);
assertTrue(getEdges() instanceof ByteArrayEdges);
super.compute(messages);
}
@@ -247,7 +247,7 @@ public class TestEdgeInput extends BspCase {
}
}
- public static class TestVertexEdgesFilterEven
+ public static class TestOutEdgesFilterEven
extends ByteArrayEdges<IntWritable, NullWritable> {
@Override
public void add(Edge<IntWritable, NullWritable> edge) {
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java b/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java
index 1c34f78..9d6b215 100644
--- a/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java
+++ b/giraph-core/src/test/java/org/apache/giraph/master/TestMasterObserver.java
@@ -89,7 +89,7 @@ public class TestMasterObserver {
conf.set(GiraphConstants.MASTER_OBSERVER_CLASSES.getKey(),
arrayToString(klasses));
conf.setVertexClass(NoOpVertex.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setVertexInputFormatClass(IntNullNullTextInputFormat.class);
InternalVertexRunner.run(conf, graph);
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-core/src/test/java/org/apache/giraph/partition/TestGiraphTransferRegulator.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/test/java/org/apache/giraph/partition/TestGiraphTransferRegulator.java b/giraph-core/src/test/java/org/apache/giraph/partition/TestGiraphTransferRegulator.java
index bdcc49e..9b655af 100644
--- a/giraph-core/src/test/java/org/apache/giraph/partition/TestGiraphTransferRegulator.java
+++ b/giraph-core/src/test/java/org/apache/giraph/partition/TestGiraphTransferRegulator.java
@@ -19,7 +19,7 @@ package org.apache.giraph.partition;
import org.apache.giraph.edge.ArrayListEdges;
import org.apache.giraph.edge.EdgeFactory;
-import org.apache.giraph.edge.VertexEdges;
+import org.apache.giraph.edge.OutEdges;
import org.apache.giraph.graph.GiraphTransferRegulator;
import org.apache.giraph.job.GiraphJob;
import org.apache.giraph.graph.Vertex;
@@ -71,7 +71,7 @@ public class TestGiraphTransferRegulator {
.setInt(GiraphTransferRegulator.MAX_VERTICES_PER_TRANSFER, 1);
job.getConfiguration()
.setInt(GiraphTransferRegulator.MAX_EDGES_PER_TRANSFER, 3);
- VertexEdges<IntWritable, DoubleWritable> edges =
+ OutEdges<IntWritable, DoubleWritable> edges =
new ArrayListEdges<IntWritable, DoubleWritable>();
edges.initialize(3);
edges.add(EdgeFactory.create(new IntWritable(2), new DoubleWritable(22)));
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTest.java
----------------------------------------------------------------------
diff --git a/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTest.java b/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTest.java
index 5d3fae1..5d71259 100644
--- a/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTest.java
+++ b/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTest.java
@@ -67,7 +67,7 @@ public class ConnectedComponentsVertexTest {
GiraphConfiguration conf = new GiraphConfiguration();
conf.setVertexClass(ConnectedComponentsVertex.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setCombinerClass(MinimumIntCombiner.class);
conf.setVertexInputFormatClass(IntIntNullTextInputFormat.class);
conf.setVertexOutputFormatClass(IdWithValueTextOutputFormat.class);
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTestInMemory.java
----------------------------------------------------------------------
diff --git a/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTestInMemory.java b/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTestInMemory.java
index f748cb0..e4c029c 100644
--- a/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTestInMemory.java
+++ b/giraph-examples/src/test/java/org/apache/giraph/examples/ConnectedComponentsVertexTestInMemory.java
@@ -58,7 +58,7 @@ public class ConnectedComponentsVertexTestInMemory {
public void testToyData() throws Exception {
GiraphConfiguration conf = new GiraphConfiguration();
conf.setVertexClass(ConnectedComponentsVertex.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setCombinerClass(MinimumIntCombiner.class);
TestGraph<IntWritable, IntWritable, NullWritable, IntWritable> graph =
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankVertexTest.java
----------------------------------------------------------------------
diff --git a/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankVertexTest.java b/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankVertexTest.java
index b41bcf6..2a39291 100644
--- a/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankVertexTest.java
+++ b/giraph-examples/src/test/java/org/apache/giraph/examples/PageRankVertexTest.java
@@ -51,7 +51,7 @@ public class PageRankVertexTest {
conf.setInt(RandomWalkWithRestartVertex.MAX_SUPERSTEPS, 50);
conf.setFloat(RandomWalkWithRestartVertex.TELEPORTATION_PROBABILITY, 0.15f);
conf.setVertexClass(PageRankVertex.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setVertexInputFormatClass(LongDoubleNullTextInputFormat.class);
conf.setVertexOutputFormatClass(
VertexWithDoubleValueNullEdgeTextOutputFormat.class);
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-examples/src/test/java/org/apache/giraph/examples/RandomWalkWithRestartVertexTest.java
----------------------------------------------------------------------
diff --git a/giraph-examples/src/test/java/org/apache/giraph/examples/RandomWalkWithRestartVertexTest.java b/giraph-examples/src/test/java/org/apache/giraph/examples/RandomWalkWithRestartVertexTest.java
index 6ecfefe..a2a891e 100644
--- a/giraph-examples/src/test/java/org/apache/giraph/examples/RandomWalkWithRestartVertexTest.java
+++ b/giraph-examples/src/test/java/org/apache/giraph/examples/RandomWalkWithRestartVertexTest.java
@@ -45,7 +45,7 @@ public class RandomWalkWithRestartVertexTest {
conf.setInt(RandomWalkWithRestartVertex.MAX_SUPERSTEPS, 30);
conf.setFloat(RandomWalkWithRestartVertex.TELEPORTATION_PROBABILITY, 0.25f);
conf.setVertexClass(RandomWalkWithRestartVertex.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setVertexInputFormatClass(LongDoubleDoubleTextInputFormat.class);
conf.setVertexOutputFormatClass(
VertexWithDoubleValueDoubleEdgeTextOutputFormat.class);
@@ -81,7 +81,7 @@ public class RandomWalkWithRestartVertexTest {
conf.setInt(RandomWalkWithRestartVertex.MAX_SUPERSTEPS, 30);
conf.setFloat(RandomWalkWithRestartVertex.TELEPORTATION_PROBABILITY, 0.15f);
conf.setVertexClass(RandomWalkWithRestartVertex.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setVertexInputFormatClass(
NormalizingLongDoubleDoubleTextInputFormat.class);
conf.setVertexOutputFormatClass(
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-examples/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
----------------------------------------------------------------------
diff --git a/giraph-examples/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java b/giraph-examples/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
index ee99dc5..1006577 100644
--- a/giraph-examples/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
+++ b/giraph-examples/src/test/java/org/apache/giraph/examples/SimpleShortestPathsVertexTest.java
@@ -124,7 +124,7 @@ public class SimpleShortestPathsVertexTest {
// start from vertex 1
SOURCE_ID.set(conf, 1);
conf.setVertexClass(SimpleShortestPathsVertex.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setVertexInputFormatClass(
JsonLongDoubleFloatDoubleVertexInputFormat.class);
conf.setVertexOutputFormatClass(
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/giraph-examples/src/test/java/org/apache/giraph/examples/TryMultiIpcBindingPortsTest.java
----------------------------------------------------------------------
diff --git a/giraph-examples/src/test/java/org/apache/giraph/examples/TryMultiIpcBindingPortsTest.java b/giraph-examples/src/test/java/org/apache/giraph/examples/TryMultiIpcBindingPortsTest.java
index 4945b52..23d055e 100644
--- a/giraph-examples/src/test/java/org/apache/giraph/examples/TryMultiIpcBindingPortsTest.java
+++ b/giraph-examples/src/test/java/org/apache/giraph/examples/TryMultiIpcBindingPortsTest.java
@@ -71,7 +71,7 @@ public class TryMultiIpcBindingPortsTest {
GiraphConfiguration conf = new GiraphConfiguration();
GiraphConstants.FAIL_FIRST_IPC_PORT_BIND_ATTEMPT.set(conf, true);
conf.setVertexClass(ConnectedComponentsVertex.class);
- conf.setVertexEdgesClass(ByteArrayEdges.class);
+ conf.setOutEdgesClass(ByteArrayEdges.class);
conf.setCombinerClass(MinimumIntCombiner.class);
conf.setVertexInputFormatClass(IntIntNullTextInputFormat.class);
conf.setVertexOutputFormatClass(IdWithValueTextOutputFormat.class);
http://git-wip-us.apache.org/repos/asf/giraph/blob/158c0b11/src/site/xdoc/io.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/io.xml b/src/site/xdoc/io.xml
index cb752cb..76f610b 100644
--- a/src/site/xdoc/io.xml
+++ b/src/site/xdoc/io.xml
@@ -1,23 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-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.
--->
+ ~ 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.
+ -->
<document xmlns="http://maven.apache.org/XDOC/2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"