You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/11/19 00:50:57 UTC

[1/3] incubator-tinkerpop git commit: Close Cluster executor after the cluster is closed (TINKERPOP3-972)

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master eaafc95ce -> bebc48ace


Close Cluster executor after the cluster is closed (TINKERPOP3-972)


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

Branch: refs/heads/master
Commit: 3db22f668763465753a23070c5408ad56ebc9bdf
Parents: aadd422
Author: Pierre Laporte <pi...@pingtimeout.fr>
Authored: Wed Nov 18 16:04:50 2015 +0100
Committer: Pierre Laporte <pi...@pingtimeout.fr>
Committed: Wed Nov 18 16:05:35 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3db22f66/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index 6c8a2f4..a1978a9 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -617,6 +617,9 @@ public final class Cluster {
                 closeIt.complete(null);
             });
 
+            // Prevent the executor from accepting new tasks while still allowing enqueued tasks to complete
+            executor.shutdown();
+
             return closeIt;
         }
 


[2/3] incubator-tinkerpop git commit: Merge branch 'TINKERPOP3-972' of https://github.com/pingtimeout/incubator-tinkerpop

Posted by sp...@apache.org.
Merge branch 'TINKERPOP3-972' of https://github.com/pingtimeout/incubator-tinkerpop


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

Branch: refs/heads/master
Commit: 9129f1bdf0afc0bb619c8c75689ca58f9d5855c5
Parents: c42613c 3db22f6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Nov 18 12:42:58 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Nov 18 12:42:58 2015 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9129f1bd/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------


[3/3] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/master'

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/master
Commit: bebc48ace4e800b863d5f32ef269a995a921d0b9
Parents: 9129f1b eaafc95
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Nov 18 18:50:32 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Nov 18 18:50:32 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   4 +-
 docs/src/the-traversal.asciidoc                 |  22 ++++
 docs/static/images/quantum-gremlin-atom.png     | Bin 0 -> 816113 bytes
 .../gremlin/process/traversal/Traversal.java    |  12 ++
 .../AdjacentToIncidentStrategy.java             |   5 +-
 .../IncidentToAdjacentStrategy.java             |   6 +
 .../traversal/util/TraversalExplanation.java    | 117 +++++++++++++++++++
 .../step/sideEffect/GroovyExplainTest.groovy    |  35 ++++++
 .../process/GroovyProcessComputerSuite.java     |   2 +
 .../process/GroovyProcessStandardSuite.java     |   2 +
 .../gremlin/process/ProcessComputerSuite.java   |   2 +
 .../gremlin/process/ProcessStandardSuite.java   |   2 +
 .../traversal/step/sideEffect/ExplainTest.java  |  85 ++++++++++++++
 .../structure/TinkerGraphPlayTest.java          |   4 +-
 14 files changed, 292 insertions(+), 6 deletions(-)
----------------------------------------------------------------------