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/05/09 21:27:14 UTC
svn commit: r1336361 - in
/incubator/giraph/trunk/src/main/java/org/apache/giraph:
comm/SendPartitionMessagesRequest.java
comm/SendPartitionMutationsRequest.java graph/Edge.java
graph/VertexMutations.java
Author: aching
Date: Wed May 9 19:27:13 2012
New Revision: 1336361
URL: http://svn.apache.org/viewvc?rev=1336361&view=rev
Log:
GIRAPH-37. Compilation failures on type problem fixes (continued from
previous commit).
Modified:
incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java
incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java
incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/Edge.java
incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/VertexMutations.java
Modified: incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java?rev=1336361&r1=1336360&r2=1336361&view=diff
==============================================================================
--- incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java (original)
+++ incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMessagesRequest.java Wed May 9 19:27:13 2012
@@ -82,12 +82,12 @@ public class SendPartitionMessagesReques
int vertexIdMessagesSize = input.readInt();
vertexIdMessages = Maps.newHashMapWithExpectedSize(vertexIdMessagesSize);
for (int i = 0; i < vertexIdMessagesSize; ++i) {
- I vertexId = BspUtils.createVertexIndex(conf);
+ I vertexId = BspUtils.<I>createVertexIndex(conf);
vertexId.readFields(input);
int messageCount = input.readInt();
List<M> messageList = Lists.newArrayListWithCapacity(messageCount);
for (int j = 0; j < messageCount; ++j) {
- M message = BspUtils.createMessageValue(conf);
+ M message = BspUtils.<M>createMessageValue(conf);
message.readFields(input);
messageList.add(message);
}
Modified: incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java?rev=1336361&r1=1336360&r2=1336361&view=diff
==============================================================================
--- incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java (original)
+++ incubator/giraph/trunk/src/main/java/org/apache/giraph/comm/SendPartitionMutationsRequest.java Wed May 9 19:27:13 2012
@@ -80,7 +80,7 @@ public class SendPartitionMutationsReque
int vertexIdMutationsSize = input.readInt();
vertexIdMutations = Maps.newHashMapWithExpectedSize(vertexIdMutationsSize);
for (int i = 0; i < vertexIdMutationsSize; ++i) {
- I vertexId = BspUtils.createVertexIndex(conf);
+ I vertexId = BspUtils.<I>createVertexIndex(conf);
vertexId.readFields(input);
VertexMutations<I, V, E, M> vertexMutations =
new VertexMutations<I, V, E, M>();
Modified: incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/Edge.java
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/Edge.java?rev=1336361&r1=1336360&r2=1336361&view=diff
==============================================================================
--- incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/Edge.java (original)
+++ incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/Edge.java Wed May 9 19:27:13 2012
@@ -102,12 +102,11 @@ public class Edge<I extends WritableComp
", edgeValue = " + edgeValue + ")";
}
- @SuppressWarnings("unchecked")
@Override
public void readFields(DataInput input) throws IOException {
- destVertexId = (I) BspUtils.createVertexIndex(getConf());
+ destVertexId = BspUtils.<I>createVertexIndex(getConf());
destVertexId.readFields(input);
- edgeValue = (E) BspUtils.createEdgeValue(getConf());
+ edgeValue = BspUtils.<E>createEdgeValue(getConf());
edgeValue.readFields(input);
}
Modified: incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/VertexMutations.java
URL: http://svn.apache.org/viewvc/incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/VertexMutations.java?rev=1336361&r1=1336360&r2=1336361&view=diff
==============================================================================
--- incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/VertexMutations.java (original)
+++ incubator/giraph/trunk/src/main/java/org/apache/giraph/graph/VertexMutations.java Wed May 9 19:27:13 2012
@@ -92,15 +92,15 @@ public class VertexMutations<I extends W
removedVertexCount = input.readInt();
int addedEdgeListSize = input.readInt();
for (int i = 0; i < addedEdgeListSize; ++i) {
- I destVertex = BspUtils.createVertexIndex(conf);
+ I destVertex = BspUtils.<I>createVertexIndex(conf);
destVertex.readFields(input);
- E edgeValue = BspUtils.createEdgeValue(conf);
+ E edgeValue = BspUtils.<E>createEdgeValue(conf);
edgeValue.readFields(input);
addedEdgeList.add(new Edge<I, E>(destVertex, edgeValue));
}
int removedEdgeListSize = input.readInt();
for (int i = 0; i < removedEdgeListSize; ++i) {
- I removedEdge = BspUtils.createVertexIndex(conf);
+ I removedEdge = BspUtils.<I>createVertexIndex(conf);
removedEdge.readFields(input);
removedEdgeList.add(removedEdge);
}