Merge pull request #2554 from ClickHouse/shade_antlr

chernser · web-flow · commit c0c7938170d3 · 2025-08-30T10:29:39.000-07:00
[repo] Shade Antlr Runtime Library
diff --git a/clickhouse-jdbc/pom.xml b/clickhouse-jdbc/pom.xml
@@ -419,7 +419,7 @@
                                 <relocation>
                                     <!-- lz4 compression -->
                                     <pattern>net.jpountz</pattern>
-                                    <shadedPattern>${shade.base}.jpountz</shadedPattern>
+                                    <shadedPattern>${shade.base}.net.jpountz</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.roaringbitmap</pattern>
@@ -435,12 +435,17 @@
 
                                 <relocation>
                                     <pattern>com.google</pattern>
-                                    <shadedPattern>${shade.base}.google</shadedPattern>
+                                    <shadedPattern>${shade.base}.com.google</shadedPattern>
                                 </relocation>
 
                                 <relocation>
                                     <pattern>org.apache</pattern>
-                                    <shadedPattern>${shade.base}.apache</shadedPattern>
+                                    <shadedPattern>${shade.base}.org.apache</shadedPattern>
+                                </relocation>
+
+                                <relocation>
+                                    <pattern>org.antlr</pattern>
+                                    <shadedPattern>${shade.base}.org.antlr</shadedPattern>
                                 </relocation>
                             </relocations>
                             <transformers>
diff --git a/client-v2/pom.xml b/client-v2/pom.xml
@@ -17,7 +17,6 @@
     <url>https://github.com/ClickHouse/clickhouse-java/tree/main/client-v2</url>
 
     <properties>
-        <apache.httpclient.version>5.3.1</apache.httpclient.version>
         <shade.base>${project.groupId}.shaded</shade.base>
     </properties>
 
