embulk-output-td 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 201740ab4976fe7a17cc09668984141ae5c6e356
-  data.tar.gz: 5079eecd7151eff1851b4faac0b6d4887ff4b1ff
+  metadata.gz: 4fe85fa7501f82e0d7660c88ef9369629fe91827
+  data.tar.gz: 9858b8eea57c1574c346d919dd9a57ba7ea44058
 SHA512:
-  metadata.gz: 7a529a73f179bf4cdd5d6a0f08a8767e56004642036fa6f95ab618e2d3d66306856c848386f807d70989650a4f3971aac63f243624493fbba1482df46d211110
-  data.tar.gz: 0659decc83f2fdb948a35b2d0ffabd53e6eb7d5e7cea6a95b14b1b5a2f1436eec878d8c30c4c709bdcb13aef8e4f05c2648285f0c0035f3a034005ffbdbb4b96
+  metadata.gz: 602fa7e84ed8e32444a6de50ceeb8333ba071e7ba546dbb46424a8e7c20ebdc21cd67705031e29fe602db1f5bd9a50b6bc08f682507aedef986b2d6741e6a20e
+  data.tar.gz: 1960a94319e23a719273853bdffcd3151caa3cfe053bcdab45c5f70fe419a0650dcc07cb77a9ff495e9bea8aff7f3bd40e7c538fe3d9260eadffa08f387b2c2c

data/.travis.yml

@@ -1,5 +1,5 @@
 language: java
-jdk: oraclejdk8
+jdk: openjdk8
 
 script: ./gradlew clean test
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+
+## 0.5.2 - 2019-10-24
+* [maintenance] Fix columns order bug described in issue [91](https://github.com/treasure-data/embulk-output-td/issues/91) [#92](https://github.com/treasure-data/embulk-output-td/pull/92)
+
 ## 0.5.1 - 2018-04-24
 * [maintenance] Upgrade td-client-java v0.8.4 [#88](https://github.com/treasure-data/embulk-output-td/pull/88)
 

data/build.gradle

@@ -19,7 +19,7 @@ configurations {
 }
 
 group = "org.embulk.output.td"
-version = "0.5.1"
+version = "0.5.2"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.8

data/embulk-output-td.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-td"
-  spec.version       = "0.5.1"
+  spec.version       = "0.5.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/TdOutputPlugin.java

@@ -2,6 +2,7 @@ package org.embulk.output.td;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -691,7 +692,7 @@ public class TdOutputPlugin
         String databaseName = task.getDatabase();
         TDTable table = findTable(client, databaseName, task.getTable());
 
-        final Map<String, TDColumnType> guessedSchema = new HashMap<>();
+        final Map<String, TDColumnType> guessedSchema = new LinkedHashMap<>();
         inputSchema.visitColumns(new ColumnVisitor() {
             public void booleanColumn(Column column)
             {

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

@@ -9,6 +9,7 @@ import com.treasuredata.client.TDClientHttpConflictException;
 import com.treasuredata.client.TDClientHttpNotFoundException;
 import com.treasuredata.client.model.TDBulkImportSession;
 import com.treasuredata.client.model.TDBulkImportSession.ImportStatus;
+import com.treasuredata.client.model.TDColumn;
 import com.treasuredata.client.model.TDColumnType;
 import com.treasuredata.client.model.TDTable;
 import com.treasuredata.client.model.TDTableType;
@@ -23,6 +24,7 @@ import org.embulk.output.td.TdOutputPlugin.HttpProxyTask;
 import org.embulk.output.td.TdOutputPlugin.TimestampColumnOption;
 import org.embulk.output.td.TdOutputPlugin.UnixTimestampUnit;
 import org.embulk.output.td.writer.FieldWriterSet;
+import org.embulk.spi.Column;
 import org.embulk.spi.Exec;
 import org.embulk.spi.ExecSession;
 import org.embulk.spi.OutputPlugin;
@@ -34,8 +36,10 @@ import org.embulk.spi.type.Types;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.ArgumentCaptor;
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -52,9 +56,11 @@ import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 
 public class TestTdOutputPlugin
@@ -540,6 +546,37 @@ public class TestTdOutputPlugin
         // Expect no error happens.
     }
 
+    @Test
+    public void testUpdateSchemaWillPreserveIndex()
+    {
+        final String dbName = "test_db";
+        final String tblName = "test_tbl";
+        PluginTask task = mock(PluginTask.class);
+        doReturn(dbName).when(task).getDatabase();
+        doReturn(tblName).when(task).getTable();
+        doReturn(tblName).when(task).getLoadTargetTableName();
+
+        TDTable table = mock(TDTable.class);
+
+        TDClient client = mock(TDClient.class);
+        doReturn(table).when(client).showTable(anyString(), anyString());
+
+        Schema schema = schema("col3", Types.LONG, "col0", Types.STRING, "col1", Types.STRING);
+
+        // capture param of client append schema to check for columns order
+        ArgumentCaptor<List<TDColumn>> schemaCaptor = ArgumentCaptor.forClass((Class) List.class);
+        doNothing().when(client).appendTableSchema(anyString(), anyString(), schemaCaptor.capture());
+
+        plugin.updateSchema(client, schema,task);
+
+        List<Column> inputCols = schema.getColumns();
+        List<TDColumn> uploadedCols = schemaCaptor.getValue();
+
+        assertEquals(inputCols.get(0).getName(), uploadedCols.get(0).getName());
+        assertEquals(inputCols.get(1).getName(), uploadedCols.get(1).getName());
+        assertEquals(inputCols.get(2).getName(), uploadedCols.get(2).getName());
+    }
+
     public static ConfigSource config()
     {
         return Exec.newConfigSource()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-td
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -83,21 +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.5.1.jar
-- classpath/guava-21.0.jar
-- classpath/hamcrest-core-1.1.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/jackson-datatype-guava-2.8.1.jar
 - classpath/junit-4.10.jar
+- classpath/jackson-annotations-2.8.1.jar
 - classpath/okhttp-3.9.0.jar
+- classpath/guava-21.0.jar
 - classpath/okhttp-urlconnection-3.9.0.jar
-- classpath/okio-1.13.0.jar
+- classpath/json-simple-1.1.1.jar
+- classpath/jackson-core-2.8.1.jar
+- classpath/jackson-databind-2.8.1.jar
+- classpath/hamcrest-core-1.1.jar
+- classpath/jackson-datatype-json-org-2.8.1.jar
 - classpath/td-client-0.8.4.jar
+- classpath/embulk-output-td-0.5.2.jar
+- classpath/okio-1.13.0.jar
 homepage: https://github.com/treasure-data/embulk-output-td
 licenses:
 - Apache 2.0