embulk-output-redshift 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0360975892302617a8f7098d1689d40e732dd4d
-  data.tar.gz: 1f1848b67129240480e2653b1f219a50a769ada4
+  metadata.gz: 47ca8a15eaed456d7a006c1dfdb43b2ae85b9013
+  data.tar.gz: 1fa61b84e89e32e81c7fb748d8d2edcbb4bf4481
 SHA512:
-  metadata.gz: fb8e9fb240aa369a79e6ba0785c67bbc350ef0edb15fbceeb4d81b5ce4d00b9b184f40bb6865005f5ca36db859b9bc60d433b2804fe37c65832474787951f315
-  data.tar.gz: 137a53934742fcf0511a83ebcf785edb3fc3c1c8dcf397fbf927262f7188f25ce52cc45ab397f7a9cd3976b04b8270a338088f7d3d37e8d9ad67ae7d825bd7dc
+  metadata.gz: b9652025ca46d67558454940362e804477d7cfa1a93bd5f19accc8a42b6bbdb11f2930bf514398b51c3bd68d9053e6258aa80badff2dd0b01329af25de6d1f12
+  data.tar.gz: 503904556c128353ad4ef366f7b0ed31300a2f9ea5c93eb0688c418a7c08a266d2ed48e65e6a93dce4fcb3f78cfb78e29e196b2241563a949a8863100a70bb34

data/README.md

@@ -36,7 +36,7 @@ Redshift output plugin for Embulk loads records to Redshift.
   - **value_type**: This plugin converts input column type (embulk type) into a database type to build a INSERT statement. This value_type option controls the type of the value in a INSERT statement. (string, default: depends on the sql type of the column. Available values options are: `byte`, `short`, `int`, `long`, `double`, `float`, `boolean`, `string`, `nstring`, `date`, `time`, `timestamp`, `decimal`, `json`, `null`, `pass`)
   - **timestamp_format**: If input column type (embulk type) is timestamp and value_type is `string` or `nstring`, this plugin needs to format the timestamp value into a string. This timestamp_format option is used to control the format of the timestamp. (string, default: `%Y-%m-%d %H:%M:%S.%6N`)
   - **timezone**: If input column type (embulk type) is timestamp, this plugin needs to format the timestamp value into a SQL string. In this cases, this timezone option is used to control the timezone. (string, value of default_timezone option is used by default)
-
+- **after_load**: if set, this SQL will be executed after loading all records.
 
 ### Modes
 

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

@@ -1,16 +1,19 @@
 package org.embulk.output.redshift;
 
-import java.util.List;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
 
-import org.embulk.output.jdbc.MergeConfig;
-import org.slf4j.Logger;
-import org.embulk.spi.Exec;
-import org.embulk.output.jdbc.JdbcOutputConnection;
 import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.JdbcOutputConnection;
 import org.embulk.output.jdbc.JdbcSchema;
+import org.embulk.output.jdbc.MergeConfig;
+import org.embulk.spi.Exec;
+import org.slf4j.Logger;
+
+import com.google.common.base.Optional;
 
 public class RedshiftOutputConnection
         extends JdbcOutputConnection
@@ -46,7 +49,7 @@ public class RedshiftOutputConnection
     // Redshift does not support DROP TABLE IF EXISTS.
     // Dropping part runs DROP TABLE and ignores errors.
     @Override
