Merge branch 'main' into v2_json_support

chernser · chernser · commit 12191bd9eafe · 2024-11-11T11:05:29.000-08:00
diff --git a/.github/workflows/nightly.yml b/.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 }}
diff --git a/.github/workflows/release.yml b/.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 }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 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
diff --git a/examples/client-v2/pom.xml b/examples/client-v2/pom.xml
@@ -64,7 +64,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <clickhouse-java.version>0.7.1-SNAPSHOT</clickhouse-java.version>
+        <clickhouse-java.version>0.7.1-patch1-SNAPSHOT</clickhouse-java.version>
         <apache-httpclient.version>5.3.1</apache-httpclient.version>
 
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
diff --git a/examples/client/pom.xml b/examples/client/pom.xml
@@ -66,7 +66,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <clickhouse-java.version>0.7.1-SNAPSHOT</clickhouse-java.version>
+        <clickhouse-java.version>0.7.1-patch1-SNAPSHOT</clickhouse-java.version>
         <!-- Nightly snapshot version from https://s01.oss.sonatype.org/content/repositories/snapshots/ or latest from local -->
 <!--        <clickhouse-java.version>0.7.1</clickhouse-java.version>-->
 
diff --git a/examples/demo-kotlin-service/build.gradle.kts b/examples/demo-kotlin-service/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor_version")
 
     // https://mvnrepository.com/artifact/com.clickhouse/client-v2
-    implementation("com.clickhouse:client-v2:0.7.1-SNAPSHOT")
+    implementation("com.clickhouse:client-v2:0.7.1-patch1-SNAPSHOT")
 //    implementation("com.clickhouse:client-v2:0.7.1") // release version
 
     testImplementation("io.ktor:ktor-server-test-host-jvm")
