fixed passing properties to client and driver

Author: chernser

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

@@ -523,6 +523,7 @@ public boolean hasValue(int colIndex) {
 
     @Override
     public boolean hasValue(String colName) {
+        getSchema().getColumnByName(colName);
         return currentRecord.containsKey(colName);
     }
 

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

@@ -22,4 +22,14 @@ public final class ServerSettings {
      */
     public static final String OUTPUT_FORMAT_BINARY_WRITE_JSON_AS_STRING = "output_format_binary_write_json_as_string";
 
+    /**
+     * Limit number of rows in a result set
+     */
+    public static final String MAX_RESULT_ROWS = "max_result_rows";
+
+    /**
+     * Defines server response if result set exceeded a limit set by {@code max_result_rows}.
+     * Possible values are 'throw' or 'break'. Default is 'throw'
+     */
+    public static final String RESULT_OVERFLOW_MODE = "result_overflow_mode";
 }

client-v2/src/main/java/com/clickhouse/client/api/metadata/NoSuchColumnException.java

@@ -0,0 +1,10 @@
+package com.clickhouse.client.api.metadata;
+
+import com.clickhouse.client.api.ClientException;
+
+public class NoSuchColumnException extends ClientException {
+
+    public NoSuchColumnException(String message) {
+        super(message);
+    }
+}

client-v2/src/main/java/com/clickhouse/client/api/metadata/TableSchema.java

@@ -1,5 +1,6 @@
 package com.clickhouse.client.api.metadata;
 
+import com.clickhouse.client.api.ClientException;
 import com.clickhouse.data.ClickHouseColumn;
 
 import java.util.ArrayList;
@@ -87,20 +88,22 @@ public void addColumn(String name, String type, String defaultType) {
     }
 
     public ClickHouseColumn getColumnByName(String name) {
-        for (ClickHouseColumn column : columns) {
-            if (column.getColumnName().equalsIgnoreCase(name)) {
-                return column;//TODO: Try to deep clone the column rather than reference pass
-            }
-        }
-
-        return null;
+        return columns.get(nameToIndex(name));
     }
 
     public String indexToName(int index) {
-        return columns.get(index).getColumnName();
+        try {
+            return columns.get(index).getColumnName();
+        } catch (IndexOutOfBoundsException e) {
+            throw new NoSuchColumnException("Result has no column with index = " + index);
+        }
     }
 
     public int nameToIndex(String name) {
+        Integer index = colIndex.get(name);
+        if (index == null) {
+            throw new NoSuchColumnException("Result has no column with name '" + name + "'");
+        }
         return colIndex.get(name).intValue();
     }
 

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

@@ -1,6 +1,7 @@
 package com.clickhouse.jdbc;
 
 
+import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.jdbc.internal.JdbcConfiguration;
 import com.clickhouse.jdbc.internal.ExceptionUtils;
 import org.slf4j.Logger;
@@ -156,6 +157,10 @@ public boolean jdbcCompliant() {
         return false;
     }
 
+    public static String chSettingKey(String key) {
+        return ClientConfigProperties.serverSetting(key);
+    }
+
     @Override
     public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
         throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);

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

