Merge branch 'main' into add-micrometer-support

Author: chernser

.github/pull_request_template.md

@@ -1,9 +1,10 @@
 ## Summary
 <!-- A short description of the changes with a link to an open issue. -->
 
+Closes <!-- Link to an issue to close on merge. -->
 ## Checklist
 Delete items not relevant to your PR:
-- [ ] Closes issue <!-- Link to an issue to close on merge. -->
+- [ ] Closes #<issue ref>
 - [ ] Unit and integration tests covering the common scenarios were added
 - [ ] A human-readable description of the changes was provided to include in CHANGELOG
 - [ ] For significant changes, documentation in https://github.com/ClickHouse/clickhouse-docs was updated with further explanations or tutorials

.github/workflows/analysis.yml

@@ -95,6 +95,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION -Dclient.tests.useNewImplementation=true \
+          mvn --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
             -Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
         continue-on-error: true

client-v2/pom.xml

@@ -13,8 +13,8 @@
     <packaging>jar</packaging>
 
     <name>ClickHouse Client API</name>
-    <description>New client api for ClickHouse</description>
-    <url>https://github.com/ClickHouse/clickhouse-java/tree/main/clickhouse-client-api</url>
+    <description>ClickHouse Client Library</description>
+    <url>https://github.com/ClickHouse/clickhouse-java/tree/main/client-v2</url>
 
     <properties>
         <apache.httpclient.version>5.3.1</apache.httpclient.version>
@@ -172,6 +172,22 @@
                     <release>8</release>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

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

@@ -1,34 +1,17 @@
 package com.clickhouse.client.api.insert;
 
-import com.clickhouse.client.ClickHouseResponse;
-import com.clickhouse.client.api.internal.ClientStatisticsHolder;
-import com.clickhouse.client.api.internal.ClientV1AdaptorHelper;
 import com.clickhouse.client.api.metrics.OperationMetrics;
 import com.clickhouse.client.api.metrics.ServerMetrics;
 
 public class InsertResponse implements AutoCloseable {
-    private final ClickHouseResponse responseRef;
     private OperationMetrics operationMetrics;
 
-    public InsertResponse(ClickHouseResponse responseRef,
-                          ClientStatisticsHolder clientStatisticsHolder) {
-        this.responseRef = responseRef;
-        this.operationMetrics = new OperationMetrics(clientStatisticsHolder);
-        this.operationMetrics.operationComplete();
-        this.operationMetrics.setQueryId(responseRef.getSummary().getQueryId());
-        ClientV1AdaptorHelper.setServerStats(responseRef.getSummary().getProgress(), this.operationMetrics);
-    }
-
     public InsertResponse(OperationMetrics metrics) {
-        this.responseRef = null;
         this.operationMetrics = metrics;
     }
 
     @Override
     public void close() {
-        if (responseRef != null) {
-            responseRef.close();
-        }
     }
 
     /**

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

@@ -1,10 +1,10 @@
 package com.clickhouse.client.api.insert;
 
+import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
-import com.clickhouse.client.api.internal.ServerSettings;
+import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.internal.ValidationUtils;
-import com.clickhouse.client.config.ClickHouseClientOption;
 import org.apache.hc.core5.http.HttpHeaders;
 
 import java.util.Collection;
@@ -79,14 +79,14 @@ public InsertSettings setDeduplicationToken(String token) {
     }
 
     public String getQueryId() {
-        return (String) rawSettings.get(ClickHouseClientOption.QUERY_ID.getKey());
+        return (String) rawSettings.get(ClientConfigProperties.QUERY_ID.getKey());
     }
 
     /**
      * Sets the query id. This id will be sent to the server and can be used to identify the query.
      */
     public InsertSettings setQueryId(String queryId) {
-        rawSettings.put(ClickHouseClientOption.QUERY_ID.getKey(), queryId);
+        rawSettings.put(ClientConfigProperties.QUERY_ID.getKey(), queryId);
         return this;
     }
 

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

@@ -3,10 +3,10 @@
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseSslContextProvider;
 import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.ClientFaultCause;
 import com.clickhouse.client.api.ClientMisconfigurationException;
-import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ConnectionInitiationException;
 import com.clickhouse.client.api.ConnectionReuseStrategy;
 import com.clickhouse.client.api.ServerException;
@@ -75,6 +75,8 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -710,11 +712,30 @@ private  String buildDefaultUserAgent() {
         userAgent.setLength(userAgent.length() - 2);
         userAgent.append(')');
 
-        userAgent.append(" ")
-                .append(this.httpClient.getClass().getPackage().getImplementationTitle().replaceAll(" ", "-"))
-                .append('/')
-                .append(this.httpClient.getClass().getPackage().getImplementationVersion());
-
+        try {
+            String httpClientVersion = this.httpClient.getClass().getPackage().getImplementationVersion();
+            if (Objects.equals(this.httpClient.getClass().getPackage().getImplementationTitle(), this.getClass().getPackage().getImplementationTitle())) {
+                // shaded jar - all packages have same implementation title
+                httpClientVersion = "unknown";
+                try (InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("client-v2-version.properties")) {
+                    Properties p = new Properties();
+                    p.load(in);
+
+                    String tmp = p.getProperty("apache.http.client.version");
+                    if (tmp != null && !tmp.isEmpty() && !tmp.equals("${apache.httpclient.version}")) {
+                        httpClientVersion = tmp;
+                    }
+                } catch (Exception e) {
+                    // ignore
+                }
+            }
+            userAgent.append(" ")
+                    .append("Apache-HttpClient")
+                    .append('/')
+                    .append(httpClientVersion);
+        } catch (Exception e) {
+            LOG.info("failed to construct http client version string");
+        }
         return userAgent.toString();
     }