embulk-input-mysql 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebead2dca4a8dbea335179c858c50dbcd1839f4f
-  data.tar.gz: d0d6b855062b4dd108736bb9d8265ea5d7852dca
+  metadata.gz: ad515b3eb8f28906f971b7f53e5c509334955fa0
+  data.tar.gz: 10475eac9234df6f9849b4d548ae19cb25db7994
 SHA512:
-  metadata.gz: 50a90da1581b48b554c0251d14696429a3009c4da03f770770381121464c785d2fdfc9af9e2a1d9d7fbb1c5f74547fbe24ec2e05bb817ef56089b3c490fa9735
-  data.tar.gz: 818c791ca3394d1463c1b113a0ad163061d94eb69de93cfe4c0fef3fc2e80c90c029a2de5f0924be099844af4474977395dd2eca93e52e386f6adc2df88af427
+  metadata.gz: 99f8149f1a4b3ea926b17a1e2739050b410b4cbf8199ca2313bece1ded494e197f84bc9ed37c9830197232e30fa99578eb70f3202b232ac2813964c60faa3474
+  data.tar.gz: c794a8d86163720dc1c625f2fc2ea21a501004af2324a75fd065fdfdc0205cb5d29138ebec8a87b0ec8610bbbd3d488621e2e3ffb31730b2c3bd4c9e5d50b2b8

data/src/main/java/org/embulk/input/MySQLInputPlugin.java

@@ -12,10 +12,12 @@ import com.mysql.jdbc.TimeUtil;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
+import org.embulk.input.jdbc.JdbcInputConnection;
 import org.embulk.input.jdbc.getter.ColumnGetterFactory;
 import org.embulk.input.mysql.MySQLInputConnection;
 import org.embulk.input.mysql.getter.MySQLColumnGetterFactory;
 import org.embulk.spi.PageBuilder;
+import org.embulk.spi.Schema;
 import org.joda.time.DateTimeZone;
 
 public class MySQLInputPlugin
@@ -163,4 +165,13 @@ public class MySQLInputPlugin
             }
         }
     }
+
+    @Override
+    protected Schema setupTask(JdbcInputConnection con, PluginTask task) throws SQLException
+    {
+        MySQLInputConnection mySQLCon = (MySQLInputConnection)con;
+        mySQLCon.compareTimeZone();
+        return super.setupTask(con,task);
+    }
+
 }

data/src/main/java/org/embulk/input/MySQLTimeZoneComparison.java

