Merge branch 'main' into v2_jwt_auth

Author: chernser

.github/workflows/build.yml

@@ -153,7 +153,7 @@ jobs:
       matrix:
         # most recent LTS releases as well as latest stable builds
         # https://github.com/ClickHouse/ClickHouse/pulls?q=is%3Aopen+is%3Apr+label%3Arelease
-        clickhouse: ["23.8", "24.3", "24.6", "latest"]
+        clickhouse: ["23.8", "24.3", "24.8", "latest"]
       fail-fast: false
     timeout-minutes: 15
     name: Java client + CH ${{ matrix.clickhouse }}
@@ -335,7 +335,7 @@ jobs:
     needs: compile
     strategy:
       matrix:
-        clickhouse: ["23.8", "24.3", "24.6", "latest"]
+        clickhouse: ["23.8", "24.3", "24.8", "latest"]
         # grpc is not fully supported, and http_client and apache_http_client do not work in CI environment(due to limited threads?)
         protocol: ["http"]
         r2dbc: ["1.0.0.RELEASE", "0.9.1.RELEASE"]
@@ -452,7 +452,7 @@ jobs:
       matrix:
         # most recent LTS releases as well as latest stable builds
         # https://github.com/ClickHouse/ClickHouse/pulls?q=is%3Aopen+is%3Apr+label%3Arelease
-        clickhouse: ["24.6", "latest"]
+        clickhouse: ["24.3", "24.8", "latest"]
       fail-fast: false
     timeout-minutes: 15
     name: Client V2 + CH ${{ matrix.clickhouse }}

.github/workflows/nightly.yml

@@ -13,6 +13,7 @@ on:
 env:
   CHC_BRANCH: "main"
   CHC_VERSION: "0.7.1"
+  CH_VERSION: "24.8"
 
 jobs:
   nightly:
@@ -66,7 +67,7 @@ jobs:
         uses: samuelmeuli/action-maven-publish@v1
         with:
           maven_profiles: release
-          maven_args: -q --batch-mode
+          maven_args: -q --batch-mode -DclickhouseVersion=${{ env.CH_VERSION }}
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
@@ -76,7 +77,7 @@ jobs:
         with:
           directory: clickhouse-r2dbc
           maven_profiles: release
-          maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE
+          maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }}
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}

.github/workflows/release.yml

@@ -8,6 +8,9 @@ on:
         required: true
         default: "0.7.1-SNAPSHOT"
 
+env:
+  CH_VERSION: "24.8"
+
 jobs:
   release:
     name: "Build and Publish Artifact"
@@ -54,7 +57,7 @@ jobs:
         uses: samuelmeuli/action-maven-publish@v1
         with:
           maven_profiles: release
-          maven_args: -q --batch-mode
+          maven_args: -q --batch-mode -DclickhouseVersion=${{ env.CH_VERSION }}
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
@@ -64,7 +67,7 @@ jobs:
         with:
           directory: clickhouse-r2dbc
           maven_profiles: release
-          maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE
+          maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE -DclickhouseVersion=${{ env.CH_VERSION }}
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
           nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}

CHANGELOG.md

