embulk-output-jdbc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99881449e41482ec67cfa089d352b3006aa7caeb
-  data.tar.gz: ae1d3d4f95451d5462a12f3a748fa7e0ea8784d6
+  metadata.gz: 1bd1b7647602182c1366959df589ccd8125ee6b6
+  data.tar.gz: 33c939b19118bc91c54928cf2977926ec283fb9b
 SHA512:
-  metadata.gz: a7af9fcf1de60876cdebc755f8c3c67c562c3ca36059f8f346fd7a4ba2062657bb484dc9417eb928fdc9381e0097a52a27c03035458e92cdf14e05806bf08635
-  data.tar.gz: 8bd197e134df1eab9e4446984e70c1b8c8dc710a7920511ad3599471e30f3557bca518497280b7e7ad4bfc92c2e6e0657ff863032966749e84ff38f6027ec147
+  metadata.gz: a7883449a40ea159edbee72967318ed54424cc4a9b5911b9dd913e1da72d41bfadebd4be0f5b2758ed71cb61bbf41721df9bdeac583bb8a3e69e53be01396731
+  data.tar.gz: 5556fef4b4a6d2d7caf145daa833758fbafdbe3c4f1fb494e1b99e0b34d181719a0cf3e7d778297a74677be2c3f86817785b69fe08bb19aee64ed170dcbd2788

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

@@ -141,7 +141,7 @@ public abstract class AbstractJdbcOutputPlugin
     }
 
     public ConfigDiff transaction(ConfigSource config,
-            Schema schema, int processorCount,
+            Schema schema, int taskCount,
             OutputPlugin.Control control)
     {
         PluginTask task = config.loadConfig(getTaskClass());
@@ -181,13 +181,13 @@ public abstract class AbstractJdbcOutputPlugin
         //    new ConfigException(String.format("Unknown mode '%s'. Supported modes are: insert_direct, replace_inplace", task.getModeConfig()));
         //}
 
-        task = begin(task, schema, processorCount);
+        task = begin(task, schema, taskCount);
         control.run(task.dump());
-        return commit(task, schema, processorCount);
+        return commit(task, schema, taskCount);
     }
 
     public ConfigDiff resume(TaskSource taskSource,
-            Schema schema, int processorCount,
+            Schema schema, int taskCount,
             OutputPlugin.Control control)
     {
         PluginTask task = taskSource.loadTask(getTaskClass());
@@ -196,9 +196,9 @@ public abstract class AbstractJdbcOutputPlugin
             throw new UnsupportedOperationException("inplace mode is not resumable. You need to delete partially-loaded records from the database and restart the entire transaction.");
         }
 
-        task = begin(task, schema, processorCount);
+        task = begin(task, schema, taskCount);
         control.run(task.dump());
-        return commit(task, schema, processorCount);
+        return commit(task, schema, taskCount);
     }
 
     private String getTransactionUniqueName()
