Merge branch 'main' into jdbc_v2_row_binary_writer

chernser · chernser · commit e50ce10e6d7b · 2025-04-29T22:58:04.000-07:00
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHC_BRANCH: "main"
-  CHC_VERSION: "0.8.2"
+  CHC_VERSION: "0.8.5"
   CH_VERSION: "24.8"
 
 jobs:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+## 0.8.5
+
+### Improvements
+- [jdbc-v2] Added debug output for final SQL. (https://github.com/ClickHouse/clickhouse-java/issues/2249) 
+
+### Bug Fixes
+- [client-v2] Fixed creating TableSchema for materialized views. It resolves issues with POJO serde. (https://github.com/ClickHouse/clickhouse-java/issues/2118,
+https://github.com/ClickHouse/clickhouse-java/issues/2025)
+- [client-v2, jdbc-v2] Fixed handling `Nullable` inside `SimpleAggregateFunction` columns. (https://github.com/ClickHouse/clickhouse-java/issues/2110)
+- [jdbc-v2] Fixed problem with server info request. It is fetched now when timezone of the server is set. (https://github.com/ClickHouse/clickhouse-java/issues/2191) 
+- [jdbc-v2] Fixed null response for `getIndexInfo()`. Empty Result Set is returned. (https://github.com/ClickHouse/clickhouse-java/issues/2286)
+- [jdbc-v2] Fixed wrong `false` response in `DataBaseMetadata.supportsBatchUpdates()`. Returns `true` now. Please note that 
+no update is supported for result sets. 
+- [jdbc-v2] Fixed handling UUID data type in PreparedStatement. (https://github.com/ClickHouse/clickhouse-java/issues/2327)
+- [jdbc-v2] Fixed unsigned integer type matching. `UInt8`, `UInt16`, `UInt32`, `UInt64`, `UInt128`, `UInt256` are presented as 
+`short`, `int`, `long`, `BigInteger`, `BigInteger`, `BigInteger` correspondingly. SQLType for them is `OTHER` because 
+JDBC (as well as Java) doesn't provide good mapping for unsigned integers. (https://github.com/ClickHouse/clickhouse-java/issues/2333)
+- [jdbc-v2] Disallowed to call method from `Statement` interface on `PreparedStatement` instance according to the JDBC spec. (https://github.com/ClickHouse/clickhouse-java/issues/2339)
+
 ## 0.8.4
 
 ### Examples
@@ -18,6 +37,7 @@ Complete metadata is returned only after statement execution. Partial metadata i
 of the statement. (https://github.com/ClickHouse/clickhouse-java/issues/2292)
 - [jdbc-v2] Fixed `clearParameters` in `PreparedStatementImpl` to correctly reset parameters array. (https://github.com/ClickHouse/clickhouse-java/issues/2299)
 - [jdbc-v2] Fixed logging. (https://github.com/ClickHouse/clickhouse-java/pull/2303)
+- [jdbc-v2] Fixed metadata field `DATA_TYPE` being `String` (https://github.com/ClickHouse/clickhouse-java/issues/2240)
 
 ## 0.8.3
 
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java b/client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java
@@ -234,6 +234,8 @@ public <T> T readValue(ClickHouseColumn column, Class<?> typeHint) throws IOExce
                     return (T) readVariant(actualColumn);
                 case Dynamic:
                     return (T) readValue(actualColumn, typeHint);
+                case Nested:
+                    return convertArray(readNested(actualColumn), typeHint);
                 default:
                     throw new IllegalArgumentException("Unsupported data type: " + actualColumn.getDataType());
             }
@@ -785,6 +787,33 @@ public Object[] readTuple(ClickHouseColumn column) throws IOException {
         return tuple;
     }
 
+    /**
+     * Reads a nested into an ArrayValue object.
+     * @param column - column information
+     * @return array value
+     * @throws IOException when IO error occurs
+     */
+    public ArrayValue readNested(ClickHouseColumn column) throws IOException {
+        int len = readVarInt(input);
+        if (len == 0) {
+            return new ArrayValue(Object[].class, 0);
+        }
+
+        ArrayValue array;
+        array = new ArrayValue(Object[].class, len);
+        for (int i = 0; i < len; i++) {
+            int tupleLen = column.getNestedColumns().size();
+            Object[] tuple = new Object[tupleLen];
+            for (int j = 0; j < tupleLen; j++) {
+                tuple[j] = readValue(column.getNestedColumns().get(j));
+            }
+
+            array.set(i, tuple);
+        }
+
+        return array;
+    }
+
     public Object readVariant(ClickHouseColumn column) throws IOException {
         int ordNum = readByte();
         return readValue(column.getNestedColumns().get(ordNum));
diff --git a/client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java b/client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java
@@ -556,7 +556,6 @@ private void addQueryParams(URIBuilder req, Map<String, String> chConfig, Map<St
         Collection<String> sessionRoles = (Collection<String>) requestConfig.getOrDefault(ClientConfigProperties.SESSION_DB_ROLES.getKey(),
                 ClientConfigProperties.valuesFromCommaSeparated(chConfiguration.getOrDefault(ClientConfigProperties.SESSION_DB_ROLES.getKey(), "")));
         if (!sessionRoles.isEmpty()) {
-
             sessionRoles.forEach(r -> req.addParameter(ClickHouseHttpProto.QPARAM_ROLE, r));
         }
 
diff --git a/examples/client-v2/pom.xml b/examples/client-v2/pom.xml
@@ -54,7 +54,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <clickhouse-java.version>0.8.4-SNAPSHOT</clickhouse-java.version>
+        <clickhouse-java.version>0.8.5-SNAPSHOT</clickhouse-java.version>
 
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
 
diff --git a/examples/client/pom.xml b/examples/client/pom.xml
@@ -40,9 +40,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <clickhouse-java.version>0.8.4-SNAPSHOT</clickhouse-java.version>
+        <clickhouse-java.version>0.8.5-SNAPSHOT</clickhouse-java.version>
         <!-- Nightly snapshot version from https://s01.oss.sonatype.org/content/repositories/snapshots/ or latest from local -->
-<!--        <clickhouse-java.version>0.8.4-SNAPSHOT</clickhouse-java.version>-->
+<!--        <clickhouse-java.version>0.8.5-SNAPSHOT</clickhouse-java.version>-->
 
         <apache-httpclient.version>5.2.1</apache-httpclient.version>
 
diff --git a/examples/demo-kotlin-service/gradle.properties b/examples/demo-kotlin-service/gradle.properties
@@ -3,4 +3,4 @@ ktor_version=2.3.12
 kotlin_version=2.0.20
 logback_version=1.4.14
 
-ch_java_client_version=0.8.4
+ch_java_client_version=0.8.5
diff --git a/examples/demo-service/gradle.properties b/examples/demo-service/gradle.properties
@@ -1,2 +1,2 @@
 
-ch_java_client_version=0.8.4
+ch_java_client_version=0.8.5
diff --git a/examples/jdbc/pom.xml b/examples/jdbc/pom.xml
@@ -47,7 +47,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <clickhouse-java.version>0.8.4-SNAPSHOT</clickhouse-java.version>
+        <clickhouse-java.version>0.8.5-SNAPSHOT</clickhouse-java.version>
         <hikaricp.version>4.0.3</hikaricp.version>
         <apache-httpclient.version>5.2.1</apache-httpclient.version>
 
diff --git a/examples/r2dbc/clickhouse-r2dbc-spring-webflux-sample/pom.xml b/examples/r2dbc/clickhouse-r2dbc-spring-webflux-sample/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <clickhouse-java.version>0.8.4-SNAPSHOT</clickhouse-java.version>
+        <clickhouse-java.version>0.8.5-SNAPSHOT</clickhouse-java.version>
         <spring-boot-starter.version>2.7.18</spring-boot-starter.version>
     </properties>
 
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java
@@ -125,6 +125,7 @@ protected ResultSetImpl executeQueryImpl(String sql, QuerySettings settings) thr
 
         try {
             lastSql = parseJdbcEscapeSyntax(sql);
+            LOG.debug("SQL Query: {}", lastSql);
             QueryResponse response;
             if (queryTimeout == 0) {
                 response = connection.client.query(lastSql, mergedSettings).get();
@@ -175,6 +176,7 @@ protected int executeUpdateImpl(String sql, StatementParser.StatementType type,
         }
 
         lastSql = parseJdbcEscapeSyntax(sql);
+        LOG.debug("SQL Query: {}", lastSql);
         int updateCount = 0;
         try (QueryResponse response = queryTimeout == 0 ? connection.client.query(lastSql, mergedSettings).get()
                 : connection.client.query(lastSql, mergedSettings).get(queryTimeout, TimeUnit.SECONDS)) {
@@ -321,7 +323,8 @@ public boolean executeImpl(String sql, StatementParser.StatementType type, Query
             //USE Database
             List<String> tokens = JdbcUtils.tokenizeSQL(sql);
             this.schema = tokens.get(1).replace("\"", "");
-            LOG.debug("Changed statement schema {}", schema);
+            connection.setSchema(schema);
+            LOG.debug("Changed statement schema to {}", schema);
             return false;
         } else {
             executeUpdateImpl(sql, type, settings);
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java
@@ -40,13 +40,9 @@ public class JdbcUtils {
     private static Map<ClickHouseDataType, SQLType> generateTypeMap() {
         Map<ClickHouseDataType, SQLType> map = new TreeMap<>(); // TreeMap is used to sort the keys in natural order so FixedString will be before String :-) (type match should be more accurate)
         map.put(ClickHouseDataType.Int8, JDBCType.TINYINT);
-        map.put(ClickHouseDataType.UInt8, JDBCType.TINYINT);
         map.put(ClickHouseDataType.Int16, JDBCType.SMALLINT);
-        map.put(ClickHouseDataType.UInt16, JDBCType.SMALLINT);
         map.put(ClickHouseDataType.Int32, JDBCType.INTEGER);
-        map.put(ClickHouseDataType.UInt32, JDBCType.INTEGER);
         map.put(ClickHouseDataType.Int64, JDBCType.BIGINT);
-        map.put(ClickHouseDataType.UInt64, JDBCType.BIGINT);
         map.put(ClickHouseDataType.Float32, JDBCType.FLOAT);
         map.put(ClickHouseDataType.Float64, JDBCType.DOUBLE);
         map.put(ClickHouseDataType.Bool, JDBCType.BOOLEAN);
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java
diff --git a/performance/pom.xml b/performance/pom.xml
diff --git a/pom.xml b/pom.xml
diff --git a/release.sh b/release.sh

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,6 @@ private void addQueryParams(URIBuilder req, Map<String, String> chConfig, Map<St`
`556`	`556`	`Collection<String> sessionRoles = (Collection<String>) requestConfig.getOrDefault(ClientConfigProperties.SESSION_DB_ROLES.getKey(),`
`557`	`557`	`ClientConfigProperties.valuesFromCommaSeparated(chConfiguration.getOrDefault(ClientConfigProperties.SESSION_DB_ROLES.getKey(), "")));`
`558`	`558`	`if (!sessionRoles.isEmpty()) {`
`559`		`-`
`560`	`559`	`sessionRoles.forEach(r -> req.addParameter(ClickHouseHttpProto.QPARAM_ROLE, r));`
`561`	`560`	`}`
`562`	`561`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`
`2`		`-ch_java_client_version=0.8.4`
	`2`	`+ch_java_client_version=0.8.5`