embulk-output-jdbc 0.2.4 → 0.3.0

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

@@ -0,0 +1,70 @@
+package org.embulk.output.jdbc.setter;
+
+import java.math.BigDecimal;
+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 BigDecimalColumnSetter
+        extends ColumnSetter
+{
+    private static final BigDecimal ZERO = BigDecimal.valueOf(0L);
+    private static final BigDecimal ONE = BigDecimal.valueOf(1L);
+
+    public BigDecimalColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setBigDecimal();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        batch.setBigDecimal(v ? ONE : ZERO);
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        batch.setBigDecimal(BigDecimal.valueOf(v));
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        if (Double.isNaN(v) || Double.isInfinite(v)) {
+            defaultValue.setBigDecimal();
+        } else {
+            batch.setBigDecimal(BigDecimal.valueOf(v));
+        }
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        BigDecimal dv;
+        try {
+            dv = new BigDecimal(v);
+        } catch (NumberFormatException ex) {
+            defaultValue.setBigDecimal();
+            return;
+        }
+        batch.setBigDecimal(dv);
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        defaultValue.setBigDecimal();
+    }
+}

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

@@ -1,52 +1,54 @@
-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.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class BooleanColumnSetter
+        extends ColumnSetter
+{
+    public BooleanColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setBoolean();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        batch.setBoolean(v);
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        batch.setBoolean(v > 0);
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        batch.setBoolean(v > 0.0);
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        defaultValue.setBoolean();
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        defaultValue.setBoolean();
+    }
+}

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

@@ -0,0 +1,76 @@
+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.ColumnVisitor;
+import org.embulk.spi.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+
+public class ByteColumnSetter
+        extends ColumnSetter
+{
+    public ByteColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setByte();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        batch.setByte(v ? (byte) 1 : (byte) 0);
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        if (v > Byte.MAX_VALUE || v < Byte.MIN_VALUE) {
+            defaultValue.setByte();
+        } else {
+            batch.setByte((byte) v);
+        }
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        long lv;
+        try {
+            // TODO configurable rounding mode
+            lv = DoubleMath.roundToLong(v, RoundingMode.HALF_UP);
+        } catch (ArithmeticException ex) {
+            // NaN / Infinite / -Infinite
+            defaultValue.setByte();
+            return;
+        }
+        longValue(lv);
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        byte sv;
+        try {
+            sv = Byte.parseByte(v);
+        } catch (NumberFormatException e) {
+            defaultValue.setByte();
+            return;
+        }
+        batch.setByte(sv);
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        defaultValue.setByte();
+    }
+}

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

@@ -3,25 +3,22 @@ package org.embulk.output.jdbc.setter;
 import java.io.IOException;
 import java.sql.SQLException;
 import org.embulk.spi.Column;
-import org.embulk.spi.ColumnVisitor;
-import org.embulk.spi.PageReader;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
 
 public abstract class ColumnSetter
-        implements ColumnVisitor
 {
     protected final BatchInsert batch;
-    protected final PageReader pageReader;
     protected final JdbcColumn column;
+    protected final DefaultValueSetter defaultValue;
 
-    public ColumnSetter(BatchInsert batch, PageReader pageReader,
-            JdbcColumn column)
+    public ColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
     {
         this.batch = batch;
-        this.pageReader = pageReader;
         this.column = column;
+        this.defaultValue = defaultValue;
     }
 
     public JdbcColumn getColumn()
@@ -34,93 +31,15 @@ public abstract class ColumnSetter
         return column.getSqlType();
     }
 