diff --git a/examples/demo-service/build.gradle.kts b/examples/demo-service/build.gradle.kts
@@ -29,7 +29,7 @@ dependencies {
 
 	// -- clickhouse dependencies
 	// Main dependency
-	implementation("com.clickhouse:client-v2:0.7.1-SNAPSHOT") // local or nightly build
+	implementation("com.clickhouse:client-v2:0.7.1-patch1-SNAPSHOT") // local or nightly build
 //	implementation("com.clickhouse:client-v2:0.7.1") // release version
 
 	// -- clickhouse-http-client dependencies if old implementation is needed
diff --git a/examples/jdbc/pom.xml b/examples/jdbc/pom.xml
@@ -66,7 +66,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <clickhouse-java.version>0.7.1-SNAPSHOT</clickhouse-java.version>
+        <clickhouse-java.version>0.7.1-patch1-SNAPSHOT</clickhouse-java.version>
         <hikaricp.version>4.0.3</hikaricp.version>
         <apache-httpclient.version>5.2.1</apache-httpclient.version>
 
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java
@@ -7,14 +7,11 @@
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.sql.*;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalField;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
@@ -78,13 +75,13 @@ public void setNull(int parameterIndex, int sqlType) throws SQLException {
     @Override
     public void setBoolean(int parameterIndex, boolean x) throws SQLException {
         checkClosed();
-        parameters[parameterIndex - 1] = x;
+        parameters[parameterIndex - 1] = Boolean.toString(x);
     }
 
     @Override
     public void setByte(int parameterIndex, byte x) throws SQLException {
         checkClosed();
-        parameters[parameterIndex - 1] = x;
+        parameters[parameterIndex - 1] = Byte.toString(x);
     }
 
     @Override
@@ -132,7 +129,7 @@ public void setString(int parameterIndex, String x) throws SQLException {
     @Override
     public void setBytes(int parameterIndex, byte[] x) throws SQLException {
         checkClosed();
-        parameters[parameterIndex - 1] = new String(x, StandardCharsets.UTF_8);
+        throw new SQLFeatureNotSupportedException("Bytes is not yet supported.");
     }
 
     @Override
@@ -265,7 +262,6 @@ public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLExceptio
         ZoneId tz = cal.getTimeZone().toZoneId();
         Calendar c = (Calendar) cal.clone();
         c.setTime(x);
-        System.out.println(String.format("'%s'", TIME_FORMATTER.format(c.toInstant().atZone(tz).toLocalTime())));
         parameters[parameterIndex - 1] = String.format("'%s'", TIME_FORMATTER.format(c.toInstant().atZone(tz).toLocalTime()));
     }
 
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/ResultSetImpl.java
@@ -57,6 +57,12 @@ public boolean next() throws SQLException {
     public void close() throws SQLException {
         closed = true;
         if (reader != null) {
+            try {
+                reader.close();
+            } catch (Exception e) {
+                throw new SQLException(e);
+            }
+
             reader = null;
         }
 
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java
@@ -4,6 +4,7 @@
 import com.clickhouse.client.api.metrics.OperationMetrics;
 import com.clickhouse.client.api.metrics.ServerMetrics;
 import com.clickhouse.client.api.query.QueryResponse;
+import com.clickhouse.client.api.query.QuerySettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -102,10 +103,15 @@ protected static String parseJdbcEscapeSyntax(String sql) {
     @Override
     public ResultSet executeQuery(String sql) throws SQLException {
         checkClosed();
+        return executeQuery(sql, new QuerySettings());
+    }
+
+    public ResultSet executeQuery(String sql, QuerySettings settings) throws SQLException {
+        checkClosed();
 
         try {
             sql = parseJdbcEscapeSyntax(sql);
-            QueryResponse response = connection.client.query(sql).get(queryTimeout, TimeUnit.SECONDS);
+            QueryResponse response = connection.client.query(sql, settings).get(queryTimeout, TimeUnit.SECONDS);
             ClickHouseBinaryFormatReader reader = connection.client.newBinaryFormatReader(response);
             currentResultSet = new ResultSetImpl(response, reader);
             metrics = response.getMetrics();
@@ -119,16 +125,22 @@ public ResultSet executeQuery(String sql) throws SQLException {
     @Override
     public int executeUpdate(String sql) throws SQLException {
         checkClosed();
-        
+        return executeUpdate(sql, new QuerySettings());
+    }
+
+    public int executeUpdate(String sql, QuerySettings settings) throws SQLException {
+        checkClosed();
+
         if (parseStatementType(sql) == StatementType.SELECT) {
             throw new SQLException("executeUpdate() cannot be called with a SELECT statement");
         }
 
         try {
             sql = parseJdbcEscapeSyntax(sql);
-            QueryResponse response = connection.client.query(sql).get(queryTimeout, TimeUnit.SECONDS);
+            QueryResponse response = connection.client.query(sql, settings).get(queryTimeout, TimeUnit.SECONDS);
             currentResultSet = null;
             metrics = response.getMetrics();
+            response.close();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -209,14 +221,19 @@ public void setCursorName(String name) throws SQLException {
 
     @Override
     public boolean execute(String sql) throws SQLException {
+        checkClosed();
+        return execute(sql, new QuerySettings());
+    }
+
+    public boolean execute(String sql, QuerySettings settings) throws SQLException {
         checkClosed();
         StatementType type = parseStatementType(sql);
 
         if (type == StatementType.SELECT) {
-            executeQuery(sql);
+            executeQuery(sql, settings);
             return true;
         } else {
-            executeUpdate(sql);
+            executeUpdate(sql, settings);
             return false;
         }
     }
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
@@ -1,5 +1,6 @@
 package com.clickhouse.jdbc;
 
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import java.sql.Connection;
@@ -142,14 +143,15 @@ public void testSetString() throws Exception {
         }
     }
 
+    @Ignore("Not supported yet")
     @Test
     public void testSetBytes() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (PreparedStatement stmt = conn.prepareStatement("SELECT ?")) {
                 stmt.setBytes(1, new byte[] { 1, 2, 3 });
                 try (ResultSet rs = stmt.executeQuery()) {
                     assertTrue(rs.next());
-                    assertEquals(new byte[] { 1, 2, 3 }, rs.getBytes(1));
+                    assertEquals(rs.getBytes(1), new byte[] { 1, 2, 3 });
                     assertFalse(rs.next());
                 }
             }
@@ -173,7 +175,7 @@ public void testSetDate() throws Exception {
     @Test
     public void testSetTime() throws Exception {
         try (Connection conn = getJdbcConnection()) {
-            try (PreparedStatement stmt = conn.prepareStatement("SELECT ?")) {
+            try (PreparedStatement stmt = conn.prepareStatement("SELECT parseDateTime(?, '%H:%i:%s')")) {
                 stmt.setTime(1, java.sql.Time.valueOf("12:34:56"));
                 try (ResultSet rs = stmt.executeQuery()) {
                     assertTrue(rs.next());
diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
     </distributionManagement>
 
     <properties>
-        <revision>0.7.1-SNAPSHOT</revision>
+        <revision>0.7.1-patch1-SNAPSHOT</revision>
         <project.current.year>2024</project.current.year>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
