merge main. a few fixes

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/insert/InsertSettings.java

@@ -3,9 +3,9 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.internal.CommonSettings;
-import com.clickhouse.client.api.query.QuerySettings;
 import org.apache.hc.core5.http.HttpHeaders;
 
+import java.time.temporal.ChronoUnit;
 import java.util.Collection;
 import java.util.Map;
 
@@ -28,6 +28,11 @@ public InsertSettings(Map<String, Object> settings) {
         }
     }
 
+    private InsertSettings(CommonSettings settings) {
+        this.settings = settings;
+        setDefaults();
+    }
+
     private void setDefaults() {// Default settings, for now a very small list
         this.setInputStreamCopyBufferSize(DEFAULT_INPUT_STREAM_BATCH_SIZE);
     }
@@ -277,25 +282,24 @@ public String getLogComment() {
     }
 
     public static InsertSettings merge(InsertSettings source, InsertSettings override) {
-        InsertSettings merged = new InsertSettings();
-        if (source != null) {
-            merged.rawSettings.putAll(source.rawSettings);
-        }
-        if (override != null && override != source) {// avoid copying the literally same object
-            merged.rawSettings.putAll(override.rawSettings);
-        }
-        return merged;
+        CommonSettings mergedSettings = source.settings.copyAndMerge(override.settings);
+        return new InsertSettings(mergedSettings);
     }
 
-    public void setNetworkTimeout(Long networkTimeout) {
-        if (networkTimeout != null) {
-            rawSettings.put(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey(), networkTimeout.intValue());
-        } else {
-            rawSettings.remove(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey());
-        }
+    /**
+     * Sets a network operation timeout.
+     * @param timeout
+     * @param unit
+     */
+    public void setNetworkTimeout(long timeout, ChronoUnit unit) {
+        settings.setNetworkTimeout(timeout, unit);
     }
 
+    /**
+     * Returns network timeout. Zero value is returned if no timeout is set.
+     * @return timeout in ms.
+     */
     public Long getNetworkTimeout() {
-        return (Long) rawSettings.get(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey());
+        return settings.getNetworkTimeout();
     }
 }

client-v2/src/main/java/com/clickhouse/client/api/internal/CommonSettings.java

@@ -3,6 +3,8 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -217,6 +219,25 @@ public String getLogComment() {
         return logComment;
     }
 
+    /**
+     * Sets a network operation timeout.
+     * @param timeout
+     * @param unit
+     */
+    public void setNetworkTimeout(long timeout, ChronoUnit unit) {
+        settings.put(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey(), Duration.of(timeout, unit).toMillis());
+    }
+
+    /**
+     * Returns network timeout. Zero value is returned if no timeout is set.
+     * @return timeout in ms.
+     */
+    public Long getNetworkTimeout() {
+        return (Long) getOption(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey(),
+                ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getDefaultValue());
+    }
+
+
     public CommonSettings copyAndMerge(CommonSettings override) {
         CommonSettings copy = new  CommonSettings();
         copy.settings.putAll(settings);

client-v2/src/main/java/com/clickhouse/client/api/query/QuerySettings.java

@@ -8,8 +8,8 @@
 import com.clickhouse.client.api.internal.ValidationUtils;
 import com.clickhouse.data.ClickHouseFormat;
 
+import java.time.temporal.ChronoUnit;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
 
@@ -269,16 +269,21 @@ public String getLogComment() {
         return settings.getLogComment();
     }
 
-    public void setNetworkTimeout(Long networkTimeout) {
-        if (networkTimeout != null) {
-            rawSettings.put(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey(), networkTimeout.intValue());
-        } else {
-            rawSettings.remove(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey());
-        }
+    /**
+     * Sets a network operation timeout.
+     * @param timeout
+     * @param unit
+     */
+    public void setNetworkTimeout(long timeout, ChronoUnit unit) {
+        settings.setNetworkTimeout(timeout, unit);
     }
 
+    /**
+     * Returns network timeout. Zero value is returned if no timeout is set.
+     * @return timeout in ms.
+     */
     public Long getNetworkTimeout() {
-        return (Long) rawSettings.get(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey());
+        return settings.getNetworkTimeout();
     }
 
     public static QuerySettings merge(QuerySettings source, QuerySettings override) {

jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java

@@ -658,8 +658,7 @@ public void onNetworkTimeout() throws SQLException {
 
     @Override
     public int getNetworkTimeout() throws SQLException {
-        Long networkTimeout = defaultQuerySettings.getNetworkTimeout();
-        return networkTimeout == null ? 0 : networkTimeout.intValue();
+        return defaultQuerySettings.getNetworkTimeout().intValue();
     }
 
     /**