embulk-output-redshift 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 719b18c2eac69c6fef514b47b0fed5a50bf3cc99
-  data.tar.gz: 99c2de779340dd07db0d4cf12d5b9660be2cc8fd
+  metadata.gz: d64af8464bfac5a262069e316fa1227072de6322
+  data.tar.gz: 4b17ad7085953c573fcc56186c5ab1ca93cec8ca
 SHA512:
-  metadata.gz: 8e7b75ea9ae85b9cadc7b6feb772a262c775704f8cdfe32016fdc238d62607b1f3aab14eb5547d7a72a2aaef81b747e0a63a9c898afa765693ca292ce08c81d1
-  data.tar.gz: 7e7fb1b629d5a5623d45fb6885299de94932daac9cc5e476280b7cd02108d36f6f6dc47a4a995f41c0e53c6ad5569313811bc17637de10bf1ddfbe5beaba7992
+  metadata.gz: c8d003c33121591debba7c54e942026caa25dfe9f2cf64622f1dd66cfbf8828b8639b149391497bb99659125050dbef00d4ff508beb32d91d401861a239dacc9
+  data.tar.gz: 765d334d8521f215d1165b82800bdd5ad3b25f3471fa86f22b4d0676670ada1ab72be25f4bafb87ab97903aa27a7d7173da0cf71830342709703eb88db9073c1

data/README.md

@@ -98,7 +98,7 @@ Redshift output plugin for Embulk loads records to Redshift.
   * Transactional: Yes.
   * Resumable: No.
 * **merge**:
-  * Behavior: This mode writes rows to some intermediate tables first. If all those tasks run correctly, inserts records from intermediate tables after deleting records whose keys exist in intermediate tables. Namely, if merge keys of a record in the intermediate tables already exist in the target table, the target record is updated by the intermediate record, otherwise the intermediate record is inserted. If the target table doesn't exist, it is created automatically.
+  * Behavior: This mode writes rows to some intermediate tables first. If all those tasks run correctly, inserts new records from intermediate tables after updating records whose keys exist in intermediate tables. Namely, if merge keys of a record in the intermediate tables already exist in the target table, the target record is updated by the intermediate record, otherwise the intermediate record is inserted. If the target table doesn't exist, it is created automatically.
   * Transactional: Yes.
   * Resumable: Yes.
 

data/src/main/java/org/embulk/output/redshift/RedshiftOutputConnection.java

@@ -200,22 +200,23 @@ public class RedshiftOutputConnection
             }
             sb.append(" FROM ");
             quoteTableIdentifier(sb, fromTables.get(i));
-            sb.append(" WHERE NOT EXISTS (SELECT 1 FROM ");
-            quoteTableIdentifier(sb, toTable);
-            sb.append(", ");
-            quoteTableIdentifier(sb, fromTables.get(i));
-            sb.append(" WHERE ");
 
+            sb.append(" WHERE (");
             for (int k = 0; k < mergeKeys.size(); k++) {
-                if (k != 0) { sb.append(" AND "); }
+                if (k != 0) { sb.append(", "); }
                 quoteTableIdentifier(sb, fromTables.get(i));
                 sb.append(".");
                 quoteIdentifierString(sb, mergeKeys.get(k));
-                sb.append(" = ");
+            }
+            sb.append(") NOT IN (SELECT ");
+            for (int k = 0; k < mergeKeys.size(); k++) {
+                if (k != 0) { sb.append(", "); }
                 quoteTableIdentifier(sb, toTable);
                 sb.append(".");
                 quoteIdentifierString(sb, mergeKeys.get(k));
             }
+            sb.append(" FROM ");
+            quoteTableIdentifier(sb, toTable);
             sb.append(")) ");
         }
         sb.append(";");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-redshift
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -25,16 +25,14 @@ files:
 - classpath/aws-java-sdk-sts-1.10.77.jar
 - classpath/commons-codec-1.6.jar
 - classpath/commons-logging-1.1.3.jar
-- classpath/embulk-core-0.8.9.jar
-- classpath/embulk-output-jdbc-0.7.10.jar
-- classpath/embulk-output-postgresql-0.7.10.jar
-- classpath/embulk-output-redshift-0.7.10.jar
+- classpath/embulk-output-jdbc-0.7.11.jar
+- classpath/embulk-output-postgresql-0.7.11.jar
+- classpath/embulk-output-redshift-0.7.11.jar
 - classpath/embulk-util-aws-credentials-0.2.8.jar
 - classpath/httpclient-4.3.6.jar
 - classpath/httpcore-4.3.3.jar
 - classpath/jackson-dataformat-cbor-2.5.3.jar
 - classpath/jcl-over-slf4j-1.7.12.jar
-- classpath/msgpack-core-0.8.7.jar
 - classpath/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/output/redshift.rb
 - src/main/java/org/embulk/output/RedshiftOutputPlugin.java