embulk-output-jdbc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a92a4a868446c83653516d3028fb5b423f2fdb
-  data.tar.gz: 1894bda08176a5ec0e9be2008d516689d3066871
+  metadata.gz: ad63f756531e91a61059ac0568e2b9d96b47a4fd
+  data.tar.gz: 0e2d9ccc4f4f40bd5439ba8639f462583b194f80
 SHA512:
-  metadata.gz: 3bc0733eec6851d2f953fe32c703177643b21bf09e34d463af4bf876ef7525b8eeaca4070627c41e0cb595b0f875bfac60ffcc6bea18cfa8c4e4779b2f9c1302
-  data.tar.gz: 76ba0c713a4dcd324aae9c9d8502556a082df91b36a9708277e69a8b81a91753bd91b7d8143299bd98fb9878f8f6ad09e77634456ad6fcfff0c0066f103be049
+  metadata.gz: 629fca902b6c03d39c3a87ff7276f31d6028f1743acde07ee573a911fd8d0dac1050d793e3aaf23de4f0084d6ef4b475d819d3bc5652256f7484cd8d0fcce616
+  data.tar.gz: 6d296929dd913354ffc58f7c4cf59b1a67a5bd020f3a5a9ca00ba8c7080673d37a9c6d37df1c730fb24a6244c76556f18229d77285d2e3addd16a5a99e66d0bc

data/src/main/java/org/embulk/output/JdbcOutputPlugin.java

@@ -1,8 +1,5 @@
 package org.embulk.output;
 
-import java.nio.file.Paths;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.Properties;
 import java.sql.Driver;
 import java.io.IOException;
@@ -10,8 +7,6 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
-import org.embulk.spi.Exec;
-import org.embulk.spi.PluginClassLoader;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
@@ -23,8 +18,6 @@ import org.embulk.output.jdbc.JdbcOutputConnection;
 public class JdbcOutputPlugin
         extends AbstractJdbcOutputPlugin
 {
-    private final static Set<String> loadedJarGlobs = new HashSet<String>();
-
     public interface GenericPluginTask extends PluginTask
     {
         @Config("driver_path")
@@ -62,13 +55,7 @@ public class JdbcOutputPlugin
         GenericPluginTask t = (GenericPluginTask) task;
 
         if (t.getDriverPath().isPresent()) {
-            synchronized (loadedJarGlobs) {
-                String glob = t.getDriverPath().get();
-                if (!loadedJarGlobs.contains(glob)) {
-                    loadDriverJar(glob);
-                    loadedJarGlobs.add(glob);
-                }
-            }
+            loadDriverJar(t.getDriverPath().get());
         }
 
         Properties props = new Properties();
@@ -85,13 +72,6 @@ public class JdbcOutputPlugin
                 t.getSchema().orNull());
     }
 
