embulk-output-jdbc 0.2.4 → 0.3.0

data/src/main/java/org/embulk/output/jdbc/setter/SqlDateColumnSetter.java

@@ -0,0 +1,63 @@
+package org.embulk.output.jdbc.setter;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.sql.Date;
+import org.joda.time.DateTimeZone;
+import org.embulk.spi.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class SqlDateColumnSetter
+        extends ColumnSetter
+{
+    private final DateTimeZone timeZone;
+
+    public SqlDateColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue,
+            DateTimeZone timeZone)
+    {
+        super(batch, column, defaultValue);
+        this.timeZone = timeZone;
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setSqlDate();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        defaultValue.setSqlDate();
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        defaultValue.setSqlDate();
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        defaultValue.setSqlDate();
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        defaultValue.setSqlDate();
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        // JavaDoc of java.sql.Time says:
+        // >> To conform with the definition of SQL DATE, the millisecond values wrapped by a java.sql.Date instance must be 'normalized' by setting the hours, minutes, seconds, and milliseconds to zero in the particular time zone with which the instance is associated.
+        long normalized = timeZone.convertUTCToLocal(v.toEpochMilli());
+        Date d = new Date(normalized);
+        batch.setSqlDate(d, getSqlType());
+    }
+}

data/src/main/java/org/embulk/output/jdbc/setter/SqlTimeColumnSetter.java

@@ -0,0 +1,55 @@
+package org.embulk.output.jdbc.setter;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.sql.Time;
+import org.embulk.spi.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class SqlTimeColumnSetter
+        extends ColumnSetter
+{
+    public SqlTimeColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setSqlTime();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTime();
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTime();
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTime();
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTime();
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        Time t = new Time(v.toEpochMilli());
+        batch.setSqlTime(t, getSqlType());
+    }
+}

data/src/main/java/org/embulk/output/jdbc/setter/SqlTimestampColumnSetter.java

@@ -1,48 +1,55 @@
-package org.embulk.output.jdbc.setter;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.math.RoundingMode;
-import com.google.common.math.DoubleMath;
-import org.embulk.spi.PageReader;
-import org.embulk.spi.time.Timestamp;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.BatchInsert;
-
-public class SqlTimestampColumnSetter
-        extends ColumnSetter
-{
-    public SqlTimestampColumnSetter(BatchInsert batch, PageReader pageReader,
-            JdbcColumn column)
-    {
-        super(batch, pageReader, column);
-    }
-
-    protected void booleanValue(boolean v) throws IOException, SQLException
-    {
-        nullValue();
-    }
-
-    protected void longValue(long v) throws IOException, SQLException
-    {
-        nullValue();
-    }
-
-    protected void doubleValue(double v) throws IOException, SQLException
-    {
-        nullValue();
-    }
-
-    protected void stringValue(String v) throws IOException, SQLException
-    {
-        // TODO parse time?
-        nullValue();
-    }
-
-    protected void timestampValue(Timestamp v) throws IOException, SQLException
-    {
-        java.sql.Timestamp t = new java.sql.Timestamp(v.toEpochMilli());
-        t.setNanos(v.getNano());
-        batch.setSqlTimestamp(t, getSqlType());
-    }
-}
+package org.embulk.output.jdbc.setter;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import org.embulk.spi.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class SqlTimestampColumnSetter
+        extends ColumnSetter
+{
+    public SqlTimestampColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setSqlTimestamp();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTimestamp();
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTimestamp();
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTimestamp();
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTimestamp();
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        java.sql.Timestamp t = new java.sql.Timestamp(v.toEpochMilli());
+        t.setNanos(v.getNano());
+        batch.setSqlTimestamp(t, getSqlType());
+    }
+}

data/src/main/java/org/embulk/output/jdbc/setter/StringColumnSetter.java

@@ -1,48 +1,59 @@
-package org.embulk.output.jdbc.setter;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import org.embulk.spi.ColumnVisitor;
-import org.embulk.spi.PageReader;
-import org.embulk.spi.time.Timestamp;
-import org.embulk.spi.time.TimestampFormatter;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.BatchInsert;
-
-public class StringColumnSetter
-        extends ColumnSetter
-{
-    private final TimestampFormatter timestampFormatter;
-
-    public StringColumnSetter(BatchInsert batch, PageReader pageReader,
-            JdbcColumn column, TimestampFormatter timestampFormatter)
-    {
-        super(batch, pageReader, column);
-        this.timestampFormatter = timestampFormatter;
-    }
-
-    protected void booleanValue(boolean v) throws IOException, SQLException
-    {
-        batch.setString(Boolean.toString(v));
-    }
-
-    protected void longValue(long v) throws IOException, SQLException
-    {
-        batch.setString(Long.toString(v));
-    }
-
-    protected void doubleValue(double v) throws IOException, SQLException
-    {
-        batch.setString(Double.toString(v));
-    }
-
-    protected void stringValue(String v) throws IOException, SQLException
-    {
-        batch.setString(v);
-    }
-
-    protected void timestampValue(Timestamp v) throws IOException, SQLException
-    {
-        batch.setString(timestampFormatter.format(v));
-    }
-}
+package org.embulk.output.jdbc.setter;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import org.embulk.spi.ColumnVisitor;
+import org.embulk.spi.time.Timestamp;
+import org.embulk.spi.time.TimestampFormatter;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class StringColumnSetter
+        extends ColumnSetter
+{
+    private final TimestampFormatter timestampFormatter;
+
+    public StringColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue,
+            TimestampFormatter timestampFormatter)
+    {
+        super(batch, column, defaultValue);
+        this.timestampFormatter = timestampFormatter;
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setString();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        batch.setString(Boolean.toString(v));
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        batch.setString(Long.toString(v));
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        batch.setString(Double.toString(v));
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        batch.setString(v);
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        batch.setString(timestampFormatter.format(v));
+    }
+}

