embulk-output-jdbc 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7b878973e6e97c5149c469886b1d11c9efc8d9
-  data.tar.gz: 3af9509130f455d733b78de7d0805907d259bdc2
+  metadata.gz: 3f912491ce43b8714fa207c9751ce0732f1d860f
+  data.tar.gz: 09361f2b0088b3df654a741018d99c7ee3256f05
 SHA512:
-  metadata.gz: 586210422b7503a9921dcf879ab13b2fd6691521cddb5afb37ef51349c844173f6ac4b6506b048e8f01d08f4f172724341b4e6a40097c8c508b8f17119248659
-  data.tar.gz: cf113f39192e5ec7dbba13c33947c1095dcf03c1297a0fbfebc251c219725a4a8ffc0580551d2001ff45cf3ea865e62faa5af133a5baa2dae70f7cd109d4ce84
+  metadata.gz: 51aa4687726314754747e3513c3316182caf5bae198a9267699057b17cabe68ec3020451f804c0f9fa8b83d79d425c9ab7b3ea8689dd1c117819eca538c90dbe
+  data.tar.gz: 8e37f62b9742d79b59a4637666bbcf9443fe8ea4fb92d4aa328e235c1ea0c30b764cb2e48124a865537852547f4474c32e3e9d181f306716c5fb7cdda694e13b

data/README.md

@@ -30,6 +30,7 @@ Generic JDBC output plugin for Embulk loads records to a database using a JDBC d
   - **value_type**: This plugin converts input column type (embulk type) into a database type to build a INSERT statement. This value_type option controls the type of the value in a INSERT statement. (string, default: depends on the sql type of the column. Available values options are: `byte`, `short`, `int`, `long`, `double`, `float`, `boolean`, `string`, `nstring`, `date`, `time`, `timestamp`, `decimal`, `json`, `null`, `pass`)
   - **timestamp_format**: If input column type (embulk type) is timestamp and value_type is `string` or `nstring`, this plugin needs to format the timestamp value into a string. This timestamp_format option is used to control the format of the timestamp. (string, default: `%Y-%m-%d %H:%M:%S.%6N`)
   - **timezone**: If input column type (embulk type) is timestamp, this plugin needs to format the timestamp value into a SQL string. In this cases, this timezone option is used to control the timezone. (string, value of default_timezone option is used by default)
+- **after_load**: if set, this SQL will be executed after loading all records.
 
 ## Modes
 

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

@@ -108,6 +108,10 @@ public abstract class AbstractJdbcOutputPlugin
         @ConfigDefault("null")
         public Optional<List<String>> getMergeRule();
 
+        @Config("after_load")
+        @ConfigDefault("null")
+        public Optional<String> getAfterLoad();
+
         public void setActualTable(String actualTable);
         public String getActualTable();
 
