up

Author: youngsofun

databend-client/src/main/java/com/databend/client/ClientSettings.java

@@ -18,10 +18,11 @@
 import java.util.Map;
 
 public class ClientSettings {
-    public static final Integer DEFAULT_QUERY_TIMEOUT = 300;
+    // not used
+    public static final Integer DEFAULT_QUERY_TIMEOUT = 3600;
     // seconds
     public static final Integer DEFAULT_CONNECTION_TIMEOUT = 60;
-    public static final Integer DEFAULT_SOCKET_TIMEOUT = 120;
+    public static final Integer DEFAULT_SOCKET_TIMEOUT = 600;
     public static final int DEFAULT_RETRY_ATTEMPTS = 5;
     public static final String X_Databend_Query_ID = "X-DATABEND-QUERY-ID";
     public static final String X_DATABEND_VERSION= "X-DATABEND-VERSION";

databend-jdbc/src/main/java/com/databend/jdbc/DatabendDriverUri.java

@@ -106,8 +106,8 @@ private DatabendDriverUri(String url, Properties driverProperties)
         this.maxRowsInBuffer = ConnectionProperties.MAX_ROWS_IN_BUFFER.getRequiredValue(properties);
         this.maxRowsPerPage = ConnectionProperties.MAX_ROWS_PER_PAGE.getRequiredValue(properties);
         Integer socketTimeout = SOCKET_TIMEOUT.getRequiredValue(properties);
-        if (socketTimeout <= this.waitTimeSecs + 5) {
-            this.socketTimeout = this.waitTimeSecs + 5;
+        if (socketTimeout <= this.waitTimeSecs + 10) {
+            this.socketTimeout = this.waitTimeSecs + 10;
         } else {
             this.socketTimeout = socketTimeout;
         }

databend-jdbc/src/test/java/com/databend/jdbc/TestDatabendDriverUri.java

@@ -230,7 +230,8 @@ public void testFull() throws SQLException {
         Assert.assertEquals(uri.getUri().getHost(), "localhost");
         Assert.assertEquals(uri.getUri().getPort(), 33101);
         Assert.assertEquals(uri.getConnectionTimeout().intValue(), 15);
-        Assert.assertEquals(uri.getSocketTimeout().intValue(), 15);
+        // wait_time_secs + 10
+        Assert.assertEquals(uri.getSocketTimeout().intValue(), 19);
         Assert.assertEquals(uri.getWaitTimeSecs().intValue(), 9);
         Assert.assertEquals(uri.getMaxRowsInBuffer().intValue(), 11);
         Assert.assertEquals(uri.getMaxRowsPerPage().intValue(), 7);