@@ -1,3 +1,15 @@
+## Latest
+
+### New Features
+- Added basic auth support for proxies. Now you can specify username/password when connecting via a proxy that requires it with HttpURLConnection and Apache HttpClient.
+
+## 0.7.1-patch1
+
+### Bug Fixes
+- [JDBC] Fixed `java.lang.NoClassDefFoundError: com/clickhouse/client/internal/apache/hc/core5/http2/HttpVersionPolicy` (https://github.com/ClickHouse/clickhouse-java/issues/1912) 
+- [client-v2] Fixed multiple issues with error message handling. (https://github.com/ClickHouse/clickhouse-java/issues/1906)
+- [client-v2] Fixed primitive types conversion. Now client correctly handles numbers to boolean and vice-versa. (https://github.com/ClickHouse/clickhouse-java/issues/1908)
+
 ## 0.7.1 
 
 ### New Features

README.md

@@ -54,7 +54,8 @@ Old client still be used when:
 ### Upcomming deprecations:
 | Component                      | Version | Comment                                          |
 |--------------------------------|---------|--------------------------------------------------|
-| Clickhouse CLI Client (Java)   | 0.7.0   | Please use `clickhouse-client` (see https://clickhouse.com/docs/en/interfaces/cli#clickhouse-client)                   |
+| ClickHouse Java v1 | TBC | We'll be deprecating Java v1 in 2025 |
+| ClickHouse CLI Client (Java)   | 0.7.0   | Please use `clickhouse-client` (see https://clickhouse.com/docs/en/interfaces/cli#clickhouse-client)                   |
 | ClickHouse GRPC Client         | 0.7.0   | Please use the ClickHouse http client instead. GRPC protos still available https://github.com/ClickHouse/ClickHouse/tree/master/src/Server/grpc_protos   |
 
 

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseConfig.java

@@ -245,6 +245,8 @@ public static Map<ClickHouseOption, Serializable> toClientOptions(Map<?, ?> prop
     private final ClickHouseProxyType proxyType;
     private final String proxyHost;
     private final int proxyPort;
+    private final String proxyUserName;
+    private final char[] proxyPassword;
     // client specific options
     private final Map<ClickHouseOption, Serializable> options;
     private final ClickHouseCredentials credentials;
@@ -383,6 +385,8 @@ public ClickHouseConfig(Map<ClickHouseOption, Serializable> options, ClickHouseC
         this.proxyType = getOption(ClickHouseClientOption.PROXY_TYPE, ClickHouseProxyType.class);
         this.proxyHost = getStrOption(ClickHouseClientOption.PROXY_HOST);
         this.proxyPort = getIntOption(ClickHouseClientOption.PROXY_PORT);
+        this.proxyUserName = getStrOption(ClickHouseClientOption.PROXY_USERNAME);
+        this.proxyPassword = getStrOption(ClickHouseClientOption.PROXY_PASSWORD).toCharArray();
     }
 
     @Override
@@ -674,14 +678,6 @@ public boolean isUseObjectsInArray() {
         return useObjectsInArray;
     }
 
-    /**
-     * Checks whether no proxy is used or not.
-     *
-     * @return true if no proxy is used; false otherwise
-     * @deprecated will be dropped in 0.5, please use {@link #getProxyType()}
-     *             instead
-     */
-
     public ClickHouseProxyType getProxyType() {
         return proxyType;
     }
@@ -694,6 +690,14 @@ public int getProxyPort() {
         return proxyPort;
     }
 
+    public String getProxyUserName() {
+        return proxyUserName;
+    }
+
+    public char[] getProxyPassword() {
+        return proxyPassword;
+    }
+
     public boolean isUseServerTimeZone() {
         return useServerTimeZone;
     }

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

@@ -218,6 +218,8 @@ public enum ClickHouseClientOption implements ClickHouseOption {
     MAX_RESULT_ROWS("max_result_rows", 0L,
             "Limit on the number of rows in the result. "
                     + "Also checked for subqueries, and on remote servers when running parts of a distributed query."),
+
+    RESULT_OVERFLOW_MODE("result_overflow_mode", "throw","What to do if the result is overflowed."),
     /**
      * Maximum size of thread pool for each client.
      */
@@ -402,7 +404,15 @@ public enum ClickHouseClientOption implements ClickHouseOption {
     /**
      * Set ClickHouse proxy port.
      */
-    PROXY_PORT("proxy_port", -1, "Set ClickHouse server proxy hostname."),
+    PROXY_PORT("proxy_port", -1, "Set ClickHouse server proxy port."),
+    /**
+     * Set Clickhouse proxy username.
+     */
+    PROXY_USERNAME("proxy_username", "", "Set ClickHouse server proxy username."),
+    /**
+     * Set ClickHouse proxy password.
+     */
+    PROXY_PASSWORD("proxy_password", "", "Set ClickHouse server proxy password."),
     /**
      * Whether to use server time zone.
      */

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

@@ -172,6 +172,7 @@ public class ClickHouseServerForTest {
                             ClickHouseProtocol.TCP.getDefaultSecurePort(),
                             ClickHouseProtocol.POSTGRESQL.getDefaultPort())
                     .withClasspathResourceMapping("containers/clickhouse-server", customDirectory, BindMode.READ_ONLY)
+                    .withClasspathResourceMapping("empty.csv", "/var/lib/clickhouse/user_files/empty.csv", BindMode.READ_ONLY)
                     .withFileSystemBind(System.getProperty("java.io.tmpdir"), getClickHouseContainerTmpDir(),
                             BindMode.READ_WRITE)
                     .withNetwork(network)
@@ -323,10 +324,12 @@ public static boolean isCloud() {
 
     @BeforeSuite(groups = {"integration"})
     public static void beforeSuite() {
-        if (isCloud()) {
+        if (isCloud) {
             if (!runQuery("CREATE DATABASE IF NOT EXISTS " + database)) {
                 throw new IllegalStateException("Failed to create database for testing.");
             }
+
+            return;
         }
 
         if (clickhouseContainer != null) {
@@ -336,6 +339,10 @@ public static void beforeSuite() {
 
             try {
                 clickhouseContainer.start();
+
+                if (clickhouseContainer.isRunning()) {
+                    runQuery("CREATE DATABASE IF NOT EXISTS " + database);
+                }
             } catch (RuntimeException e) {
                 throw new IllegalStateException(new StringBuilder()
                         .append("Failed to start docker container for integration test.\r\n")
@@ -352,7 +359,7 @@ public static void afterSuite() {
             clickhouseContainer.stop();
         }
 
-        if (isCloud()) {
+        if (isCloud) {
             if (!runQuery("DROP DATABASE IF EXISTS " + database)) {
                 LOGGER.warn("Failed to drop database for testing.");
             }

clickhouse-client/src/test/resources/empty.csv

@@ -19,9 +19,12 @@
 import com.clickhouse.data.ClickHouseUtils;
 import com.clickhouse.logging.Logger;
 import com.clickhouse.logging.LoggerFactory;
+import org.apache.hc.client5.http.auth.AuthScope;
+import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.config.ConnectionConfig;
+import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
@@ -121,6 +124,14 @@ private CloseableHttpClient newConnection(ClickHouseConfig c) throws IOException
         }
         if (c.getProxyType() == ClickHouseProxyType.HTTP) {
             builder.setProxy(new HttpHost(c.getProxyHost(), c.getProxyPort()));
+
+            if (c.getProxyUserName() != null && c.getProxyUserName() != "") {
+                AuthScope authScope = new AuthScope(c.getProxyHost(), c.getProxyPort());
+                UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(c.getProxyUserName(), c.getProxyPassword());
+                BasicCredentialsProvider credsProvider = new BasicCredentialsProvider();
+                credsProvider.setCredentials(authScope, credentials);
+                builder.setDefaultCredentialsProvider(credsProvider);
+            }
         }
         return builder.build();
     }