Merge pull request #580 from zhicwu/fix-build-break

Fix build break

Author: zhicwu

.github/workflows/benchmark.yml

@@ -69,13 +69,10 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            if (process.env.BENCHMARK_REPORT) {
-              github.issues.createComment({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                body: '```\n' + process.env.BENCHMARK_REPORT + '\n```'
-              });
+            const report = process.env.BENCHMARK_REPORT;
+            const { issue: { number: issue_number }, repo: { owner, repo } } = context;
+            if (report) {
+              github.issues.createComment({issue_number, owner, repo, body: '```\n' + report + '\n```'});
             }
 
   benchmark-on-demand:

README.md

@@ -10,7 +10,7 @@ It has support of a minimal subset of features to be usable.
 <dependency>
     <groupId>ru.yandex.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>0.2.6</version>
+    <version>0.3.0</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>ru.yandex.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>0.2.6</version>
+    <version>${revision}</version>
     <packaging>jar</packaging>
 
     <name>clickhouse-jdbc</name>
@@ -52,6 +52,7 @@
     </developers>
 
     <properties>
+        <revision>0.3.0-SNAPSHOT</revision>
         <slf4j.version>1.7.30</slf4j.version>
         <project.current.year>2021</project.current.year>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,7 +63,7 @@
         <guava.version>29.0-jre</guava.version>
         <jaxb.version>2.3.1</jaxb.version>
         <jdk.version>1.8</jdk.version>
-        <testcontainers.version>1.15.1</testcontainers.version>
+        <testcontainers.version>1.15.2</testcontainers.version>
         <testng.version>6.14.3</testng.version>
         <mockito.version>1.10.19</mockito.version>
         <wiremock.version>2.27.2</wiremock.version>
@@ -84,7 +85,7 @@
         <skipITs>${skipTests}</skipITs>
         <skipUTs>${skipTests}</skipUTs>
         <spec.title>JDBC</spec.title>
-        <spec.version>4.1</spec.version>
+        <spec.version>4.2</spec.version>
     </properties>
 
     <dependencies>
@@ -262,7 +263,6 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>${failsafe-plugin.version}</version>
                 <configuration>
-                    <argLine>-Duser.timezone=Europe/Moscow</argLine>
                     <includes>**/*.java</includes>
                     <skipTests>${skipTests}</skipTests>
                     <skipITs>${skipITs}</skipITs>
@@ -284,7 +284,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire-plugin.version}</version>
                 <configuration>
-                    <argLine>-Duser.timezone=Europe/Moscow</argLine>
                     <skipTests>${skipUTs}</skipTests>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>

src/main/java/ru/yandex/clickhouse/Writer.java

@@ -17,7 +17,7 @@
 import static ru.yandex.clickhouse.domain.ClickHouseFormat.RowBinary;
 import static ru.yandex.clickhouse.domain.ClickHouseFormat.TabSeparated;
 
-public final class Writer extends ConfigurableApi<Writer> {
+public class Writer extends ConfigurableApi<Writer> {
 
     private ClickHouseFormat format = TabSeparated;
     private ClickHouseCompression compression = null;

src/main/java/ru/yandex/clickhouse/response/parser/ClickHouseSQLTimeParser.java

@@ -11,6 +11,7 @@
 import ru.yandex.clickhouse.response.ClickHouseColumnInfo;
 
 final class ClickHouseSQLTimeParser extends ClickHouseDateValueParser<Time> {
+    private static final long MILLISECONDS_A_DAY = 24 * 3600 * 1000;
 
     private static ClickHouseSQLTimeParser instance;
 
@@ -21,6 +22,10 @@ static ClickHouseSQLTimeParser getInstance() {
         return instance;
     }
 
+    static long normalize(long time) {
+        return (time + MILLISECONDS_A_DAY) % MILLISECONDS_A_DAY;
+    }
+
     private ClickHouseSQLTimeParser() {
         super(Time.class);
     }
@@ -29,65 +34,65 @@ private ClickHouseSQLTimeParser() {
     Time parseDate(String value, ClickHouseColumnInfo columnInfo,
         TimeZone timeZone)
     {
-        return new Time(
+        return new Time(normalize(
             LocalDateTime.of(
                 LocalDate.ofEpochDay(0),
                 LocalTime.MIDNIGHT)
             .atZone(effectiveTimeZone(columnInfo, timeZone))
             .toInstant()
-            .toEpochMilli());
+            .toEpochMilli()));
     }
 
     @Override
     Time parseDateTime(String value, ClickHouseColumnInfo columnInfo,
         TimeZone timeZone)
     {
-        return new Time(parseAsLocalDateTime(value)
+        return new Time(normalize(parseAsLocalDateTime(value)
             .atZone(effectiveTimeZone(columnInfo, timeZone))
             .withFixedOffsetZone()
             .withYear(1970)
             .withMonth(1)
             .withDayOfMonth(1)
             .toInstant()
-            .toEpochMilli());
+            .toEpochMilli()));
     }
 
     @Override
     Time parseNumber(long value, ClickHouseColumnInfo columnInfo,
         TimeZone timeZone)
     {
-        return new Time(
+        return new Time(normalize(
             LocalDateTime.of(
                 LocalDate.ofEpochDay(0),
                 parseAsLocalTime(value))
             .atZone(effectiveTimeZone(columnInfo, timeZone))
             .toInstant()
-            .toEpochMilli());
+            .toEpochMilli()));
     }
 
     @Override
     Time parseOther(String value, ClickHouseColumnInfo columnInfo,
         TimeZone timeZone)
     {
         try {
-            return new Time(
+            return new Time(normalize(
                 LocalDateTime.of(
                     LocalDate.ofEpochDay(0),
                     LocalTime.parse(value, DateTimeFormatter.ISO_LOCAL_TIME))
                 .atZone(effectiveTimeZone(columnInfo, timeZone))
                 .toInstant()
-                .toEpochMilli());
+                .toEpochMilli()));
         } catch (DateTimeParseException dtpe) {
             // try next pattern candidate
         }
 
-        return new Time(
+        return new Time(normalize(
             LocalDateTime.of(
                 LocalDate.ofEpochDay(0),
                 parseAsLocalTime(value))
             .atZone(effectiveTimeZone(columnInfo, timeZone))
             .toInstant()
-            .toEpochMilli());
+            .toEpochMilli()));
     }
 
 }

src/main/java/ru/yandex/clickhouse/util/ClickHouseValueFormatter.java

@@ -110,8 +110,9 @@ public static String formatBoolean(boolean myBoolean) {
     }
 
     public static String formatDate(Date date, TimeZone timeZone) {
-        getDateFormat().setTimeZone(timeZone);
-        return getDateFormat().format(date);
+        SimpleDateFormat formatter = getDateFormat();
+        formatter.setTimeZone(timeZone);
+        return formatter.format(date);
     }
 
     public static String formatTime(Time time, TimeZone timeZone) {
@@ -124,8 +125,9 @@ public static String formatTime(Time time, TimeZone timeZone) {
     }
 
     public static String formatTimestamp(Timestamp time, TimeZone timeZone) {
-        getDateTimeFormat().setTimeZone(timeZone);
-        return getDateTimeFormat().format(time);
+        SimpleDateFormat formatter = getDateTimeFormat();
+        formatter.setTimeZone(timeZone);
+        return formatter.format(time);
     }
 
     public static String formatUUID(UUID x) {

src/test/java/ru/yandex/clickhouse/ClickHouseContainerForTest.java

@@ -22,6 +22,10 @@ public class ClickHouseContainerForTest {
     private static final GenericContainer<?> clickhouseContainer;
 
     static {
+        String timezone = System.getProperty("clickhouseTimezone");
+        if (timezone == null || timezone.isEmpty()) {
+            timezone = "UTC";
+        }
         String imageTag = System.getProperty("clickhouseVersion");
 
         if (imageTag == null || (imageTag = imageTag.trim()).isEmpty()) {
@@ -43,6 +47,7 @@ public class ClickHouseContainerForTest {
                                .from( imageNameWithTag )
                                .run("apt-get update && apt-get install tzdata")
                 ))
+                .withEnv("TZ", timezone)
                 .withExposedPorts(HTTP_PORT, NATIVE_PORT, MYSQL_PORT)
                 .withClasspathResourceMapping(
                     "ru/yandex/clickhouse/users.d",

src/test/java/ru/yandex/clickhouse/ClickHousePreparedStatementTest.java

@@ -154,17 +154,28 @@ public void testSetDateNull() throws Exception {
     @Test
     public void testSetDateNormal() throws Exception {
         ClickHousePreparedStatement s = createStatement();
-        s.setDate(1, new Date(1557168043000L));
-        assertParamMatches(s, "'2019-05-06'");
+        Date d = new Date(1557168043000L);
+        s.setDate(1, d);
+        assertParamMatches(s, "'" + d.toLocalDate().toString() + "'");
     }
 
     @Test
     public void testSetDateOtherTimeZone() throws Exception {
+        ClickHouseProperties p = new ClickHouseProperties();
         ClickHousePreparedStatement s = createStatement(
-            TimeZone.getTimeZone("Asia/Tokyo"),
-            new ClickHouseProperties());
-        s.setDate(1, new Date(1557168043000L));
-        assertParamMatches(s, "'2019-05-06'");
+            TimeZone.getTimeZone("Asia/Tokyo"), p);
+        Date d = new Date(1557168043000L);
+        s.setDate(1, d);
+        assertParamMatches(s, "'" + d.toLocalDate().toString() + "'");
+
+        /*
+        TimeZone t = TimeZone.getTimeZone("American/Los_Angels");
+        p.setUseServerTimeZoneForDates(true);
+        s = createStatement(t, p);
+        s.setDate(1, d);
+        assertParamMatches(s, "'" + LocalDate.ofInstant(
+            Instant.ofEpochMilli(d.getTime()), t.toZoneId()).toString() + "'");
+        */
     }
 
     @Test

