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/16 23:26:03 UTC

incubator-tinkerpop git commit: removed an unneeded synchronization in DetachedEdge.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master dc639238a -> f49d02e72


removed an unneeded synchronization in DetachedEdge.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f49d02e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f49d02e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f49d02e7

Branch: refs/heads/master
Commit: f49d02e721b1e95b5c02709b2c293f4cd07fc7e2
Parents: dc63923
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Mar 16 16:25:59 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Mar 16 16:25:59 2015 -0600

----------------------------------------------------------------------
 .../tinkerpop/gremlin/structure/util/detached/DetachedEdge.java | 2 +-
 .../hadoop/structure/io/gryo/VertexStreamIteratorTest.java      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f49d02e7/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
index 973b229..ed97d25 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
@@ -106,7 +106,7 @@ public class DetachedEdge extends DetachedElement<Edge> implements Edge {
         return hostGraph.edges(this.id).next();
     }
 
-    public synchronized static Edge addTo(final Graph graph, final DetachedEdge detachedEdge) {
+    public static Edge addTo(final Graph graph, final DetachedEdge detachedEdge) {
         Iterator<Vertex> outVertices = graph.vertices(detachedEdge.outVertex.id());
         final Vertex outV = outVertices.hasNext() ? outVertices.next() : graph.addVertex(T.id, detachedEdge.outVertex.id());
         Iterator<Vertex> inVertices = graph.vertices(detachedEdge.inVertex.id());

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f49d02e7/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIteratorTest.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIteratorTest.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIteratorTest.java
index 64ad70d..4c1ded6 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIteratorTest.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/gryo/VertexStreamIteratorTest.java
@@ -57,9 +57,10 @@ public class VertexStreamIteratorTest {
                 System.out.println(iterator.getProgress() + " -- progress");
                 time = System.currentTimeMillis();
             }
-            final ByteArrayOutputStream out = new ByteArrayOutputStream();
+            iterator.next();
+          //  final ByteArrayOutputStream out = new ByteArrayOutputStream();
             //System.out.println("HERE:" +IteratorUtils.count(vertex.get().edges(Direction.BOTH)));
-           final GiraphComputeVertex vertex = new GiraphComputeVertex(iterator.next());
+          // final GiraphComputeVertex vertex = new GiraphComputeVertex(iterator.next());
            //System.out.println(vertex + "!!!!");
            // final DataOutputStream output = new DataOutputStream(out);
            // vertex.getValue().write(output);