Merge pull request #837 from zhicwu/exception-handling

Prepare patch5

Author: zhicwu

README.md

@@ -99,7 +99,7 @@ Java 8 or higher is required in order to use Java client([clickhouse-client](htt
     <groupId>com.clickhouse</groupId>
     <!-- or clickhouse-grpc-client if you prefer gRPC -->
     <artifactId>clickhouse-http-client</artifactId>
-    <version>0.3.2-patch4</version>
+    <version>0.3.2-patch5</version>
 </dependency>
 ```
 
@@ -135,7 +135,7 @@ try (ClickHouseClient client = ClickHouseClient.newInstance(preferredProtocol);
     <!-- will stop using ru.yandex.clickhouse starting from 0.4.0  -->
     <groupId>com.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>0.3.2-patch4</version>
+    <version>0.3.2-patch5</version>
     <!-- below is only needed when all you want is a shaded jar -->
     <classifier>http</classifier>
     <exclusions>
@@ -189,7 +189,7 @@ Use `mvn clean verify` to compile, test and generate shaded packages if you're u
 
 ## Benchmark
 
-To benchmark the driver:
+To benchmark JDBC drivers for comparison:
 
 ```bash
 cd clickhouse-benchmark
@@ -198,7 +198,10 @@ mvn -Drelease clean package
 java -DdbHost=localhost -jar target/benchmarks.jar -t 1 -p client=clickhouse-http-jdbc1 -p connection=reuse -p statement=prepared Query.selectInt8
 ```
 
-Note: it's time consuming to run all benchmarks against all drivers using different parameters for comparison. If you just need some numbers to understand performance, please refer to early test results against [0.3.2-test3](https://github.com/ClickHouse/clickhouse-jdbc/issues/768)(still have plenty of room to improve according to ranking at [here](https://github.com/go-faster/ch-bench)).
+It's time consuming to run all benchmarks against all drivers using different parameters. If you just need some numbers to understand performance, please refer to table below and some more details like CPU and memory usage mentioned at [here](https://github.com/ClickHouse/clickhouse-jdbc/issues/768)(still have plenty of room to improve according to ranking at [here](https://github.com/go-faster/ch-bench)).
+
+![image](https://user-images.githubusercontent.com/4270380/154429324-631f718d-9277-4522-b60d-13f87b2e6c31.png)
+
 
 ## Testing
 

clickhouse-benchmark/pom.xml

@@ -16,6 +16,7 @@
     <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/clickhouse-benchmark</url>
 
     <properties>
+        <legacy-driver.version>0.3.1-patch</legacy-driver.version>
         <clickhouse4j-driver.version>1.4.4</clickhouse4j-driver.version>
         <native-driver.version>2.6.4</native-driver.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,6 +37,18 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>ru.yandex.clickhouse</groupId>
+            <artifactId>clickhouse-jdbc</artifactId>
+            <version>${legacy-driver.version}</version>
+            <classifier>shaded</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>clickhouse-client</artifactId>
@@ -135,6 +148,17 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
                             </transformers>
                             <filters>
+                                <filter>
+                                    <artifact>com.clickhouse:clickhouse-jdbc</artifact>
+                                    <excludes>
+                                        <exclude>**/module-info.class</exclude>
+                                        <exclude>ru/**</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
                                 <filter>
                                     <artifact>*:*</artifact>
                                     <excludes>

clickhouse-client/README.md

@@ -9,7 +9,7 @@ Async Java client for ClickHouse. `clickhouse-client` is an abstract module, so
 <dependency>
     <groupId>com.clickhouse</groupId>
     <artifactId>clickhouse-http-client</artifactId>
-    <version>0.3.2-patch4</version>
+    <version>0.3.2-patch5</version>
 </dependency>
 ```
 

clickhouse-jdbc/README.md

@@ -11,7 +11,7 @@ Keep in mind that `clickhouse-jdbc` is synchronous, and in general it has more o
     <!-- will stop using ru.yandex.clickhouse starting from 0.4.0 -->
     <groupId>com.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>0.3.2-patch4</version>
+    <version>0.3.2-patch5</version>
 </dependency>
 ```
 

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java

@@ -277,7 +277,7 @@ public int executeUpdate(String sql) throws SQLException {
         try (ClickHouseResponse response = getLastResponse(null, null, null)) {
             summary = response.getSummary();
         } catch (Exception e) {
-            log.error("can not close stream: %s", e.getMessage());
+            throw SqlExceptionUtils.handle(e);
         }
 
         return summary != null ? (int) summary.getWrittenRows() : 1;
@@ -511,21 +511,28 @@ public void clearBatch() throws SQLException {
     public int[] executeBatch() throws SQLException {
         ensureOpen();
 
+        boolean continueOnError = getConnection().getJdbcConfig().isContinueBatchOnError();
         int len = batchStmts.size();
         int[] results = new int[len];
-        for (int i = 0; i < len; i++) {
-            ClickHouseSqlStatement s = batchStmts.get(i);
-            try (ClickHouseResponse r = executeStatement(s, null, null, null)) {
-                updateResult(s, r);
-                results[i] = currentUpdateCount <= 0 ? 0 : currentUpdateCount;
-            } catch (Exception e) {
-                results[i] = EXECUTE_FAILED;
-                log.error("Faled to execute task %d of %d", i + 1, len, e);
+        try {
+            for (int i = 0; i < len; i++) {
+                ClickHouseSqlStatement s = batchStmts.get(i);
+                try (ClickHouseResponse r = executeStatement(s, null, null, null)) {
+                    updateResult(s, r);
+                    results[i] = currentUpdateCount <= 0 ? 0 : currentUpdateCount;
+                } catch (Exception e) {
+                    if (!continueOnError) {
+                        throw SqlExceptionUtils.handle(e);
+                    }
+
+                    results[i] = EXECUTE_FAILED;
+                    log.error("Faled to execute task %d of %d", i + 1, len, e);
+                }
             }
+        } finally {
+            clearBatch();
         }
 
-        clearBatch();
-
         return results;
     }
 

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java

@@ -106,18 +106,37 @@ public void testLogComment() throws SQLException {
 
     @Test(groups = "integration")
     public void testMutation() throws SQLException {
-        try (ClickHouseConnection conn = newConnection(new Properties())) {
-            ClickHouseStatement stmt = conn.createStatement();
-            stmt.execute("drop table if exists test_mutation;"
-                    + "create table test_mutation(a String, b UInt32) engine=MergeTree() order by tuple()");
+        Properties props = new Properties();
+        try (ClickHouseConnection conn = newConnection(props); ClickHouseStatement stmt = conn.createStatement()) {
+            Assert.assertFalse(stmt.execute("drop table if exists test_mutation;"
+                    + "create table test_mutation(a String, b UInt32) engine=MergeTree() order by tuple()"),
+                    "Should not return result set");
             // [delete from ]tbl a [delete ]where a.b = 1[ settings mutation_async=0]
             // alter table tbl a delete where a.b = 1
-            stmt.execute("-- test\nselect 1");
-            stmt.execute("-- test\ndelete from test_mutation where b = 1");
+            Assert.assertTrue(stmt.execute("-- test\nselect 1"), "Should return a result set");
+            Assert.assertFalse(stmt.execute("-- test\ndelete from test_mutation where b = 1"),
+                    "Should not return result set");
             // [update] tbl a [set] a.b = 1 where a.b != 1[ settings mutation_async=0]
             // alter table tbl a update a.b = 1 where a.b != 1
             conn.setClientInfo("ApplicationName", "333");
-            conn.createStatement().execute("update test_mutation set b = 22 where b = 1");
+            Assert.assertEquals(conn.createStatement().executeUpdate("update test_mutation set b = 22 where b = 1"), 0);
+
+            Assert.assertThrows(SQLException.class,
+                    () -> stmt.executeUpdate("update non_exist_table set value=1 where key=1"));
+
+            stmt.addBatch("select 1");
+            stmt.addBatch("select * from non_exist_table");
+            stmt.addBatch("select 2");
+            Assert.assertThrows(SQLException.class, () -> stmt.executeBatch());
+        }
+
+        props.setProperty(JdbcConfig.PROP_CONTINUE_BATCH, "true");
+        try (ClickHouseConnection conn = newConnection(props); ClickHouseStatement stmt = conn.createStatement()) {
+            stmt.addBatch("select 1");
+            stmt.addBatch("select * from non_exist_table");
+            stmt.addBatch("insert into test_mutation values('a',1)");
+            stmt.addBatch("select 2");
+            Assert.assertEquals(stmt.executeBatch(), new int[] { 0, ClickHouseStatement.EXECUTE_FAILED, 1, 0 });
         }
     }
 
@@ -126,7 +145,7 @@ public void testAsyncInsert() throws SQLException {
         if (DEFAULT_PROTOCOL != ClickHouseProtocol.HTTP) {
             return;
         }
-        
+
         Properties props = new Properties();
         try (ClickHouseConnection conn = newConnection(props)) {
             if (conn.getServerVersion().check("(,21.12)")) {

examples/grpc/pom.xml

@@ -56,7 +56,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <clickhouse-grpc.version>0.3.2-patch4</clickhouse-grpc.version>
+        <clickhouse-grpc.version>0.3.2-patch5</clickhouse-grpc.version>
 
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
 

examples/jdbc/pom.xml

@@ -56,7 +56,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <clickhouse-jdbc.version>0.3.2-patch4</clickhouse-jdbc.version>
+        <clickhouse-jdbc.version>0.3.2-patch5</clickhouse-jdbc.version>
 
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
 

pom.xml

@@ -97,7 +97,7 @@
 
         <mariadb-driver.version>3.0.3</mariadb-driver.version>
         <mysql-driver.version>8.0.28</mysql-driver.version>
-        <postgresql-driver.version>42.3.2</postgresql-driver.version>
+        <postgresql-driver.version>42.3.3</postgresql-driver.version>
 
         <repackaged.version>1.1.1</repackaged.version>