diff --git a/client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java b/client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java
@@ -1947,14 +1947,14 @@ public void testReadingJSONValues() throws Exception {
         client.execute("INSERT INTO test_json_values VALUES ('{\"a\" : {\"b\" : 42}, \"c\" : [1, 2, 3]}')", commandSettings).get(1, TimeUnit.SECONDS);
 
 
-        QuerySettings settings = new QuerySettings().setFormat(ClickHouseFormat.CSV);
+        QuerySettings settings = new QuerySettings().setFormat(ClickHouseFormat.CSV).serverSetting("output_format_json_quote_64bit_integers", "1");
         try (QueryResponse resp = client.query("SELECT json FROM test_json_values", settings).get(1, TimeUnit.SECONDS)) {
             BufferedReader reader = new BufferedReader(new InputStreamReader(resp.getInputStream()));
             Assert.assertEquals(StringEscapeUtils.unescapeCsv(reader.lines().findFirst().get()), "{\"a\":{\"b\":\"42\"},\"c\":[\"1\",\"2\",\"3\"]}");
         }
 
         settings = new QuerySettings()
-                .serverSetting(ServerSettings.OUTPUT_FORMAT_BINARY_WRITE_JSON_AS_STRING, "1");
+                .serverSetting(ServerSettings.OUTPUT_FORMAT_BINARY_WRITE_JSON_AS_STRING, "1").serverSetting("output_format_json_quote_64bit_integers", "1");
         try (QueryResponse resp = client.query("SELECT json FROM test_json_values", settings).get(1, TimeUnit.SECONDS)) {
             ClickHouseBinaryFormatReader reader = client.newBinaryFormatReader(resp);
             Assert.assertNotNull(reader.next());
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java
@@ -369,10 +369,6 @@ private void checkResultSetFlags(int resultSetType, int resultSetConcurrency, in
                 throw new SQLFeatureNotSupportedException("Cannot create statement with result set concurrency other then ResultSet.CONCUR_READ_ONLY",
                         ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
             }
-            if (resultSetHoldability != ResultSet.CLOSE_CURSORS_AT_COMMIT) {
-                throw new SQLFeatureNotSupportedException("Cannot create statement with result set holdability other then ResultSet.CLOSE_CURSORS_AT_COMMIT",
-                        ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
-            }
         }
     }
 
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/ConnectionTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/ConnectionTest.java
@@ -99,13 +99,11 @@ public void testCreateUnsupportedStatements() throws Throwable {
                 Assert.ThrowingRunnable[] createStatements = new Assert.ThrowingRunnable[]{
                         () -> conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY),
                         () -> conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE),
-                        () -> conn.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT),
                         () -> conn.prepareStatement("SELECT 1", Statement.RETURN_GENERATED_KEYS),
                         () -> conn.prepareStatement("SELECT 1", new int[]{1}),
                         () -> conn.prepareStatement("SELECT 1", new String[]{"1"}),
                         () -> conn.prepareStatement("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE),
                         () -> conn.prepareStatement("SELECT 1", ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY),
-                        () -> conn.prepareStatement("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT),
                         () -> conn.prepareCall("SELECT 1"),
                         () -> conn.prepareCall("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY),
                         () -> conn.prepareCall("SELECT 1", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,  ResultSet.HOLD_CURSORS_OVER_COMMIT),
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java
@@ -1404,15 +1404,15 @@ public void testJSONWritingAsString() throws SQLException {
         double key1 =  rand.nextDouble();
         int key2 =  rand.nextInt();
         final String json = "{\"key1\": \"" + key1 + "\", \"key2\": " + key2 + ", \"key3\": [1000, \"value3\", 400000]}";
-        final String serverJson = "{\"key1\":\"" + key1 + "\",\"key2\":" + key2 + ",\"key3\":[\"1000\",\"value3\",\"400000\"]}";
+        final String serverJson = "{\"key1\":\"" + key1 + "\",\"key2\":\"" + key2 + "\",\"key3\":[\"1000\",\"value3\",\"400000\"]}";
         insertData(String.format("INSERT INTO test_json VALUES ( 1, '%s' )", json));
 
         // Check the results
         Properties props = new Properties();
         props.setProperty(
                 ClientConfigProperties.serverSetting(ServerSettings.OUTPUT_FORMAT_BINARY_WRITE_JSON_AS_STRING),
                 "1");
-        props.setProperty(ClientConfigProperties.serverSetting("output_format_json_quote_64bit_integers"), "0");
+        props.setProperty(ClientConfigProperties.serverSetting("output_format_json_quote_64bit_integers"), "1");
         try (Connection conn = getJdbcConnection(props)) {
             try (Statement stmt = conn.createStatement()) {
                 try (ResultSet rs = stmt.executeQuery("SELECT * FROM test_json ORDER BY order")) {
diff --git a/performance/src/main/java/com/clickhouse/benchmark/clients/Compression.java b/performance/src/main/java/com/clickhouse/benchmark/clients/Compression.java
@@ -2,7 +2,7 @@
 
 import com.clickhouse.benchmark.data.DataSet;
 import com.clickhouse.client.api.internal.ClickHouseLZ4OutputStream;
-import com.clickhouse.client.internal.jpountz.lz4.LZ4Factory;
+import com.clickhouse.client.internal.net.jpountz.lz4.LZ4Factory;
 import com.clickhouse.data.ClickHouseOutputStream;
 import com.clickhouse.data.stream.Lz4OutputStream;
 import org.openjdk.jmh.annotations.Benchmark;
diff --git a/pom.xml b/pom.xml
@@ -75,7 +75,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <annotations-api.version>6.0.53</annotations-api.version>
-        <apache.httpclient.version>5.3.1</apache.httpclient.version>
+        <apache.httpclient.version>5.4.4</apache.httpclient.version>
         <arrow.version>12.0.1</arrow.version>
         <asm.version>9.7</asm.version>
         <avro.version>1.11.4</avro.version>

Original file line number	Diff line number	Diff line change
`@@ -369,10 +369,6 @@ private void checkResultSetFlags(int resultSetType, int resultSetConcurrency, in`
`369`	`369`	`throw new SQLFeatureNotSupportedException("Cannot create statement with result set concurrency other then ResultSet.CONCUR_READ_ONLY",`
`370`	`370`	`ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);`
`371`	`371`	`}`
`372`		`- if (resultSetHoldability != ResultSet.CLOSE_CURSORS_AT_COMMIT) {`
`373`		`- throw new SQLFeatureNotSupportedException("Cannot create statement with result set holdability other then ResultSet.CLOSE_CURSORS_AT_COMMIT",`
`374`		`- ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);`
`375`		`- }`
`376`	`372`	`}`
`377`	`373`	`}`
`378`	`374`