embulk-output-oracle 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b0a0f62c43923ecb8fced2310c707fa9549dee
-  data.tar.gz: 0a4b933f2770fb1db850232a3e3b871f29b24890
+  metadata.gz: 93819131e319fc21dfc222a8cc210314c6090b11
+  data.tar.gz: 95c2ce5f6e6c6b76ece685fdfa7db3ab72462e10
 SHA512:
-  metadata.gz: 1ea9df3f2e4533a3a486ffea7fce1da41a1ca87a4af0a378db09b02a18c4a06d886093a36867864af0c0dc6c8363c85b7585d85c472c5a3c738c843c33ac8dc8
-  data.tar.gz: 1a7b88ceaa62d485f351c9267ef9f3061f65bebf57edbb0ddc74aed315bad72fa10c4ec04e20e514965978f4999a7126fd918f5c0513406f660b7a22abea9b4b
+  metadata.gz: 7103236d7c51629469c5940c4b39a197c48ff57f46f63ca0b8a21e2dcdfe725c4bb3efb20706bba400af470ef0fc1670c5d4eaac0354aaa49efc08262b260bc0
+  data.tar.gz: 152fae8051856d856bc542e544dcb916c1307d761454998f7a26d1b31df88c1e922c02a86a3478202a37ecc9c5758476336a90af22f44fbdba3a4d3a01e04b48

data/src/main/java/org/embulk/output/oracle/DirectBatchInsert.java

@@ -153,21 +153,13 @@ public class DirectBatchInsert implements BatchInsert
             rowSize += column.getDataSize();
         }
 
-        TableDefinition tableDefinition = new TableDefinition(quoteIdentifierString(schema), quoteIdentifierString(loadTable), columns);
+        TableDefinition tableDefinition = new TableDefinition(schema, loadTable, columns);
         ociKey = Arrays.asList(database, user, loadTable);
         ociManager.open(ociKey, database, user, password, tableDefinition);
 
         buffer = new RowBuffer(tableDefinition, Math.max(batchSize / rowSize, 8));
     }
 
-    private String quoteIdentifierString(String s)
-    {
-        if (s == null) {
-            return null;
-        }
-        return "\"" + s + "\"";
-    }
-
     @Override
     public int getBatchWeight()
     {

data/src/main/java/org/embulk/output/oracle/oci/OCI.java

@@ -15,7 +15,6 @@ public interface OCI
     static short OCI_NO_DATA = 100;
     static short OCI_CONTINUE = -24200;
 
-
     static int OCI_THREADED = 1;
     static int OCI_OBJECT = 2;
 
@@ -36,13 +35,14 @@ public interface OCI
     static int OCI_ATTR_NUM_ROWS = 81;
     static int OCI_ATTR_NUM_COLS = 102;
     static int OCI_ATTR_LIST_COLUMNS = 103;
+    static int OCI_ATTR_DIRPATH_NO_INDEX_ERRORS = 2013;
 
     static int OCI_DTYPE_PARAM = 53;
 
     static byte OCI_DIRPATH_COL_COMPLETE = 0;
 
-    static int SQLT_CHR = 1;
-    static int SQLT_INT = 3;
+    static short SQLT_CHR = 1;
+    static short SQLT_INT = 3;
 
     short OCIErrorGet(Pointer hndlp,
             @u_int32_t int  recordno,
@@ -129,4 +129,4 @@ public interface OCI
     short OCIDirPathFinish(Pointer dpctx, Pointer errhp);
 
     short OCIDirPathAbort(Pointer dpctx, Pointer errhp);
-}
+ }

data/src/main/java/org/embulk/output/oracle/oci/OCIManager.java

@@ -54,8 +54,8 @@ public class OCIManager
                 ociAndCounter.counter--;
                 if (ociAndCounter.counter == 0) {
                     logger.info(String.format("OCI : close for %s.", key));
-                    ociAndCounter.oci.close();
                     ociAndCounters.remove(key);
+                    ociAndCounter.oci.close();
                 }
             }
         }

data/src/main/java/org/embulk/output/oracle/oci/OCIWrapper.java

@@ -24,7 +24,6 @@ public class OCIWrapper
     private final Charset systemCharset;
     private Pointer envHandle;
     private Pointer errHandle;
-    private Pointer svcHandlePointer;
     private Pointer svcHandle;
     private Pointer dpHandle;
     private Pointer dpcaHandle;
@@ -95,7 +94,7 @@ public class OCIWrapper
         errHandle = errHandlePointer.getPointer(0);
 
         // service context
