embulk-output-jdbc 0.2.3 → 0.2.4

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

@@ -1,105 +1,105 @@
-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;
-                }
-            }
-        }
-    }
-}
-
+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;
+                }
+            }
+        }
+    }
+}
+

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

@@ -1,52 +1,52 @@
-package org.embulk.output.jdbc.setter;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import com.google.common.collect.ImmutableSet;
-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 BooleanColumnSetter
-        extends ColumnSetter
-{
-    private static final ImmutableSet<String> trueStrings =
-        ImmutableSet.<String>of(
-                "true", "True", "TRUE",
-                "yes", "Yes", "YES",
-                "y", "Y",
-                "on", "On", "ON",
-                "1");
-
-    public BooleanColumnSetter(BatchInsert batch, PageReader pageReader,
-            JdbcColumn column)
-    {
-        super(batch, pageReader, column);
-    }
-
-    protected void booleanValue(boolean v) throws IOException, SQLException
-    {
-        batch.setBoolean(v);
-    }
-
-    protected void longValue(long v) throws IOException, SQLException
-    {
-        batch.setBoolean(v > 0);
-    }
-
-    protected void doubleValue(double v) throws IOException, SQLException
-    {
-        batch.setBoolean(v > 0.0);
-    }
-
-    protected void stringValue(String v) throws IOException, SQLException
-    {
-        batch.setBoolean(trueStrings.contains(v));
-    }
-
-    protected void timestampValue(Timestamp v) throws IOException, SQLException
-    {
-        nullValue();
-    }
-}
+package org.embulk.output.jdbc.setter;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import com.google.common.collect.ImmutableSet;
+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 BooleanColumnSetter
+        extends ColumnSetter
+{
+    private static final ImmutableSet<String> trueStrings =
+        ImmutableSet.<String>of(
+                "true", "True", "TRUE",
+                "yes", "Yes", "YES",
+                "y", "Y",
+                "on", "On", "ON",
+                "1");
+
+    public BooleanColumnSetter(BatchInsert batch, PageReader pageReader,
+            JdbcColumn column)
+    {
+        super(batch, pageReader, column);
+    }
+
+    protected void booleanValue(boolean v) throws IOException, SQLException
+    {
+        batch.setBoolean(v);
+    }
+
+    protected void longValue(long v) throws IOException, SQLException
+    {
+        batch.setBoolean(v > 0);
+    }
+
+    protected void doubleValue(double v) throws IOException, SQLException
+    {
+        batch.setBoolean(v > 0.0);
+    }
+
+    protected void stringValue(String v) throws IOException, SQLException
+    {
+        batch.setBoolean(trueStrings.contains(v));
+    }
+
+    protected void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        nullValue();
+    }
+}

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

