embulk-output-td 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac66106da1011a062652d0daded90b2902b115af
-  data.tar.gz: 6798b24ab73f66cdfc9004ceb2dad72e75efe659
+  metadata.gz: bafffe3329257454d4b7d41593bd6b7cb3c2c61f
+  data.tar.gz: 1ce0414e864669fcffc7b4c46c56ed2f3ab937d4
 SHA512:
-  metadata.gz: 04cbb46c3d0686a2196fee1f0bde39008a0429fbdf91de846ac9410c9ab8c51b8b4a02320f946259df6705badd02552c613b52694c8331168243fa8c6ea9987f
-  data.tar.gz: 1188d20bec483ff792df110188f415254a90b090ce84066f4aaa483e23a77381fd2276ee4bb65797265fcdf35a48045929a71d0f6a8f52c30d9f9fe54f14a16a
+  metadata.gz: fd565fe11e81cd25bdf17de7da522f88bf0a2dd80cfbe4c2fa7c5f1f48d964545c114f52f61d5c6b2aa52f812b2eb8c1917ef19e0e017ef59489b6ed8e9fd780
+  data.tar.gz: 00408ba371cbda77388e742111c3e8890d7476951c1c92b55d9936dfbdc5f081fee12c637b0f9a5761c5c3fcf2c90a618064028b67438dd6c8c2d43b0e0f1adf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.9 - 2016-10-26
+
+* [maintenance] Add retry limit and interval configurations [#51](https://github.com/treasure-data/embulk-output-td/pull/51)
+
 ## 0.3.8 - 2016-08-15
 
 * [maintenance] Change retry configuration [#50](https://github.com/treasure-data/embulk-output-td/pull/50)

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
     provided
 }
 
-version = "0.3.8"
+version = "0.3.9"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.7

data/embulk-output-td.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-td"
-  spec.version       = "0.3.8"
+  spec.version       = "0.3.9"
   spec.authors       = ["Muga Nishizawa"]
   spec.summary       = %[TreasureData output plugin for Embulk]
   spec.description   = %[TreasureData output plugin is an Embulk plugin that loads records to TreasureData read by any input plugins. Search the input plugins by 'embulk-output' keyword.]

data/src/main/java/org/embulk/output/td/TdOutputPlugin.java

@@ -168,6 +168,18 @@ public class TdOutputPlugin
         @Min(0)
         int getDisplayedErrorRecordsCountLimit();
 
+        @Config("retry_limit")
+        @ConfigDefault("20")
+        int getRetryLimit();
+
+        @Config("retry_initial_interval_millis")
+        @ConfigDefault("1000")
+        int getRetryInitialIntervalMillis();
+
+        @Config("retry_max_interval_millis")
+        @ConfigDefault("90000")
+        int getRetryMaxIntervalMillis();
+
         public boolean getDoUpload();
         public void setDoUpload(boolean doUpload);
 
@@ -444,9 +456,9 @@ public class TdOutputPlugin
         builder.setUseSSL(task.getUseSsl());
         builder.setConnectTimeoutMillis(60000); // default 15000
         builder.setIdleTimeoutMillis(60000); // default 60000
-        builder.setRetryLimit(20); // default 10
-        builder.setRetryInitialIntervalMillis(1000); // default 500
-        builder.setRetryMaxIntervalMillis(90000); // default 60000
+        builder.setRetryLimit(task.getRetryLimit());
+        builder.setRetryInitialIntervalMillis(task.getRetryInitialIntervalMillis());
+        builder.setRetryMaxIntervalMillis(task.getRetryMaxIntervalMillis());
 
         Optional<ProxyConfig> proxyConfig = newProxyConfig(task.getHttpProxy());
         if (proxyConfig.isPresent()) {

data/src/test/java/org/embulk/output/td/TestTdOutputPlugin.java

@@ -47,6 +47,7 @@ import static com.treasuredata.client.model.TDBulkImportSession.ImportStatus.REA
 import static com.treasuredata.client.model.TDBulkImportSession.ImportStatus.UNKNOWN;
 import static com.treasuredata.client.model.TDBulkImportSession.ImportStatus.UPLOADING;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
@@ -72,6 +73,45 @@ public class TestTdOutputPlugin
         plugin = plugin();
     }
 
+    @Test
+    public void checkDefaultValues()
+    {
+        ConfigSource config = this.config.deepCopy();
+        PluginTask task = config.loadConfig(PluginTask.class);
+        assertEquals(true, task.getUseSsl());
+        assertFalse(task.getHttpProxy().isPresent());
+        assertEquals(TdOutputPlugin.Mode.APPEND, task.getMode());
+        assertEquals(true, task.getAutoCreateTable());
+        assertFalse(task.getSession().isPresent());
+        assertEquals(TdOutputPlugin.ConvertTimestampType.STRING, task.getConvertTimestampType());
+        assertFalse(task.getTimeColumn().isPresent());
+        assertFalse(task.getTimeValue().isPresent());
+        assertEquals(TdOutputPlugin.UnixTimestampUnit.SEC, task.getUnixTimestampUnit());
+        assertFalse(task.getTempDir().isPresent());
+        assertEquals(2, task.getUploadConcurrency());
+        assertEquals(16384, task.getFileSplitSize());
+        assertEquals("%Y-%m-%d %H:%M:%S.%3N", task.getDefaultTimestampFormat());
+        assertTrue(task.getColumnOptions().isEmpty());
+        assertFalse(task.getStopOnInvalidRecord());
+        assertEquals(10, task.getDisplayedErrorRecordsCountLimit());
+        assertEquals(20, task.getRetryLimit());
+        assertEquals(1000, task.getRetryInitialIntervalMillis());
+        assertEquals(90000, task.getRetryMaxIntervalMillis());
+    }
+
+    @Test
+    public void checkRetryValues()
+    {
+        ConfigSource config = this.config.deepCopy()
+                .set("retry_limit", 17)
+                .set("retry_initial_interval_millis", 4822)
+                .set("retry_max_interval_millis", 19348);
+        PluginTask task = config.loadConfig(PluginTask.class);
+        assertEquals(17, task.getRetryLimit());
+        assertEquals(4822, task.getRetryInitialIntervalMillis());
+        assertEquals(19348, task.getRetryMaxIntervalMillis());
+    }
+
     @Test
     public void checkUnixTimestampUnit()
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-td
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ files:
 - src/test/java/org/embulk/output/td/TestTdOutputPlugin.java
 - src/test/java/org/embulk/output/td/TestTimeValueGenerator.java
 - src/test/java/org/embulk/output/td/writer/TestFieldWriterSet.java
-- classpath/embulk-output-td-0.3.8.jar
+- classpath/embulk-output-td-0.3.9.jar
 - classpath/hamcrest-core-1.1.jar
 - classpath/jackson-annotations-2.6.7.jar
 - classpath/jackson-core-2.6.7.jar