embulk-output-oracle 0.6.3 → 0.6.4

data/src/test/resources/oracle/yml/test-insert-direct-oci-method-large.yml

@@ -0,0 +1,29 @@
+in:
+  type: file
+  path_prefix: '/oracle/data/test3/test3.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: NVARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert_direct
+    insert_method: oci
+    column_options:
+      INTEGER_ITEM: {value_type: pass}
+    #driver_path: driver/ojdbc7.jar

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,27 +19,40 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
+- classpath/embulk-output-jdbc-0.6.4.jar
+- classpath/embulk-output-oracle-0.6.4.jar
+- lib/embulk/native/x86_64-linux/libembulk-output-oracle-oci.so
+- lib/embulk/native/x86_64-windows/embulk-output-oracle-oci.dll
 - lib/embulk/output/oracle.rb
+- src/main/cpp/common/embulk-output-oracle-oci.cpp
+- src/main/cpp/linux/build.sh
+- src/main/cpp/windows/build.bat
+- src/main/cpp/windows/dllmain.cpp
+- src/main/cpp/windows/embulk-output-oracle-oci.sln
+- src/main/cpp/windows/embulk-output-oracle-oci.vcxproj
 - src/main/java/org/embulk/output/OracleOutputPlugin.java
 - src/main/java/org/embulk/output/oracle/DirectBatchInsert.java
 - src/main/java/org/embulk/output/oracle/InsertMethod.java
 - src/main/java/org/embulk/output/oracle/OracleCharset.java
 - src/main/java/org/embulk/output/oracle/OracleOutputConnection.java
 - src/main/java/org/embulk/output/oracle/OracleOutputConnector.java
+- src/main/java/org/embulk/output/oracle/oci/BulkOCI.java
 - src/main/java/org/embulk/output/oracle/oci/ColumnDefinition.java
 - src/main/java/org/embulk/output/oracle/oci/OCI.java
 - src/main/java/org/embulk/output/oracle/oci/OCIManager.java
 - src/main/java/org/embulk/output/oracle/oci/OCIWrapper.java
+- src/main/java/org/embulk/output/oracle/oci/PrimitiveBulkOCI.java
 - src/main/java/org/embulk/output/oracle/oci/RowBuffer.java
 - src/main/java/org/embulk/output/oracle/oci/TableDefinition.java
 - src/test/java/org/embulk/input/filesplit/LocalFileSplitInputPlugin.java
 - src/test/java/org/embulk/input/filesplit/PartialFile.java
 - src/test/java/org/embulk/input/filesplit/PartialFileInputStream.java
 - src/test/java/org/embulk/output/oracle/OracleOutputPluginTest.java
-- src/test/java/org/embulk/output/oracle/OracleOutputPluginTestImpl.java
 - src/test/resources/oracle/data/test1/test1.csv
+- src/test/resources/oracle/data/test3/test3.csv
 - src/test/resources/oracle/yml/test-insert-direct-direct-method.yml
 - src/test/resources/oracle/yml/test-insert-direct-empty.yml
+- src/test/resources/oracle/yml/test-insert-direct-oci-method-large.yml
 - src/test/resources/oracle/yml/test-insert-direct-oci-method-multibyte.yml
 - src/test/resources/oracle/yml/test-insert-direct-oci-method-split.yml
 - src/test/resources/oracle/yml/test-insert-direct-oci-method.yml
@@ -58,8 +71,6 @@ files:
 - src/test/resources/oracle/yml/test-truncate-insert-oci-method.yml
 - src/test/resources/oracle/yml/test-truncate-insert.yml
 - src/test/resources/oracle/yml/test-url.yml
-- classpath/embulk-output-jdbc-0.6.3.jar
-- classpath/embulk-output-oracle-0.6.3.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0
@@ -70,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: JDBC output plugin for Embulk

data/src/test/java/org/embulk/output/oracle/OracleOutputPluginTestImpl.java

