fixed passing timezone from old client

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -632,8 +632,11 @@ private Map<String, String> setDefaults(Map<String, String> userConfig) {
             }
 
             if (!userConfig.containsKey(ClickHouseClientOption.USE_SERVER_TIME_ZONE.getKey())) {
-                userConfig.put(ClickHouseClientOption.USE_SERVER_TIME_ZONE.getKey(),
-                        String.valueOf(ClickHouseClientOption.USE_SERVER_TIME_ZONE.getDefaultValue()));
+                userConfig.put(ClickHouseClientOption.USE_SERVER_TIME_ZONE.getKey(), "true");
+            }
+
+            if (!userConfig.containsKey(ClickHouseClientOption.SERVER_TIME_ZONE.getKey())) {
+                userConfig.put(ClickHouseClientOption.SERVER_TIME_ZONE.getKey(), "UTC");
             }
 
             return userConfig;
@@ -1086,9 +1089,9 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
         }
         ClientStatisticsHolder clientStats = new ClientStatisticsHolder();
         clientStats.start(ClientMetrics.OP_DURATION);
+        applyDefaults(settings);
 
         if (useNewImplementation) {
-            applyDefaults(settings);
             //
             String retry = configuration.get(ClickHouseClientOption.RETRY.getKey());
             final int maxRetries = retry == null ? (int) ClickHouseClientOption.RETRY.getDefaultValue() : Integer.parseInt(retry);
@@ -1222,7 +1225,7 @@ public List<GenericRecord> queryAll(String sqlQuery) {
                 List<GenericRecord> records = new ArrayList<>();
                 if (response.getResultRows() > 0) {
                     ClickHouseBinaryFormatReader reader =
-                            new RowBinaryWithNamesAndTypesFormatReader(response.getInputStream(), settings);
+                            new RowBinaryWithNamesAndTypesFormatReader(response.getInputStream(), response.getSettings());
                     Map<String, Object> record;
                     while ((record = reader.next()) != null) {
                         records.add(new MapBackedRecord(record, reader.getSchema()));
@@ -1332,6 +1335,11 @@ private void applyDefaults(QuerySettings settings) {
         if ( !settings.getUseServerTimeZone() && !settingsMap.containsKey(key) && configuration.containsKey(key)) {
             settings.setOption(key, TimeZone.getTimeZone(configuration.get(key)));
         }
+
+        key = ClickHouseClientOption.SERVER_TIME_ZONE.getKey();
+        if (!settingsMap.containsKey(key) && configuration.containsKey(key)) {
+            settings.setOption(key, TimeZone.getTimeZone(configuration.get(key)));
+        }
     }
 
     public String toString() {

client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java

@@ -152,13 +152,15 @@ public void testNoHttpResponseFailure() {
         byte[] requestBody = ("INSERT INTO table01 FORMAT " +
                 ClickHouseFormat.TSV.name() + " \n1\t2\t3\n").getBytes();
 
+        // First request gets no response
         faultyServer.addStubMapping(WireMock.post(WireMock.anyUrl())
                         .withRequestBody(WireMock.binaryEqualTo(requestBody))
                 .inScenario("Retry")
                 .whenScenarioStateIs(STARTED)
                 .willSetStateTo("Failed")
                 .willReturn(WireMock.aResponse().withFault(Fault.EMPTY_RESPONSE)).build());
 
+        // Second request gets a response (retry)
         faultyServer.addStubMapping(WireMock.post(WireMock.anyUrl())
                         .withRequestBody(WireMock.binaryEqualTo(requestBody))
                 .inScenario("Retry")
@@ -177,19 +179,7 @@ public void testNoHttpResponseFailure() {
                 .compressClientRequest(false)
                 .setOption(ClickHouseClientOption.RETRY.getKey(), "2")
                 .build();
-        Runnable powerBlink = () -> {
-            try {
-                Thread.sleep(100);
-                faultyServer.stop();
-                Thread.sleep(50);
-                faultyServer.start();
-            } catch (InterruptedException e) {
-                Assert.fail("Unexpected exception", e);
-            }
-        };
         try {
-            new Thread(powerBlink).start();
-            Thread.sleep(200);
             InsertResponse insertResponse = mockServerClient.insert("table01",
                     new ByteArrayInputStream("1\t2\t3\n".getBytes()), ClickHouseFormat.TSV, settings).get(30, TimeUnit.SECONDS);
             insertResponse.close();

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

@@ -1227,7 +1227,7 @@ public void testClientUseOwnTimeZone() {
                 ZonedDateTime serverUtcTimeZ = serverUtcTime.atZone(ZoneId.of("UTC"));
 
                 Assert.assertEquals(serverTimeZ.withZoneSameInstant(ZoneId.of("UTC")), serverUtcTimeZ);
-                Assert.assertEquals(serverLisbonTime.withZoneSameInstant(ZoneId.of("UTC")), serverTimeZ);
+                Assert.assertEquals(serverLisbonTime.withZoneSameInstant(ZoneId.of("UTC")), serverUtcTimeZ);
             }
         } catch (Exception e) {
             e.printStackTrace();