embulk-output-oracle 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93819131e319fc21dfc222a8cc210314c6090b11
-  data.tar.gz: 95c2ce5f6e6c6b76ece685fdfa7db3ab72462e10
+  metadata.gz: f4b3ba3440b432def6f321576d4f1553c2e54fdd
+  data.tar.gz: 2d4ea596ef35da89bdb4689f07be3c535b0b1feb
 SHA512:
-  metadata.gz: 7103236d7c51629469c5940c4b39a197c48ff57f46f63ca0b8a21e2dcdfe725c4bb3efb20706bba400af470ef0fc1670c5d4eaac0354aaa49efc08262b260bc0
-  data.tar.gz: 152fae8051856d856bc542e544dcb916c1307d761454998f7a26d1b31df88c1e922c02a86a3478202a37ecc9c5758476336a90af22f44fbdba3a4d3a01e04b48
+  metadata.gz: 648669de3b8c14f9d06ff544f53a2c30506c1fda7c741927f9065d59ee60f09104160114f278a29f7c3684daa144786fd1113ff2bc8df9204730da7a3ea63d9c
+  data.tar.gz: 788d1616fb277ce7a6f583aa757be938c1f0f5f7405cc3050e6b24d54fb0250c093d399c5d28cb6c5e157e523c35c57f38518b1604d71e21b541fa563a51d5ac

data/README.md

@@ -5,8 +5,8 @@ Oracle output plugins for Embulk loads records to Oracle.
 ## Overview
 
 * **Plugin type**: output
-* **Load all or nothing**: depnds on the mode. see below.
-* **Resume supported**: depnds on the mode. see below.
+* **Load all or nothing**: depends on the mode. see below.
+* **Resume supported**: depends on the mode. see below.
 
 ## Configuration
 
@@ -19,6 +19,9 @@ Oracle output plugins for Embulk loads records to Oracle.
 - **url**: URL of the JDBC connection (string, optional)
 - **table**: destination table name (string, required)
 - **options**: extra connection properties (hash, default: {})
+- **retry_limit** max retry count for database operations (integer, default: 12)
+- **retry_wait** initial retry wait time in milliseconds (integer, default: 1000 (1 second))
+- **max_retry_wait** upper limit of retry wait, which will be doubled at every retry (integer, default: 1800000 (30 minutes))
 - **mode**: "insert", "insert_direct", "truncate_insert", or "replace". See below. (string, required)
 - **insert_method**: see below
 - **batch_size**: size of a single batch insert (integer, default: 16777216)

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

@@ -10,10 +10,7 @@ import com.google.common.collect.ImmutableSet;
 
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
-import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
-import org.embulk.output.jdbc.BatchInsert;
-import org.embulk.output.jdbc.JdbcOutputConnector;
-import org.embulk.output.jdbc.StandardBatchInsert;
+import org.embulk.output.jdbc.*;
 import org.embulk.output.oracle.DirectBatchInsert;
 import org.embulk.output.oracle.InsertMethod;
 import org.embulk.output.oracle.OracleCharset;
@@ -127,9 +124,9 @@ public class OracleOutputPlugin
     }
 
     @Override
-    protected BatchInsert newBatchInsert(PluginTask task, Optional<List<String>> mergeKeys) throws IOException, SQLException
+    protected BatchInsert newBatchInsert(PluginTask task, Optional<MergeConfig> mergeConfig) throws IOException, SQLException
     {
-        if (mergeKeys.isPresent()) {
+        if (mergeConfig.isPresent()) {
             throw new UnsupportedOperationException("Oracle output plugin doesn't support 'merge_direct' mode.");
         }
 
@@ -154,6 +151,6 @@ public class OracleOutputPlugin
                     oracleTask.getBatchSize());
         }
 
-        return new StandardBatchInsert(getConnector(task, true), mergeKeys);
+        return new StandardBatchInsert(getConnector(task, true), mergeConfig);
     }
 }

data/src/test/java/org/embulk/input/filesplit/PartialFile.java

@@ -47,4 +47,4 @@ public class PartialFile
     {
         this.end = end;
     }
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -58,8 +58,8 @@ files:
 - src/test/resources/oracle/yml/test-truncate-insert-oci-method.yml
 - src/test/resources/oracle/yml/test-truncate-insert.yml
 - src/test/resources/oracle/yml/test-url.yml
-- classpath/embulk-output-jdbc-0.6.1.jar
-- classpath/embulk-output-oracle-0.6.1.jar
+- classpath/embulk-output-jdbc-0.6.2.jar
+- classpath/embulk-output-oracle-0.6.2.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0