data/src/test/java/org/embulk/output/TestJdbcOutputPlugin.java

@@ -1,5 +1,5 @@
-package org.embulk.output;
-
-public class TestJdbcOutputPlugin
-{
-}
+package org.embulk.output;
+
+public class TestJdbcOutputPlugin
+{
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -23,23 +23,35 @@ files:
 - src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java
 - src/main/java/org/embulk/output/jdbc/BatchInsert.java
 - src/main/java/org/embulk/output/jdbc/JdbcColumn.java
+- src/main/java/org/embulk/output/jdbc/JdbcColumnOption.java
 - src/main/java/org/embulk/output/jdbc/JdbcOutputConnection.java
 - src/main/java/org/embulk/output/jdbc/JdbcOutputConnector.java
 - src/main/java/org/embulk/output/jdbc/JdbcSchema.java
 - src/main/java/org/embulk/output/jdbc/JdbcUtils.java
-- src/main/java/org/embulk/output/jdbc/RetryExecutor.java
 - src/main/java/org/embulk/output/jdbc/StandardBatchInsert.java
+- src/main/java/org/embulk/output/jdbc/setter/BigDecimalColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/BooleanColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/ByteColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/ColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/ColumnSetterFactory.java
+- src/main/java/org/embulk/output/jdbc/setter/ColumnSetterVisitor.java
+- src/main/java/org/embulk/output/jdbc/setter/DefaultValueSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/DoubleColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/FloatColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/IntColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/LongColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/NStringColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/NullColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/NullDefaultValueSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/PassThroughColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/ShortColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/SkipColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/SqlDateColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/SqlTimeColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/SqlTimestampColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/StringColumnSetter.java
 - src/test/java/org/embulk/output/TestJdbcOutputPlugin.java
-- classpath/embulk-output-jdbc-0.2.4.jar
+- classpath/embulk-output-jdbc-0.3.0.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0

data/src/main/java/org/embulk/output/jdbc/RetryExecutor.java

@@ -1,105 +0,0 @@
-package org.embulk.output.jdbc;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-
-public class RetryExecutor
-{
-    public static RetryExecutor retryExecutor()
-    {
-        return new RetryExecutor();
-    }
-
-    public static abstract class IdempotentOperation<T> implements Callable<T>
-    {
-        public abstract T call() throws Exception;
-
-        public void onRetry(Throwable exception, int retryCount, int retryLimit, int retryWait)
-        { }
-
-        public void onGiveup(Throwable firstException, Throwable lastException)
-        { }
-
-        public abstract boolean isRetryableException(Throwable exception);
-    }
-
-    private int retryLimit = 3;
-    private int initialRetryWait = 500;
-    private int maxRetryWait = 30*60*1000;
-
-    private RetryExecutor()
-    { }
-
-    public RetryExecutor setRetryLimit(int count)
-    {
-        this.retryLimit = count;
-        return this;
-    }
-
-    public RetryExecutor setInitialRetryWait(int msec)
-    {
-        this.initialRetryWait = msec;
-        return this;
-    }
-
-    public RetryExecutor setMaxRetryWait(int msec)
-    {
-        this.maxRetryWait = msec;
-        return this;
-    }
-
-    public <T> T runInterruptible(IdempotentOperation<T> op) throws InterruptedException, ExecutionException
-    {
-        return run(op, true);
-    }
-
-    public <T> T run(IdempotentOperation<T> op) throws ExecutionException
-    {
-        try {
-            return run(op, false);
-        } catch (InterruptedException ex) {
-            throw new ExecutionException("Unexpected interruption", ex);
-        }
-    }
-
-    private <T> T run(IdempotentOperation<T> op, boolean interruptible)
-            throws InterruptedException, ExecutionException
-    {
-        int retryWait = initialRetryWait;
-        int retryCount = 0;
-
-        Throwable firstException = null;
-
-        while(true) {
-            try {
-                return op.call();
-            } catch (Throwable exception) {
-                if (firstException == null) {
-                    firstException = exception;
-                }
-                if (!op.isRetryableException(exception) || retryCount >= retryLimit) {
-                    op.onGiveup(firstException, exception);
-                    throw new ExecutionException(firstException);
-                }
-
-                retryCount++;
-                op.onRetry(exception, retryCount, retryLimit, retryWait);
-
-                try {
-                    Thread.sleep(retryWait);
-                } catch (InterruptedException ex) {
-                    if (interruptible) {
-                        throw ex;
-                    }
-                }
-
-                retryWait *= 2;  // exponential back-off
-
-                if (retryWait > maxRetryWait) {
-                    retryWait = maxRetryWait;
-                }
-            }
-        }
-    }
-}
-