Merge branch 'main' into fix_statement_impl

Author: chernser

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,26 @@ assignees: ''
 
 ---
 <!--
-    possible labels: bug,client-api-v2,jdbc-v2
+    High Level Area Labels: 
+     - client-api-v2 
+     - client-v1
+     - jdbc-v2
+
+    Specific Area Labels:
+      - packaging
+      - sql-parser
+      - data-type
+      - docs
+      - network
+      - performance
+      - jdbc-metadata
+      - jdbc-insert
+      - jdbc-read
+      - client-insert
+      - client-read
+      - client-pojo-serde
+      - format
+     
 -->
 ## Description
 

.github/workflows/analysis.yml

@@ -29,6 +29,7 @@ on:
 
 env:
   PREFERRED_LTS_VERSION: "24.3"
+  PR_NUMBER: ${{ github.event.pull_request.number || '' }}
 
 jobs:
   sonarcloud:
@@ -85,32 +86,30 @@ jobs:
           restore-keys: ${{ runner.os }}-sonar
       - name: Update sonar config
         run: |
-          sed -i -e 's|^\(.*<sonar.projectKey>\).*\(</sonar.projectKey>\)$|\1ClickHouse_clickhouse-jdbc\2|' \
+          sed -i -e 's|^\(.*<sonar.projectKey>\).*\(</sonar.projectKey>\)$|\1ClickHouse_clickhouse-java\2|' \
             -e 's|^\(.*<sonar.organization>\).*\(</sonar.organization>\)$|\1clickhouse-java\2|' pom.xml
         if: github.repository_owner == 'ClickHouse'
       - name: Build and install
         run: |
           find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
-          mvn -q --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
+          mvn -q --no-transfer-progress --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
             -DskipTests install
       - name: Analyze
         env:
           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 \
-            -Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-          pwd
-          ls -l ./client-v2/target/site/jacoco-aggregate/jacoco.xml
+          mvn -fn --no-transfer-progress --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
+            -Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=ClickHouse_clickhouse-java
         continue-on-error: true
       - name: Generate and post coverage report
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          pwd
-          ls -la
-          node jacoco-report-generator.mjs ./client-v2/target/site/jacoco-aggregate/jacoco.csv client-v2-cov.md --pr ${{ github.event.pull_request.number }} --title "Client V2 Coverage"
-          node jacoco-report-generator.mjs ./jdbc-v2/target/site/jacoco-aggregate/jacoco.csv jdbc-v2-cov.md --pr ${{ github.event.pull_request.number }} --title "JDBC V2 Coverage"
-          node jacoco-report-generator.mjs ./clickhouse-jdbc/target/site/jacoco-aggregate/jacoco.csv jdbc-v1-cov.md --pr ${{ github.event.pull_request.number }} --title "JDBC V1 Coverage"
-          node jacoco-report-generator.mjs ./clickhouse-client/target/site/jacoco-aggregate/jacoco.csv client-v1-cov.md --pr ${{ github.event.pull_request.number }} --title "Client V1 Coverage"
-          cat *-cov.md
+          PR_ARG=''
+          if [ ! -z $PR_NUMBER ]; then PR_ARG="--pr $PR_NUMBER"; fi;
+          node jacoco-report-generator.mjs ./client-v2/target/site/jacoco-aggregate/jacoco.csv client-v2-cov.md --title "Client V2 Coverage" ${PR_ARG}
+          node jacoco-report-generator.mjs ./jdbc-v2/target/site/jacoco-aggregate/jacoco.csv jdbc-v2-cov.md --title "JDBC V2 Coverage" ${PR_ARG}
+          node jacoco-report-generator.mjs ./clickhouse-jdbc/target/site/jacoco-aggregate/jacoco.csv jdbc-v1-cov.md --title "JDBC V1 Coverage" ${PR_ARG}
+          node jacoco-report-generator.mjs ./clickhouse-client/target/site/jacoco-aggregate/jacoco.csv client-v1-cov.md --title "Client V1 Coverage" ${PR_ARG}
+          cat *-cov.md

.github/workflows/nightly.yml

@@ -12,7 +12,7 @@ on:
 
 env:
   CHC_BRANCH: "main"
-  CHC_VERSION: "0.8.6"
+  # CHC_VERSION: "0.9.0"
   CH_VERSION: "24.8"
 
 jobs:
@@ -59,15 +59,16 @@ jobs:
           EOF
       - name: Update Configuration
         run: |
-          find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ env.CHC_VERSION }}-SNAPSHOT|g' \
-            -e 's|^\(    <version>\).*\(</version>\)$|\1${{ env.CHC_VERSION }}-SNAPSHOT\2|' \
-            -e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
+          # find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ env.CHC_VERSION }}-SNAPSHOT|g' \
+          #   -e 's|^\(    <version>\).*\(</version>\)$|\1${{ env.CHC_VERSION }}-SNAPSHOT\2|' \
+          #   -e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
           find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
       - name: Release Snapshot
         uses: samuelmeuli/action-maven-publish@v1
         with:
           maven_profiles: release
           maven_args: -q --batch-mode -DclickhouseVersion=${{ env.CH_VERSION }}