src/test/java/ru/yandex/clickhouse/integration/RowBinaryStreamTest.java

@@ -219,7 +219,9 @@ public void writeTo(ClickHouseRowBinaryStream stream) throws IOException {
             ResultSet rs = connection.createStatement().executeQuery("SELECT * FROM test.raw_binary ORDER BY date");
 
             Assert.assertTrue(rs.next());
-            assertEquals(rs.getString("date"), "2017-01-01");
+            assertEquals(rs.getString("date"), 
+                Instant.ofEpochMilli(timestamp).atZone(connection.getTimeZone().toZoneId())
+                    .withZoneSameInstant(ZoneId.systemDefault()).toLocalDate().toString());
             assertEquals(rs.getTimestamp("dateTime").getTime(), date1.getTime());
             assertEquals(rs.getString("string"), "string\n1");
             assertEquals(rs.getInt("int8"), Byte.MIN_VALUE);

src/test/java/ru/yandex/clickhouse/integration/StreamSQLTest.java

@@ -8,19 +8,30 @@
 import ru.yandex.clickhouse.ClickHouseDataSource;
 import ru.yandex.clickhouse.domain.ClickHouseCompression;
 import ru.yandex.clickhouse.domain.ClickHouseFormat;
-import ru.yandex.clickhouse.util.ClickHouseVersionNumberUtil;
 
 import java.io.*;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.zip.GZIPOutputStream;
 
 public class StreamSQLTest {
+    private static final DateTimeFormatter DATE_TIME_FORMATTER_TZ = 
+        DateTimeFormatter.ofPattern("yyyy-MM-dd['T'][ ]HH:mm:ss[.SSS][XXX]");
+
     private ClickHouseDataSource dataSource;
     private ClickHouseConnection connection;
 
+    private Timestamp utcToServerTimezone(String datetime) {
+        return Timestamp.from(LocalDateTime.parse(datetime, DATE_TIME_FORMATTER_TZ)
+            .atZone(ZoneId.of("UTC")).withZoneSameInstant(connection.getTimeZone().toZoneId()).toInstant());
+    }
+
     @BeforeTest
     public void setUp() throws Exception {
         dataSource = ClickHouseContainerForTest.newDataSource();
@@ -259,8 +270,8 @@ public void ORCInsertCompressedIntoTable() throws SQLException {
         Assert.assertEquals(rs.getFloat("sum_flt"), Float.POSITIVE_INFINITY);
         Assert.assertEquals(rs.getLong("uniq_str"), 100);
         Assert.assertEquals(rs.getBigDecimal("max_dcml"), new BigDecimal("1.000000000"));
-        Assert.assertEquals(rs.getString("min_time"), "2020-01-01 00:00:00");
-        Assert.assertEquals(rs.getString("max_time"), "2020-01-01 00:01:39");
+        Assert.assertEquals(rs.getTimestamp("min_time"), utcToServerTimezone("2020-01-01 00:00:00"));
+        Assert.assertEquals(rs.getTimestamp("max_time"), utcToServerTimezone("2020-01-01 00:01:39"));
     }
 
     @Test
@@ -295,7 +306,7 @@ public void ORCInsertCompressedIntoTable1() throws SQLException {
         Assert.assertEquals(rs.getString("str"), "42");
         Assert.assertTrue( Math.abs(rs.getFloat("flt") - 0.023809524) < 0.0001);
         Assert.assertTrue( Math.abs(rs.getFloat("dcml") - 0.023255813) < 0.0001);
-        Assert.assertEquals(rs.getString("time"), "2020-01-01 00:00:42");
+        Assert.assertEquals(rs.getTimestamp("time"), utcToServerTimezone("2020-01-01 00:00:42"));
     }
 
     @Test
@@ -339,8 +350,8 @@ public void ParquetInsertCompressedIntoTable() throws SQLException {
         Assert.assertEquals(rs.getFloat("sum_flt"), Float.POSITIVE_INFINITY);
         Assert.assertEquals(rs.getLong("uniq_str"), 100);
         Assert.assertEquals(rs.getBigDecimal("max_dcml"), new BigDecimal("1.000000000"));
-        Assert.assertEquals(rs.getString("min_time"), "2020-01-01 00:00:00");
-        Assert.assertEquals(rs.getString("max_time"), "2020-01-01 00:01:39");
+        Assert.assertEquals(rs.getTimestamp("min_time"), utcToServerTimezone("2020-01-01 00:00:00"));
+        Assert.assertEquals(rs.getTimestamp("max_time"), utcToServerTimezone("2020-01-01 00:01:39"));
     }
 
     @Test
@@ -375,7 +386,7 @@ public void ParquetInsertCompressedIntoTable1() throws SQLException {
         Assert.assertEquals(rs.getString("str"), "42");
         Assert.assertTrue( Math.abs(rs.getFloat("flt") - 0.023809524) < 0.0001);
         Assert.assertTrue( Math.abs(rs.getFloat("dcml") - 0.023255813) < 0.0001);
-        Assert.assertEquals(rs.getString("time"), "2020-01-01 00:00:42");
+        Assert.assertEquals(rs.getTimestamp("time"), utcToServerTimezone("2020-01-01 00:00:42"));
     }
 
 }