@@ -5,15 +5,17 @@
 
 /**
  * JDBC driver specific properties. Should not include any of ClientConfigProperties.
- * All driver specific properties must have {@code "driver."} prefix to isolate them from everything else
+ * Processing logic should be the follows
+ * 1. If property is among DriverProperties then Driver handles it specially and will not pass to a client
+ * 2. If property is not among DriverProperties then it is passed to a client
  */
 public enum DriverProperties {
 
     /**
      * query settings to be passed along with query operation.
      * {@see com.clickhouse.client.api.query.QuerySettings}
      */
-    DEFAULT_QUERY_SETTINGS("driver.query_settings", null);
+    DEFAULT_QUERY_SETTINGS("default_query_settings", null);
 
     private final String key;
 

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

@@ -102,7 +102,6 @@ private static String stripUrlPrefix(String url) {
     List<DriverPropertyInfo> listOfProperties;
 
     private void initProperties(String url, Properties providedProperties) {
-        log.debug("Parsing url: " + url + ", properties: " + providedProperties);
         Map<String, String> props = new HashMap<>();
         for (Map.Entry<Object, Object> entry : providedProperties.entrySet()) {
             if (entry.getKey() instanceof String && entry.getValue() instanceof String) {
@@ -111,21 +110,17 @@ private void initProperties(String url, Properties providedProperties) {
                 throw new RuntimeException("Cannot apply non-String properties");
             }
         }
-        Map<String, String> mergedProperties = ClickHouseUtils.extractParameters(url, props);
+
         Map<String, DriverPropertyInfo> propertyInfos = new HashMap<>();
-        for (Map.Entry<String, String> prop : mergedProperties.entrySet()) {
+        // create initial list of properties that will be passed to a client
+        for (Map.Entry<String, String> prop : ClickHouseUtils.extractParameters(url, props).entrySet()) {
             DriverPropertyInfo propertyInfo = new DriverPropertyInfo(prop.getKey(), prop.getValue());
             propertyInfo.description = "(User Defined)";
             propertyInfos.put(prop.getKey(), propertyInfo);
-            if (prop.getValue() != null) {
-                if (prop.getKey().contains("driver.")) {
-                    driverProperties.put(prop.getKey(), prop.getValue());
-                } else {
-                    clientProperties.put(prop.getKey(), prop.getValue());
-                }
-            }
+            clientProperties.put(prop.getKey(), prop.getValue());
         }
-        // set know properties
+
+        // Fill list of client properties information, add not specified properties (doesn't affect client properties)
         for (ClientConfigProperties clientProp : ClientConfigProperties.values()) {
             DriverPropertyInfo propertyInfo = propertyInfos.get(clientProp.getKey());
             if (propertyInfo == null) {
@@ -135,12 +130,18 @@ private void initProperties(String url, Properties providedProperties) {
             }
         }
 
+        // Fill list of driver properties information, add not specified properties, copy know driver properties from client properties
         for (DriverProperties driverProp : DriverProperties.values()) {
             DriverPropertyInfo propertyInfo = propertyInfos.get(driverProp.getKey());
             if (propertyInfo == null) {
                 propertyInfo = new DriverPropertyInfo(driverProp.getKey(), driverProp.getDefaultValue());
                 propertyInfos.put(driverProp.getKey(), propertyInfo);
             }
+
+            String value = clientProperties.get(driverProp.getKey());
+            if (value != null) {
+                driverProperties.put(driverProp.getKey(), value);
+            }
         }
 
         listOfProperties = propertyInfos.values().stream().sorted(Comparator.comparing(o -> o.name)).toList();

jdbc-v2/src/test/java/com/clickhouse/jdbc/ConnectionTest.java

@@ -1,11 +1,18 @@
 package com.clickhouse.jdbc;
 
 import java.sql.*;
+import java.util.Properties;
+
+import com.clickhouse.client.api.ClientConfigProperties;
+import com.clickhouse.client.api.ServerException;
+import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.jdbc.internal.ClientInfoProperties;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.fail;
 
 
 public class ConnectionTest extends JdbcIntegrationTest {
@@ -284,4 +291,19 @@ public void setShardingKeyTest() throws SQLException {
        assertThrows(SQLFeatureNotSupportedException.class, () -> localConnection.setShardingKey(null));
        assertThrows(SQLFeatureNotSupportedException.class, () -> localConnection.setShardingKey(null, null));
     }
+
+    @Test
+    public void testMaxResultRowsProperty() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty(Driver.chSettingKey(ServerSettings.MAX_RESULT_ROWS), "5");
+        try (Connection conn = getJdbcConnection(properties)) {
+            try (Statement stmt = conn.createStatement()) {
+                ResultSet rs = stmt.executeQuery("SELECT toInt32(number) FROM system.numbers LIMIT 20");
+                fail("Exception expected");
+            } catch (SQLException e) {
+                Assert.assertTrue(e.getCause() instanceof ServerException);
+                Assert.assertEquals(((ServerException)e.getCause()).getCode(), 396);
+            }
+        }
+    }
 }

jdbc-v2/src/test/java/com/clickhouse/jdbc/JdbcIntegrationTest.java

@@ -25,11 +25,16 @@ public String getEndpointString(boolean includeDbName) {
     }
 
     public Connection getJdbcConnection() throws SQLException {
+        return getJdbcConnection(null);
+    }
+    public Connection getJdbcConnection(Properties addProperties) throws SQLException {
         Properties info = new Properties();
         info.setProperty("user", "default");
         info.setProperty("password", ClickHouseServerForTest.getPassword());
         LOGGER.info("Connecting to {}", getEndpointString());
-
+        if (addProperties != null) {
+            info.putAll(addProperties);
+        }
         return new ConnectionImpl(getEndpointString(), info);
         //return DriverManager.getConnection(getEndpointString(), "default", ClickHouseServerForTest.getPassword());
     }

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JdbcConfigurationTest.java

@@ -14,6 +14,7 @@
 import static org.testng.Assert.assertEquals;
 
 public class JdbcConfigurationTest {
+    
     @Test(dataProvider = "testConnectionUrlDataProvider")
     public void testConnectionUrl(String jdbcUrl, String connectionUrl, Properties properties) throws Exception {
         JdbcConfiguration configuration = new JdbcConfiguration(jdbcUrl, properties);