Merge branch 'main' into v2_json_support

Author: chernser

clickhouse-jdbc/pom.xml

@@ -302,6 +302,7 @@
                                     <include>com.clickhouse:clickhouse-http-client</include>
                                     <include>org.apache.httpcomponents.client5:httpclient5</include>
                                     <include>org.apache.httpcomponents.core5:httpcore5</include>
+                                    <include>org.apache.httpcomponents.core5:httpcore5-h2</include>
                                     <include>org.lz4:lz4-pure-java</include>
                                 </includes>
                             </artifactSet>

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -531,6 +531,7 @@ private HttpEntity wrapEntity(HttpEntity httpEntity, int httpStatus, boolean isR
                 case HttpStatus.SC_NOT_MODIFIED:
                 case HttpStatus.SC_BAD_REQUEST:
                 case HttpStatus.SC_INTERNAL_SERVER_ERROR:
+                case HttpStatus.SC_NOT_FOUND:
                     boolean useHttpCompression = MapUtils.getFlag(chConfiguration, "client.use_http_compression", false);
                     return new LZ4Entity(httpEntity, useHttpCompression, serverCompression, clientCompression,
                             MapUtils.getInt(chConfiguration, "compression.lz4.uncompressed_buffer_size"), isResponse);

client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java

@@ -341,6 +341,16 @@ public void testServerErrorHandling(ClickHouseFormat format, boolean serverCompr
                         "Unexpected error message: " + e.getMessage());
             }
 
+            querySettings.serverSetting("unknown_setting", "1");
+            try (QueryResponse response = client.query("CREATE TABLE table_from_csv AS SELECT * FROM file('empty.csv')", querySettings)
+                    .get(1, TimeUnit.SECONDS)) {
+                Assert.fail("Expected exception");
+            } catch (ServerException e) {
+                e.printStackTrace();
+                Assert.assertEquals(e.getCode(), 115);
+                Assert.assertTrue(e.getMessage().startsWith("Code: 115. DB::Exception: Setting unknown_setting is neither a builtin setting nor started with the prefix 'custom_' registered for user-defined settings. (UNKNOWN_SETTING)"),
+                        "Unexpected error message: " + e.getMessage());
+            }
 
         } catch (Exception e) {
             e.printStackTrace();

examples/jdbc/README.md

@@ -18,5 +18,15 @@ To run simplified example:
  mvn exec:java -Dexec.mainClass="com.clickhouse.examples.jdbc.Basic"
 ```
 
+To run example with jdbc-all packaging (fat-jar):
+```shell
+ mvn -Pfatjar exec:java -Dexec.mainClass="com.clickhouse.examples.jdbc.Basic"
+```
+
+To run example with jdbc-shaded packaging:
+```shell
+ mvn -Pshaded exec:java -Dexec.mainClass="com.clickhouse.examples.jdbc.Basic"
+```
+
 Addition options can be passed to the application:
 - `-DchUrl` - ClickHouse JDBC URL. Default is `jdbc:clickhouse://localhost:8123/default`

examples/jdbc/pom.xml

@@ -75,25 +75,54 @@
         <minJdk>1.8</minJdk>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>http</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.clickhouse</groupId>
+                    <artifactId>clickhouse-jdbc</artifactId>
+                    <version>${clickhouse-java.version}</version>
+                    <classifier>http</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>shaded</id>
+            <dependencies>
+                <dependency>
+                    <groupId>com.clickhouse</groupId>
+                    <artifactId>clickhouse-jdbc</artifactId>
+                    <version>${clickhouse-java.version}</version>
+                    <classifier>shaded</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>fatjar</id>
+            <dependencies>
+                <dependency>
+                    <groupId>com.clickhouse</groupId>
+                    <artifactId>clickhouse-jdbc</artifactId>
+                    <version>${clickhouse-java.version}</version>
+                    <classifier>all</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
+
+    </profiles>
+
     <dependencies>
-        <dependency>
-            <groupId>com.clickhouse</groupId>
-            <artifactId>clickhouse-jdbc</artifactId>
-            <version>${clickhouse-java.version}</version>
-            <classifier>http</classifier>
-        </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
             <version>${hikaricp.version}</version>
         </dependency>
-
-        <!-- Recommended to communicate with ClickHouse server over http -->
-        <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-            <version>${apache-httpclient.version}</version>
-        </dependency>
     </dependencies>
 
     <build>