-        svcHandlePointer = createPointerPointer();
+        Pointer svcHandlePointer = createPointerPointer();
         check("OCIHandleAlloc(OCI_HTYPE_SVCCTX)", oci.OCIHandleAlloc(
                 envHandle,
                 svcHandlePointer,
@@ -142,8 +141,17 @@ public class OCIWrapper
                     errHandle));
         }
 
-        // load table name
-        Pointer tableName = createPointer(tableDefinition.getTableName());
+        Pointer cols = createPointer((short)tableDefinition.getColumnCount());
+        check("OCIAttrSet(OCI_ATTR_NUM_COLS)", oci.OCIAttrSet(
+                dpHandle,
+                OCI.OCI_HTYPE_DIRPATH_CTX,
+                cols,
+                (int)cols.size(),
+                OCI.OCI_ATTR_NUM_COLS,
+                errHandle));
+
+        // load table name (case sensitive)
+        Pointer tableName = createPointer("\"" + tableDefinition.getTableName() + "\"");
         check("OCIAttrSet(OCI_ATTR_NAME)", oci.OCIAttrSet(
                 dpHandle,
                 OCI.OCI_HTYPE_DIRPATH_CTX,
@@ -152,13 +160,13 @@ public class OCIWrapper
                 , OCI.OCI_ATTR_NAME,
                 errHandle));
 
-        Pointer cols = createPointer((short)tableDefinition.getColumnCount());
-        check("OCIAttrSet(OCI_ATTR_NUM_COLS)", oci.OCIAttrSet(
+        Pointer noIndexErrors = createPointer((byte)1);
+        check("OCIAttrSet(OCI_ATTR_DIRPATH_NO_INDEX_ERRORS)", oci.OCIAttrSet(
                 dpHandle,
                 OCI.OCI_HTYPE_DIRPATH_CTX,
-                cols,
-                (int)cols.size(),
-                OCI.OCI_ATTR_NUM_COLS,
+                noIndexErrors,
+                (int)noIndexErrors.size(),
+                OCI.OCI_ATTR_DIRPATH_NO_INDEX_ERRORS,
                 errHandle));
 
         Pointer columnsPointer = createPointerPointer();
@@ -352,10 +360,12 @@ public class OCIWrapper
         committedOrRollbacked = true;
         logger.info("OCI : start to commit.");
 
-        check("OCIDirPathFinish", oci.OCIDirPathFinish(dpHandle, errHandle));
-
-        check("OCILogoff", oci.OCILogoff(svcHandle, errHandle));
-        svcHandle = null;
+        try {
+            check("OCIDirPathFinish", oci.OCIDirPathFinish(dpHandle, errHandle));
+        } finally {
+            check("OCILogoff", oci.OCILogoff(svcHandle, errHandle));
+            svcHandle = null;
+        }
     }
 
     public void rollback() throws SQLException
@@ -363,10 +373,12 @@ public class OCIWrapper
         committedOrRollbacked = true;
         logger.info("OCI : start to rollback.");
 
-        check("OCIDirPathAbort", oci.OCIDirPathAbort(dpHandle, errHandle));
-
-        check("OCILogoff", oci.OCILogoff(svcHandle, errHandle));
-        svcHandle = null;
+        try {
+            check("OCIDirPathAbort", oci.OCIDirPathAbort(dpHandle, errHandle));
+        } finally {
+            check("OCILogoff", oci.OCILogoff(svcHandle, errHandle));
+            svcHandle = null;
+        }
     }
 
     public void close() throws SQLException
@@ -413,6 +425,13 @@ public class OCIWrapper
         return Pointer.wrap(Runtime.getSystemRuntime(), ByteBuffer.wrap(s.getBytes(systemCharset)));
     }
 
