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/07 20:22:03 UTC

[03/10] incubator-tinkerpop git commit: More renaming of "request" to "usage" in variables/methods.

More renaming of "request" to "usage" in variables/methods.


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

Branch: refs/heads/master
Commit: c6d220d9b65697d963a3e0f0322ee72d4d7ca594
Parents: eff9d9f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 7 12:59:30 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 7 12:59:30 2015 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/driver/Cluster.java       | 20 ++++++++++----------
 .../driver/util/ProfilingApplication.java       |  4 +---
 2 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c6d220d9/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 b0c78b1..cdf8a09 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
@@ -109,8 +109,8 @@ public class Cluster {
                 .nioPoolSize(settings.nioPoolSize)
                 .workerPoolSize(settings.workerPoolSize)
                 .maxInProcessPerConnection(settings.connectionPool.maxInProcessPerConnection)
-                .maxSimultaneousRequestsPerConnection(settings.connectionPool.maxSimultaneousUsagePerConnection)
-                .minSimultaneousRequestsPerConnection(settings.connectionPool.minSimultaneousUsagePerConnection)
+                .maxSimultaneousUsagePerConnection(settings.connectionPool.maxSimultaneousUsagePerConnection)
+                .minSimultaneousUsagePerConnection(settings.connectionPool.minSimultaneousUsagePerConnection)
                 .maxConnectionPoolSize(settings.connectionPool.maxSize)
                 .minConnectionPoolSize(settings.connectionPool.minSize);
 
@@ -192,8 +192,8 @@ public class Cluster {
         private int workerPoolSize = Runtime.getRuntime().availableProcessors() * 2;
         private int minConnectionPoolSize = ConnectionPool.MIN_POOL_SIZE;
         private int maxConnectionPoolSize = ConnectionPool.MAX_POOL_SIZE;
-        private int minSimultaneousRequestsPerConnection = ConnectionPool.MIN_SIMULTANEOUS_USAGE_PER_CONNECTION;
-        private int maxSimultaneousRequestsPerConnection = ConnectionPool.MAX_SIMULTANEOUS_USAGE_PER_CONNECTION;
+        private int minSimultaneousUsagePerConnection = ConnectionPool.MIN_SIMULTANEOUS_USAGE_PER_CONNECTION;
+        private int maxSimultaneousUsagePerConnection = ConnectionPool.MAX_SIMULTANEOUS_USAGE_PER_CONNECTION;
         private int maxInProcessPerConnection = Connection.MAX_IN_PROCESS;
         private int minInProcessPerConnection = Connection.MIN_IN_PROCESS;
         private int maxWaitForConnection = Connection.MAX_WAIT_FOR_CONNECTION;
@@ -261,13 +261,13 @@ public class Cluster {
             return this;
         }
 
-        public Builder maxSimultaneousRequestsPerConnection(final int maxSimultaneousRequestsPerConnection) {
-            this.maxSimultaneousRequestsPerConnection = maxSimultaneousRequestsPerConnection;
+        public Builder maxSimultaneousUsagePerConnection(final int maxSimultaneousUsagePerConnection) {
+            this.maxSimultaneousUsagePerConnection = maxSimultaneousUsagePerConnection;
             return this;
         }
 
-        public Builder minSimultaneousRequestsPerConnection(final int minSimultaneousRequestsPerConnection) {
-            this.minSimultaneousRequestsPerConnection = minSimultaneousRequestsPerConnection;
+        public Builder minSimultaneousUsagePerConnection(final int minSimultaneousUsagePerConnection) {
+            this.minSimultaneousUsagePerConnection = minSimultaneousUsagePerConnection;
             return this;
         }
 
@@ -356,8 +356,8 @@ public class Cluster {
             final Settings.ConnectionPoolSettings connectionPoolSettings = new Settings.ConnectionPoolSettings();
             connectionPoolSettings.maxInProcessPerConnection = this.maxInProcessPerConnection;
             connectionPoolSettings.minInProcessPerConnection = this.minInProcessPerConnection;
-            connectionPoolSettings.maxSimultaneousUsagePerConnection = this.maxSimultaneousRequestsPerConnection;
-            connectionPoolSettings.minSimultaneousUsagePerConnection = this.minSimultaneousRequestsPerConnection;
+            connectionPoolSettings.maxSimultaneousUsagePerConnection = this.maxSimultaneousUsagePerConnection;
+            connectionPoolSettings.minSimultaneousUsagePerConnection = this.minSimultaneousUsagePerConnection;
             connectionPoolSettings.maxSize = this.maxConnectionPoolSize;
             connectionPoolSettings.minSize = this.minConnectionPoolSize;
             connectionPoolSettings.maxWaitForConnection = this.maxWaitForConnection;

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c6d220d9/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
index 7a1080d..fa1e8a8 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/util/ProfilingApplication.java
@@ -22,10 +22,8 @@ import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
 import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
 
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.PrintWriter;
 import java.util.List;
@@ -148,7 +146,7 @@ public class ProfilingApplication {
             final Cluster cluster = Cluster.build(host)
                     .minConnectionPoolSize(minConnectionPoolSize)
                     .maxConnectionPoolSize(maxConnectionPoolSize)
-                    .maxSimultaneousRequestsPerConnection(maxSimultaneousUsagePerConnection)
+                    .maxSimultaneousUsagePerConnection(maxSimultaneousUsagePerConnection)
                     .maxInProcessPerConnection(maxInProcessPerConnection)
                     .nioPoolSize(clients)
                     .workerPoolSize(workerPoolSize).create();