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/05/08 20:14:14 UTC
[2/3] incubator-tinkerpop git commit: Make sure that the cluster
executor handles all async ops.
Make sure that the cluster executor handles all async ops.
Should be resorting to fork/join pool anywhere.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/186494d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/186494d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/186494d4
Branch: refs/heads/master
Commit: 186494d41e8153dbe332f6cbfc8ea7796ad839c6
Parents: aa398ee
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 8 14:13:14 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 8 14:13:14 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 2 +-
.../main/java/org/apache/tinkerpop/gremlin/driver/Connection.java | 2 +-
.../java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/186494d4/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 c42014a..0e5617e 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
@@ -466,7 +466,7 @@ public class Cluster {
return CompletableFuture.supplyAsync(() -> {
this.factory.shutdown();
return null;
- });
+ }, executor());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/186494d4/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index 6c4b4a4..00e87c3 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -174,7 +174,7 @@ class Connection {
thisConnection.returnToPool();
if (isClosed() && pending.isEmpty())
shutdown(closeFuture.get());
- });
+ }, cluster.executor());
final ResultQueue handler = new ResultQueue(resultLinkedBlockingQueue, readCompleted);
pending.put(requestMessage.getRequestId(), handler);
final ResultSet resultSet = new ResultSet(handler, cluster.executor(), channel,
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/186494d4/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
index 839978f..9ea3db6 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
@@ -226,7 +226,7 @@ class ConnectionPool {
final List<CompletableFuture<Void>> futures = new ArrayList<>(connections.size());
for (Connection connection : connections) {
final CompletableFuture<Void> future = connection.closeAsync();
- future.thenRunAsync(open::decrementAndGet);
+ future.thenRunAsync(open::decrementAndGet, cluster.executor());
futures.add(future);
}
return futures.toArray(new CompletableFuture[futures.size()]);