You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/04/22 22:05:49 UTC
incubator-tinkerpop git commit: minor nothings.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 31d028668 -> f7073a541
minor nothings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f7073a54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f7073a54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f7073a54
Branch: refs/heads/master
Commit: f7073a541e202f77d2490938e644438ed832ba25
Parents: 31d0286
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Apr 22 14:05:44 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Apr 22 14:05:44 2015 -0600
----------------------------------------------------------------------
.../util/star/StarGraphSerializer.java | 31 ++++++++++----------
1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f7073a54/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java
index 38cdbe9..e9caeed 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/star/StarGraphSerializer.java
@@ -78,14 +78,14 @@ public final class StarGraphSerializer extends Serializer<StarGraph> {
readEdges(kryo, input, starGraph, Direction.IN);
readEdges(kryo, input, starGraph, Direction.OUT);
if (kryo.readObject(input, Boolean.class)) {
- final int labelSize = kryo.readObject(input, Integer.class);
- for (int i = 0; i < labelSize; i++) {
- final String key = kryo.readObject(input, String.class);
- final int vertexPropertySize = kryo.readObject(input, Integer.class);
- for (int j = 0; j < vertexPropertySize; j++) {
+ final int numberOfUniqueKeys = kryo.readObject(input, Integer.class);
+ for (int i = 0; i < numberOfUniqueKeys; i++) {
+ final String vertexPropertyKey = kryo.readObject(input, String.class);
+ final int numberOfVertexPropertiesWithKey = kryo.readObject(input, Integer.class);
+ for (int j = 0; j < numberOfVertexPropertiesWithKey; j++) {
final Object id = kryo.readClassAndObject(input);
final Object value = kryo.readClassAndObject(input);
- starGraph.starVertex.property(VertexProperty.Cardinality.list, key, value, T.id, id);
+ starGraph.starVertex.property(VertexProperty.Cardinality.list, vertexPropertyKey, value, T.id, id);
}
}
}
@@ -110,19 +110,18 @@ public final class StarGraphSerializer extends Serializer<StarGraph> {
}
private static void readEdges(final Kryo kryo, final Input input, final StarGraph starGraph, final Direction direction) {
- final boolean hasEdges = kryo.readObject(input, Boolean.class);
- if (hasEdges) {
- final int labelSize = kryo.readObject(input, Integer.class);
- for (int i = 0; i < labelSize; i++) {
- final String label = kryo.readObject(input, String.class);
- final int edgeSize = kryo.readObject(input, Integer.class);
- for (int j = 0; j < edgeSize; j++) {
+ if (kryo.readObject(input, Boolean.class)) {
+ final int numberOfUniqueLabels = kryo.readObject(input, Integer.class);
+ for (int i = 0; i < numberOfUniqueLabels; i++) {
+ final String edgeLabel = kryo.readObject(input, String.class);
+ final int numberOfEdgesWithLabel = kryo.readObject(input, Integer.class);
+ for (int j = 0; j < numberOfEdgesWithLabel; j++) {
final Object edgeId = kryo.readClassAndObject(input);
- final Object otherVertexId = kryo.readClassAndObject(input);
+ final Object adjacentVertexId = kryo.readClassAndObject(input);
if (direction.equals(Direction.OUT))
- starGraph.starVertex.addOutEdge(label, starGraph.addVertex(T.id, otherVertexId), T.id, edgeId);
+ starGraph.starVertex.addOutEdge(edgeLabel, starGraph.addVertex(T.id, adjacentVertexId), T.id, edgeId);
else
- starGraph.starVertex.addInEdge(label, starGraph.addVertex(T.id, otherVertexId), T.id, edgeId);
+ starGraph.starVertex.addInEdge(edgeLabel, starGraph.addVertex(T.id, adjacentVertexId), T.id, edgeId);
}
}
}