Let HugeClient use default max conns

Change-Id: I326d8d8e93b2fb2f8041abbbe0f4508f8e50b0d6
hugegraph · Apr 9, 2019 · 468808d · 468808d
1 parent 1c27c4f
commit 468808d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/src/main/java/com/baidu/hugegraph/client/RestClient.java b/src/main/java/com/baidu/hugegraph/client/RestClient.java
@@ -41,14 +41,22 @@ public RestClient(String url, int timeout) {
         super(url, timeout * SECOND);
     }
 
-    public RestClient(String url, int timeout, int maxTotal, int maxPerRoute) {
-        super(url, timeout * SECOND, maxTotal, maxPerRoute);
+    public RestClient(String url, int timeout, int maxConns,
+                      int maxConnsPerRoute) {
+        super(url, timeout * SECOND, maxConns, maxConnsPerRoute);
     }
 
-    public RestClient(String url, String username, String password, int timeout) {
+    public RestClient(String url, String username, String password,
+                      int timeout) {
         super(url, username, password, timeout * SECOND);
     }
 
+    public RestClient(String url, String username, String password,
+                      int timeout, int maxConns, int maxConnsPerRoute) {
+        super(url, username, password, timeout * SECOND,
+              maxConns, maxConnsPerRoute);
+    }
+
     protected void checkStatus(Response response, Response.Status... statuses) {
         boolean match = false;
         for (Response.Status status : statuses) {

diff --git a/src/main/java/com/baidu/hugegraph/driver/HugeClient.java b/src/main/java/com/baidu/hugegraph/driver/HugeClient.java
@@ -31,6 +31,8 @@
 public class HugeClient implements Closeable {
 
     private static final int DEFAULT_TIMEOUT = 20;
+    private static final int DEFAULT_MAX_CONNS = 100;
+    private static final int DEFAULT_MAX_CONNS_PER_ROUTE = 40;
 
     static {
         ClientVersion.check();
@@ -53,18 +55,15 @@ public HugeClient(String url, String graph) {
     }
 
     public HugeClient(String url, String graph, int timeout) {
-        try {
-            this.client = new RestClient(url, timeout);
-        } catch (ProcessingException e) {
-            throw new ServerException("Failed to connect url '%s'", url);
-        }
-        this.initManagers(this.client, graph);
+        this(url, graph, timeout, DEFAULT_MAX_CONNS,
+             DEFAULT_MAX_CONNS_PER_ROUTE);
     }
 
     public HugeClient(String url, String graph, int timeout,
-                      int maxTotal, int maxPerRoute) {
+                      int maxConns, int maxConnsPerRoute) {
         try {
-            this.client = new RestClient(url, timeout, maxTotal, maxPerRoute);
+            this.client = new RestClient(url, timeout, maxConns,
+                                         maxConnsPerRoute);
         } catch (ProcessingException e) {
             throw new ServerException("Failed to connect url '%s'", url);
         }
@@ -79,8 +78,16 @@ public HugeClient(String url, String graph,
     public HugeClient(String url, String graph,
                       String username, String password,
                       int timeout) {
+        this(url, graph, username, password, timeout, DEFAULT_MAX_CONNS,
+             DEFAULT_MAX_CONNS_PER_ROUTE);
+    }
+
+    public HugeClient(String url, String graph,
+                      String username, String password,
+                      int timeout, int maxConns, int maxConnsPerRoute) {
         try {
-            this.client = new RestClient(url, username, password, timeout);
+            this.client = new RestClient(url, username, password, timeout,
+                                         maxConns, maxConnsPerRoute);
         } catch (ProcessingException e) {
             throw new ServerException("Failed to connect url '%s'", url);
         }