-    private void loadDriverJar(String glob)
-    {
-        // TODO match glob
-        PluginClassLoader loader = (PluginClassLoader) getClass().getClassLoader();
-        loader.addPath(Paths.get(glob));
-    }
-
     private static class GenericOutputConnector
             implements JdbcOutputConnector
     {

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

@@ -1,19 +1,25 @@
 package org.embulk.output.jdbc;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.sql.Types;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
+
 import org.slf4j.Logger;
+
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
+
 import org.embulk.config.CommitReport;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
@@ -27,19 +33,24 @@ import org.embulk.spi.Column;
 import org.embulk.spi.ColumnVisitor;
 import org.embulk.spi.OutputPlugin;
 import org.embulk.spi.PageOutput;
+import org.embulk.spi.PluginClassLoader;
 import org.embulk.spi.Schema;
 import org.embulk.spi.TransactionalPageOutput;
 import org.embulk.spi.Page;
 import org.embulk.spi.PageReader;
 import org.embulk.spi.time.Timestamp;
+import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.output.jdbc.setter.ColumnSetter;
 import org.embulk.output.jdbc.setter.ColumnSetterFactory;
 import org.embulk.output.jdbc.RetryExecutor.IdempotentOperation;
+
 import static org.embulk.output.jdbc.RetryExecutor.retryExecutor;
 
 public abstract class AbstractJdbcOutputPlugin
         implements OutputPlugin
 {
+    private final static Set<String> loadedJarGlobs = new HashSet<String>();
+
     private final Logger logger = Exec.getLogger(getClass());
 
     public interface PluginTask
@@ -73,6 +84,18 @@ public abstract class AbstractJdbcOutputPlugin
         public void setMultipleLoadTablePrefix(Optional<String> prefix);
     }
 
+    protected void loadDriverJar(String glob)
+    {
+        synchronized (loadedJarGlobs) {
+            if (!loadedJarGlobs.contains(glob)) {
+                // TODO match glob
+                PluginClassLoader loader = (PluginClassLoader) getClass().getClassLoader();
+                loader.addPath(Paths.get(glob));
+                loadedJarGlobs.add(glob);
+            }
+        }
+    }
+
     // for subclasses to add @Config
     protected Class<? extends PluginTask> getTaskClass()
     {
@@ -266,7 +289,7 @@ public abstract class AbstractJdbcOutputPlugin
             // DROP TABLE IF EXISTS xyz__0000000054d92dee1e452158_bulk_load_temp
             // CREATE TABLE IF NOT EXISTS xyz__0000000054d92dee1e452158_bulk_load_temp
             // swapTableName = "xyz__0000000054d92dee1e452158_bulk_load_temp"
-            String swapTableName = task.getTable() + "_" + getTransactionUniqueName() + "_bulk_load_temp";
+            String swapTableName = generateSwapTableName(task);
             con.dropTableIfExists(swapTableName);
             con.createTableIfNotExists(swapTableName, newJdbcSchemaForNewTable(schema));
             targetTableSchema = newJdbcSchemaFromExistentTable(con, swapTableName);
@@ -291,6 +314,11 @@ public abstract class AbstractJdbcOutputPlugin
         task.setLoadSchema(matchSchemaByColumnNames(schema, targetTableSchema));
     }
 
+    protected String generateSwapTableName(PluginTask task) throws SQLException
+    {
+    	return task.getTable() + "_" + getTransactionUniqueName() + "_bulk_load_temp";
+    }
+
     protected void doCommit(JdbcOutputConnection con, PluginTask task, int taskCount)
         throws SQLException
     {
@@ -443,7 +471,7 @@ public abstract class AbstractJdbcOutputPlugin
         }
         try {
             PageReader reader = new PageReader(schema);
-            ColumnSetterFactory factory = new ColumnSetterFactory(batch, reader, null);  // TODO TimestampFormatter
+            ColumnSetterFactory factory = newColumnSetterFactory(batch, reader, null);  // TODO TimestampFormatter
 
             JdbcSchema loadSchema = task.getLoadSchema();
 
@@ -507,6 +535,12 @@ public abstract class AbstractJdbcOutputPlugin
         }
     }
 
+    protected ColumnSetterFactory newColumnSetterFactory(BatchInsert batch, PageReader pageReader,
+            TimestampFormatter timestampFormatter)
+    {
+    	return new ColumnSetterFactory(batch, pageReader, timestampFormatter);
+    }
+
     public static class PluginPageOutput
             implements TransactionalPageOutput
     {

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

@@ -4,8 +4,10 @@ import java.util.List;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+
 import org.slf4j.Logger;
 import org.embulk.spi.Exec;
 
@@ -58,12 +60,37 @@ public class JdbcOutputConnection
         }
     }
 
