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/02/10 22:07:40 UTC

incubator-tinkerpop git commit: TinkerGraph.close() drops the view. Need to come up with a solution where TinkerGraph computer results are a GraphView in and of themselves.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 316cd6420 -> f60b04514


TinkerGraph.close() drops the view. Need to come up with a solution where TinkerGraph computer results are a GraphView in and of themselves.


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

Branch: refs/heads/master
Commit: f60b04514bcad7021a1fe05bff86a8548453cdea
Parents: 316cd64
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Feb 10 14:07:37 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Feb 10 14:07:37 2015 -0700

----------------------------------------------------------------------
 .../com/tinkerpop/gremlin/process/computer/ComputerResult.java   | 3 +++
 .../tinkergraph/process/computer/TinkerComputerResult.java       | 3 +--
 .../com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java | 2 +-
 .../tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java    | 4 ----
 4 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f60b0451/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java
index ced7022..d7bfb90 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/computer/ComputerResult.java
@@ -21,6 +21,9 @@ package com.tinkerpop.gremlin.process.computer;
 import com.tinkerpop.gremlin.structure.Graph;
 
 /**
+ * The result of the {@link GraphComputer}'s computation. This is returned in a {@link java.util.concurrent.Future} by {@link GraphComputer#submit}.
+ * A GraphComputer computation yields two things: an updated view of the computed on {@link Graph} and any computational sideEffects called {@link Memory}.
+ *
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  */
 public interface ComputerResult extends AutoCloseable {

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f60b0451/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerComputerResult.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerComputerResult.java b/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerComputerResult.java
index 9dea009..5271cab 100644
--- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerComputerResult.java
+++ b/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/process/computer/TinkerComputerResult.java
@@ -22,7 +22,6 @@ import com.tinkerpop.gremlin.process.computer.Memory;
 import com.tinkerpop.gremlin.process.computer.util.DefaultComputerResult;
 import com.tinkerpop.gremlin.structure.Graph;
 import com.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
-import com.tinkerpop.gremlin.tinkergraph.structure.TinkerHelper;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -35,6 +34,6 @@ public class TinkerComputerResult extends DefaultComputerResult {
 
     @Override
     public void close() {
-        TinkerHelper.dropView((TinkerGraph) this.graph);
+        ((TinkerGraph) this.graph).close();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f60b0451/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index 1d58142..4a74889 100644
--- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -174,7 +174,7 @@ public class TinkerGraph implements Graph, Graph.Iterators {
 
     @Override
     public void close() {
-
+       this.graphView = null;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f60b0451/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java b/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
index df4db47..622d8e7 100644
--- a/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
+++ b/tinkergraph-gremlin/src/main/java/com/tinkerpop/gremlin/tinkergraph/structure/TinkerHelper.java
@@ -87,10 +87,6 @@ public class TinkerHelper {
         edges.add(edge);
     }
 
-    public static void dropView(final TinkerGraph graph) {
-        graph.graphView = null;
-    }
-
     public static List<TinkerVertex> queryVertexIndex(final TinkerGraph graph, final String key, final Object value) {
         return graph.vertexIndex.get(key, value);
     }