Discard known issues when testing against CH older than 21.9

ClickHouse · Oct 7, 2021 · 9686cd4 · 9686cd4
1 parent 43dff6d
commit 9686cd4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/...khouse-grpc-client/src/test/java/com/clickhouse/client/grpc/ClickHouseGrpcClientTest.java b/...khouse-grpc-client/src/test/java/com/clickhouse/client/grpc/ClickHouseGrpcClientTest.java
@@ -14,11 +14,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
@@ -41,6 +40,7 @@
 import com.clickhouse.client.data.ClickHouseIntegerValue;
 import com.clickhouse.client.data.ClickHouseIpv4Value;
 import com.clickhouse.client.data.ClickHouseIpv6Value;
+import com.clickhouse.client.exception.ClickHouseException;
 import com.clickhouse.client.ClickHouseColumn;
 import com.clickhouse.client.ClickHouseDataProcessor;
 import com.clickhouse.client.ClickHouseDataType;
@@ -406,14 +406,22 @@ public void testReadWriteSimpleTypes(String dataType, String zero, String negati
             zeroValue = ClickHouseUtils.format("'%s'", ClickHouseIntegerValue.of(0).asUuid());
             positiveOneValue = ClickHouseUtils.format("'%s'", ClickHouseIntegerValue.of(1).asUuid());
         }
-        ClickHouseClient
-                .send(server, ClickHouseUtils.format(dropTemplate, columnName),
-                        ClickHouseUtils.format(createTemplate, columnName, typeName),
-                        ClickHouseUtils.format(insertTemplate, columnName, 0, zeroValue, null),
-                        ClickHouseUtils.format(insertTemplate, columnName, 1, zeroValue, zeroValue),
-                        ClickHouseUtils.format(insertTemplate, columnName, 2, negativeOneValue, negativeOneValue),
-                        ClickHouseUtils.format(insertTemplate, columnName, 3, positiveOneValue, positiveOneValue))
-                .get();
+
+        try {
+            ClickHouseClient
+                    .send(server, ClickHouseUtils.format(dropTemplate, columnName),
+                            ClickHouseUtils.format(createTemplate, columnName, typeName),
+                            ClickHouseUtils.format(insertTemplate, columnName, 0, zeroValue, null),
+                            ClickHouseUtils.format(insertTemplate, columnName, 1, zeroValue, zeroValue),
+                            ClickHouseUtils.format(insertTemplate, columnName, 2, negativeOneValue, negativeOneValue),
+                            ClickHouseUtils.format(insertTemplate, columnName, 3, positiveOneValue, positiveOneValue))
+                    .get();
+        } catch (ExecutionException e) {
+            // maybe the type is just not supported, for example: Date32
+            Throwable cause = e.getCause();
+            Assert.assertTrue(cause instanceof ClickHouseException);
+            return;
+        }
 
         try (ClickHouseClient client = ClickHouseClient.newInstance(ClickHouseProtocol.GRPC);
                 ClickHouseResponse resp = client.connect(server).format(ClickHouseFormat.RowBinaryWithNamesAndTypes)
@@ -445,10 +453,17 @@ public void testReadWriteSimpleTypes(String dataType, String zero, String negati
     public void testReadWriteMap() throws Exception {
         ClickHouseNode server = getServer(ClickHouseProtocol.GRPC);
 
-        ClickHouseClient
-                .send(server, "drop table if exists test_map_types",
-                        "create table test_map_types(no UInt32, m Map(LowCardinality(String), Int32))engine=Memory")
-                .get();
+        try {
+            ClickHouseClient
+                    .send(server, "drop table if exists test_map_types",
+                            "create table test_map_types(no UInt32, m Map(LowCardinality(String), Int32))engine=Memory")
+                    .get();
+        } catch (ExecutionException e) {
+            // looks like LowCardinality(String) as key is not supported even in 21.8
+            Throwable cause = e.getCause();
+            Assert.assertTrue(cause instanceof ClickHouseException);
+            return;
+        }
 
         // write
         ClickHouseClient.send(server, "insert into test_map_types values (1, {'key1' : 1})").get();

diff --git a/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/BalancedClickhouseDataSourceTest.java b/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/BalancedClickhouseDataSourceTest.java
@@ -325,7 +325,7 @@ public void testIPv6() throws Exception {
             // acceptable if IPv6 is not enabled
             Throwable cause = e.getCause();
             assertTrue(cause instanceof SocketException);
-            assertEquals(cause.getMessage(), "Protocol family unavailable");
+            assertTrue("Protocol family unavailable".equals(cause.getMessage()) || cause.getMessage().contains("Connection refused"));
         }
     }
 }