embulk-output-td 0.2.2 → 0.3.0

data/src/main/java/org/embulk/output/td/writer/FieldWriterSet.java

@@ -19,6 +19,7 @@ import org.embulk.spi.Schema;
 import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.spi.type.BooleanType;
 import org.embulk.spi.type.DoubleType;
+import org.embulk.spi.type.JsonType;
 import org.embulk.spi.type.LongType;
 import org.embulk.spi.type.StringType;
 import org.embulk.spi.type.TimestampType;
@@ -238,6 +239,9 @@ public class FieldWriterSet
         else if (columnType instanceof TimestampType) {
             return newSimpleTimestampFieldWriter(columnName, columnType, convertTimestampType, timestampFormatter);
         }
+        else if (columnType instanceof JsonType) {
+            return new JsonFieldWriter(columnName);
+        }
         else {
             throw new ConfigException("Unsupported type: " + columnType);
         }
@@ -300,6 +304,11 @@ public class FieldWriterSet
                 addColumn(builder, reader, column);
             }
 
+            @Override
+            public void jsonColumn(Column column)
+            {
+                addColumn(builder, reader, column);
+            }
         });
 
         endRecord(builder);

data/src/main/java/org/embulk/output/td/writer/JsonFieldWriter.java

@@ -0,0 +1,23 @@
+package org.embulk.output.td.writer;
+
+import org.embulk.output.td.MsgpackGZFileBuilder;
+import org.embulk.spi.Column;
+import org.embulk.spi.PageReader;
+
+import java.io.IOException;
+
+public class JsonFieldWriter
+        extends FieldWriter
+{
+    public JsonFieldWriter(String keyName)
+    {
+        super(keyName);
+    }
+
+    @Override
+    public void writeValue(MsgpackGZFileBuilder builder, PageReader reader, Column column)
+            throws IOException
+    {
+        builder.writeString(reader.getJson(column).toJson());
+    }
+}

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

@@ -1,7 +1,7 @@
 package org.embulk.output.td;
 
 import com.google.common.collect.ImmutableMap;
-import com.treasuredata.api.TdApiClient;
+import com.treasuredata.client.TDClient;
 import org.embulk.EmbulkTestRuntime;
 import org.embulk.output.td.TdOutputPlugin.PluginTask;
 import org.embulk.spi.Page;
@@ -12,13 +12,14 @@ import org.embulk.spi.type.Types;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.msgpack.MessagePack;
-import org.msgpack.type.MapValue;
-import org.msgpack.unpacker.Unpacker;
+import org.msgpack.core.MessagePack;
+import org.msgpack.core.MessageUnpacker;
+import org.msgpack.value.Value;
 import org.slf4j.Logger;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.util.Map;
 import java.util.zip.GZIPInputStream;
 
 import static org.embulk.output.td.TestTdOutputPlugin.config;
@@ -27,21 +28,20 @@ import static org.embulk.output.td.TestTdOutputPlugin.plugin;
 import static org.embulk.output.td.TestTdOutputPlugin.pluginTask;
 import static org.embulk.output.td.TestTdOutputPlugin.schema;
 import static org.embulk.output.td.TestTdOutputPlugin.recordWriter;
