Merge branch 'main' into impl_SNI_config

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

@@ -92,23 +92,22 @@ jobs:
       - 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 \
+          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: |
           PR_ARG=''
-          if [ ! -z $PR_NUMBER ]; then RP_ARG="--pr $PR_NUMBER"; fi;
-          echo $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}

.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/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",

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; }
+}