-    public void booleanColumn(Column column)
-    {
-        try {
-            if (pageReader.isNull(column)) {
-                nullValue();
-            } else {
-                booleanValue(pageReader.getBoolean(column));
-            }
-        } catch (IOException | SQLException ex) {
-            // TODO exception class
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public void longColumn(Column column)
-    {
-        try {
-            if (pageReader.isNull(column)) {
-                nullValue();
-            } else {
-                longValue(pageReader.getLong(column));
-            }
-        } catch (IOException | SQLException ex) {
-            // TODO exception class
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public void doubleColumn(Column column)
-    {
-        try {
-            if (pageReader.isNull(column)) {
-                nullValue();
-            } else {
-                doubleValue(pageReader.getDouble(column));
-            }
-        } catch (IOException | SQLException ex) {
-            // TODO exception class
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public void stringColumn(Column column)
-    {
-        try {
-            if (pageReader.isNull(column)) {
-                nullValue();
-            } else {
-                stringValue(pageReader.getString(column));
-            }
-        } catch (IOException | SQLException ex) {
-            // TODO exception class
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public void timestampColumn(Column column)
-    {
-        try {
-            if (pageReader.isNull(column)) {
-                nullValue();
-            } else {
-                timestampValue(pageReader.getTimestamp(column));
-            }
-        } catch (IOException | SQLException ex) {
-            // TODO exception class
-            throw new RuntimeException(ex);
-        }
-    }
-
-    protected void nullValue() throws IOException, SQLException
-    {
-        try {
-            batch.setNull(getSqlType());
-        } catch (IOException | SQLException ex) {
-            // TODO exception class
-            throw new RuntimeException(ex);
-        }
-    }
+    public abstract void nullValue() throws IOException, SQLException;
 
-    protected abstract void booleanValue(boolean v) throws IOException, SQLException;
+    public abstract void booleanValue(boolean v) throws IOException, SQLException;
 
-    protected abstract void longValue(long v) throws IOException, SQLException;
+    public abstract void longValue(long v) throws IOException, SQLException;
 
-    protected abstract void doubleValue(double v) throws IOException, SQLException;
+    public abstract void doubleValue(double v) throws IOException, SQLException;
 
-    protected abstract void stringValue(String v) throws IOException, SQLException;
+    public abstract void stringValue(String v) throws IOException, SQLException;
 
-    protected abstract void timestampValue(Timestamp v) throws IOException, SQLException;
+    public abstract void timestampValue(Timestamp v) throws IOException, SQLException;
 }

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

@@ -1,137 +1,189 @@
-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.joda.time.DateTimeZone;
+import org.embulk.spi.time.TimestampFormatter;
+import org.embulk.output.jdbc.BatchInsert;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.JdbcColumnOption;
+import org.embulk.config.ConfigException;
+
+public class ColumnSetterFactory
+{
+    protected final BatchInsert batch;
+    protected final DateTimeZone defaultTimeZone;
+
+    public ColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    {
+        this.batch = batch;
+        this.defaultTimeZone = defaultTimeZone;
+    }
+
+    public SkipColumnSetter newSkipColumnSetter()
+    {
+        return new SkipColumnSetter(batch);
+    }
+
+    public DefaultValueSetter newDefaultValueSetter(JdbcColumn column, JdbcColumnOption option)
+    {
+        return new NullDefaultValueSetter(batch, column);
+    }
+
+    public ColumnSetter newColumnSetter(JdbcColumn column, JdbcColumnOption option)
+    {
+        switch (option.getValueType()) {
+        case "coalesce":
+            return newCoalesceColumnSetter(column, option);
+        case "byte":
+            return new ByteColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "short":
+            return new ShortColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "int":
+            return new IntColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "long":
+            return new LongColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "double":
+            return new DoubleColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "float":
+            return new FloatColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "boolean":
+            return new BooleanColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "string":
+            return new StringColumnSetter(batch, column, newDefaultValueSetter(column, option), newTimestampFormatter(option));
+        case "nstring":
+            return new NStringColumnSetter(batch, column, newDefaultValueSetter(column, option), newTimestampFormatter(option));
+        case "date":
+            return new SqlDateColumnSetter(batch, column, newDefaultValueSetter(column, option), getTimeZone(option));
+        case "time":
+            return new SqlTimeColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "timestamp":
+            return new SqlTimestampColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "decimal":
+            return new BigDecimalColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "null":
+            return new NullColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "pass":
+            return new PassThroughColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        default:
+            throw new ConfigException(String.format("Unknown value_type '%s' for column '%s'", option.getValueType(), column.getName()));
+        }
+    }
+
+    protected TimestampFormatter newTimestampFormatter(JdbcColumnOption option)
+    {
+        return new TimestampFormatter(
+                option.getJRuby(),
+                option.getTimestampFormat().getFormat(),
+                option.getTimeZone().or(defaultTimeZone));
+    }
+
+    protected DateTimeZone getTimeZone(JdbcColumnOption option)
+    {
+        return option.getTimeZone().or(defaultTimeZone);
+    }
+
+    public ColumnSetter newCoalesceColumnSetter(JdbcColumn column, JdbcColumnOption option)
+    {
+        switch(column.getSqlType()) {
+        // setByte
+        case Types.TINYINT:
+            return new ByteColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // setShort
+        case Types.SMALLINT:
+            return new ShortColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // setInt
+        case Types.INTEGER:
+            return new IntColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // setLong
+        case Types.BIGINT:
+            return new LongColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // setDouble
+        case Types.DOUBLE:
+        case Types.FLOAT:
+            return new DoubleColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // setFloat
+        case Types.REAL:
+            return new FloatColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // setBool
+        case Types.BOOLEAN:
+        case Types.BIT:  // JDBC BIT is boolean, unlike SQL-92
+            return new BooleanColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // setString, Clob
+        case Types.CHAR:
+        case Types.VARCHAR:
+        case Types.LONGVARCHAR:
+        case Types.CLOB:
+            return new StringColumnSetter(batch, column, newDefaultValueSetter(column, option), newTimestampFormatter(option));
+
+        // setNString, NClob
+        case Types.NCHAR:
+        case Types.NVARCHAR:
+        case Types.LONGNVARCHAR:
+            return new NStringColumnSetter(batch, column, newDefaultValueSetter(column, option), newTimestampFormatter(option));
+
+        // TODO
+        //// setBytes Blob
+        //case Types.BINARY:
+        //case Types.VARBINARY:
+        //case Types.LONGVARBINARY:
+        //case Types.BLOB:
+        //    return new BytesColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // Time
+        case Types.DATE:
+            return new SqlDateColumnSetter(batch, column, newDefaultValueSetter(column, option), getTimeZone(option));
+        case Types.TIME:
+            return new SqlTimeColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case Types.TIMESTAMP:
+            return new SqlTimestampColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // Null
+        case Types.NULL:
+            return new NullColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // BigDecimal
+        case Types.NUMERIC:
+        case Types.DECIMAL:
+            return new BigDecimalColumnSetter(batch, column, newDefaultValueSetter(column, option));
+
+        // 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.getDeclaredType().or(column.getSimpleTypeName()),
+                    column.getSqlType(), column.getSizeTypeParameter(), column.getScaleTypeParameter()));
+    }
+}