optimized code

Author: chernser

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

@@ -283,7 +283,9 @@ public String getLogComment() {
 
     public static InsertSettings merge(InsertSettings source, InsertSettings override) {
         CommonSettings mergedSettings = source.settings.copyAndMerge(override.settings);
-        return new InsertSettings(mergedSettings);
+        InsertSettings insertSettings = new InsertSettings(mergedSettings);
+        insertSettings.setInputStreamCopyBufferSize(override.getInputStreamCopyBufferSize());
+        return insertSettings;
     }
 
     /**

client-v2/src/test/java/com/clickhouse/client/SettingsTests.java

@@ -6,9 +6,11 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 @Test(groups = {"unit"})
 public class SettingsTests {
@@ -22,15 +24,28 @@ void testClientSettings() {
     }
 
     @Test
-    void testMergeQuerySettings() {
-        QuerySettings settings1 = new QuerySettings().setQueryId("test1").httpHeader("key1",  "value1");
-        QuerySettings settings2 = new QuerySettings().httpHeader("key1",  "value2");
+    void testMergeSettings() {
+        {
+            QuerySettings settings1 = new QuerySettings().setQueryId("test1").httpHeader("key1", "value1");
+            QuerySettings settings2 = new QuerySettings().httpHeader("key1", "value2");
+
+            QuerySettings merged = QuerySettings.merge(settings1, settings2);
+            Assert.assertNotSame(merged, settings1);
+            Assert.assertNotSame(merged, settings2);
 
-        QuerySettings merged = QuerySettings.merge(settings1, settings2);
-        Assert.assertNotSame(merged, settings1);
-        Assert.assertNotSame(merged, settings2);
+            Assert.assertEquals(merged.getAllSettings().get(ClientConfigProperties.httpHeader("key1")), "value2");
+        }
+        {
+            InsertSettings settings1 = new InsertSettings().setQueryId("test1").httpHeader("key1", "value1");
+            InsertSettings settings2 = new InsertSettings().httpHeader("key1", "value2").setInputStreamCopyBufferSize(200000);
 
-        Assert.assertEquals(merged.getAllSettings().get(ClientConfigProperties.httpHeader("key1")), "value2");
+            InsertSettings merged = InsertSettings.merge(settings1, settings2);
+            Assert.assertNotSame(merged, settings1);
+            Assert.assertNotSame(merged, settings2);
+
+            Assert.assertEquals(merged.getInputStreamCopyBufferSize(), settings2.getInputStreamCopyBufferSize());
+            Assert.assertEquals(merged.getAllSettings().get(ClientConfigProperties.httpHeader("key1")), "value2");
+        }
     }
 
     @Test
@@ -87,6 +102,12 @@ void testQuerySettingsSpecific() throws Exception {
             settings.logComment(null);
             Assert.assertNull(settings.getLogComment());
         }
+
+        {
+            final QuerySettings settings = new QuerySettings();
+            settings.setNetworkTimeout(10, ChronoUnit.SECONDS);
+            Assert.assertEquals(settings.getNetworkTimeout(), TimeUnit.SECONDS.toMillis(10));
+        }
     }
 
     @Test
@@ -140,5 +161,11 @@ public void testInsertSettingsSpecific() throws Exception {
             settings.logComment(null);
             Assert.assertNull(settings.getLogComment());
         }
+
+        {
+            final InsertSettings settings = new InsertSettings();
+            settings.setNetworkTimeout(10, ChronoUnit.SECONDS);
+            Assert.assertEquals(settings.getNetworkTimeout(), TimeUnit.SECONDS.toMillis(10));
+        }
     }
 }

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

@@ -39,6 +39,7 @@
 import java.sql.Statement;
 import java.sql.Struct;
 import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
@@ -637,7 +638,7 @@ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLExc
         // Some connection pools set timeout before calling Connection#close() to ensure that this operation will not hang
         // Socket timeout is propagated with QuerySettings this connection has.
         networkTimeoutExecutor = executor;
-        defaultQuerySettings.setOption(ClientConfigProperties.SOCKET_OPERATION_TIMEOUT.getKey(), (long)milliseconds);
+        defaultQuerySettings.setNetworkTimeout(milliseconds, ChronoUnit.MILLIS);
     }
 
 

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

@@ -37,6 +37,7 @@
 import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.Map;
+import java.util.function.Consumer;
 
 public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
     private static final Logger log = LoggerFactory.getLogger(ResultSetImpl.class);
@@ -57,7 +58,10 @@ public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
 
     private int fetchSize;
 
-    public ResultSetImpl(StatementImpl parentStatement, QueryResponse response, ClickHouseBinaryFormatReader reader) throws SQLException {
+    private Consumer<Exception> onDataTransferException;
+
+    public ResultSetImpl(StatementImpl parentStatement, QueryResponse response, ClickHouseBinaryFormatReader reader,
+                         Consumer<Exception> onDataTransferException) throws SQLException {
         this.parentStatement = parentStatement;
         this.response = response;
         this.reader = reader;
@@ -73,17 +77,7 @@ public ResultSetImpl(StatementImpl parentStatement, QueryResponse response, Clic
         this.defaultCalendar = parentStatement.getConnection().defaultCalendar;
         this.rowPos = BEFORE_FIRST;
         this.fetchSize = parentStatement.getFetchSize();
-    }
-
-    protected ResultSetImpl(ResultSetImpl resultSet) throws SQLException{
-        this.parentStatement = resultSet.parentStatement;
-        this.response = resultSet.response;
-        this.reader = resultSet.reader;
-        this.metaData = resultSet.metaData;
-        this.closed = false;
-        this.wasNull = false;
-        this.defaultCalendar = parentStatement.getConnection().defaultCalendar;
-        this.featureManager = new FeatureManager(parentStatement.getConnection().getJdbcConfig());
+        this.onDataTransferException = onDataTransferException;
     }
 
     private void checkClosed() throws SQLException {
@@ -118,8 +112,8 @@ public boolean next() throws SQLException {
             }
             return readerRow != null;
         } catch (Exception e) {
-            if (e instanceof SocketTimeoutException) {
-                this.parentStatement.onNetworkTimeout();
+            if (onDataTransferException != null) {
+                onDataTransferException.accept(e);
             }
             throw ExceptionUtils.toSqlState(e);
         }

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

@@ -166,7 +166,7 @@ protected ResultSetImpl executeQueryImpl(String sql, QuerySettings settings) thr
                 reader.close();
                 throw new SQLException("Called method expects empty or filled result set but query has returned none. Consider using `java.sql.Statement.execute(java.lang.String)`", ExceptionUtils.SQL_STATE_CLIENT_ERROR);
             }
-            return new ResultSetImpl(this, response, reader);
+            return new ResultSetImpl(this, response, reader, this::handleSocketTimeoutException);
         } catch (Exception e) {
             if (response != null) {
                 try {
@@ -635,9 +635,4 @@ public long executeLargeUpdate(String sql, String[] columnNames) throws SQLExcep
     public String getLastQueryId() {
         return lastQueryId;
     }
-
-    // Proxy method for child objects. Do not call.
-    public void onNetworkTimeout() throws SQLException {
-        this.connection.onNetworkTimeout();
-    }
 }

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java

@@ -298,14 +298,4 @@ public static List<Object> convertList(List<Object> values, Class<?> type) throw
         }
         return convertedValues;
     }
-
-    public static void safeClose(AutoCloseable closeable, Logger logger) {
-        if (closeable != null) {
-            try {
-                closeable.close();
-            } catch (Exception ex) {
-                logger.warn("Failed to close closeable after exception", ex);
-            }
-        }
-    }
 }