embulk-output-mysql 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 753cd35ceccb305741025c9f2956e2a8bcd43e0f
-  data.tar.gz: a264b7fe51085f24b4a96bfe3f98defc45f3ba4f
+  metadata.gz: 5bd951816256b91bd4c8ea18655cb69cce02d800
+  data.tar.gz: 7f85745159a29910334433785030c998318cefad
 SHA512:
-  metadata.gz: e3af007fe65e593ab4ec3740a3a399d9c622e6867af811c2774445744ebe0a972eddc7610c692793a81a8b9eab7e086bc444ef796fb1022c1e686a3ff1ad5343
-  data.tar.gz: 9e59a1bf4698cca86fc4389c66e84b6a4ad17cc778fc4c72fd55f43377120479fc369f2d91e3247867d00b2f62578624abd368dafa34495c432c01a94e1250b6
+  metadata.gz: 2defc0817f7e6bf4671131875e51e2c063c1295a4f31b8d1759ba6755888f7a190c448d13e5c1e651f63ba57078fc1b03d73676ffb39a940dcb21878337889b5
+  data.tar.gz: 67b7e2158febcbb3d8c766d8726ddf8ec1f89a597ec64aa089c6d0511f58859c203ebf6ad5fc15373ea3c63746c020406e054e49a778c4d2a88d7598cd5f753c

data/src/test/java/org/embulk/output/mysql/RetryTest.java

@@ -5,7 +5,9 @@ import static org.embulk.output.mysql.MySQLTests.selectRecords;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
+import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileWriter;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.FileSystems;
@@ -97,7 +99,7 @@ public class RetryTest
 
     // will be flushed multiple times
     @Test
-    public void testRetryLarge() throws Exception
+    public void testRetry_FlushedMultipleTimes() throws Exception
     {
         Thread thread = new Thread() {
             @Override
@@ -125,9 +127,71 @@ public class RetryTest
         };
         thread.start();
 
-        Path in1 = toPath("test1_large.csv");
-        TestingEmbulk.RunResult result1 = embulk.runOutput(baseConfig.merge(loadYamlResource(embulk, "test1_large.yml")), in1);
-        assertThat(selectRecords(embulk, "test1"), is(readResource("test1_large_expected.csv")));
+        Path in1 = toPath("test1_flushed_multiple_times.csv");
+        TestingEmbulk.RunResult result1 = embulk.runOutput(baseConfig.merge(loadYamlResource(embulk, "test1_flushed_multiple_times.yml")), in1);
+        assertThat(selectRecords(embulk, "test1"), is(readResource("test1_flushed_multiple_times_expected.csv")));
+    }
+
+    // records will be partially committed
+    @Test
+    public void testRetry_Large() throws Exception
+    {
+        Path in1 = embulk.createTempFile("csv");
+        StringBuilder expected1 = new StringBuilder();
+
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(in1.toFile()))) {
+            writer.write("id:string,num:long");
+            writer.newLine();
+
+            for (int i = 1000000; i < 1250000; i++) {
+                writer.write("A" + i + "," + i);
+                writer.newLine();
+
+                expected1.append("A" + i + "," + i + "\n");
+            }
+        }
+
+        final Object lock = new Object();
+
+        Thread thread = new Thread() {
+            @Override
+            public void run() {
+                try {
+                    try (Connection conn = MySQLTests.connect()) {
+                        conn.setAutoCommit(false);
+                        try (Statement statement = conn.createStatement()) {
+                            // make the transaction larger so that embulk-output-mysql transaction will be rolled back at a deadlock.
+                            for (int i = 1000000; i < 1260000; i++) {
+                                statement.execute("insert into test1 values('B" + i + "', 0)");
+                            }
+
+                            synchronized (lock) {
+                                lock.notify();
+                            }
+
+                            System.out.println("##1");
+
+                            statement.execute("insert into test1 values('A1249010', 0)");
+                            Thread.sleep(5000);
+                            // deadlock will occur
+                            statement.execute("insert into test1 values('A1249000', 0)");
+                            conn.rollback();
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+        thread.start();
+
+        synchronized (lock) {
+            lock.wait();
+        }
+
+        //Path in1 = toPath("test1_flushed_multiple_times.csv");
+        TestingEmbulk.RunResult result1 = embulk.runOutput(baseConfig.merge(loadYamlResource(embulk, "test1.yml")), in1);
+        assertThat(selectRecords(embulk, "test1"), is(expected1.toString()));
     }
 
     private Path toPath(String fileName) throws URISyntaxException

data/src/test/resources/org/embulk/output/mysql/test/expect/retry/setup.sql

@@ -1,7 +1,7 @@
 drop table if exists test1;
 
 create table test1 (
-    id              char(4),
+    id              char(8),
     num             int,
     primary key (id)
 );

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mysql
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-08 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.3.jar
-- classpath/embulk-output-mysql-0.8.3.jar
+- classpath/embulk-output-jdbc-0.8.4.jar
+- classpath/embulk-output-mysql-0.8.4.jar
 - default_jdbc_driver/mysql-connector-java-5.1.44.jar
 - lib/embulk/output/mysql.rb
 - src/main/java/org/embulk/output/MySQLOutputPlugin.java
@@ -67,9 +67,9 @@ files:
 - src/test/resources/org/embulk/output/mysql/test/expect/retry/test1.csv
 - src/test/resources/org/embulk/output/mysql/test/expect/retry/test1.yml
 - src/test/resources/org/embulk/output/mysql/test/expect/retry/test1_expected.csv
-- src/test/resources/org/embulk/output/mysql/test/expect/retry/test1_large.csv
-- src/test/resources/org/embulk/output/mysql/test/expect/retry/test1_large.yml
-- src/test/resources/org/embulk/output/mysql/test/expect/retry/test1_large_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/retry/test1_flushed_multiple_times.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/retry/test1_flushed_multiple_times.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/retry/test1_flushed_multiple_times_expected.csv
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0