+    private Pointer createPointer(byte n)
+    {
+        Pointer pointer = new ArrayMemoryIO(Runtime.getSystemRuntime(), 1);
+        pointer.putByte(0, n);
+        return pointer;
+    }
+
     private Pointer createPointer(short n)
     {
         Pointer pointer = new ArrayMemoryIO(Runtime.getSystemRuntime(), 2);

data/src/main/java/org/embulk/output/oracle/oci/RowBuffer.java

@@ -70,8 +70,8 @@ public class RowBuffer
 
         ByteBuffer bytes = charset.encode(value);
         int length = bytes.remaining();
-        if (length > 65535) {
-            throw new SQLException(String.format("byte count of string is too large (max : 65535, actual : %d).", length));
+        if (length > Short.MAX_VALUE) {
+            throw new SQLException(String.format("byte count of string is too large (max : %d, actual : %d).", Short.MAX_VALUE, length));
         }
         if (length > column.getDataSize()) {
             throw new SQLException(String.format("byte count of string is too large for column \"%s\" (max : %d, actual : %d).",

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

@@ -175,6 +175,12 @@ public class OracleOutputPluginTest
         invoke(test12c, "testInsertDirect");
     }
 
+    @Test
+    public void testInsertDirectDuplicate() throws Exception
+    {
+        invoke(test12c, "testInsertDirectDuplicate");
+    }
+
     @Test
     public void testInsertDirectCreate() throws Exception
     {
@@ -199,6 +205,24 @@ public class OracleOutputPluginTest
         invoke(test12c, "testInsertDirectOCIMethod");
     }
 
+    @Test
+    public void testInsertDirectOCIMethodDuplicate() throws Exception
+    {
+        invoke(test12c, "testInsertDirectOCIMethodDuplicate");
+    }
+
+    @Test
+    public void testInsertDirectOCIMethodMultibyte() throws Exception
+    {
+        invoke(test12c, "testInsertDirectOCIMethodMultibyte");
+    }
+
+    @Test
+    public void testInsertDirectOCIMethodMultibyteDuplicate() throws Exception
+    {
+        invoke(test12c, "testInsertDirectOCIMethodMultibyteDuplicate");
+    }
+
     @Test
     public void testInsertDirectOCIMethodSplit() throws Exception
     {
@@ -211,6 +235,24 @@ public class OracleOutputPluginTest
         invoke(test12c, "testUrl");
     }
 
+    @Test
+    public void testLowerTable() throws Exception
+    {
+        invoke(test12c, "testLowerTable");
+    }
+
+    @Test
+    public void testLowerColumn() throws Exception
+    {
+        invoke(test12c, "testLowerColumn");
+    }
+
+    @Test
+    public void testLowerColumnOptions() throws Exception
+    {
+        invoke(test12c, "testLowerColumnOptions");
+    }
+
     @Test
     public void testReplace() throws Exception
     {

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

@@ -1,6 +1,7 @@
 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;
@@ -147,6 +148,22 @@ public class OracleOutputPluginTestImpl extends AbstractJdbcOutputPluginTest
         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";
@@ -195,6 +212,50 @@ public class OracleOutputPluginTestImpl extends AbstractJdbcOutputPluginTest
         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";
@@ -219,6 +280,42 @@ public class OracleOutputPluginTestImpl extends AbstractJdbcOutputPluginTest
         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";
@@ -316,7 +413,12 @@ public class OracleOutputPluginTestImpl extends AbstractJdbcOutputPluginTest
 
     private void insertRecord(String table) throws SQLException
     {
-        executeSQL(String.format("INSERT INTO %s VALUES('9999', NULL, NULL, NULL, NULL, NULL, NULL)", table));
+        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

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

@@ -0,0 +1,29 @@
+in:
+  type: file
+  path_prefix: '/oracle/data/test1/test1.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: ＴＥＳＴ１
+    mode: insert_direct
+    insert_method: oci
+    column_options:
+      INTEGER_ITEM: {value_type: pass}
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/oracle/yml/test-lower-column-options.yml

@@ -0,0 +1,29 @@
+in:
+  type: file
+  path_prefix: '/oracle/data/test1/test1.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: string}
+    - {name: timestamp_item, type: string}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert_direct
+    column_options:
+      date_item: {value_type: pass}
+      timestamp_item: {value_type: pass}
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/oracle/yml/test-lower-column.yml

@@ -0,0 +1,26 @@
+in:
+  type: file
+  path_prefix: '/oracle/data/test1/test1.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
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/oracle/yml/test-lower-table.yml

@@ -0,0 +1,26 @@
+in:
+  type: file
+  path_prefix: '/oracle/data/test1/test1.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
+    #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.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -40,11 +40,15 @@ files:
 - src/test/resources/oracle/data/test1/test1.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-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
 - src/test/resources/oracle/yml/test-insert-direct.yml
 - src/test/resources/oracle/yml/test-insert-empty.yml
 - src/test/resources/oracle/yml/test-insert.yml
+- src/test/resources/oracle/yml/test-lower-column-options.yml
+- src/test/resources/oracle/yml/test-lower-column.yml
+- src/test/resources/oracle/yml/test-lower-table.yml
 - src/test/resources/oracle/yml/test-replace-empty.yml
 - src/test/resources/oracle/yml/test-replace-long-name-multibyte.yml
 - src/test/resources/oracle/yml/test-replace-long-name.yml
@@ -54,8 +58,8 @@ 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.0.jar
-- classpath/embulk-output-oracle-0.6.0.jar
+- classpath/embulk-output-jdbc-0.6.1.jar
+- classpath/embulk-output-oracle-0.6.1.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0