+    public boolean tableExists(String tableName) throws SQLException
+    {
+        try (ResultSet rs = connection.getMetaData().getTables(null, schemaName, tableName, null)) {
+            return rs.next();
+        }
+    }
+    
     public void dropTableIfExists(String tableName) throws SQLException
     {
         Statement stmt = connection.createStatement();
         try {
-            String sql = String.format("DROP TABLE IF EXISTS %s", quoteIdentifierString(tableName));
-            executeUpdate(stmt, sql);
+            dropTableIfExists(stmt, tableName);
+            commitIfNecessary(connection);
+        } catch (SQLException ex) {
+            throw safeRollback(connection, ex);
+        } finally {
+            stmt.close();
+        }
+    }
+
+    protected void dropTableIfExists(Statement stmt, String tableName) throws SQLException
+    {
+        String sql = String.format("DROP TABLE IF EXISTS %s", quoteIdentifierString(tableName));
+        executeUpdate(stmt, sql);
+    }
+
+    public void dropTable(String tableName) throws SQLException
+    {
+        Statement stmt = connection.createStatement();
+        try {
+            dropTable(stmt, tableName);
             commitIfNecessary(connection);
         } catch (SQLException ex) {
             throw safeRollback(connection, ex);
@@ -72,6 +99,12 @@ public class JdbcOutputConnection
         }
     }
 
+    protected void dropTable(Statement stmt, String tableName) throws SQLException
+    {
+        String sql = String.format("DROP TABLE %s", quoteIdentifierString(tableName));
+        executeUpdate(stmt, sql);
+    }
+
     public void createTableIfNotExists(String tableName, JdbcSchema schema) throws SQLException
     {
         Statement stmt = connection.createStatement();
@@ -92,6 +125,38 @@ public class JdbcOutputConnection
 
         sb.append("CREATE TABLE IF NOT EXISTS ");
         quoteIdentifierString(sb, name);
+        sb.append(buildColumnsOfCreateTableSql(schema));
+        return sb.toString();
+    }
+
+    public void createTable(String tableName, JdbcSchema schema) throws SQLException
+    {
+        Statement stmt = connection.createStatement();
+        try {
+            String sql = buildCreateTableSql(tableName, schema);
+            executeUpdate(stmt, sql);
+            commitIfNecessary(connection);
+        } catch (SQLException ex) {
+            throw safeRollback(connection, ex);
+        } finally {
+            stmt.close();
+        }
+    }
+
+    protected String buildCreateTableSql(String name, JdbcSchema schema)
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("CREATE TABLE ");
+        quoteIdentifierString(sb, name);
+        sb.append(buildColumnsOfCreateTableSql(schema));
+        return sb.toString();
+    }
+    
+    private String buildColumnsOfCreateTableSql(JdbcSchema schema)
+    {
+        StringBuilder sb = new StringBuilder();
+
         sb.append(" (");
         boolean first = true;
         for (JdbcColumn c : schema.getColumns()) {
@@ -287,23 +352,15 @@ public class JdbcOutputConnection
     {
         Statement stmt = connection.createStatement();
         try {
-            {
-                StringBuilder sb = new StringBuilder();
-                sb.append("DROP TABLE IF EXISTS ");
-                quoteIdentifierString(sb, toTable);
-                String sql = sb.toString();
-                executeUpdate(stmt, sql);
-            }
-
-            {
-                StringBuilder sb = new StringBuilder();
-                sb.append("ALTER TABLE ");
-                quoteIdentifierString(sb, fromTable);
-                sb.append(" RENAME TO ");
-                quoteIdentifierString(sb, toTable);
-                String sql = sb.toString();
-                executeUpdate(stmt, sql);
-            }
+            dropTableIfExists(stmt, toTable);
+
+            StringBuilder sb = new StringBuilder();
+            sb.append("ALTER TABLE ");
+            quoteIdentifierString(sb, fromTable);
+            sb.append(" RENAME TO ");
+            quoteIdentifierString(sb, toTable);
+            String sql = sb.toString();
+            executeUpdate(stmt, sql);
 
             commitIfNecessary(connection);
         } catch (SQLException ex) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-15 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -39,7 +39,7 @@ files:
 - 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.0.jar
+- classpath/embulk-output-jdbc-0.2.1.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0