embulk-input-jdbc 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a21cec9ce3a1a38d3328338e06044dfd492f47f7
-  data.tar.gz: 1e306f57cda5959b21bfd6ccfa71415181297259
+  metadata.gz: 7174c1ad10ec5dd300afc371676a7cad51359a68
+  data.tar.gz: 7fab375bd50f0ef627743bb657d57bcd0501ca49
 SHA512:
-  metadata.gz: d07d396a4ae59a862b2bb53f94d1246d5c3b98306465b2f2e0ee0778a4517697fca874dd381c115e77f03d91db7fd1ce47978d600ace53136fea9ffadccdf60b
-  data.tar.gz: a09e9719778a2ec55f3506cb56a345288ab944194623b9a7dd5f116748c33dc90c75f0e9219f53442bcdd629e160b66dd170f16e701bc07f6164ef75c7bea7ef
+  metadata.gz: 71b7cc73f16de4b2a2ca79a612d3a26b0b2c7d077a2d9ca87f0fbcea500ab069a367cd93480b7c436afd8098514139d9085f13e9849d8024caebde1eb9147524
+  data.tar.gz: cffdf1296b5955170b2f4dbba778bf1065b5e72f2067d94f40e5e0a4e84e3a34413549f5a165de2c19f97c55c0ca401610d460fdd4a5e98d77c0df8b2c2520c4

data/src/main/java/org/embulk/input/jdbc/AbstractJdbcInputPlugin.java

@@ -13,7 +13,6 @@ import com.google.common.base.Supplier;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
 
-import org.embulk.config.CommitReport;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigDefault;
@@ -21,6 +20,7 @@ import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
+import org.embulk.config.TaskReport;
 import org.embulk.config.TaskSource;
 import org.embulk.plugin.PluginClassLoader;
 import org.embulk.spi.BufferAllocator;
@@ -97,6 +97,14 @@ public abstract class AbstractJdbcInputPlugin
         //@ConfigDefault("null")
         //public Optional<Integer> getLimitRows();
 
+        @Config("connect_timeout")
+        @ConfigDefault("300")
+        public int getConnectTimeout();
+
+        @Config("socket_timeout")
+        @ConfigDefault("1800")
+        public int getSocketTimeout();
+
         @Config("fetch_rows")
         @ConfigDefault("10000")
         // TODO set minimum number
@@ -203,7 +211,7 @@ public abstract class AbstractJdbcInputPlugin
         return Exec.newConfigDiff();
     }
 
-    protected ConfigDiff buildNextConfigDiff(PluginTask task, List<CommitReport> reports)
+    protected ConfigDiff buildNextConfigDiff(PluginTask task, List<TaskReport> reports)
     {
         ConfigDiff next = Exec.newConfigDiff();
         // TODO
@@ -218,13 +226,13 @@ public abstract class AbstractJdbcInputPlugin
     @Override
     public void cleanup(TaskSource taskSource,
             Schema schema, int taskCount,
-            List<CommitReport> successCommitReports)
+            List<TaskReport> successTaskReports)
     {
         // do nothing
     }
 
     @Override
-    public CommitReport run(TaskSource taskSource,
+    public TaskReport run(TaskSource taskSource,
             Schema schema, int taskIndex,
             PageOutput output)
     {
@@ -238,7 +246,7 @@ public abstract class AbstractJdbcInputPlugin
             List<ColumnGetter> getters = newColumnGetters(task, querySchema, pageBuilder);
 
             try (JdbcInputConnection con = newConnection(task)) {
-                try (BatchSelect cursor = con.newSelectCursor(getQuery(task, con), task.getFetchRows())) {
+                try (BatchSelect cursor = con.newSelectCursor(getQuery(task, con), task.getFetchRows(), task.getSocketTimeout())) {
                     while (true) {
                         // TODO run fetch() in another thread asynchronously
                         // TODO retry fetch() if it failed (maybe order_by is required and unique_column(s) option is also required)
@@ -255,7 +263,7 @@ public abstract class AbstractJdbcInputPlugin
         }
         pageBuilder.finish();
 
-        CommitReport report = Exec.newCommitReport();
+        TaskReport report = Exec.newTaskReport();
         // TODO
         //if (orderByColumn != null) {
         //    report.set("last_value", lastValue);

data/src/main/java/org/embulk/input/jdbc/JdbcColumn.java

@@ -2,7 +2,6 @@ package org.embulk.input.jdbc;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class JdbcColumn
 {

data/src/main/java/org/embulk/input/jdbc/JdbcInputConnection.java

@@ -66,16 +66,17 @@ public class JdbcInputConnection
         return new JdbcSchema(columns.build());
     }
 
-    public BatchSelect newSelectCursor(String query, int fetchRows) throws SQLException
+    public BatchSelect newSelectCursor(String query, int fetchRows, int queryTimeout) throws SQLException
     {
-        return newBatchSelect(query, fetchRows);
+        return newBatchSelect(query, fetchRows, queryTimeout);
     }
 
-    protected BatchSelect newBatchSelect(String query, int fetchRows) throws SQLException
+    protected BatchSelect newBatchSelect(String query, int fetchRows, int queryTimeout) throws SQLException
     {
         logger.info("SQL: " + query);
         PreparedStatement stmt = connection.prepareStatement(query);
         stmt.setFetchSize(fetchRows);
+        stmt.setQueryTimeout(queryTimeout);
         return new SingleSelect(stmt);
     }
 

data/src/main/java/org/embulk/input/jdbc/ToStringMap.java

@@ -6,7 +6,6 @@ import java.util.Properties;
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 
 // TODO copied from embulk-output-jdbc. Move this class to embulk-core spi.unit.
 public class ToStringMap

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -40,7 +40,7 @@ files:
 - src/main/java/org/embulk/input/jdbc/getter/StringColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/TimeColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/TimestampColumnGetter.java
-- classpath/embulk-input-jdbc-0.6.0.jar
+- classpath/embulk-input-jdbc-0.6.1.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0