@@ -394,7 +398,7 @@ public abstract class AbstractJdbcOutputPlugin
     private ConfigDiff commit(final PluginTask task,
             Schema schema, final int taskCount)
     {
-        if (!task.getMode().isDirectModify()) {  // no intermediate data if isDirectModify == true
+        if (!task.getMode().isDirectModify() || task.getAfterLoad().isPresent()) {  // no intermediate data if isDirectModify == true
             try {
                 withRetry(task, new IdempotentSqlRunnable() {
                     public void run() throws SQLException
@@ -492,7 +496,7 @@ public abstract class AbstractJdbcOutputPlugin
             if (mode.tempTablePerTask()) {
                 String namePrefix = generateIntermediateTableNamePrefix(task.getActualTable(), con, 3,
                         task.getFeatures().getMaxTableNameLength(), task.getFeatures().getTableNameLengthSemantics());
-                for (int i=0; i < taskCount; i++) {
+                for (int i = 0; i < taskCount; i++) {
                     intermTableNames.add(namePrefix + String.format("%03d", i));
                 }
             } else {
@@ -666,16 +670,15 @@ public abstract class AbstractJdbcOutputPlugin
     protected void doCommit(JdbcOutputConnection con, PluginTask task, int taskCount)
         throws SQLException
     {
-        if (task.getIntermediateTables().get().isEmpty()) {
-            return;
-        }
-
         JdbcSchema schema = filterSkipColumns(task.getTargetTableSchema());
 
         switch (task.getMode()) {
         case INSERT_DIRECT:
         case MERGE_DIRECT:
             // already done
+            if (task.getAfterLoad().isPresent()) {
+                con.executeSql(task.getAfterLoad().get());
+            }
             break;
 
         case INSERT:
@@ -683,7 +686,7 @@ public abstract class AbstractJdbcOutputPlugin
             if (task.getNewTableSchema().isPresent()) {
                 con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
-            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), false);
+            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), false, task.getAfterLoad());
             break;
 
         case TRUNCATE_INSERT:
@@ -691,7 +694,7 @@ public abstract class AbstractJdbcOutputPlugin
             if (task.getNewTableSchema().isPresent()) {
                 con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
-            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), true);
+            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), true, task.getAfterLoad());
             break;
 
         case MERGE:
@@ -699,12 +702,13 @@ public abstract class AbstractJdbcOutputPlugin
             if (task.getNewTableSchema().isPresent()) {
                 con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
-            con.collectMerge(task.getIntermediateTables().get(), schema, task.getActualTable(), new MergeConfig(task.getMergeKeys().get(), task.getMergeRule()));
+            con.collectMerge(task.getIntermediateTables().get(), schema, task.getActualTable(),
+                    new MergeConfig(task.getMergeKeys().get(), task.getMergeRule()), task.getAfterLoad());
             break;
 
         case REPLACE:
             // swap table
-            con.replaceTable(task.getIntermediateTables().get().get(0), schema, task.getActualTable());
+            con.replaceTable(task.getIntermediateTables().get().get(0), schema, task.getActualTable(), task.getAfterLoad());
             break;
         }
     }

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

@@ -280,9 +280,26 @@ public class JdbcOutputConnection
         throw new UnsupportedOperationException("not implemented");
     }
 
+    protected void executeSql(String sql) throws SQLException
+    {
+        Statement stmt = connection.createStatement();
+        try {
+            executeUpdate(stmt, sql);
+            commitIfNecessary(connection);
+        } catch (SQLException ex) {
+            throw safeRollback(connection, ex);
+        } finally {
+            stmt.close();
+        }
+    }
+
     protected void collectInsert(List<String> fromTables, JdbcSchema schema, String toTable,
-            boolean truncateDestinationFirst) throws SQLException
+            boolean truncateDestinationFirst, Optional<String> additionalSql) throws SQLException
     {
+        if (fromTables.isEmpty()) {
+            return;
+        }
+
         Statement stmt = connection.createStatement();
         try {
             if (truncateDestinationFirst) {
@@ -291,6 +308,9 @@ public class JdbcOutputConnection
             }
             String sql = buildCollectInsertSql(fromTables, schema, toTable);
             executeUpdate(stmt, sql);
+            if (additionalSql.isPresent()) {
+                executeUpdate(stmt, additionalSql.get());
+            }
             commitIfNecessary(connection);
         } catch (SQLException ex) {
             throw safeRollback(connection, ex);
@@ -335,12 +355,20 @@ public class JdbcOutputConnection
         return sb.toString();
     }
 
-    protected void collectMerge(List<String> fromTables, JdbcSchema schema, String toTable, MergeConfig mergeConfig) throws SQLException
+    protected void collectMerge(List<String> fromTables, JdbcSchema schema, String toTable, MergeConfig mergeConfig,
+            Optional<String> additionalSql) throws SQLException
     {
+        if (fromTables.isEmpty()) {
+            return;
+        }
+
         Statement stmt = connection.createStatement();
         try {
             String sql = buildCollectMergeSql(fromTables, schema, toTable, mergeConfig);
             executeUpdate(stmt, sql);
+            if (additionalSql.isPresent()) {
+                executeUpdate(stmt, additionalSql.get());
+            }
             commitIfNecessary(connection);
         } catch (SQLException ex) {
             throw safeRollback(connection, ex);
@@ -354,14 +382,15 @@ public class JdbcOutputConnection
         throw new UnsupportedOperationException("not implemented");
     }
 
-    public void replaceTable(String fromTable, JdbcSchema schema, String toTable) throws SQLException
+    public void replaceTable(String fromTable, JdbcSchema schema, String toTable, Optional<String> additionalSql) throws SQLException
     {
         Statement stmt = connection.createStatement();
         try {
             dropTableIfExists(stmt, toTable);
-
             executeUpdate(stmt, buildRenameTableSql(fromTable, toTable));
-
+            if (additionalSql.isPresent()) {
+                executeUpdate(stmt, additionalSql.get());
+            }
             commitIfNecessary(connection);
         } catch (SQLException ex) {
             throw safeRollback(connection, ex);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.7.0.jar
+- classpath/embulk-output-jdbc-0.7.1.jar
 - lib/embulk/output/jdbc.rb
 - src/main/java/org/embulk/output/JdbcOutputPlugin.java
 - src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java