embulk-output-td 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ebf964f7fb872e56a7a39508835b3414aaeb600
-  data.tar.gz: 2c40c6bbfbff60c1bf390ced74ced48a726e1a4b
+  metadata.gz: 8c63a17af8ffcd56935a0645c1344ad81a70504f
+  data.tar.gz: 4316828fe7bb3447f3e707218431ca2dbae71391
 SHA512:
-  metadata.gz: d425caf2d476d054c76bd0acff2760df98ad8a90c461b8fb4442d85a77572063740761713888f43608a779a61ad739ba52c4e231841226ba466b7f2b62181ab2
-  data.tar.gz: 0f042e174cc191748954dd8b8e63e8a648f6db5d874b2b57a7df07b54bdc3aff3fbc05a8fa4a02599d15a11eb179338f0d840c568d99c6c776ca6b0b84cf904e
+  metadata.gz: c7c320e8757801656d13b3baf817d0d25d320c53daef359bbfcd87da6835d4af3be89e65194aa58e525a1cadd41b422c8b8275a791d6b74f2983eedfe3bb4fdd
+  data.tar.gz: 7eaa607ac5324d313d5a5b753f94a1c229ae055c86f0cff03552a115b53c91495e6cce4678134eaf90015de31e790a482f6655600b9459911084b306586fdf9a

data/.travis.yml

@@ -1,7 +1,7 @@
 language: java
-jdk: oraclejdk7
+jdk: oraclejdk8
 
 script: ./gradlew clean test
 
 after_success:
-- ./gradlew check jacocoRootReport
+- ./gradlew check jacocoRootReport

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.0 - 2018-04-10
+
+* [maintenance] Support resource pool name [#81](https://github.com/treasure-data/embulk-output-td/pull/81)
+
 ## 0.4.2 - 2017-08-09
 
 * [maintenance] Fix Embulk version check logic bug [#79](https://github.com/treasure-data/embulk-output-td/pull/79)

data/README.md

@@ -2,7 +2,9 @@
 
 [Treasure Data Service](https://www.treasuredata.com/) output plugin for [Embulk](https://github.com/embulk/embulk)
 
-**NOTICE**: embulk-output-td v0.4.0+ only supports **Embulk v0.8.22+**.
+**NOTICE**:
+  * embulk-output-td v0.5.0+ requires Java 1.8 or higher. For Java7, use embulk-output-td v0.4.x
+  * embulk-output-td v0.4.0+ only supports **Embulk v0.8.22+**.
 
 ## Overview
 

data/build.gradle

@@ -19,11 +19,11 @@ configurations {
 }
 
 group = "org.embulk.output.td"
-version = "0.4.2"
+version = "0.5.0"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 dependencies {
     compile     "org.embulk:embulk-core:0.8.+"
@@ -32,7 +32,7 @@ dependencies {
     provided    "org.embulk:embulk-standards:0.8.+"
     compile     "org.msgpack:msgpack-core:0.8.+"
     provided    "org.msgpack:msgpack-core:0.8.+"
-    compile    "com.treasuredata.client:td-client:0.7.41"
+    compile    "com.treasuredata.client:td-client:0.8.3"
 
     testCompile "junit:junit:4.+"
     testCompile "org.bigtesting:fixd:1.0.0"

data/circle.yml

@@ -0,0 +1,13 @@
+machine:
+  java:
+    version: oraclejdk8
+
+test:
+  override:
+    - ./gradlew clean check jacocoTestReport
+  post:
+    - cp -R build/reports/* $CIRCLE_ARTIFACTS
+
+notify:
+  webhooks:
+    - url: http://td-beda.herokuapp.com/circleci_callback

data/embulk-output-td.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-td"
-  spec.version       = "0.4.2"
+  spec.version       = "0.5.0"
   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

@@ -179,6 +179,10 @@ public class TdOutputPlugin
         @ConfigDefault("90000")
         int getRetryMaxIntervalMillis();
 
+        @Config("pool_name")
+        @ConfigDefault("null")
+        public Optional<String> getPoolName();
+
         public boolean getDoUpload();
         public void setDoUpload(boolean doUpload);
 
@@ -466,7 +470,7 @@ public class TdOutputPlugin
         builder.setEndpoint(task.getEndpoint());
         builder.setUseSSL(task.getUseSsl());
         builder.setConnectTimeoutMillis(60000); // default 15000
-        builder.setIdleTimeoutMillis(60000); // default 60000
+        builder.setReadTimeoutMillis(60000); // default 60000
         builder.setRetryLimit(task.getRetryLimit());
         builder.setRetryInitialIntervalMillis(task.getRetryInitialIntervalMillis());
         builder.setRetryMaxIntervalMillis(task.getRetryMaxIntervalMillis());
@@ -633,7 +637,7 @@ public class TdOutputPlugin
                 }
             }
             // perform
-            client.performBulkImportSession(sessionName); // TODO use priority
+            client.performBulkImportSession(sessionName, task.getPoolName()); // TODO use priority
 
             // pass
         case PERFORMING:

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

@@ -452,7 +452,7 @@ public class TestTdOutputPlugin
 
         TDClient client = spy(plugin.newTDClient(task));
         doNothing().when(client).freezeBulkImportSession(anyString());
-        doNothing().when(client).performBulkImportSession(anyString());
+        doNothing().when(client).performBulkImportSession(anyString(), any(Optional.class));
         doNothing().when(client).commitBulkImportSession(anyString());
 
         { // uploading + unfreeze

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-td
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 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.
 email:
 - muga.nishizawa@gmail.com
@@ -50,6 +50,7 @@ files:
 - CHANGELOG.md
 - README.md
 - build.gradle
+- circle.yml
 - config/checkstyle/checkstyle.xml
 - embulk-output-td.gemspec
 - gradle/check.gradle
@@ -82,17 +83,21 @@ 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.4.2.jar
+- classpath/embulk-output-td-0.5.0.jar
+- classpath/guava-21.0.jar
 - classpath/hamcrest-core-1.1.jar
-- classpath/jackson-datatype-json-org-2.6.7.jar
-- classpath/jetty-client-9.2.22.v20170606.jar
-- classpath/jetty-http-9.2.22.v20170606.jar
-- classpath/jetty-io-9.2.22.v20170606.jar
-- classpath/jetty-util-9.2.22.v20170606.jar
+- classpath/jackson-annotations-2.8.1.jar
+- classpath/jackson-core-2.8.1.jar
+- classpath/jackson-databind-2.8.1.jar
+- classpath/jackson-datatype-guava-2.8.1.jar
+- classpath/jackson-datatype-json-org-2.8.1.jar
 - classpath/json-20090211_1.jar
 - classpath/json-simple-1.1.1.jar
 - classpath/junit-4.10.jar
-- classpath/td-client-0.7.41.jar
+- classpath/okhttp-3.9.0.jar
+- classpath/okhttp-urlconnection-3.9.0.jar
+- classpath/okio-1.13.0.jar
+- classpath/td-client-0.8.3.jar
 homepage: https://github.com/treasure-data/embulk-output-td
 licenses:
 - Apache 2.0