+          server_id: central
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
@@ -78,6 +79,7 @@ jobs:
           directory: clickhouse-r2dbc
           maven_profiles: release
           maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }}
+          server_id: central
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}

.gitignore

@@ -48,6 +48,8 @@ java.prof
 jmh-result.*
 profile.html
 jdbc-v2/gen
+jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/gen
+jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseLexer.tokens
 
 # Shell scripts
 *.sh

clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java

@@ -451,7 +451,14 @@ public enum ClickHouseClientOption implements ClickHouseOption {
      */
     CONNECTION_TTL("connection_ttl", 0L,
             "Connection time to live in milliseconds. 0 or negative number means no limit."),
-    MEASURE_REQUEST_TIME("debug_measure_request_time", false, "Whether to measure request time. If true, the time will be logged in debug mode.");
+    MEASURE_REQUEST_TIME("debug_measure_request_time", false, "Whether to measure request time. If true, the time will be logged in debug mode."),
+
+    /**
+     *  SNI SSL parameter that will be set for each outbound SSL socket.
+     */
+    SSL_SOCKET_SNI("ssl_socket_sni", "", " SNI SSL parameter that will be set for each outbound SSL socket.")
+
+    ;
 
     private final String key;
     private final Serializable defaultValue;

clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseServerForTest.java

@@ -370,13 +370,6 @@ public static String getDatabase() {
 
     public static boolean runQuery(String sql) {
         LOGGER.info("runQuery: (\"" + sql + "\")");
-
-        try {
-            throw new Exception("test");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
         if (clickhouseContainer != null) {
             try {
                 Container.ExecResult res =  clickhouseContainer.execInContainer("clickhouse-client",

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ApacheHttpConnectionImpl.java

@@ -11,6 +11,7 @@
 import com.clickhouse.client.config.ClickHouseProxyType;
 import com.clickhouse.client.config.ClickHouseSslMode;
 import com.clickhouse.client.http.config.ClickHouseHttpOption;
+import com.clickhouse.config.ClickHouseOption;
 import com.clickhouse.data.ClickHouseChecker;
 import com.clickhouse.data.ClickHouseExternalTable;
 import com.clickhouse.data.ClickHouseFormat;
@@ -54,8 +55,11 @@
 import org.apache.hc.core5.util.Timeout;
 import org.apache.hc.core5.util.VersionInfo;
 
+import javax.net.ssl.SNIHostName;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSocket;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -66,10 +70,9 @@
 import java.io.UncheckedIOException;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.net.SocketOption;
-import java.net.SocketOptions;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
@@ -394,6 +397,7 @@ public static SocketFactory create(ClickHouseConfig config) {
 
     static class SSLSocketFactory extends SSLConnectionSocketFactory {
         private final ClickHouseConfig config;
+        private final SNIHostName defaultSNI;
 
         private SSLSocketFactory(ClickHouseConfig config) throws SSLException {
             super(ClickHouseSslContextProvider.getProvider().getSslContext(SSLContext.class, config)
@@ -402,13 +406,25 @@ private SSLSocketFactory(ClickHouseConfig config) throws SSLException {
                             ? new DefaultHostnameVerifier()
                             : (hostname, session) -> true); // NOSONAR
             this.config = config;
+            String sni = config.getStrOption(ClickHouseClientOption.SSL_SOCKET_SNI);
+            defaultSNI = sni == null || sni.trim().isEmpty() ? null : new SNIHostName(sni);
         }
 
         @Override
         public Socket createSocket(HttpContext context) throws IOException {
             return AbstractSocketClient.setSocketOptions(config, new Socket());
         }
 
+        @Override
+        protected void prepareSocket(SSLSocket socket, HttpContext context) throws IOException {
+            super.prepareSocket(socket, context);
+            if (defaultSNI != null) {
+                SSLParameters sslParams = socket.getSSLParameters();
+                sslParams.setServerNames(Collections.singletonList(defaultSNI));
+                socket.setSSLParameters(sslParams);
+            }
+        }
+
         public static SSLSocketFactory create(ClickHouseConfig config) throws SSLException {
             return new SSLSocketFactory(config);
         }

client-v2/pom.xml

@@ -129,6 +129,12 @@
             <version>1.18.36</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.16</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -0,0 +1,18 @@
+package com.clickhouse.client.api;
+
+public class ClickHouseException extends RuntimeException {
+    protected boolean isRetryable  = false;
+
+    public ClickHouseException(String message) {
+        super(message);
+    }
+
+    public ClickHouseException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ClickHouseException(Throwable cause) {
+        super(cause);
+    }
+    public boolean isRetryable() { return isRetryable; }
+}