Merge pull request #301 from civitaspo/flexible-temp-table-suffix

Make temp tables suffix length flexible

Author: dmikurube

embulk-output-jdbc/src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java

@@ -59,6 +59,7 @@
 import org.embulk.util.retryhelper.RetryExecutor;
 import org.embulk.util.retryhelper.RetryGiveupException;
 import org.embulk.util.retryhelper.Retryable;
+import org.msgpack.core.annotations.VisibleForTesting;
 import org.embulk.util.config.Config;
 import org.embulk.util.config.ConfigDefault;
 import org.embulk.util.config.ConfigMapper;
@@ -693,10 +694,10 @@ public List<TableIdentifier> call() throws Exception
                 {
                     intermTables = new ArrayList<>();
                     if (task.getMode().tempTablePerTask()) {
-                        String namePrefix = generateIntermediateTableNamePrefix(task.getActualTable().getTableName(), con, 3,
+                        String tableNameFormat = generateIntermediateTableNameFormat(task.getActualTable().getTableName(), con, taskCount,
                                 task.getFeatures().getMaxTableNameLength(), task.getFeatures().getTableNameLengthSemantics());
                         for (int taskIndex = 0; taskIndex < taskCount; taskIndex++) {
-                            String tableName = namePrefix + String.format("%03d", taskIndex % 1000);
+                            String tableName = String.format(tableNameFormat, taskIndex);
                             table = buildIntermediateTableId(con, task, tableName);
                             // if table already exists, SQLException will be thrown
                             con.createTable(table, newTableSchema, task.getCreateTableConstraint(), task.getCreateTableOption());
@@ -760,6 +761,25 @@ private void dropTables() throws SQLException
         }
     }
 
+    @VisibleForTesting
+    static int calculateSuffixLength(int taskCount)
+    {
+        assert(taskCount >= 0);
+        // NOTE: for backward compatibility
+        //       See. https://github.com/embulk/embulk-output-jdbc/pull/301
+        int minimumLength = 3;
+        return Math.max(minimumLength, String.valueOf(taskCount - 1).length());
+    }
+
+    protected String generateIntermediateTableNameFormat(String baseTableName, JdbcOutputConnection con,
+            int taskCount, int maxLength, LengthSemantics lengthSemantics) throws SQLException
+    {
+        int suffixLength = calculateSuffixLength(taskCount);
+        String prefix = generateIntermediateTableNamePrefix(baseTableName, con, suffixLength, maxLength, lengthSemantics);
+        String suffixFormat = "%0" + suffixLength + "d";
+        return prefix + suffixFormat;
+    }
+
     protected String generateIntermediateTableNamePrefix(String baseTableName, JdbcOutputConnection con,
             int suffixLength, int maxLength, LengthSemantics lengthSemantics) throws SQLException
     {

embulk-output-jdbc/src/test/java/org/embulk/output/TestJdbcOutputPlugin.java

@@ -1,4 +1,4 @@
-package org.embulk.output;
+package org.embulk.output.jdbc;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,8 +24,8 @@
 
 import org.embulk.config.ConfigException;
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
-import org.embulk.output.tester.EmbulkPluginTester;
-import org.embulk.output.tester.EmbulkPluginTester.PluginDefinition;
+import org.embulk.output.jdbc.tester.EmbulkPluginTester;
+import org.embulk.output.jdbc.tester.EmbulkPluginTester.PluginDefinition;
 import org.yaml.snakeyaml.Yaml;
 
 import static java.util.Locale.ENGLISH;

embulk-output-jdbc/src/test/java/org/embulk/output/AbstractJdbcOutputPluginTest.java renamed to embulk-output-jdbc/src/test/java/org/embulk/output/jdbc/AbstractJdbcOutputPluginTest.java

@@ -0,0 +1,63 @@
+package org.embulk.output.jdbc;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class TestJdbcOutputPlugin
+{
+    @Test
+    public void testCalculateSuffixLength()
+    {
+        {
+            try {
+                AbstractJdbcOutputPlugin.calculateSuffixLength(-1);
+            } catch (java.lang.AssertionError e) {
+                assert(true);
+            }
+        }
+        {
+            try {
+                AbstractJdbcOutputPlugin.calculateSuffixLength(0);
+            } catch (java.lang.AssertionError e) {
+                assert(true);
+            }
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(1);
+            assertEquals(3, i);
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(10);
+            assertEquals(3, i);
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(11);
+            assertEquals(3, i);
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(100);
+            assertEquals(3, i);
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(101);
+            assertEquals(3, i);
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(1000);
+            assertEquals(3, i);
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(1001);
+            assertEquals(4, i);
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(10000);
+            assertEquals(4, i);
+        }
+        {
+            int i = AbstractJdbcOutputPlugin.calculateSuffixLength(10001);
+            assertEquals(5, i);
+        }
+    }
+}

embulk-output-jdbc/src/test/java/org/embulk/output/jdbc/TestJdbcOutputPlugin.java

@@ -1,4 +1,4 @@
-package org.embulk.output;
+package org.embulk.output.jdbc;
 
 import java.sql.Timestamp;
 import java.text.ParseException;

embulk-output-jdbc/src/test/java/org/embulk/output/TimestampFormatTest.java renamed to embulk-output-jdbc/src/test/java/org/embulk/output/jdbc/TimestampFormatTest.java

@@ -1,4 +1,4 @@
-package org.embulk.output.tester;
+package org.embulk.output.jdbc.tester;
 
 import java.util.ArrayList;
 import java.util.Collections;