Merge pull request #1961 from ClickHouse/testing-feedback

Testing feedback

Author: Paultagoras

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -29,6 +29,7 @@
 import com.clickhouse.client.api.internal.EnvUtils;
 import com.clickhouse.client.api.internal.HttpAPIClientHelper;
 import com.clickhouse.client.api.internal.MapUtils;
+import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.internal.SettingsConverter;
 import com.clickhouse.client.api.internal.TableSchemaParser;
 import com.clickhouse.client.api.internal.ValidationUtils;
@@ -242,7 +243,16 @@ public Builder fromUrl(String url) {
             try {
                 Map<String, String> urlProperties = HttpAPIClientHelper.parseUrlParameters(new java.net.URL(url));
                 this.addEndpoint(url);
-                this.configuration.putAll(urlProperties);//TODO: Mostly just a placeholder for now
+
+                for (ClientConfigProperties properties: ClientConfigProperties.values()) {
+                    String key = properties.getKey().replace(ClientConfigProperties.SERVER_SETTING_PREFIX, "");//People wouldn't pass with prefix
+                    String value = urlProperties.get(key);
+                    if (value != null) {
+                        this.configuration.put(properties.getKey(), value);//We need to keep the original key
+                    }
+                }
+
+                // Set the database
             } catch (java.net.MalformedURLException e) {
                 throw new IllegalArgumentException("Configuration via URL should be done with a valid URL string", e);
             }

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

@@ -601,6 +601,15 @@ public static Map<String, String> parseUrlParameters(URL url) {
         Map<String, String> params = new HashMap<>();
 
         try {
+            String path = url.getPath();
+            path = path.substring(path.indexOf('/') + 1);
+            LOG.debug("path: {}", path);
+            if (!path.trim().isEmpty()) {
+                params.put("database", path);
+            } else {
+                params.put("database", "default");
+            }
+
             String query = url.getQuery();
             if (query != null) {
                 for (String pair : query.split("&")) {

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

@@ -254,4 +254,15 @@ public QuerySettings logComment(String logComment) {
     public String getLogComment() {
         return logComment;
     }
+
+    public static QuerySettings merge(QuerySettings source, QuerySettings override) {
+        QuerySettings merged = new QuerySettings();
+        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;
+    }
 }

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

@@ -3,6 +3,7 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
 import com.clickhouse.client.api.query.QueryResponse;
+import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.jdbc.internal.JdbcConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,16 +24,30 @@ public class ConnectionImpl implements Connection, JdbcV2Wrapper {
     private boolean closed = false;
     private String catalog;
     private String schema;
+    private QuerySettings defaultQuerySettings;
 
     public ConnectionImpl(String url, Properties info) {
         log.debug("Creating connection to {}", url);
-
         this.url = url;//Raw URL
         this.config = new JdbcConfiguration(url, info);
+        String clientName = "ClickHouse JDBC Driver/" + Driver.driverVersion;
+
+        if (this.config.isDisableFrameworkDetection()) {
+            log.debug("Framework detection is disabled.");
+        } else {
+            String detectedFrameworks = Driver.FrameworksDetection.getFrameworksDetected();
+            log.debug("Detected frameworks: {}", detectedFrameworks);
+            clientName += " (" + detectedFrameworks + ")";
+        }
+
         this.client =  new Client.Builder()
                 .fromUrl(this.config.getUrl())//URL without prefix
                 .setUsername(config.getUser())
-                .setPassword(config.getPassword()).build();
+                .setPassword(config.getPassword())
+                .setClientName(clientName)
+                .build();
+
+        this.defaultQuerySettings = new QuerySettings();
     }
 
     public String getUser() {
@@ -43,6 +58,14 @@ public String getURL() {
         return url;
     }
 
+    public QuerySettings getDefaultQuerySettings() {
+        return defaultQuerySettings;
+    }
+
+    public void setDefaultQuerySettings(QuerySettings settings) {
+        this.defaultQuerySettings = settings;
+    }
+
     private String getServerVersion() throws SQLException {
         try (QueryResponse response = client.query("SELECT version()").get(30, TimeUnit.SECONDS)) {
             // Create a reader to access the data in a convenient way

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

@@ -14,6 +14,30 @@ public class Driver implements java.sql.Driver {
     private static final Logger log = LoggerFactory.getLogger(Driver.class);
     public static final String driverVersion;
 
+    public static String frameworksDetected = null;
+    public static class FrameworksDetection {
+        private static final List<String> FRAMEWORKS_TO_DETECT = Arrays.asList("apache.spark");
+        static volatile String frameworksDetected = null;
+
+        private FrameworksDetection() {}
+        public static String getFrameworksDetected() {
+            if (frameworksDetected == null) {//Only detect frameworks once
+                Set<String> inferredFrameworks = new LinkedHashSet<>();
+                for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
+                    for (String framework : FRAMEWORKS_TO_DETECT) {
+                        if (ste.toString().contains(framework)) {
+                            inferredFrameworks.add(String.format("(%s)", framework));
+                        }
+                    }
+                }
+
+                frameworksDetected = String.join("; ", inferredFrameworks);
+            }
+
+            return frameworksDetected;
+        }
+    }
+
     static {
         log.debug("Initializing ClickHouse JDBC driver V2");
         String tempDriverVersion = Driver.class.getPackage().getImplementationVersion();

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

@@ -103,15 +103,16 @@ protected static String parseJdbcEscapeSyntax(String sql) {
     @Override
     public ResultSet executeQuery(String sql) throws SQLException {
         checkClosed();
-        return executeQuery(sql, new QuerySettings());
+        return executeQuery(sql, connection.getDefaultQuerySettings());
     }
 
     public ResultSet executeQuery(String sql, QuerySettings settings) throws SQLException {
         checkClosed();
+        QuerySettings mergedSettings = QuerySettings.merge(connection.getDefaultQuerySettings(), settings);
 
         try {
             sql = parseJdbcEscapeSyntax(sql);
-            QueryResponse response = connection.client.query(sql, settings).get(queryTimeout, TimeUnit.SECONDS);
+            QueryResponse response = connection.client.query(sql, mergedSettings).get(queryTimeout, TimeUnit.SECONDS);
             ClickHouseBinaryFormatReader reader = connection.client.newBinaryFormatReader(response);
             currentResultSet = new ResultSetImpl(response, reader);
             metrics = response.getMetrics();
@@ -125,7 +126,7 @@ public ResultSet executeQuery(String sql, QuerySettings settings) throws SQLExce
     @Override
     public int executeUpdate(String sql) throws SQLException {
         checkClosed();
-        return executeUpdate(sql, new QuerySettings());
+        return executeUpdate(sql, connection.getDefaultQuerySettings());
     }
 
     public int executeUpdate(String sql, QuerySettings settings) throws SQLException {
@@ -135,9 +136,11 @@ public int executeUpdate(String sql, QuerySettings settings) throws SQLException
             throw new SQLException("executeUpdate() cannot be called with a SELECT statement");
         }
 
+        QuerySettings mergedSettings = QuerySettings.merge(connection.getDefaultQuerySettings(), settings);
+
         try {
             sql = parseJdbcEscapeSyntax(sql);
-            QueryResponse response = connection.client.query(sql, settings).get(queryTimeout, TimeUnit.SECONDS);
+            QueryResponse response = connection.client.query(sql, mergedSettings).get(queryTimeout, TimeUnit.SECONDS);
             currentResultSet = null;
             metrics = response.getMetrics();
             response.close();

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

@@ -20,6 +20,8 @@ public class JdbcConfiguration {
     final String user;
     final String password;
     final String url;
+    final String jdbcUrl;
+    final boolean disableFrameworkDetection;
 
     public String getPassword() {
         return password;
@@ -33,17 +35,27 @@ public String getUrl() {
         return url;
     }
 
+    public String getJdbcUrl() {
+        return jdbcUrl;
+    }
+
+    public boolean isDisableFrameworkDetection() {
+        return disableFrameworkDetection;
+    }
+
     public JdbcConfiguration(String url, Properties info) {
+        this.jdbcUrl = url;
         this.url = stripUrlPrefix(url);
         this.user = info.getProperty("user", "default");
         this.password = info.getProperty("password", "");
+        this.disableFrameworkDetection = Boolean.parseBoolean(info.getProperty("disable_frameworks_detection", "false"));
     }
 
     public static boolean acceptsURL(String url) {
         return url.startsWith(PREFIX_CLICKHOUSE) || url.startsWith(PREFIX_CLICKHOUSE_SHORT);
     }
 
-    public String stripUrlPrefix(String url) {
+    private String stripUrlPrefix(String url) {
         if (url.startsWith(PREFIX_CLICKHOUSE)) {
             return url.substring(PREFIX_CLICKHOUSE.length());
         } else if (url.startsWith(PREFIX_CLICKHOUSE_SHORT)) {