@@ -209,7 +209,7 @@ public abstract class AbstractJdbcOutputPlugin
     }
 
     private PluginTask begin(final PluginTask task,
-            final Schema schema, int processorCount)
+            final Schema schema, int taskCount)
     {
         try {
             withRetry(new IdempotentSqlRunnable() {  // no intermediate data if isDirectWrite == true
@@ -230,7 +230,7 @@ public abstract class AbstractJdbcOutputPlugin
     }
 
     private ConfigDiff commit(final PluginTask task,
-            Schema schema, final int processorCount)
+            Schema schema, final int taskCount)
     {
         if (!task.getMode().isDirectWrite()) {  // no intermediate data if isDirectWrite == true
             try {
@@ -239,7 +239,7 @@ public abstract class AbstractJdbcOutputPlugin
                     {
                         JdbcOutputConnection con = newConnection(task, false, false);
                         try {
-                            doCommit(con, task, processorCount);
+                            doCommit(con, task, taskCount);
                         } finally {
                             con.close();
                         }
@@ -253,7 +253,7 @@ public abstract class AbstractJdbcOutputPlugin
     }
 
     public void cleanup(TaskSource taskSource,
-            Schema schema, final int processorCount,
+            Schema schema, final int taskCount,
             final List<CommitReport> successCommitReports)
     {
         final PluginTask task = taskSource.loadTask(getTaskClass());
@@ -265,7 +265,7 @@ public abstract class AbstractJdbcOutputPlugin
                     {
                         JdbcOutputConnection con = newConnection(task, true, true);
                         try {
-                            doCleanup(con, task, processorCount, successCommitReports);
+                            doCleanup(con, task, taskCount, successCommitReports);
                         } finally {
                             con.close();
                         }
@@ -312,7 +312,7 @@ public abstract class AbstractJdbcOutputPlugin
         task.setLoadSchema(matchSchemaByColumnNames(schema, targetTableSchema));
     }
 
-    protected void doCommit(JdbcOutputConnection con, PluginTask task, int processorCount)
+    protected void doCommit(JdbcOutputConnection con, PluginTask task, int taskCount)
         throws SQLException
     {
         switch (task.getMode()) {
@@ -332,7 +332,7 @@ public abstract class AbstractJdbcOutputPlugin
             throw new UnsupportedOperationException("not implemented yet");
             //break;
         case REPLACE:
-            if (processorCount == 1) {
+            if (taskCount == 1) {
                 // swap table
                 con.replaceTable(task.getSwapTable().get(), task.getLoadSchema(), task.getTable());
             } else {
@@ -347,7 +347,7 @@ public abstract class AbstractJdbcOutputPlugin
         }
     }
 
-    protected void doCleanup(JdbcOutputConnection con, PluginTask task, int processorCount,
+    protected void doCleanup(JdbcOutputConnection con, PluginTask task, int taskCount,
             List<CommitReport> successCommitReports)
         throws SQLException
     {
@@ -355,15 +355,15 @@ public abstract class AbstractJdbcOutputPlugin
             con.dropTableIfExists(task.getSwapTable().get());
         }
         if (task.getMultipleLoadTablePrefix().isPresent()) {
-            for (int i=0; i < processorCount; i++) {
+            for (int i=0; i < taskCount; i++) {
                 con.dropTableIfExists(formatMultipleLoadTableName(task, i));
             }
         }
     }
 
-    static String formatMultipleLoadTableName(PluginTask task, int processorIndex)
+    static String formatMultipleLoadTableName(PluginTask task, int taskIndex)
     {
-        return task.getMultipleLoadTablePrefix().get() + String.format("%04x", processorIndex);
+        return task.getMultipleLoadTablePrefix().get() + String.format("%04x", taskIndex);
     }
 
     protected JdbcSchema newJdbcSchemaForNewTable(Schema schema)
@@ -451,7 +451,7 @@ public abstract class AbstractJdbcOutputPlugin
         return targetTableSchema;
     }
 
-    public TransactionalPageOutput open(TaskSource taskSource, Schema schema, final int processorIndex)
+    public TransactionalPageOutput open(TaskSource taskSource, Schema schema, final int taskIndex)
     {
         final PluginTask task = taskSource.loadTask(getTaskClass());
         final Mode mode = task.getMode();
@@ -488,7 +488,7 @@ public abstract class AbstractJdbcOutputPlugin
                     boolean createTable;
                     if (mode.usesMultipleLoadTables()) {
                         // insert, truncate_insert, merge, replace
-                        loadTable = formatMultipleLoadTableName(task, processorIndex);
+                        loadTable = formatMultipleLoadTableName(task, taskIndex);
                         JdbcOutputConnection con = newConnection(task, true, true);
                         try {
                             con.createTableIfNotExists(loadTable, insertSchema);
@@ -661,12 +661,12 @@ public abstract class AbstractJdbcOutputPlugin
 
                     public boolean isRetryableException(Throwable exception)
                     {
-                        if (exception instanceof SQLException) {
-                            SQLException ex = (SQLException) exception;
-                            String sqlState = ex.getSQLState();
-                            int errorCode = ex.getErrorCode();
-                            return isRetryableException(ex);
-                        }
+                        //if (exception instanceof SQLException) {
+                        //    SQLException ex = (SQLException) exception;
+                        //    String sqlState = ex.getSQLState();
+                        //    int errorCode = ex.getErrorCode();
+                        //    return isRetryableSQLException(ex);
+                        //}
                         return false;  // TODO
                     }
                 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - FURUHASHI Sadayuki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies: []
 description: JDBC output plugin is an Embulk plugin that loads records to JDBC read by any input plugins. Search the input plugins by "embulk-input" keyword.
 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.1.0.jar
+- classpath/embulk-output-jdbc-0.1.1.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0