Fixed reading server errors messages if they are multi-line

Author: chernser

clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseServerForTest.java

@@ -172,6 +172,7 @@ public class ClickHouseServerForTest {
                             ClickHouseProtocol.TCP.getDefaultSecurePort(),
                             ClickHouseProtocol.POSTGRESQL.getDefaultPort())
                     .withClasspathResourceMapping("containers/clickhouse-server", customDirectory, BindMode.READ_ONLY)
+                    .withClasspathResourceMapping("empty.csv", "/var/lib/clickhouse/user_files/empty.csv", BindMode.READ_ONLY)
                     .withFileSystemBind(System.getProperty("java.io.tmpdir"), getClickHouseContainerTmpDir(),
                             BindMode.READ_WRITE)
                     .withNetwork(network)

clickhouse-client/src/test/resources/empty.csv

@@ -66,6 +66,13 @@
             <artifactId>jackson-core</artifactId>
             <version>2.17.2</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.12.0</version>
+        </dependency>
+
         <!-- Test Dependencies -->
         <dependency>
             <groupId>com.google.code.gson</groupId>

client-v2/pom.xml

@@ -16,6 +16,7 @@
 import com.clickhouse.client.config.ClickHouseDefaults;
 import com.clickhouse.client.http.ClickHouseHttpProto;
 import com.clickhouse.client.http.config.ClickHouseHttpOption;
+import org.apache.commons.text.StringEscapeUtils;
 import org.apache.hc.client5.http.ConnectTimeoutException;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.config.ConnectionConfig;
@@ -63,7 +64,6 @@
 import java.net.NoRouteToHostException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLEncoder;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
@@ -303,21 +303,17 @@ public Exception readError(ClassicHttpResponse httpResponse) {
                                 }
                             }
                             if (found) {
-                                int start = i;
-                                while (i < rBytes && buffer[i] != '\n') {
-                                    i++;
-                                }
-
-                                return new ServerException(serverCode, new String(buffer, start, i -start, StandardCharsets.UTF_8));
+                                String msg = StringEscapeUtils.unescapeJson(new String(buffer, i, rBytes - i, StandardCharsets.UTF_8));
+                                return new ServerException(serverCode, msg.replaceAll("\n", " "));
                             }
                         }
                     }
                 }
             }
 
             return new ServerException(serverCode, String.format(ERROR_CODE_PREFIX_PATTERN, serverCode) + " <Unreadable error message>");
-        } catch (IOException e) {
-            throw new ClientException("Failed to read response body", e);
+        } catch (Exception e) {
+            return new ServerException(serverCode, String.format(ERROR_CODE_PREFIX_PATTERN, serverCode) + " <Unreadable error message>");
         }
     }
 

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

@@ -314,9 +314,7 @@ public void testServerErrorHandling(ClickHouseFormat format) {
                 .addEndpoint(server.getBaseUri())
                 .setUsername("default")
                 .setPassword("")
-                .useNewImplementation(true)
-                // TODO: fix in old client
-//                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "false").equals("true"))
+                .compressServerResponse(false)
                 .build()) {
 
             QuerySettings querySettings = new QuerySettings().setFormat(format);
@@ -329,6 +327,19 @@ public void testServerErrorHandling(ClickHouseFormat format) {
                 Assert.assertTrue(e.getMessage().startsWith("Code: 62. DB::Exception: Syntax error (Multi-statements are not allowed): failed at position 15 (end of query)"),
                         "Unexpected error message: " + e.getMessage());
             }
+
+
+            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(), 636);
+                Assert.assertTrue(e.getMessage().startsWith("Code: 636. DB::Exception: The table structure cannot be extracted from a CSV format file. Error: The table structure cannot be extracted from a CSV format file: the file is empty. You can specify the structure manually: (in file/uri /var/lib/clickhouse/user_files/empty.csv). (CANNOT_EXTRACT_TABLE_STRUCTURE)"),
+                        "Unexpected error message: " + e.getMessage());
+            }
+
+
         } catch (Exception e) {
             e.printStackTrace();
             Assert.fail(e.getMessage(), e);
@@ -337,7 +348,8 @@ public void testServerErrorHandling(ClickHouseFormat format) {
 
     @DataProvider(name = "testServerErrorHandlingDataProvider")
     public static Object[] testServerErrorHandlingDataProvider() {
-        return new Object[] { ClickHouseFormat.JSON, ClickHouseFormat.TabSeparated, ClickHouseFormat.RowBinary };
+        return new Object[] { ClickHouseFormat.JSON, ClickHouseFormat.TabSeparated, ClickHouseFormat.RowBinary, ClickHouseFormat.TSKV,
+            ClickHouseFormat.JSONEachRow};
     }