@@ -0,0 +1,104 @@
+package org.embulk.input;
+
+import org.embulk.spi.Exec;
+import org.slf4j.Logger;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+public class MySQLTimeZoneComparison
+{
+    private static final int ONE_HOUR_SEC = 3600;
+    private static final int ONE_MIN_SEC = 60;
+
+    private Connection connection;
+
+    private final Logger logger = Exec.getLogger(getClass());
+
+    public MySQLTimeZoneComparison(Connection connection)
+    {
+        this.connection = connection;
+    }
+
+    public void compareTimeZone()
+            throws SQLException
+    {
+        TimeZone serverTimeZone = null;
+        try {
+            serverTimeZone = getServerTimeZone();
+        }
+        catch (SQLException ex) {
+            logger.warn("Can't get server TimeZone.");
+            logger.warn(String.format(Locale.ENGLISH, "SQLException raised %s", ex.toString()));
+        }
+
+        TimeZone clientTimeZone = TimeZone.getDefault();
+        Date today = new Date();
+        int clientOffset = clientTimeZone.getRawOffset();
+
+        if (clientTimeZone.inDaylightTime(today)) {
+            clientOffset += clientTimeZone.getDSTSavings();
+        }
+
+        //
+        // Compare offset only. Although I expect to return true, the following code return false,
+        //
+        // TimeZone tz_jst   = TimeZone.getTimeZone("JST");
+        // TimeZone tz_gmt9  = TimeZone.getTimeZone("GMT+9");
+        // tz_jst.hasSameRules(tz_gmt9) // return false.
+        //
+        if (clientOffset != serverTimeZone.getRawOffset()) {
+            logger.warn(String.format(Locale.ENGLISH,
+                    "The client timezone(%s) is different from the server timezone(%s). The plugin will fetch wrong datetime values.",
+                    clientTimeZone.getID(), serverTimeZone.getID()));
+            logger.warn(String.format(Locale.ENGLISH,
+                    "You may need to set options `useLegacyDatetimeCode` and `serverTimezone`"));
+            logger.warn(String.format(Locale.ENGLISH,
+                    "Example. `options: { useLegacyDatetimeCode: false, serverTimezone: UTC }`"));
+        }
+        logger.warn(String.format(Locale.ENGLISH, "The plugin will set `useLegacyDatetimeCode=false` by default in future."));
+    }
+
+    private TimeZone getServerTimeZone()
+            throws SQLException
+    {
+        //
+        // First, I used `@@system_time_zone`. but It return non Time Zone Abbreviations name on a specific platform.
+        // So, This method calculate GMT offset with query.
+        //
+        String query = "select TIME_TO_SEC(timediff(now(),utc_timestamp()));";
+        Statement stmt = connection.createStatement();
+
+        try {
+            ResultSet rs = stmt.executeQuery(query);
+            if (rs.next()) {
+                int offsetSeconds = rs.getInt(1);
+                return fromGMTOffsetSeconds(offsetSeconds);
+            }
+            throw new SQLException(String.format(Locale.ENGLISH,
+                    "The timezone comparison query(%s) doesn't return the result.",query));
+        }
+        finally {
+            stmt.close();
+        }
+    }
+
+    private TimeZone fromGMTOffsetSeconds(int offsetSeconds)
+    {
+        if (offsetSeconds == 0) {
+            return TimeZone.getTimeZone("UTC");
+        }
+
+        String sign = offsetSeconds > 0 ? "+" : "-";
+        int absOffsetSec = Math.abs(offsetSeconds);
+        int tzHour = absOffsetSec / ONE_HOUR_SEC;
+        int tzMin = absOffsetSec % ONE_HOUR_SEC / ONE_MIN_SEC;
+        String tzName = String.format(Locale.ENGLISH, "GMT%s%02d:%02d", sign, tzHour, tzMin);
+        return TimeZone.getTimeZone(tzName);
+    }
+}

data/src/main/java/org/embulk/input/mysql/MySQLInputConnection.java

@@ -9,6 +9,7 @@ import java.util.TimeZone;
 
 import com.mysql.jdbc.ConnectionImpl;
 import com.mysql.jdbc.ConnectionProperties;
+import org.embulk.input.MySQLTimeZoneComparison;
 import org.embulk.input.jdbc.JdbcInputConnection;
 import org.embulk.input.jdbc.JdbcLiteral;
 import org.embulk.input.jdbc.getter.ColumnGetter;
@@ -59,4 +60,11 @@ public class MySQLInputConnection
     {
         return ((ConnectionImpl) connection).getServerTimezoneTZ();
     }
+
+    public void compareTimeZone() throws SQLException
+    {
+        MySQLTimeZoneComparison timeZoneComparison = new MySQLTimeZoneComparison(connection);
+        timeZoneComparison.compareTimeZone();
+    }
+
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-mysql
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,11 +19,12 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.8.2.jar
-- classpath/embulk-input-mysql-0.8.2.jar
+- classpath/embulk-input-jdbc-0.8.3.jar
+- classpath/embulk-input-mysql-0.8.3.jar
 - classpath/mysql-connector-java-5.1.34.jar
 - lib/embulk/input/mysql.rb
 - src/main/java/org/embulk/input/MySQLInputPlugin.java
+- src/main/java/org/embulk/input/MySQLTimeZoneComparison.java
 - src/main/java/org/embulk/input/mysql/MySQLInputConnection.java
 - src/main/java/org/embulk/input/mysql/getter/AbstractMySQLTimestampIncrementalHandler.java
 - src/main/java/org/embulk/input/mysql/getter/MySQLColumnGetterFactory.java