embulk-output-sqlserver 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0eddd477e809123693ab12675860d1f704b620c
-  data.tar.gz: 2d8cbf8fd8cfd85806b8eff879954caf16225800
+  metadata.gz: ab40cc336da42a9437f0b4a8ec1928e144ec0f28
+  data.tar.gz: 53b18f070e754cc3d7bd2fb76daecfd1d4fd3782
 SHA512:
-  metadata.gz: aa332ea6d815c01aab521bb2b4f22b5d846858db0bc8dfbd922e5dd48327b52b192d08ece8154b939216660a4323947252247e39d59af09742dd9552bc18c4f9
-  data.tar.gz: fd0286fe07a6ce64ad53f427660ed607e733ae2c311ebeb9eac50a6a947d507e747568f0407bac5810d347429d9b1f1cda2c610a5a38f53b69e316b89d3a1a22
+  metadata.gz: 31e2b132a400055182386085c3ab56e00896dc89db87b166c60772fc750bfac02ae0cb7a079a35afc03dbaa7fb421f176b6d700fb93e1d23470fac1c5afc29ff
+  data.tar.gz: 4d409facf4724f1d166211799bcb2993e39460cd21cb2790966fffe9f285dced7d14e168f37ca666dc6d011bf5ee783a0aed2d5026d3c47d7779087e5526b6c8

data/README.md

@@ -28,8 +28,9 @@ embulk "-J-Djava.library.path=C:\drivers" run input-sqlserver.yml
 - **table**: destination table name (string, required)
 - **create_table_constraint**: table constraint added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
 - **create_table_option**: table option added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
+- **transaction_isolation**: transaction isolation level for each connection ("read_uncommitted", "read_committed", "repeatable_read" or "serializable"). if not specified, database default value will be used.
 - **options**: extra connection properties (hash, default: {})
-- **retry_limit**: max retry count for database operations (integer, default: 12)
+- **retry_limit**: max retry count for database operations (integer, default: 12). When intermediate table to create already created by another process, this plugin will retry with another table name to avoid collision.
 - **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" , "replace" or "merge". See below. (string, required)

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

@@ -9,6 +9,7 @@ import org.embulk.config.ConfigException;
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
 import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.output.jdbc.JdbcOutputConnection;
+import org.embulk.output.jdbc.JdbcOutputConnector;
 import org.embulk.output.jdbc.MergeConfig;
 import org.embulk.output.jdbc.StandardBatchInsert;
 import org.embulk.output.jdbc.TableIdentifier;
@@ -130,7 +131,7 @@ public class SQLServerOutputPlugin
     }
 
     @Override
-    protected SQLServerOutputConnector getConnector(PluginTask task, boolean retryableMetadataOperation)
+    protected JdbcOutputConnector getConnector(PluginTask task, boolean retryableMetadataOperation)
     {
         SQLServerPluginTask sqlServerTask = (SQLServerPluginTask) task;
         boolean useJtdsDriver = false;
@@ -166,7 +167,8 @@ public class SQLServerOutputPlugin
 
         UrlAndProperties urlProps = getUrlAndProperties(sqlServerTask, useJtdsDriver);
         logConnectionProperties(urlProps.getUrl(), urlProps.getProps());
-        return new SQLServerOutputConnector(urlProps.getUrl(), urlProps.getProps(), sqlServerTask.getSchema().orNull());
+        return new SQLServerOutputConnector(urlProps.getUrl(), urlProps.getProps(), sqlServerTask.getSchema().orNull(),
+                sqlServerTask.getTransactionIsolation());
     }
 
     private UrlAndProperties getUrlAndProperties(SQLServerPluginTask sqlServerTask, boolean useJtdsDriver)

data/src/main/java/org/embulk/output/sqlserver/NativeBatchInsert.java

@@ -219,6 +219,8 @@ public class NativeBatchInsert implements BatchInsert
     @Override
     public void flush() throws IOException, SQLException
     {
+        if (batchWeight == 0) return;
+
         logger.info(String.format("Loading %,d rows", batchRows));
         long startTime = System.currentTimeMillis();
 
@@ -236,9 +238,6 @@ public class NativeBatchInsert implements BatchInsert
     @Override
     public void finish() throws IOException, SQLException
     {
-        if (getBatchWeight() != 0) {
-            flush();
-        }
         client.commit(true);
     }
 

data/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnection.java

@@ -14,11 +14,10 @@ import org.embulk.output.jdbc.TableIdentifier;
 public class SQLServerOutputConnection
         extends JdbcOutputConnection
 {
-    public SQLServerOutputConnection(Connection connection, String schemaName, boolean autoCommit)
+    public SQLServerOutputConnection(Connection connection, String schemaName)
             throws SQLException
     {
         super(connection, schemaName);
-        connection.setAutoCommit(autoCommit);
     }
 
     @Override

data/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnector.java

@@ -7,13 +7,17 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.embulk.output.jdbc.JdbcOutputConnector;
+import org.embulk.output.jdbc.JdbcOutputConnection;
+import org.embulk.output.jdbc.AbstractJdbcOutputConnector;
+import org.embulk.output.jdbc.TransactionIsolation;
 import org.embulk.spi.Exec;
 import org.slf4j.Logger;
 
+import com.google.common.base.Optional;
+
 
 public class SQLServerOutputConnector
-        implements JdbcOutputConnector
+        extends AbstractJdbcOutputConnector
 {
     private final Logger logger = Exec.getLogger(getClass());
 
@@ -21,15 +25,17 @@ public class SQLServerOutputConnector
     private final Properties properties;
     private final String schemaName;
 
-    public SQLServerOutputConnector(String url, Properties properties, String schemaName)
+    public SQLServerOutputConnector(String url, Properties properties, String schemaName,
+            Optional<TransactionIsolation> transactionIsolation)
     {
+        super(transactionIsolation);
         this.url = url;
         this.properties = properties;
         this.schemaName = schemaName;
     }
 
     @Override
-    public SQLServerOutputConnection connect(boolean autoCommit) throws SQLException
+    protected JdbcOutputConnection connect() throws SQLException
     {
         Connection c = DriverManager.getConnection(url, properties);
         if (c == null) {
@@ -55,7 +61,7 @@ public class SQLServerOutputConnector
         }
 
         try {
-            SQLServerOutputConnection con = new SQLServerOutputConnection(c, schemaName, autoCommit);
+            SQLServerOutputConnection con = new SQLServerOutputConnection(c, schemaName);
             c = null;
             return con;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-sqlserver
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.8.2.jar
-- classpath/embulk-output-sqlserver-0.8.2.jar
+- classpath/embulk-output-jdbc-0.8.3.jar
+- classpath/embulk-output-sqlserver-0.8.3.jar
 - classpath/jtds-1.3.1.jar
 - lib/embulk/output/sqlserver.rb
 - src/main/java/org/embulk/output/SQLServerOutputPlugin.java