embulk-output-td 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cad2cf52951ef756a112466a0d4c45fbb4aaa08
-  data.tar.gz: 1a52354a42fd5686e897c5077ff3e1ac9d2d6d11
+  metadata.gz: 80f63ad74ba0c51fdcd64103df283845f7b9d2df
+  data.tar.gz: 8f96d9061f19f649f61fde281145bf303f323011
 SHA512:
-  metadata.gz: 80147f9fbeba7f30f4e878219a0cc7e2046a4da4d21df6451a9287814729ff9d083dbe9e0e5901e45e91820b15b155efe2cd75c45c2d9ccbb989f0cc3d915851
-  data.tar.gz: 28b99ac88e456db27b79d86897a2f176daf09119c0c1dd8dfce07e95a65902dda9c5feadde69b6bc3f05f6ead643db72e483dc46436448f756d3a88e0054c2da
+  metadata.gz: bc0220f507c1d133f3b96a5a9efa6bf6766abbb16e07c1d47b2e93951d27f6292560d48ea3e1e2a8dc8361bd862ef5a0ab7334ca9585ebcebab6392ecf6121b8
+  data.tar.gz: dd9f4fc167f89423b8467f352f522a853107e2c6a9d3e8c1e0d3c8e279207b2b3d6a57e65825f1544f91b1d0641aa62e0bf1da47efccbe48a607afa609da4a59

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 0.3.2 - 2016-05-10
+
+* [maintenance] Fix bug Plugin couldn't create temporal directory and job failed at Windows 10 [#39](https://github.com/treasure-data/embulk-output-td/pull/39)
+
 ## 0.3.1 - 2016-04-25
 
-* [maintenance] Fix bug TransactionalPageOutput.flush method throws NullPointerException
+* [maintenance] Fix bug TransactionalPageOutput.flush method throws NullPointerException [#38](https://github.com/treasure-data/embulk-output-td/pull/38)
 
 ## 0.3.0 - 2016-03-03
 

data/README.md

@@ -21,7 +21,7 @@ TODO: Write short description here
 - **session**: bulk_import session name (string, optional)
 - **time_column**: user-defined time column (string, optional)
 - **unix_timestamp_unit**: if type of "time" or **time_column** is long, it's considered unix timestamp. This option specify its unit in sec, milli, micro or nano (enum, default: `sec`)
-- **tmpdir**: temporal directory
+- **tmpdir**: temporal directory (string, optional) if set to null, plugin will use directory that could get from System.property
 - **upload_concurrency**: upload concurrency (int, default=2). max concurrency is 8.
 - **file_split_size**: split size (long, default=16384 (16MB)).
 - **stop_on_invalid_record**: stop bulk load transaction if a file includes invalid record (such as invalid timestamp) (boolean, default=false).

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
     provided
 }
 
-version = "0.3.1"
+version = "0.3.2"
 
 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.1"
+  spec.version       = "0.3.2"
   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/RecordWriter.java

@@ -50,7 +50,7 @@ public class RecordWriter
         this.taskIndex = taskIndex;
 
         this.fieldWriters = fieldWriters;
-        this.tempDir = new File(task.getTempDir());
+        this.tempDir = new File(task.getTempDir().get());
         this.executor = new FinalizableExecutorService();
         this.uploadConcurrency = task.getUploadConcurrency();
         this.fileSplitSize = task.getFileSplitSize() * 1024;

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

@@ -1,5 +1,6 @@
 package org.embulk.output.td;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
@@ -118,8 +119,9 @@ public class TdOutputPlugin
         public UnixTimestampUnit getUnixTimestampUnit();
 
         @Config("tmpdir")
-        @ConfigDefault("\"/tmp\"")
-        public String getTempDir();
+        @ConfigDefault("null")
+        public Optional<String> getTempDir();
+        public void setTempDir(String dir);
 
         @Config("upload_concurrency")
         @ConfigDefault("2")
@@ -324,6 +326,10 @@ public class TdOutputPlugin
         // generate session name
         task.setSessionName(buildBulkImportSessionName(task, Exec.session()));
 
+        if (!task.getTempDir().isPresent()) {
+            task.setTempDir(getEnvironmentTempDirectory());
+        }
+
         try (TDClient client = newTDClient(task)) {
             String databaseName = task.getDatabase();
             String tableName = task.getTable();
@@ -798,4 +804,10 @@ public class TdOutputPlugin
             }
         }
     }
+
+    @VisibleForTesting
+    String getEnvironmentTempDirectory()
+    {
+        return System.getProperty("java.io.tmpdir");
+    }
 }

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

@@ -57,7 +57,7 @@ public class TestRecordWriter
                 "_c2", Types.BOOLEAN, "_c3", Types.DOUBLE, "_c4", Types.TIMESTAMP);
 
         plugin = plugin();
-        task = pluginTask(config().set("session_name", "my_session"));
+        task = pluginTask(config().set("session_name", "my_session").set("tmpdir", plugin.getEnvironmentTempDirectory()));
     }
 
     @Test
@@ -192,7 +192,11 @@ public class TestRecordWriter
     {
         schema = schema("_c0", Types.LONG, "_c1", Types.STRING,
                 "_c2", Types.BOOLEAN, "_c3", Types.DOUBLE, "_c4", Types.TIMESTAMP);
-        task = pluginTask(config().set("session_name", "my_session").set("time_value", ImmutableMap.of("from", 0L, "to", 0L)));
+        task = pluginTask(config()
+                .set("session_name", "my_session")
+                .set("time_value", ImmutableMap.of("from", 0L, "to", 0L))
+                .set("tmpdir", plugin.getEnvironmentTempDirectory())
+        );
         recordWriter = recordWriter(task, tdClient(plugin, task), fieldWriters(log, task, schema));
 
         try {

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

@@ -473,6 +473,7 @@ public class TestTdOutputPlugin
         task.setSessionName("session_name");
         task.setLoadTargetTableName("my_table");
         task.setDoUpload(true);
+        task.setTempDir(plugin.getEnvironmentTempDirectory());
         Schema schema = schema("time", Types.LONG, "c0", Types.STRING, "c1", Types.STRING);
 
         try (TransactionalPageOutput output = plugin.open(task.dump(), schema, 0)) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-td
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-10 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.1.jar
+- classpath/embulk-output-td-0.3.2.jar
 - classpath/hamcrest-core-1.1.jar
 - classpath/jackson-datatype-json-org-2.4.4.jar
 - classpath/jetty-client-9.2.2.v20140723.jar