@@ -1,620 +0,0 @@
-package org.embulk.output.oracle;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TimeZone;
-
-import org.embulk.output.AbstractJdbcOutputPluginTest;
-import org.embulk.output.tester.EmbulkPluginTester;
-
-
-public class OracleOutputPluginTestImpl extends AbstractJdbcOutputPluginTest
-{
-    private EmbulkPluginTester tester;
-    private String pluginName;
-
-    public void setTester(EmbulkPluginTester tester) {
-        this.tester = tester;
-    }
-
-    public void setPluginName(String pluginName) {
-        this.pluginName = pluginName;
-    }
-
-    public String beforeClass()
-    {
-        try {
-            Class.forName("oracle.jdbc.OracleDriver");
-
-            try (Connection connection = connect()) {
-                String version = connection.getMetaData().getDriverVersion();
-                System.out.println("Driver version = " + version);
-                return version;
-            }
-
-        } catch (ClassNotFoundException | NoClassDefFoundError e) {
-            //throw new RuntimeException("You should put Oracle JDBC driver on 'driver' directory.");
-            System.err.println("Warning: put Oracle JDBC driver on 'driver' directory in order to test embulk-output-oracle plugin.");
-
-        } catch (SQLException e) {
-            System.err.println(e);
-            //throw new RuntimeException("You should prepare a schema on Oracle 12c (database = 'TESTDB', user = 'TEST_USER', password = 'test_pw', charset = UTF-8).");
-            System.err.println("Warning: prepare a schema on Oracle 12c (database = 'TESTDB', user = 'TEST_USER', password = 'test_pw', charset = UTF-8).");
-            // for example
-            //   CREATE USER EMBULK_USER IDENTIFIED BY "embulk_pw";
-            //   GRANT DBA TO EMBULK_USER;
-        }
-
-        return null;
-    }
-
-    public void testInsert() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-insert.yml");
-
-        assertTable(table);
-    }
-
-    public void testInsertCreate() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-
-        run("/oracle/yml/test-insert.yml");
-
-        assertGeneratedTable1(table);
-    }
-
-    public void testInsertEmpty() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        new File(convertPath("/oracle/data/"), "test2").mkdir();
-        run("/oracle/yml/test-insert-empty.yml");
-
-        assertTableEmpty(table);
-    }
-
-    public void testTruncateInsert() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-        insertRecord(table);
-
-        run("/oracle/yml/test-truncate-insert.yml");
-
-        assertTable(table);
-    }
-
-    public void testTruncateInsertOCIMethod() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-        insertRecord(table);
-
-        run("/oracle/yml/test-truncate-insert-oci-method.yml");
-
-        assertTable(table);
-    }
-
-    public void testTruncateInsertCreate() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-
-        run("/oracle/yml/test-truncate-insert.yml");
-
-        assertGeneratedTable1(table);
-    }
-
-    public void testInsertDirect() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-insert-direct.yml");
-
-        assertTable(table);
-    }
-
-    public void testInsertDirectDuplicate() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-        insertRecord(table, "A002");
-
-        try {
-            run("/oracle/yml/test-insert-direct.yml");
-            fail("Exception expected.");
-        } catch (Exception e) {
-            System.out.println(e);
-        }
-    }
-
-    public void testInsertDirectEmpty() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        new File(convertPath("/oracle/data/"), "test2").mkdir();
-        run("/oracle/yml/test-insert-direct-empty.yml");
-
-        assertTableEmpty(table);
-    }
-
-    public void testInsertDirectCreate() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-
-        run("/oracle/yml/test-insert-direct.yml");
-
-        assertGeneratedTable1(table);
-    }
-
-    public void testInsertDirectDirectMethod() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-insert-direct-direct-method.yml");
-
-        assertTable(table);
-    }
-
-    public void testInsertDirectOCIMethod() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-insert-direct-oci-method.yml");
-
-        assertTable(table);
-    }
-
-    public void testInsertDirectOCIMethodDuplicate() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-        insertRecord(table, "A002");
-
-        try {
-            run("/oracle/yml/test-insert-direct-oci-method.yml");
-            fail("Exception expected.");
-        } catch (Exception e) {
-            System.out.println(e);
-        }
-    }
-
-    public void testInsertDirectOCIMethodMultibyte() throws Exception
-    {
-        String table = "ＴＥＳＴ１";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-insert-direct-oci-method-multibyte.yml");
-
-        assertTable(table);
-    }
-
-    public void testInsertDirectOCIMethodMultibyteDuplicate() throws Exception
-    {
-        String table = "ＴＥＳＴ１";
-
-        dropTable(table);
-        createTable(table);
-        insertRecord(table, "A002");
-
-        try {
-            run("/oracle/yml/test-insert-direct-oci-method-multibyte.yml");
-            fail("Exception expected.");
-        } catch (Exception e) {
-            System.out.println(e);
-        }
-    }
-
-    public void testInsertDirectOCIMethodSplit() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-insert-direct-oci-method-split.yml");
-
-        assertTable(table);
-    }
-
-    public void testUrl() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-url.yml");
-
-        assertTable(table);
-    }
-
-    public void testLowerTable() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-lower-table.yml");
-
-        assertTable(table);
-    }
-
-    public void testLowerColumn() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-lower-column.yml");
-
-        assertTable(table);
-    }
-
-    public void testLowerColumnOptions() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-lower-column-options.yml");
-
-        assertTable(table);
-    }
-
-    public void testReplace() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-replace.yml");
-
-        assertGeneratedTable2(table);
-    }
-
-    public void testReplaceOCIMethod() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-replace-oci-method.yml");
-
-        assertGeneratedTable2(table);
-    }
-
-    public void testReplaceEmpty() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-replace-empty.yml");
-
-        assertTableEmpty(table);
-    }
-
-    public void testReplaceCreate() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-
-        run("/oracle/yml/test-replace.yml");
-
-        assertGeneratedTable2(table);
-    }
-
-
-    public void testReplaceLongName() throws Exception
-    {
-        String table = "TEST12345678901234567890123456";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-replace-long-name.yml");
-
-        assertGeneratedTable2(table);
-    }
-
-    public void testReplaceLongNameMultibyte() throws Exception
-    {
-        String table = "ＴＥＳＴ123456789012345678";
-
-        run("/oracle/yml/test-replace-long-name-multibyte.yml");
-
-        assertGeneratedTable2(table);
-    }
-
-    public void testStringTimestamp() throws Exception
-    {
-        String table = "TEST1";
-
-        dropTable(table);
-        createTable(table);
-
-        run("/oracle/yml/test-string-timestamp.yml");
-
-        assertTable(table);
-    }
-
-    private void createTable(String table) throws SQLException
-    {
-        String sql = String.format("CREATE TABLE %s ("
-                + "ID              CHAR(4),"
-                + "VARCHAR2_ITEM   VARCHAR2(6),"
-                + "NVARCHAR2_ITEM  NVARCHAR2(6),"
-                + "INTEGER_ITEM    NUMBER(4,0),"
-                + "NUMBER_ITEM     NUMBER(10,2),"
-                + "DATE_ITEM       DATE,"
-                + "TIMESTAMP_ITEM  TIMESTAMP,"
-                + "PRIMARY KEY (ID))", table);
-        executeSQL(sql);
-    }
-
-    private void insertRecord(String table) throws SQLException
-    {
-        insertRecord(table, "9999");
-    }
-
-    private void insertRecord(String table, String id) throws SQLException
-    {
-        executeSQL(String.format("INSERT INTO %s VALUES('%s', NULL, NULL, NULL, NULL, NULL, NULL)", table, id));
-    }
-
-    private void assertTable(String table) throws Exception
-    {
-        // datetime of UTC will be inserted by embulk.
-        // datetime of default timezone will be selected by JDBC.
-        TimeZone timeZone = TimeZone.getDefault();
-        List<List<Object>> rows = select(table);
-
-        /*
-        A001,ABCDE,abcde,,0,123.45,2015/03/05,2015/03/05 12:34:56
-        A002,ＡＢ,ａｂｃｄｅｆ,-9999,-99999999.99,2015/03/06,2015/03/06 23:59:59
-        A003,,,,,,
-        */
-
-        assertEquals(3, rows.size());
-        Iterator<List<Object>> i1 = rows.iterator();
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A001", i2.next());
-            assertEquals("ABCDE", i2.next());
-            assertEquals("abcde", i2.next());
-            assertEquals(new BigDecimal("0"), i2.next());
-            assertEquals(new BigDecimal("123.45"), i2.next());
-            assertEquals(toTimestamp("2015/03/05 00:00:00", timeZone), i2.next());
-            assertEquals(toOracleTimestamp("2015/03/05 12:34:56", timeZone), i2.next());
-        }
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A002", i2.next());
-            assertEquals("ＡＢ", i2.next());
-            assertEquals("ａｂｃｄｅｆ", i2.next());
-            assertEquals(new BigDecimal("-9999"), i2.next());
-            assertEquals(new BigDecimal("-99999999.99"), i2.next());
-            assertEquals(toTimestamp("2015/03/06 00:00:00", timeZone), i2.next());
-            assertEquals(toOracleTimestamp("2015/03/06 23:59:59", timeZone), i2.next());
-        }
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A003", i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-        }
-    }
-
-    private void assertTableEmpty(String table) throws Exception
-    {
-        List<List<Object>> rows = select(table);
-        assertEquals(0, rows.size());
-    }
-
-    private void assertGeneratedTable1(String table) throws Exception
-    {
-        // datetime of UTC will be inserted by embulk.
-        // datetime of default timezone will be selected by JDBC.
-        TimeZone timeZone = TimeZone.getDefault();
-        List<List<Object>> rows = select(table);
-
-        /*
-        A001,ABCDE,abcde,0,123.45,2015/03/05,2015/03/05 12:34:56
-        A002,ＡＢ,ａｂｃｄｅｆ,-9999,-99999999.99,2015/03/06,2015/03/06 23:59:59
-        A003,,,,,,
-        */
-
-        assertEquals(3, rows.size());
-        Iterator<List<Object>> i1 = rows.iterator();
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A001", i2.next());
-            assertEquals("ABCDE", i2.next());
-            assertEquals("abcde", i2.next());
-            assertEquals(new BigDecimal("0"), i2.next());
-            assertEquals("123.45", i2.next());
-            assertEquals(toOracleTimestamp("2015/03/05 00:00:00", timeZone), i2.next());
-            assertEquals(toOracleTimestamp("2015/03/05 12:34:56", timeZone), i2.next());
-        }
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A002", i2.next());
-            assertEquals("ＡＢ", i2.next());
-            assertEquals("ａｂｃｄｅｆ", i2.next());
-            assertEquals(new BigDecimal("-9999"), i2.next());
-            assertEquals("-99999999.99", i2.next());
-            assertEquals(toOracleTimestamp("2015/03/06 00:00:00", timeZone), i2.next());
-            assertEquals(toOracleTimestamp("2015/03/06 23:59:59", timeZone), i2.next());
-        }
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A003", i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-        }
-    }
-
-    private void assertGeneratedTable2(String table) throws Exception
-    {
-        // datetime of UTC will be inserted by embulk.
-        // datetime of default timezone will be selected by JDBC.
-        TimeZone timeZone = TimeZone.getDefault();
-        List<List<Object>> rows = select(table);
-
-        /*
-        A001,ABCDE,abcde,0,123.45,2015/03/05,2015/03/05 12:34:56
-        A002,ＡＢ,ａｂｃｄｅｆ,-9999,-99999999.99,2015/03/06,2015/03/06 23:59:59
-        A003,,,,,,
-        */
-
-        assertEquals(3, rows.size());
-        Iterator<List<Object>> i1 = rows.iterator();
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A001", i2.next());
-            assertEquals("ABCDE", i2.next());
-            assertEquals("abcde", i2.next());
-            assertEquals(new BigDecimal("0"), i2.next());
-            assertEquals(new BigDecimal("123.45"), i2.next());
-            assertEquals(toTimestamp("2015/03/05 00:00:00", timeZone), i2.next());
-            assertEquals(toOracleTimestamp("2015/03/05 12:34:56", timeZone), i2.next());
-        }
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A002", i2.next());
-            assertEquals("ＡＢ", i2.next());
-            assertEquals("ａｂｃｄｅｆ", i2.next());
-            assertEquals(new BigDecimal("-9999"), i2.next());
-            assertEquals(new BigDecimal("-99999999.99"), i2.next());
-            assertEquals(toTimestamp("2015/03/06 00:00:00", timeZone), i2.next());
-            assertEquals(toOracleTimestamp("2015/03/06 23:59:59", timeZone), i2.next());
-        }
-        {
-            Iterator<Object> i2 = i1.next().iterator();
-            assertEquals("A003", i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-            assertEquals(null, i2.next());
-        }
-    }
-
-    @Override
-    protected Object getValue(ResultSet resultSet, int index) throws SQLException
-    {
-        if (resultSet.getMetaData().getColumnTypeName(index).equals("CLOB")) {
-            return resultSet.getString(index);
-        }
-        return super.getValue(resultSet, index);
-    }
-
-
-    private Timestamp toTimestamp(String s, TimeZone timeZone)
-    {
-        for (String formatString : new String[]{"yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd"}) {
-            DateFormat dateFormat = new SimpleDateFormat(formatString);
-            dateFormat.setTimeZone(timeZone);
-            try {
-                Date date = dateFormat.parse(s);
-                return new Timestamp(date.getTime());
-            } catch (ParseException e) {
-                // NOP
-            }
-        }
-        throw new IllegalArgumentException(s);
-    }
-
-    private Object toOracleTimestamp(String s, TimeZone timeZone) throws Exception
-    {
-        Class<?> timestampClass = Class.forName("oracle.sql.TIMESTAMP");
-        Constructor<?> constructor = timestampClass.getConstructor(Timestamp.class);
-        return constructor.newInstance(toTimestamp(s, timeZone));
-    }
-
-    @Override
-    protected Connection connect() throws SQLException
-    {
-        return DriverManager.getConnection("jdbc:oracle:thin:@localhost:1521:TESTDB", "TEST_USER", "test_pw");
-    }
-
-    private void run(String ymlName) throws Exception
-    {
-        tester.run(convertYml(ymlName));
-    }
-
-    @Override
-    protected String convertYmlLine(String line)
-    {
-        return line.replaceAll("type: oracle", "type: " + pluginName);
-    }
-
-}