From ff0076dff23bb0d616087fead2f95b6df8bb8ea9 Mon Sep 17 00:00:00 2001
From: serebrserg <serebrserg@yandex-team.ru>
Date: Wed, 23 Mar 2016 12:52:14 +0300
Subject: [PATCH] METR-20494: don't use java.time since it does not exist in
java 1.6. remove extra @Override. The interface was smaller back in 1.6.
---
.../metrika/clickhouse/CHConnectionImpl.java | 5 -----
.../clickhouse/CHPreparedStatementImpl.java | 6 ------
.../metrika/clickhouse/CHStatementImpl.java | 2 --
.../java/ru/yandex/metrika/clickhouse/CHUtil.java | 15 ---------------
4 files changed, 28 deletions(-)
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHConnectionImpl.java b/src/main/java/ru/yandex/metrika/clickhouse/CHConnectionImpl.java
index a4d95a0d..76ceb494 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHConnectionImpl.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHConnectionImpl.java
@@ -308,27 +308,22 @@ public class CHConnectionImpl implements CHConnection {
return false;
}
- @Override
public void setSchema(String schema) throws SQLException {
}
- @Override
public String getSchema() throws SQLException {
return null;
}
- @Override
public void abort(Executor executor) throws SQLException {
this.close();
}
- @Override
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
}
- @Override
public int getNetworkTimeout() throws SQLException {
return 0;
}
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHPreparedStatementImpl.java b/src/main/java/ru/yandex/metrika/clickhouse/CHPreparedStatementImpl.java
index 6898bdf1..6e6721a8 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHPreparedStatementImpl.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHPreparedStatementImpl.java
@@ -11,8 +11,6 @@ import java.math.BigInteger;
import java.net.URL;
import java.sql.*;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
@@ -238,10 +236,6 @@ public class CHPreparedStatementImpl extends CHStatementImpl implements CHPrepar
setTime(parameterIndex, (Time) x);
} else if (x instanceof Timestamp) {
setTimestamp(parameterIndex, (Timestamp) x);
- } else if (x instanceof LocalDate) {
- setDate(parameterIndex, Date.valueOf((LocalDate) x));
- } else if (x instanceof LocalDateTime) {
- setTimestamp(parameterIndex, Timestamp.valueOf((LocalDateTime) x));
} else if (x instanceof Boolean) {
setBoolean(parameterIndex, ((Boolean) x).booleanValue());
} else if (x instanceof InputStream) {
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java b/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
index ecd49011..707e46d2 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHStatementImpl.java
@@ -470,12 +470,10 @@ public class CHStatementImpl implements CHStatement {
return params;
}
- @Override
public void closeOnCompletion() throws SQLException {
closeOnCompletion = true;
}
- @Override
public boolean isCloseOnCompletion() throws SQLException {
return closeOnCompletion;
}
diff --git a/src/main/java/ru/yandex/metrika/clickhouse/CHUtil.java b/src/main/java/ru/yandex/metrika/clickhouse/CHUtil.java
index 255aa4d2..799cb28a 100644
--- a/src/main/java/ru/yandex/metrika/clickhouse/CHUtil.java
+++ b/src/main/java/ru/yandex/metrika/clickhouse/CHUtil.java
@@ -1,8 +1,5 @@
package ru.yandex.metrika.clickhouse;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
/**
* Created by zhur on 01/03/16.
@@ -68,16 +65,4 @@ public class CHUtil {
return sb.toString();
}
- public static String quoteDate(LocalDate d) {
- return "toDate(" + quote(d.format(DateTimeFormatter.ISO_LOCAL_DATE)) + ")";
- }
-
- public static String quoteDate(LocalDateTime d) {
- return "toDate(" + quote(d.format(DateTimeFormatter.ISO_LOCAL_DATE)) + ")";
- }
-
- public static String quoteDateTime(LocalDateTime dt) {
- return "toDateTime(" + quote(dt.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)) + ")";
- }
-
}
--
GitLab