@@ -1,137 +1,137 @@
-package org.embulk.output.jdbc.setter;
-
-import java.sql.Types;
-import org.embulk.spi.time.TimestampFormatter;
-import org.embulk.spi.PageReader;
-import org.embulk.output.jdbc.BatchInsert;
-import org.embulk.output.jdbc.JdbcColumn;
-
-public class ColumnSetterFactory
-{
-    protected final BatchInsert batch;
-    protected final PageReader pageReader;
-    protected final TimestampFormatter timestampFormatter;
-
-    public ColumnSetterFactory(BatchInsert batch, PageReader pageReader,
-            TimestampFormatter timestampFormatter)
-    {
-        this.batch = batch;
-        this.pageReader = pageReader;
-        this.timestampFormatter = timestampFormatter;
-    }
-
-    public SkipColumnSetter newSkipColumnSetter()
-    {
-        return new SkipColumnSetter(batch, pageReader);
-    }
-
-    public ColumnSetter newColumnSetter(JdbcColumn column)
-    {
-        switch(column.getSqlType()) {
-        //// TODO
-        // setByte
-        //case Types.TINYINT:
-        //    return new ByteColumnSetter(batch, pageReader, column);
-
-        //// TODO
-        //// setShort
-        //case Types.SMALLINT:
-        //    return new ShortColumnSetter(batch, pageReader, column);
-
-        //// TODO
-        //// setInt
-        //case Types.INTEGER:
-        //    return new IntColumnSetter(batch, pageReader, column);
-
-        // setLong
-        case Types.BIGINT:
-            return new LongColumnSetter(batch, pageReader, column);
-
-        // setDouble
-        case Types.DOUBLE:
-        case Types.FLOAT:
-            return new DoubleColumnSetter(batch, pageReader, column);
-
-        // TODO
-        //// setFloat
-        //case Types.REAL:
-        //    return new FloatColumnSetter(batch, pageReader, column);
-
-        // setBool
-        case Types.BOOLEAN:
-        case Types.BIT:  // JDBC BIT is boolean, unlike SQL-92
-            return new BooleanColumnSetter(batch, pageReader, column);
-
-        // setString, Clob
-        case Types.CHAR:
-        case Types.VARCHAR:
-        case Types.LONGVARCHAR:
-        case Types.CLOB:
-            return new StringColumnSetter(batch, pageReader, column, timestampFormatter);
-
-        // TODO
-        //// setNString, NClob
-        //case Types.NCHAR:
-        //case Types.NVARCHAR:
-        //case Types.LONGNVARCHAR:
-        //    return new NStringColumnSetter(batch, pageReader, column);
-
-        // TODO
-        //// setBytes Blob
-        //case Types.BINARY:
-        //case Types.VARBINARY:
-        //case Types.LONGVARBINARY:
-        //case Types.BLOB:
-        //    return new BytesColumnSetter(batch, pageReader, column);
-
-        // Time
-        //case Types.DATE:
-        //    return new SqlDateColumnSetter(batch, pageReader, column); // TODO
-        //case Types.TIME:
-        //    return new SqlTimeColumnSetter(batch, pageReader, column); // TODO
-        case Types.TIMESTAMP:
-            return new SqlTimestampColumnSetter(batch, pageReader, column);
-
-        // Null
-        case Types.NULL:
-            return new NullColumnSetter(batch, pageReader, column);
-
-        // TODO
-        //// BigDecimal
-        //case Types.NUMERIC:
-        //case Types.DECIMAL:
-        //    return new BigDecimalColumnSetter(batch, pageReader, column);
-
-        // others
-        case Types.ARRAY:  // array
-        case Types.STRUCT: // map
-        case Types.REF:
-        case Types.DATALINK:
-        case Types.SQLXML: // XML
-        case Types.ROWID:
-        case Types.DISTINCT:
-        case Types.JAVA_OBJECT:
-        case Types.OTHER:
-        default:
-            throw unsupportedOperationException(column);
-        }
-    }
-
-    //private static String[] UNSUPPORTED = new String[] {
-    //    "ARRAY",
-    //    "STRUCT",
-    //    "REF",
-    //    "DATALINK",
-    //    "SQLXML",
-    //    "ROWID",
-    //    "DISTINCT",
-    //    "OTHER",
-    //};
-
-    private static UnsupportedOperationException unsupportedOperationException(JdbcColumn column)
-    {
-        throw new UnsupportedOperationException(
-                String.format("Unsupported type %s (sqlType=%d, size=%d, scale=%d)",
-                    column.getTypeName(), column.getSqlType(), column.getSizeTypeParameter(), column.getScaleTypeParameter()));
-    }
-}
+package org.embulk.output.jdbc.setter;
+
+import java.sql.Types;
+import org.embulk.spi.time.TimestampFormatter;
+import org.embulk.spi.PageReader;
+import org.embulk.output.jdbc.BatchInsert;
+import org.embulk.output.jdbc.JdbcColumn;
+
+public class ColumnSetterFactory
+{
+    protected final BatchInsert batch;
+    protected final PageReader pageReader;
+    protected final TimestampFormatter timestampFormatter;
+
+    public ColumnSetterFactory(BatchInsert batch, PageReader pageReader,
+            TimestampFormatter timestampFormatter)
+    {
+        this.batch = batch;
+        this.pageReader = pageReader;
+        this.timestampFormatter = timestampFormatter;
+    }
+
+    public SkipColumnSetter newSkipColumnSetter()
+    {
+        return new SkipColumnSetter(batch, pageReader);
+    }
+
+    public ColumnSetter newColumnSetter(JdbcColumn column)
+    {
+        switch(column.getSqlType()) {
+        //// TODO
+        // setByte
+        //case Types.TINYINT:
+        //    return new ByteColumnSetter(batch, pageReader, column);
+
+        //// TODO
+        //// setShort
+        //case Types.SMALLINT:
+        //    return new ShortColumnSetter(batch, pageReader, column);
+
+        //// TODO
+        //// setInt
+        //case Types.INTEGER:
+        //    return new IntColumnSetter(batch, pageReader, column);
+
+        // setLong
+        case Types.BIGINT:
+            return new LongColumnSetter(batch, pageReader, column);
+
+        // setDouble
+        case Types.DOUBLE:
+        case Types.FLOAT:
+            return new DoubleColumnSetter(batch, pageReader, column);
+
+        // TODO
+        //// setFloat
+        //case Types.REAL:
+        //    return new FloatColumnSetter(batch, pageReader, column);
+
+        // setBool
+        case Types.BOOLEAN:
+        case Types.BIT:  // JDBC BIT is boolean, unlike SQL-92
+            return new BooleanColumnSetter(batch, pageReader, column);
+
+        // setString, Clob
+        case Types.CHAR:
+        case Types.VARCHAR:
+        case Types.LONGVARCHAR:
+        case Types.CLOB:
+            return new StringColumnSetter(batch, pageReader, column, timestampFormatter);
+
+        // TODO
+        //// setNString, NClob
+        //case Types.NCHAR:
+        //case Types.NVARCHAR:
+        //case Types.LONGNVARCHAR:
+        //    return new NStringColumnSetter(batch, pageReader, column);
+
+        // TODO
+        //// setBytes Blob
+        //case Types.BINARY:
+        //case Types.VARBINARY:
+        //case Types.LONGVARBINARY:
+        //case Types.BLOB:
+        //    return new BytesColumnSetter(batch, pageReader, column);
+
+        // Time
+        //case Types.DATE:
+        //    return new SqlDateColumnSetter(batch, pageReader, column); // TODO
+        //case Types.TIME:
+        //    return new SqlTimeColumnSetter(batch, pageReader, column); // TODO
+        case Types.TIMESTAMP:
+            return new SqlTimestampColumnSetter(batch, pageReader, column);
+
+        // Null
+        case Types.NULL:
+            return new NullColumnSetter(batch, pageReader, column);
+
+        // TODO
+        //// BigDecimal
+        //case Types.NUMERIC:
+        //case Types.DECIMAL:
+        //    return new BigDecimalColumnSetter(batch, pageReader, column);
+
+        // others
+        case Types.ARRAY:  // array
+        case Types.STRUCT: // map
+        case Types.REF:
+        case Types.DATALINK:
+        case Types.SQLXML: // XML
+        case Types.ROWID:
+        case Types.DISTINCT:
+        case Types.JAVA_OBJECT:
+        case Types.OTHER:
+        default:
+            throw unsupportedOperationException(column);
+        }
+    }
+
+    //private static String[] UNSUPPORTED = new String[] {
+    //    "ARRAY",
+    //    "STRUCT",
+    //    "REF",
+    //    "DATALINK",
+    //    "SQLXML",
+    //    "ROWID",
+    //    "DISTINCT",
+    //    "OTHER",
+    //};
+
+    private static UnsupportedOperationException unsupportedOperationException(JdbcColumn column)
+    {
+        throw new UnsupportedOperationException(
+                String.format("Unsupported type %s (sqlType=%d, size=%d, scale=%d)",
+                    column.getTypeName(), column.getSqlType(), column.getSizeTypeParameter(), column.getScaleTypeParameter()));
+    }
+}