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/03/13 00:29:36 UTC
incubator-tinkerpop git commit: minor nothing optimizations.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 69b69ee76 -> 859b3dff3
minor nothing optimizations.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/859b3dff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/859b3dff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/859b3dff
Branch: refs/heads/master
Commit: 859b3dff3eb673b73b1151777d80469b32519a78
Parents: 69b69ee
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Mar 12 17:29:33 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Mar 12 17:29:33 2015 -0600
----------------------------------------------------------------------
.../tinkerpop/gremlin/structure/io/gryo/GryoReader.java | 8 +++-----
.../hadoop/structure/io/gryo/VertexStreamIterator.java | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/859b3dff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
index 4088526..5bb327d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
@@ -219,8 +219,7 @@ public class GryoReader implements GraphReader {
this.headerReader.read(kryo, input);
- final DetachedVertex detachedVertex = (DetachedVertex) kryo.readClassAndObject(input);
- final Vertex v = vertexMaker.apply(detachedVertex);
+ final Vertex vertex = vertexMaker.apply((DetachedVertex) kryo.readClassAndObject(input));
final boolean streamContainsEdgesInSomeDirection = input.readBoolean();
if (!streamContainsEdgesInSomeDirection && directionRequested != null)
@@ -254,15 +253,14 @@ public class GryoReader implements GraphReader {
}
}
- return v;
+ return vertex;
}
private void readEdges(final Input input, final Function<DetachedEdge, Edge> edgeMaker) {
if (input.readBoolean()) {
Object next = kryo.readClassAndObject(input);
while (!next.equals(EdgeTerminator.INSTANCE)) {
- final DetachedEdge detachedEdge = (DetachedEdge) next;
- edgeMaker.apply(detachedEdge);
+ edgeMaker.apply((DetachedEdge) next);
next = kryo.readClassAndObject(input);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/859b3dff/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIterator.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIterator.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIterator.java
index 5f73fd2..7fb69ee 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIterator.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIterator.java
@@ -130,7 +130,7 @@ public class VertexStreamIterator implements Iterator<VertexWritable> {
final Function<DetachedVertex, Vertex> vertexMaker = detachedVertex -> DetachedVertex.addTo(gLocal, detachedVertex);
final Function<DetachedEdge, Edge> edgeMaker = detachedEdge -> DetachedEdge.addTo(gLocal, detachedEdge);
try (InputStream in = new ByteArrayInputStream(this.output.toByteArray())) {
- return gryoReader.readVertex(in, Direction.BOTH, vertexMaker, edgeMaker);
+ return this.gryoReader.readVertex(in, Direction.BOTH, vertexMaker, edgeMaker);
}
}
}