-    public void replaceTable(String fromTable, JdbcSchema schema, String toTable) throws SQLException
+    public void replaceTable(String fromTable, JdbcSchema schema, String toTable, Optional<String> additionalSql) throws SQLException
     {
         Statement stmt = connection.createStatement();
         try {
@@ -73,6 +76,10 @@ public class RedshiftOutputConnection
                 executeUpdate(stmt, sql);
             }
 
+            if (additionalSql.isPresent()) {
+                executeUpdate(stmt, additionalSql.get());
+            }
+
             commitIfNecessary(connection);
         } catch (SQLException ex) {
             throw safeRollback(connection, ex);
@@ -128,18 +135,41 @@ public class RedshiftOutputConnection
     {
         StringBuilder sb = new StringBuilder();
 
+        List<String> mergeKeys = mergeConfig.getMergeKeys();
+
+        List<String> updateKeys = new ArrayList<String>();
+        for (int i = 0; i < schema.getCount(); i++) {
+            String updateKey = schema.getColumnName(i);
+            if (!mergeKeys.contains(updateKey)) {
+                updateKeys.add(updateKey);
+            }
+        }
+
         sb.append("BEGIN TRANSACTION;");
 
-        sb.append("DELETE FROM ");
+        sb.append("UPDATE ");
         quoteIdentifierString(sb, toTable);
-        sb.append(" USING (");
+        sb.append(" SET ");
+        for (int i = 0; i < updateKeys.size(); i++) {
+            if (i != 0) { sb.append(", "); }
+            quoteIdentifierString(sb, updateKeys.get(i).toString());
+            sb.append(" = ");
+            sb.append("S.");
+            quoteIdentifierString(sb, updateKeys.get(i).toString());
+        }
+        sb.append(" FROM ( ");
         for (int i = 0; i < fromTables.size(); i++) {
             if (i != 0) { sb.append(" UNION ALL "); }
-            sb.append("SELECT * FROM ");
+            sb.append(" SELECT ");
+            for (int j = 0; j < schema.getCount(); j++) {
+                if (j != 0) { sb.append(", "); }
+                quoteIdentifierString(sb, schema.getColumnName(j));
+            }
+            sb.append(" FROM ");
             quoteIdentifierString(sb, fromTables.get(i));
         }
-        sb.append(") S WHERE (");
-        List<String> mergeKeys = mergeConfig.getMergeKeys();
+        sb.append(" ) S WHERE ");
+
         for (int i = 0; i < mergeKeys.size(); i++) {
             if (i != 0) { sb.append(" AND "); }
             sb.append("S.");
@@ -149,7 +179,7 @@ public class RedshiftOutputConnection
             sb.append(".");
             quoteIdentifierString(sb, mergeKeys.get(i));
         }
-        sb.append(");");
+        sb.append(";");
 
         sb.append("INSERT INTO ");
         quoteIdentifierString(sb, toTable);
@@ -160,7 +190,7 @@ public class RedshiftOutputConnection
         }
         sb.append(") (");
         for (int i = 0; i < fromTables.size(); i++) {
-            if (i != 0) { sb.append(" UNION ALL "); }
+            if (i != 0) { sb.append(" UNION ALL ("); }
             sb.append("SELECT ");
             for (int j = 0; j < schema.getCount(); j++) {
                 if (j != 0) { sb.append(", "); }
@@ -168,12 +198,28 @@ public class RedshiftOutputConnection
             }
             sb.append(" FROM ");
             quoteIdentifierString(sb, fromTables.get(i));
+            sb.append(" WHERE NOT EXISTS (SELECT 1 FROM ");
+            quoteIdentifierString(sb, toTable);
+            sb.append(" WHERE ");
+
+            for (int k = 0; k < mergeKeys.size(); k++) {
+                if (k != 0) { sb.append(" AND "); }
+                quoteIdentifierString(sb, fromTables.get(i));
+                sb.append(".");
+                quoteIdentifierString(sb, mergeKeys.get(k));
+                sb.append(" = ");
+                quoteIdentifierString(sb, toTable);
+                sb.append(".");
+                quoteIdentifierString(sb, mergeKeys.get(k));
+            }
+            sb.append(")) ");
         }
-        sb.append(");");
+        sb.append(";");
 
         sb.append("END TRANSACTION;");
 
         return sb.toString();
+
     }
 
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-redshift
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -25,9 +25,9 @@ files:
 - classpath/aws-java-sdk-sts-1.10.33.jar
 - classpath/commons-codec-1.6.jar
 - classpath/commons-logging-1.1.3.jar
-- classpath/embulk-output-jdbc-0.7.0.jar
-- classpath/embulk-output-postgresql-0.7.0.jar
-- classpath/embulk-output-redshift-0.7.0.jar
+- classpath/embulk-output-jdbc-0.7.1.jar
+- classpath/embulk-output-postgresql-0.7.1.jar
+- classpath/embulk-output-redshift-0.7.1.jar
 - classpath/httpclient-4.3.6.jar
 - classpath/httpcore-4.3.3.jar
 - classpath/postgresql-9.4-1205-jdbc41.jar