Merge pull request #2166 from ClickHouse/small_fixes

[client-v1,v2] Small fix and change in tests

Author: chernser

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ApacheHttpConnectionImpl.java

@@ -433,8 +433,7 @@ static class HttpConnectionManager extends PoolingHttpClientConnectionManager {
             USER_AGENT = ClickHouseClientOption.buildUserAgent(null,
                     versionInfo != null && !versionInfo.isEmpty() ? versionInfo : PROVIDER);
 
-            try {
-                Socket s = new Socket();
+            try (Socket s = new Socket()) {
                 int defaultSoRcvBuf = s.getReceiveBufferSize();
                 int defaultSoSndBuf = s.getSendBufferSize();
                 s.setReceiveBufferSize(Integer.MAX_VALUE);
@@ -446,6 +445,7 @@ static class HttpConnectionManager extends PoolingHttpClientConnectionManager {
                         defaultSoRcvBuf, defaultSoSndBuf, maxSoRcvBuf, maxSoSndBuf);
             } catch (Exception e) { // NOSONAR
                 // ignore
+                log.warn("Failed to get default socket buffer size", e);
             }
         }
 

client-v2/src/test/java/com/clickhouse/client/datatypes/DataTypeTests.java

@@ -142,7 +142,7 @@ public static String tblCreateSQL(String table) {
 
     @Test(groups = {"integration"})
     public void testVariantWithSimpleDataTypes() throws Exception {
-        if (isVersionMatch("(,24.8]") || isCloud()) {
+        if (isVersionMatch("(,24.8]")) {
             return;
         }
 
@@ -183,9 +183,10 @@ public void testVariantWithSimpleDataTypes() throws Exception {
                     continue dataTypesLoop;
 
             }
-            b.append(")) Engine = MergeTree ORDER BY () SETTINGS enable_variant_type=1");
+            b.append(")) Engine = MergeTree ORDER BY ()");
 
-            client.execute(b.toString());
+            client.execute(b.toString(),
+                    (CommandSettings) new CommandSettings().serverSetting("allow_experimental_variant_type", "1"));
             client.register(DTOForVariantPrimitivesTests.class, client.getTableSchema(table));
 
             Object value = null;
@@ -396,7 +397,7 @@ public void testVariantWithTuple() throws Exception {
 
     @Test(groups = {"integration"})
     public void testDynamicWithPrimitives() throws Exception {
-        if (isVersionMatch("(,24.8]") || isCloud()) {
+        if (isVersionMatch("(,24.8]")) {
             return;
         }
 
@@ -588,14 +589,14 @@ public static class DTOForDynamicPrimitivesTests {
     }
 
     private void testDynamicWith(String withWhat, Object[] values, String[] expectedStrValues) throws Exception {
-        if (isVersionMatch("(,24.8]") || isCloud()) {
+        if (isVersionMatch("(,24.8]")) {
             return;
         }
 
         String table = "test_dynamic_with_" + withWhat;
         client.execute("DROP TABLE IF EXISTS " + table).get();
         client.execute(tableDefinition(table, "rowId Int32", "field Dynamic"),
-                (CommandSettings) new CommandSettings().serverSetting("enable_dynamic_type", "1")).get();
+                (CommandSettings) new CommandSettings().serverSetting("allow_experimental_dynamic_type", "1")).get();
 
         client.register(DTOForDynamicPrimitivesTests.class, client.getTableSchema(table));
 
@@ -612,7 +613,7 @@ private void testDynamicWith(String withWhat, Object[] values, String[] expected
     }
 
     private void testVariantWith(String withWhat, String[] fields, Object[] values, String[] expectedStrValues) throws Exception {
-        if (isVersionMatch("(,24.8]") || isCloud()) {
+        if (isVersionMatch("(,24.8]")) {
             return;
         }
 
@@ -621,7 +622,8 @@ private void testVariantWith(String withWhat, String[] fields, Object[] values,
         actualFields[0] = "rowId Int32";
         System.arraycopy(fields, 0, actualFields, 1, fields.length);
         client.execute("DROP TABLE IF EXISTS " + table).get();
-        client.execute(tableDefinition(table, actualFields), (CommandSettings) new CommandSettings().serverSetting("enable_variant_type", "1")).get();
+        client.execute(tableDefinition(table, actualFields),
+                (CommandSettings) new CommandSettings().serverSetting("allow_experimental_variant_type", "1")).get();
 
         client.register(DTOForVariantPrimitivesTests.class, client.getTableSchema(table));
 

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -1418,8 +1418,9 @@ private List<Map<String, Object>> prepareDataSet(String table, List<String> colu
 
             // Create table
             CommandSettings settings = new CommandSettings();
-            if (isVersionMatch("[24.8,)") && !isCloud()) {
-                settings.serverSetting("allow_experimental_dynamic_type", "1")
+            if (isVersionMatch("[24.8,)")) {
+                settings.serverSetting("allow_experimental_variant_type", "1")
+                        .serverSetting("allow_experimental_dynamic_type", "1")
                         .serverSetting("allow_experimental_json_type", "1");
             }
             StringBuilder createStmtBuilder = new StringBuilder();

jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java

@@ -823,14 +823,12 @@ public void testGeometricTypesSimpleStatement() throws SQLException {
 
     @Test(groups = { "integration" })
     public void testDynamicTypesSimpleStatement() throws SQLException {
-        if (earlierThan(24, 8) || isCloud()) {
+        if (earlierThan(24, 8)) {
             return;
         }
 
         Properties properties = new Properties();
-        if (!isCloud()) {
-            properties.setProperty(ClientConfigProperties.serverSetting("allow_experimental_dynamic_type"), "1");
-        }
+        properties.setProperty(ClientConfigProperties.serverSetting("allow_experimental_dynamic_type"), "1");
         runQuery("CREATE TABLE test_dynamic (order Int8, "
                 + "dynamic Dynamic"
                 + ") ENGINE = MergeTree ORDER BY ()",
@@ -941,14 +939,12 @@ public void testTypeConversions() throws Exception {
 
     @Test(groups = { "integration" })
     public void testVariantTypesSimpleStatement() throws SQLException {
-        if (earlierThan(24, 8) || isCloud()) {
+        if (earlierThan(24, 8)) {
             return;
         }
 
         Properties properties = new Properties();
-        if (!isCloud()) {
-            properties.setProperty(ClientConfigProperties.serverSetting("allow_experimental_variant_type"), "1");
-        }
+        properties.setProperty(ClientConfigProperties.serverSetting("allow_experimental_variant_type"), "1");
         runQuery("CREATE TABLE test_variant (order Int8, "
                         + "v Variant(String, Int32)"
                         + ") ENGINE = MergeTree ORDER BY ()",