fixed passing custom properties to ClickHouse. No enabling required

Author: chernser

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequest.java

@@ -55,7 +55,7 @@ public class ClickHouseRequest<SelfT extends ClickHouseRequest<SelfT>> implement
 
     static {
         Set<String> set = new HashSet<>();
-        set.add("query_id");
+        set.add(ClickHouseClientOption.QUERY_ID.getKey());
         set.add(ClickHouseClientOption.SESSION_ID.getKey());
         set.add(ClickHouseClientOption.SESSION_CHECK.getKey());
         set.add(ClickHouseClientOption.SESSION_TIMEOUT.getKey());

clickhouse-client/src/main/java/com/clickhouse/client/config/ClickHouseClientOption.java

@@ -420,7 +420,12 @@ public enum ClickHouseClientOption implements ClickHouseOption {
      * false.
      */
     USE_TIME_ZONE("use_time_zone", "", "Time zone of all DateTime* values. "
-            + "Only used when use_server_time_zone is false. Empty value means client time zone.");
+            + "Only used when use_server_time_zone is false. Empty value means client time zone."),
+
+    /**
+     * Query ID to be attached to an operation
+     */
+    QUERY_ID("query_id", "", "Query id");
 
     private final String key;
     private final Serializable defaultValue;

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

@@ -10,6 +10,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -20,7 +21,8 @@ public static Map<String, Serializable> toRequestSettings(Map<String, Object> se
         Map<String, Serializable> requestSettings = new HashMap<>();
 
         for (Map.Entry<String, Object> entry : settings.entrySet()) {
-            if (!REQUEST_SETTINGS.contains(entry.getKey())) {
+            if (REQUEST_OPTIONS.get(entry.getKey()) != null) {
+                // This definitely is a request option
                 continue;
             }
 
@@ -89,18 +91,12 @@ public static String escape(String value) {
     }
 
     private static final Map<String, ClickHouseOption> REQUEST_OPTIONS = createMapOfRequestOptions();
-    private static final Set<String> REQUEST_SETTINGS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-            ClickHouseClientOption.MAX_EXECUTION_TIME.getKey(),
-            ClickHouseClientOption.MAX_RESULT_ROWS.getKey(),
-            "extremes",
-            "role",
-            "describe_include_subcolumns",
-            "allow_experimental_variant_type"
-    )));
+
 
     public static Map<String, ClickHouseOption> createMapOfRequestOptions() {
         Map<String, ClickHouseOption> map = new HashMap<>();
 
+
         Arrays.asList(ClickHouseClientOption.FORMAT,
                         ClickHouseClientOption.MAX_EXECUTION_TIME,
                         ClickHouseHttpOption.CUSTOM_PARAMS,

client-v2/src/main/java/com/clickhouse/client/api/query/Records.java

@@ -13,7 +13,7 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-public class Records implements Iterable<GenericRecord> {
+public class Records implements Iterable<GenericRecord>, AutoCloseable {
 
     private final QueryResponse response;
 
@@ -128,4 +128,9 @@ public long getServerTime() {
     public long getResultRows() {
         return response.getMetrics().getMetric(ServerMetrics.RESULT_ROWS).getLong();
     }
+
+    @Override
+    public void close() throws Exception {
+        response.close();
+    }
 }

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

@@ -4,6 +4,9 @@
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.query.GenericRecord;
+import com.clickhouse.client.api.query.QueryResponse;
+import com.clickhouse.client.api.query.QuerySettings;
+import com.clickhouse.client.api.query.Records;
 import com.clickhouse.client.config.ClickHouseClientOption;
 import org.junit.Assert;
 import org.testng.annotations.DataProvider;
@@ -12,6 +15,7 @@
 import java.net.ConnectException;
 import java.sql.Connection;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 public class ClientTests extends BaseIntegrationTest {
 
@@ -55,4 +59,34 @@ private static Client[] secureClientProvider() throws Exception {
                         .build()
         };
     }
+
+
+    @Test
+    public void testRawSettings() {
+        ClickHouseNode node = getServer(ClickHouseProtocol.HTTP);
+        Client client = new Client.Builder()
+                .addEndpoint(node.toUri().toString())
+                .setUsername("default")
+                .setPassword("")
+                .setOption("custom_setting_1", "value_1")
+                .build();
+
+        client.execute("SELECT 1");
+
+        QuerySettings querySettings = new QuerySettings();
+        querySettings.setOption("session_timezone", "Europe/Zurich");
+
+        try (Records response =
+                     client.queryRecords("SELECT timeZone(), serverTimeZone()", querySettings).get(10, TimeUnit.SECONDS)) {
+
+            response.forEach(record -> {
+                System.out.println(record.getString(1) + " " + record.getString(2));
+                Assert.assertEquals("Europe/Zurich", record.getString(1));
+                Assert.assertEquals("UTC", record.getString(2));
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            Assert.fail(e.getMessage());
+        }
+    }
 }