embulk-output-redshift 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d2f7306ecf1ffe0fafbb6eb0a62d04a3f07b053
-  data.tar.gz: 4f11cdc60013a43161eac70d71c3673ee403b2a1
+  metadata.gz: e3ce6b0831abd53dfa802eb0ac5744b7bf33c90c
+  data.tar.gz: c123cce8fff3f0fcc3088bf68267de9f868f14bb
 SHA512:
-  metadata.gz: 4014f2c41bdadd4fba4ff11c82af34648082363d40bb994668ddc475e746e6730d6c7ca1302542b672a5a7c42fe39de9e4d63ff8954eacec0b5270011727b8d2
-  data.tar.gz: 04196bcdac4da6d3a131ce2eab4dddd521998bcfc7bf1609ff5a119e3949f2138d9c341909ac792c5bb687c70ccb51d9be27b652f102b4151a579f887ae34b21
+  metadata.gz: b7a51d83ebe03ac82abf75188a74190dc6466839f6ed9ec74474d9f48d620f922f33d2acc33bfc0625a94dcd52327a1fc5326a459cc3fa914fdd2d514210411b
+  data.tar.gz: 9fbd5a53e11b5e15303cb139499acac8585b22be265bf86ec4385885395fe73a08909060d566286f77ef9b705cb7e0b5e20e74b2cbdbabbac3fd0d2a0ce79524

data/README.md

@@ -17,8 +17,8 @@ Redshift output plugins for Embulk loads records to Redshift.
 - **user**: database login user name (string, required)
 - **password**: database login password (string, default: "")
 - **database**: destination database name (string, required)
-- **schema**: destination name (string, default: "public")
-- **table**: destination name (string, required)
+- **schema**: destination schema name (string, default: "public")
+- **table**: destination table name (string, required)
 - **mode**: "replace" or "insert" (string, required)
 - **batch_size**: size of a single batch insert (integer, default: 16777216)
 - **options**: extra connection properties (hash, default: {})

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

@@ -8,6 +8,7 @@ import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import org.embulk.spi.Exec;
 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.redshift.RedshiftOutputConnector;
@@ -16,13 +17,31 @@ import org.embulk.output.redshift.RedshiftCopyBatchInsert;
 public class RedshiftOutputPlugin
         extends AbstractJdbcOutputPlugin
 {
-    private static final String DEFAULT_SCHEMA = "public";
-    private static final int DEFAULT_PORT = 5439;
-
     private final Logger logger = Exec.getLogger(RedshiftOutputPlugin.class);
 
     public interface RedshiftPluginTask extends PluginTask
     {
+        @Config("host")
+        public String getHost();
+
+        @Config("port")
+        @ConfigDefault("5439")
+        public int getPort();
+
+        @Config("user")
+        public String getUser();
+
+        @Config("password")
+        @ConfigDefault("\"\"")
+        public String getPassword();
+
+        @Config("database")
+        public String getDatabase();
+
+        @Config("schema")
+        @ConfigDefault("\"public\"")
+        public String getSchema();
+
         @Config("access_key_id")
         public String getAccessKeyId();
 
@@ -45,12 +64,14 @@ public class RedshiftOutputPlugin
     @Override
     protected RedshiftOutputConnector getConnector(PluginTask task, boolean retryableMetadataOperation)
     {
+        RedshiftPluginTask t = (RedshiftPluginTask) task;
+
         String url = String.format("jdbc:postgresql://%s:%d/%s",
-                task.getHost(), task.getPort().or(DEFAULT_PORT), task.getDatabase());
+                t.getHost(), t.getPort(), t.getDatabase());
 
         Properties props = new Properties();
-        props.setProperty("user", task.getUser());
-        props.setProperty("password", task.getPassword());
+        props.setProperty("user", t.getUser());
+        props.setProperty("password", t.getPassword());
         props.setProperty("loginTimeout",   "300"); // seconds
         props.setProperty("socketTimeout", "1800"); // seconds
 
@@ -75,18 +96,18 @@ public class RedshiftOutputPlugin
             props.setProperty("socketTimeout", "28800");  // seconds
         }
 
-        props.putAll(task.getOptions());
+        props.putAll(t.getOptions());
 
-        return new RedshiftOutputConnector(url, props, task.getSchema().or(DEFAULT_SCHEMA));
+        return new RedshiftOutputConnector(url, props, t.getSchema());
     }
 
     @Override
     protected BatchInsert newBatchInsert(PluginTask task) throws IOException, SQLException
     {
-        RedshiftPluginTask rt = (RedshiftPluginTask) task;
+        RedshiftPluginTask t = (RedshiftPluginTask) task;
         AWSCredentials creds = new BasicAWSCredentials(
-                rt.getAccessKeyId(), rt.getSecretAccessKey());
+                t.getAccessKeyId(), t.getSecretAccessKey());
         return new RedshiftCopyBatchInsert(getConnector(task, true),
-                creds, rt.getS3Bucket(), rt.getIamUserName());
+                creds, t.getS3Bucket(), t.getIamUserName());
     }
 }

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

@@ -30,11 +30,11 @@ public class RedshiftOutputConnection
         try {
             String sql = String.format("DROP TABLE IF EXISTS %s", quoteIdentifierString(tableName));
             executeUpdate(stmt, sql);
-            connection.commit();
+            commitIfNecessary(connection);
         } catch (SQLException ex) {
             // ignore errors.
             // TODO here should ignore only 'table "XXX" does not exist' errors.
-            connection.rollback();
+            SQLException ignored = safeRollback(connection, ex);
         } finally {
             stmt.close();
         }
@@ -57,7 +57,7 @@ public class RedshiftOutputConnection
                 // ignore errors.
                 // TODO here should ignore only 'table "XXX" does not exist' errors.
                 // rollback or comimt is required to recover failed transaction
-                connection.rollback();
+                SQLException ignored = safeRollback(connection, ex);
             }
 
             {
@@ -70,10 +70,9 @@ public class RedshiftOutputConnection
                 executeUpdate(stmt, sql);
             }
 
-            connection.commit();
+            commitIfNecessary(connection);
         } catch (SQLException ex) {
-            connection.rollback();
-            throw ex;
+            throw safeRollback(connection, ex);
         } finally {
             stmt.close();
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-redshift
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -30,9 +30,9 @@ files:
 - classpath/aws-java-sdk-sts-1.9.17.jar
 - classpath/commons-codec-1.6.jar
 - classpath/commons-logging-1.1.3.jar
-- classpath/embulk-output-jdbc-0.1.2.jar
-- classpath/embulk-output-postgresql-0.1.2.jar
-- classpath/embulk-output-redshift-0.1.2.jar
+- classpath/embulk-output-jdbc-0.2.0.jar
+- classpath/embulk-output-postgresql-0.2.0.jar
+- classpath/embulk-output-redshift-0.2.0.jar
 - classpath/httpclient-4.3.4.jar
 - classpath/httpcore-4.3.2.jar
 - classpath/jna-4.1.0.jar