-import static org.embulk.output.td.TestTdOutputPlugin.tdApiClient;
+import static org.embulk.output.td.TestTdOutputPlugin.tdClient;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.spy;
-import static org.msgpack.type.ValueFactory.createRawValue;
+import static org.msgpack.value.ValueFactory.newString;
 
 public class TestRecordWriter
 {
     @Rule
     public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
 
-    private MessagePack msgpack;
     private Logger log;
     private Schema schema;
     private TdOutputPlugin plugin; // mock
@@ -51,7 +51,6 @@ public class TestRecordWriter
     @Before
     public void createResources()
     {
-        msgpack = new MessagePack();
         log = runtime.getExec().getLogger(TestRecordWriter.class);
 
         schema = schema("time", Types.LONG, "_c0", Types.LONG, "_c1", Types.STRING,
@@ -65,7 +64,7 @@ public class TestRecordWriter
     public void checkOpenAndClose()
             throws Exception
     {
-        recordWriter = recordWriter(task, tdApiClient(plugin, task), fieldWriters(log, task, schema));
+        recordWriter = recordWriter(task, tdClient(plugin, task), fieldWriters(log, task, schema));
 
         // confirm that no error happens
         try {
@@ -80,7 +79,7 @@ public class TestRecordWriter
     public void checkFlushAndFinish()
             throws Exception
     {
-        TdApiClient client = spy(plugin.newTdApiClient(task));
+        TDClient client = spy(plugin.newTDClient(task));
         recordWriter = recordWriter(task, client, fieldWriters(log, task, schema));
 
         { // add no record
@@ -116,7 +115,7 @@ public class TestRecordWriter
     public void addNonNullValues()
             throws Exception
     {
-        recordWriter = recordWriter(task, tdApiClient(plugin, task), fieldWriters(log, task, schema));
+        recordWriter = recordWriter(task, tdClient(plugin, task), fieldWriters(log, task, schema));
 
         try {
             recordWriter.open(schema);
@@ -133,16 +132,16 @@ public class TestRecordWriter
             // record count 1
             assertEquals(1, builder.getRecordCount());
 
-            Unpacker u = msgpack.createUnpacker(new GZIPInputStream(new FileInputStream(builder.getFile())));
-            MapValue v = u.readValue().asMapValue();
+            MessageUnpacker u = MessagePack.newDefaultUnpacker(new GZIPInputStream(new FileInputStream(builder.getFile())));
+            Map<Value, Value> v = u.unpackValue().asMapValue().map();
 
             // compare actual values
-            assertEquals(1442595600L, v.get(createRawValue("time")).asIntegerValue().getLong());
-            assertEquals(0L, v.get(createRawValue("_c0")).asIntegerValue().getLong());
-            assertEquals("v", v.get(createRawValue("_c1")).asRawValue().getString());
-            assertEquals(true, v.get(createRawValue("_c2")).asBooleanValue().getBoolean());
-            assertEquals(0.0, v.get(createRawValue("_c3")).asFloatValue().getDouble(), 0.000001);
-            assertEquals("2015-09-18 17:00:00.000", v.get(createRawValue("_c4")).asRawValue().getString());
+            assertEquals(1442595600L, v.get(newString("time")).asIntegerValue().toLong());
+            assertEquals(0L, v.get(newString("_c0")).asIntegerValue().toLong());
+            assertEquals("v", v.get(newString("_c1")).asStringValue().toString());
+            assertEquals(true, v.get(newString("_c2")).asBooleanValue().getBoolean());
+            assertEquals(0.0, v.get(newString("_c3")).asFloatValue().toFloat(), 0.000001);
+            assertEquals("2015-09-18 17:00:00.000", v.get(newString("_c4")).asStringValue().toString());
 
         }
         finally {
@@ -154,7 +153,7 @@ public class TestRecordWriter
     public void addNullValues()
             throws Exception
     {
-        recordWriter = recordWriter(task, tdApiClient(plugin, task), fieldWriters(log, task, schema));
+        recordWriter = recordWriter(task, tdClient(plugin, task), fieldWriters(log, task, schema));
 
         try {
             recordWriter.open(schema);
@@ -171,15 +170,15 @@ public class TestRecordWriter
             // record count 1
             assertEquals(1, builder.getRecordCount());
 
-            Unpacker u = msgpack.createUnpacker(new GZIPInputStream(new FileInputStream(builder.getFile())));
-            MapValue v = u.readValue().asMapValue();
+            MessageUnpacker u = MessagePack.newDefaultUnpacker(new GZIPInputStream(new FileInputStream(builder.getFile())));
+            Map<Value, Value> v = u.unpackValue().asMapValue().map();
 
             // compare actual values
-            assertTrue(v.get(createRawValue("_c0")).isNilValue());
-            assertTrue(v.get(createRawValue("_c1")).isNilValue());
-            assertTrue(v.get(createRawValue("_c2")).isNilValue());
-            assertTrue(v.get(createRawValue("_c3")).isNilValue());
-            assertTrue(v.get(createRawValue("_c4")).isNilValue());
+            assertTrue(v.get(newString("_c0")).isNilValue());
+            assertTrue(v.get(newString("_c1")).isNilValue());
+            assertTrue(v.get(newString("_c2")).isNilValue());
+            assertTrue(v.get(newString("_c3")).isNilValue());
+            assertTrue(v.get(newString("_c4")).isNilValue());
 
         }
         finally {
@@ -194,7 +193,7 @@ 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)));
-        recordWriter = recordWriter(task, tdApiClient(plugin, task), fieldWriters(log, task, schema));
+        recordWriter = recordWriter(task, tdClient(plugin, task), fieldWriters(log, task, schema));
 
         try {
             recordWriter.open(schema);
@@ -211,16 +210,16 @@ public class TestRecordWriter
             // record count 1
             assertEquals(1, builder.getRecordCount());
 
-            Unpacker u = msgpack.createUnpacker(new GZIPInputStream(new FileInputStream(builder.getFile())));
-            MapValue v = u.readValue().asMapValue();
+            MessageUnpacker u = MessagePack.newDefaultUnpacker(new GZIPInputStream(new FileInputStream(builder.getFile())));
+            Map<Value, Value> v = u.unpackValue().asMapValue().map();
 
             // compare actual values
-            assertEquals(0L, v.get(createRawValue("time")).asIntegerValue().getLong());
-            assertEquals(0L, v.get(createRawValue("_c0")).asIntegerValue().getLong());
-            assertEquals("v", v.get(createRawValue("_c1")).asRawValue().getString());
-            assertEquals(true, v.get(createRawValue("_c2")).asBooleanValue().getBoolean());
-            assertEquals(0.0, v.get(createRawValue("_c3")).asFloatValue().getDouble(), 0.000001);
-            assertEquals("2015-09-18 17:00:00.000", v.get(createRawValue("_c4")).asRawValue().getString());
+            assertEquals(0L, v.get(newString("time")).asIntegerValue().toLong());
+            assertEquals(0L, v.get(newString("_c0")).asIntegerValue().toLong());
+            assertEquals("v", v.get(newString("_c1")).asStringValue().toString());
+            assertEquals(true, v.get(newString("_c2")).asBooleanValue().getBoolean());
+            assertEquals(0.0, v.get(newString("_c3")).asFloatValue().toFloat(), 0.000001);
+            assertEquals("2015-09-18 17:00:00.000", v.get(newString("_c4")).asStringValue().toString());
 
         }
         finally {
@@ -231,7 +230,7 @@ public class TestRecordWriter
     @Test
     public void doAbortNorthing()
     {
-        recordWriter = recordWriter(task, tdApiClient(plugin, task), fieldWriters(log, task, schema));
+        recordWriter = recordWriter(task, tdClient(plugin, task), fieldWriters(log, task, schema));
         recordWriter.abort();
         // no error happen
     }
@@ -239,7 +238,7 @@ public class TestRecordWriter
     @Test
     public void checkTaskReport()
     {
-        recordWriter = recordWriter(task, tdApiClient(plugin, task), fieldWriters(log, task, schema));
+        recordWriter = recordWriter(task, tdClient(plugin, task), fieldWriters(log, task, schema));
         assertTrue(recordWriter.commit().isEmpty());
     }
 }

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

@@ -3,21 +3,20 @@ package org.embulk.output.td;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import com.treasuredata.api.TdApiClient;
-import com.treasuredata.api.TdApiConflictException;
-import com.treasuredata.api.TdApiNotFoundException;
-import com.treasuredata.api.model.TDBulkImportSession;
-import com.treasuredata.api.model.TDBulkImportSession.ImportStatus;
-import com.treasuredata.api.model.TDColumnType;
-import com.treasuredata.api.model.TDTable;
-import com.treasuredata.api.model.TDTableType;
+import com.treasuredata.client.TDClient;
+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.TDColumnType;
+import com.treasuredata.client.model.TDTable;
+import com.treasuredata.client.model.TDTableType;
 import org.embulk.EmbulkTestRuntime;
 import org.embulk.config.TaskReport;
 import org.embulk.config.ConfigDiff;
 import org.embulk.config.ConfigException;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.TaskSource;
-import org.embulk.output.td.TdOutputPlugin.Mode;
 import org.embulk.output.td.TdOutputPlugin.PluginTask;
 import org.embulk.output.td.TdOutputPlugin.TimestampColumnOption;
 import org.embulk.output.td.TdOutputPlugin.UnixTimestampUnit;
@@ -38,12 +37,12 @@ import org.slf4j.Logger;
 import java.util.HashMap;
 import java.util.List;
 
-import static com.treasuredata.api.model.TDBulkImportSession.ImportStatus.COMMITTED;
-import static com.treasuredata.api.model.TDBulkImportSession.ImportStatus.COMMITTING;
-import static com.treasuredata.api.model.TDBulkImportSession.ImportStatus.PERFORMING;
-import static com.treasuredata.api.model.TDBulkImportSession.ImportStatus.READY;
-import static com.treasuredata.api.model.TDBulkImportSession.ImportStatus.UNKNOWN;
-import static com.treasuredata.api.model.TDBulkImportSession.ImportStatus.UPLOADING;
+import static com.treasuredata.client.model.TDBulkImportSession.ImportStatus.COMMITTED;
+import static com.treasuredata.client.model.TDBulkImportSession.ImportStatus.COMMITTING;
+import static com.treasuredata.client.model.TDBulkImportSession.ImportStatus.PERFORMING;
+import static com.treasuredata.client.model.TDBulkImportSession.ImportStatus.READY;
+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.assertTrue;
 import static org.junit.Assert.fail;
@@ -114,12 +113,12 @@ public class TestTdOutputPlugin
     {
         doReturn("session_name").when(plugin).buildBulkImportSessionName(any(PluginTask.class), any(ExecSession.class));
         ConfigDiff configDiff = Exec.newConfigDiff().set("last_session", "session_name");
-        doReturn(configDiff).when(plugin).doRun(any(TdApiClient.class), any(Schema.class), any(PluginTask.class), any(OutputPlugin.Control.class));
+        doReturn(configDiff).when(plugin).doRun(any(TDClient.class), any(Schema.class), any(PluginTask.class), any(OutputPlugin.Control.class));
         Schema schema = schema("time", Types.LONG, "c0", Types.STRING, "c1", Types.STRING);
 
         { // auto_create_table is true
             ConfigSource config = this.config.deepCopy().set("auto_create_table", "true");
-            doNothing().when(plugin).createTableIfNotExists(any(TdApiClient.class), anyString(), anyString());
+            doNothing().when(plugin).createTableIfNotExists(any(TDClient.class), anyString(), anyString());
             assertEquals("session_name", plugin.transaction(config, schema, 0, new OutputPlugin.Control()
             {
                 @Override
@@ -132,7 +131,7 @@ public class TestTdOutputPlugin
 
         { // auto_create_table is false
             ConfigSource config = this.config.deepCopy().set("auto_create_table", "false");
-            doNothing().when(plugin).validateTableExists(any(TdApiClient.class), anyString(), anyString());
+            doNothing().when(plugin).validateTableExists(any(TDClient.class), anyString(), anyString());
             assertEquals("session_name", plugin.transaction(config, schema, 0, new OutputPlugin.Control()
             {
                 @Override
@@ -152,8 +151,8 @@ public class TestTdOutputPlugin
         task.setSessionName("session_name");
         task.setLoadTargetTableName("my_table");
         task.setDoUpload(true);
-        doReturn(true).when(plugin).startBulkImportSession(any(TdApiClient.class), anyString(), anyString(), anyString());
-        doNothing().when(plugin).completeBulkImportSession(any(TdApiClient.class), any(Schema.class), any(PluginTask.class), anyInt());
+        doReturn(true).when(plugin).startBulkImportSession(any(TDClient.class), anyString(), anyString(), anyString());
+        doNothing().when(plugin).completeBulkImportSession(any(TDClient.class), any(Schema.class), any(PluginTask.class), anyInt());
         Schema schema = schema("time", Types.LONG, "c0", Types.STRING, "c1", Types.STRING);
 
         ConfigDiff configDiff = plugin.resume(task.dump(), schema, 0, new OutputPlugin.Control()
@@ -175,9 +174,9 @@ public class TestTdOutputPlugin
         task.setSessionName("session_name");
         task.setLoadTargetTableName("my_table");
         task.setDoUpload(true);
-        TdApiClient client = spy(plugin.newTdApiClient(task));
+        TDClient client = spy(plugin.newTDClient(task));
         doNothing().when(client).deleteBulkImportSession(anyString());
-        doReturn(client).when(plugin).newTdApiClient(task);
+        doReturn(client).when(plugin).newTDClient(task);
         Schema schema = schema("time", Types.LONG, "c0", Types.STRING, "c1", Types.STRING);
 
         plugin.cleanup(task.dump(), schema, 0, Lists.newArrayList(Exec.newTaskReport()));
@@ -211,11 +210,11 @@ public class TestTdOutputPlugin
     }
 
     @Test
-    public void newTdApiClient()
+    public void newTDClient()
     {
         { // no proxy setting
             PluginTask task = pluginTask(config);
-            try (TdApiClient client = plugin.newTdApiClient(task)) {
+            try (TDClient client = plugin.newTDClient(task)) {
             }
             // no error happens
         }
@@ -223,7 +222,7 @@ public class TestTdOutputPlugin
         { // proxy setting
             PluginTask task = pluginTask(config.deepCopy()
                     .set("http_proxy", ImmutableMap.of("host", "xxx", "port", "8080")));
-            try (TdApiClient client = plugin.newTdApiClient(task)) {
+            try (TDClient client = plugin.newTDClient(task)) {
             }
             // no error happens
         }
@@ -233,10 +232,10 @@ public class TestTdOutputPlugin
     public void createTableIfNotExists()
     {
         PluginTask task = pluginTask(config);
-        TdApiClient client = spy(plugin.newTdApiClient(task));
+        TDClient client = spy(plugin.newTDClient(task));
 
         { // database exists but table doesn't exist
-            doReturn(null).when(client).createTable(anyString(), anyString());
+            doNothing().when(client).createTable(anyString(), anyString());
             plugin.createTableIfNotExists(client, "my_db", "my_table");
             // no error happens
         }
@@ -249,14 +248,14 @@ public class TestTdOutputPlugin
 
         { // database and table don't exist
             { // createTable -> createDB -> createTable
-                doThrow(notFound()).doReturn(null).when(client).createTable(anyString(), anyString());
-                doReturn(null).when(client).createDatabase(anyString());
+                doThrow(notFound()).doNothing().when(client).createTable(anyString(), anyString());
+                doNothing().when(client).createDatabase(anyString());
                 plugin.createTableIfNotExists(client, "my_db", "my_table");
                 // no error happens
             }
 
             { // createTable -> createDB -> createTable
-                doThrow(notFound()).doReturn(null).when(client).createTable(anyString(), anyString());
+                doThrow(notFound()).doNothing().when(client).createTable(anyString(), anyString());
                 doThrow(conflict()).when(client).createDatabase(anyString());
                 plugin.createTableIfNotExists(client, "my_db", "my_table");
                 // no error happens
@@ -264,7 +263,7 @@ public class TestTdOutputPlugin
 
             { // createTable -> createDB -> createTable
                 doThrow(notFound()).doThrow(conflict()).when(client).createTable(anyString(), anyString());
-                doReturn(null).when(client).createDatabase(anyString());
+                doNothing().when(client).createDatabase(anyString());
                 plugin.createTableIfNotExists(client, "my_db", "my_table");
                 // no error happens
             }
@@ -282,17 +281,17 @@ public class TestTdOutputPlugin
     public void validateTableExists()
     {
         PluginTask task = pluginTask(config);
-        TdApiClient client = spy(plugin.newTdApiClient(task));
-        TDTable table = new TDTable("my_table", TDTableType.LOG, null);
+        TDClient client = spy(plugin.newTDClient(task));
+        TDTable table = newTable("my_table", "[]");
 
         { // table exists
-            doReturn(ImmutableList.of(table)).when(client).getTables(anyString());
+            doReturn(ImmutableList.of(table)).when(client).listTables(anyString());
             plugin.validateTableExists(client, "my_db", "my_table");
             // no error happens
         }
 
         { // table doesn't exist
-            doReturn(ImmutableList.of()).when(client).getTables(anyString());
+            doReturn(ImmutableList.of()).when(client).listTables(anyString());
             try {
                 plugin.validateTableExists(client, "my_db", "my_table");
                 fail();
@@ -303,7 +302,7 @@ public class TestTdOutputPlugin
         }
 
         { // database doesn't exist
-            doThrow(notFound()).when(client).getTables(anyString());
+            doThrow(notFound()).when(client).listTables(anyString());
             try {
                 plugin.validateTableExists(client, "my_db", "my_table");
                 fail();
@@ -332,7 +331,7 @@ public class TestTdOutputPlugin
     public void startBulkImportSession()
     {
         PluginTask task = pluginTask(config);
-        TdApiClient client = spy(plugin.newTdApiClient(task));
+        TDClient client = spy(plugin.newTDClient(task));
         doNothing().when(client).createBulkImportSession(anyString(), anyString(), anyString());
 
         { // status is uploading and unfrozen
@@ -388,12 +387,12 @@ public class TestTdOutputPlugin
         PluginTask task = pluginTask(config);
         Schema schema = schema("c0", Types.LONG);
 
-        doReturn(session(UNKNOWN, false)).when(plugin).waitForStatusChange(any(TdApiClient.class), anyString(), any(ImportStatus.class), any(ImportStatus.class), anyString());
-        doReturn(new HashMap<String, TDColumnType>()).when(plugin).updateSchema(any(TdApiClient.class), any(Schema.class), any(PluginTask.class));
+        doReturn(session(UNKNOWN, false)).when(plugin).waitForStatusChange(any(TDClient.class), anyString(), any(ImportStatus.class), any(ImportStatus.class), anyString());
+        doReturn(new HashMap<String, TDColumnType>()).when(plugin).updateSchema(any(TDClient.class), any(Schema.class), any(PluginTask.class));
 
-        TdApiClient client = spy(plugin.newTdApiClient(task));
+        TDClient client = spy(plugin.newTDClient(task));
         doNothing().when(client).freezeBulkImportSession(anyString());
-        doNothing().when(client).performBulkImportSession(anyString(), anyInt());
+        doNothing().when(client).performBulkImportSession(anyString());
         doNothing().when(client).commitBulkImportSession(anyString());
 
         { // uploading + unfreeze
@@ -454,7 +453,7 @@ public class TestTdOutputPlugin
     public void waitForStatusChange()
     {
         PluginTask task = pluginTask(config);
-        TdApiClient client = spy(plugin.newTdApiClient(task));
+        TDClient client = spy(plugin.newTDClient(task));
 
         { // performing -> ready
             doReturn(session(PERFORMING, false)).doReturn(session(READY, false)).when(client).getBulkImportSession("my_session");
@@ -512,9 +511,14 @@ public class TestTdOutputPlugin
         return spy(new TdOutputPlugin());
     }
 
-    public static TdApiClient tdApiClient(TdOutputPlugin plugin, PluginTask task)
+    public static TDClient tdClient(TdOutputPlugin plugin, PluginTask task)
     {
-        return spy(plugin.newTdApiClient(task));
+        return spy(plugin.newTDClient(task));
+    }
+
+    public static TDTable newTable(String name, String schema)
+    {
+        return new TDTable("", name, TDTableType.LOG, schema, 0, 0, "", "", "", "");
     }
 
     public static FieldWriterSet fieldWriters(Logger log, PluginTask task, Schema schema)
@@ -522,19 +526,19 @@ public class TestTdOutputPlugin
         return spy(new FieldWriterSet(log, task, schema));
     }
 
-    public static RecordWriter recordWriter(PluginTask task, TdApiClient client, FieldWriterSet fieldWriters)
+    public static RecordWriter recordWriter(PluginTask task, TDClient client, FieldWriterSet fieldWriters)
     {
         return spy(new RecordWriter(task, 0, client, fieldWriters));
     }
 
-    static TdApiNotFoundException notFound()
+    static TDClientHttpNotFoundException notFound()
     {
-        return new TdApiNotFoundException(404, "not found".getBytes());
+        return new TDClientHttpNotFoundException("not found");
     }
 
-    static TdApiConflictException conflict()
+    static TDClientHttpConflictException conflict()
     {
-        return new TdApiConflictException(409, "conflict".getBytes());
+        return new TDClientHttpConflictException("conflict");
     }
 
     private static TDBulkImportSession session(ImportStatus status, boolean uploadFrozen)