embulk-input-redshift 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c1b050f62024c8b6cf8628f45e35a2595f3e6d
-  data.tar.gz: 8e1b161c9a439f538266af094faba0e4bc615de7
+  metadata.gz: 5e23d4e059b076fec9be77f77c9684131f840d90
+  data.tar.gz: 538f85b4803d2c3d1facebf992ad8e7548126a22
 SHA512:
-  metadata.gz: 9e4a7e153e7a6ae651c5afc4de47dae2837af189638148db5a78b37fcfd7a5d334c5ff021012802ec734788f9e216e5f6f592283ab32eab991298988b577314e
-  data.tar.gz: aac3cd36d281e8ec783e1e4e4f07c8d2a3321edd436af4c05570792c95d0c7f0b21da918e6bf76e789c32ba56b7b968301dfb6846c8fa1488e36acf23d3df1b9
+  metadata.gz: 3d70ccf9d99d91adfc82efde03b5878fc27cde539679816fda50ba9bd32e4453c9fcf72c0e2cb45592728ff5ad5a908d981a01b348df3e0754d8d515a6d949df
+  data.tar.gz: 7f195f9acd815f07680ff2ebfd81ede4f56b95368da0cf0a242483bc631fae585e83e15aaef0eef8fcaea6b23ab06fa53334158c7c025da86ab72b0d21d27c6a

data/README.md

@@ -14,8 +14,8 @@ Redshift input plugins for Embulk loads records from 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)
 - **select**: comma-separated list of columns to select (string, default: "*")
 - **where**: WHERE condition to filter the rows (string, default: no-condition)
 - **fetch_rows**: number of rows to fetch one time (used for java.sql.Statement#setFetchSize) (integer, default: 10000)

data/src/main/java/org/embulk/input/RedshiftInputPlugin.java

@@ -6,6 +6,7 @@ import java.sql.Driver;
 import java.sql.SQLException;
 import com.google.common.base.Throwables;
 import org.embulk.config.Config;
+import org.embulk.config.ConfigDefault;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
 import org.embulk.input.postgresql.PostgreSQLInputConnection;
@@ -13,20 +14,50 @@ import org.embulk.input.postgresql.PostgreSQLInputConnection;
 public class RedshiftInputPlugin
         extends AbstractJdbcInputPlugin
 {
-    private static final String DEFAULT_SCHEMA = "public";
-    private static final int DEFAULT_PORT = 5439;
-
     private static final Driver driver = new org.postgresql.Driver();
 
+    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();
+    }
+
+    @Override
+    protected Class<? extends PluginTask> getTaskClass()
+    {
+        return RedshiftPluginTask.class;
+    }
+
     @Override
     protected PostgreSQLInputConnection newConnection(PluginTask task) throws SQLException
     {
+        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
 
@@ -35,7 +66,7 @@ public class RedshiftInputPlugin
         props.setProperty("tcpKeepAlive", "true");
 
         // TODO
-        //switch task.getSssl() {
+        //switch t.getSssl() {
         //when "disable":
         //    break;
         //when "enable":
@@ -45,11 +76,11 @@ public class RedshiftInputPlugin
         //    break;
         //}
 
-        props.putAll(task.getOptions());
+        props.putAll(t.getOptions());
 
         Connection con = driver.connect(url, props);
         try {
-            PostgreSQLInputConnection c = new PostgreSQLInputConnection(con, task.getSchema().or(DEFAULT_SCHEMA));
+            PostgreSQLInputConnection c = new PostgreSQLInputConnection(con, t.getSchema());
             con = null;
             return c;
         } finally {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-redshift
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.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: Selects records from a table.
 email:
@@ -21,9 +21,9 @@ files:
 - build.gradle
 - lib/embulk/input/redshift.rb
 - src/main/java/org/embulk/input/RedshiftInputPlugin.java
-- classpath/embulk-input-jdbc-0.2.3.jar
-- classpath/embulk-input-postgresql-0.2.3.jar
-- classpath/embulk-input-redshift-0.2.3.jar
+- classpath/embulk-input-jdbc-0.3.0.jar
+- classpath/embulk-input-postgresql-0.3.0.jar
+- classpath/embulk-input-redshift-0.3.0.jar
 - classpath/jna-4.1.0.jar
 - classpath/jna-platform-4.1.0.jar
 - classpath/postgresql-9.4-1200-jdbc41.jar