embulk-output-oracle 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f22f18309d604502073834ef9bcac39ba1c7ed2
-  data.tar.gz: f4e47f7c177a3f8d99c0a6ebbc8eb7e3d5882417
+  metadata.gz: 1c196893bc6c5cd54b0fdd6933634de04145b5c2
+  data.tar.gz: 433b11005ff3c74efbfda08efe789e473634a15a
 SHA512:
-  metadata.gz: f8791a70edae2c6af65682b2e96fb6186563509f7eff0d1c952d6e19b641e663e1f64624f4f57d441d4dc3d8efd8838d0006bc75c537b386c51fae3252e2ebdc
-  data.tar.gz: 713c24da25c5b10dcb47589ec5aa690ea6f64643961f3bf3273eed14bed835c23dec84e8c352bc3fcce04555c4ec00432334b850143fd53ec4f4861708760ecb
+  metadata.gz: d4f361b8d4507f0993664aa40be3ee8411705148c2161de3bb172d8dc2b2e6b2ed928dbb106aa20b80a6ade4c81887cb2efd183be19b8af807373fa20d804a6b
+  data.tar.gz: 59614a59bb30a5c2f0a5b1d900991e1bdb6dd692b210bd4972cde255b8f40322a621becf9175b6f19c4f909ac63d56a8aaa74d0ebca0d575c1f9e59ba6408e6a

data/README.md

@@ -5,8 +5,8 @@ Oracle output plugins for Embulk loads records to Oracle.
 ## Overview
 
 * **Plugin type**: output
-* **Load all or nothing**: depnds on the mode. see bellow.
-* **Resume supported**: depnds on the mode. see bellow.
+* **Load all or nothing**: depnds on the mode. see below.
+* **Resume supported**: depnds on the mode. see below.
 
 ## Configuration
 
@@ -19,7 +19,7 @@ Oracle output plugins for Embulk loads records to Oracle.
 - **url**: URL of the JDBC connection (string, optional)
 - **table**: destination table name (string, required)
 - **options**: extra connection properties (hash, default: {})
-- **mode**: "insert", "insert_direct", "truncate_insert", or "replace". See bellow. (string, required)
+- **mode**: "insert", "insert_direct", "truncate_insert", or "replace". See below. (string, required)
 - **insert_method**: see below
 - **batch_size**: size of a single batch insert (integer, default: 16777216)
 - **default_timezone**: If input column type (embulk type) is timestamp, this plugin needs to format the timestamp into a SQL string. This default_timezone option is used to control the timezone. You can overwrite timezone for each columns using column_options option. (string, default: `UTC`)
@@ -48,13 +48,13 @@ Oracle output plugins for Embulk loads records to Oracle.
   * Transactional: Yes.
   * Resumable: No.
 
-### Insert modes
+### Insert methods
 
 insert_method supports three options.
 
 "normal" means normal insert (default). It requires Oracle JDBC driver.
 
-"direct" means direct path insert. It is faster than 'normal.
+"direct" means direct path insert. It is faster than "normal".
 It requires Oracle JDBC driver too, but the version 12 driver doesn't work (the version 11 driver works).
 
 "oci" means direct path insert using OCI(Oracle Call Interface). It is fastest.

data/build.gradle

@@ -2,6 +2,6 @@
 
 dependencies {
     compile project(':embulk-output-jdbc')
-    testCompile 'org.embulk:embulk-standards:0.8.0'
+    testCompile 'org.embulk:embulk-standards:0.8.8'
     testCompile files('../embulk-output-jdbc/build/classes/test/')
 }

data/src/main/java/org/embulk/output/OracleOutputPlugin.java

@@ -4,8 +4,10 @@ import java.util.List;
 import java.util.Properties;
 import java.io.IOException;
 import java.sql.SQLException;
+
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
+
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
@@ -40,6 +42,10 @@ public class OracleOutputPlugin
         @ConfigDefault("null")
         public Optional<String> getDatabase();
 
+        @Config("schema")
+        @ConfigDefault("null")
+        public Optional<String> getSchema();
+
         @Config("url")
         @ConfigDefault("null")
         public Optional<String> getUrl();
@@ -117,7 +123,7 @@ public class OracleOutputPlugin
         logger.info("Connecting to {} options {}", url, props);
         props.setProperty("password", oracleTask.getPassword());
 
-        return new OracleOutputConnector(url, props, oracleTask.getInsertMethod() == InsertMethod.direct);
+        return new OracleOutputConnector(url, props, oracleTask.getSchema().orNull(), oracleTask.getInsertMethod() == InsertMethod.direct);
     }
 
     @Override
@@ -131,8 +137,8 @@ public class OracleOutputPlugin
         JdbcOutputConnector connector = getConnector(task, true);
 
         if (oracleTask.getInsertMethod() == InsertMethod.oci) {
-        	OracleCharset charset;
-        	OracleCharset nationalCharset;
+            OracleCharset charset;
+            OracleCharset nationalCharset;
             try (OracleOutputConnection connection = (OracleOutputConnection)connector.connect(true)) {
                 charset = connection.getOracleCharset();
                 nationalCharset = connection.getOracleNationalCharset();
@@ -142,7 +148,7 @@ public class OracleOutputPlugin
                     String.format("%s:%d/%s", oracleTask.getHost().get(), oracleTask.getPort(), oracleTask.getDatabase().get()),
                     oracleTask.getUser(),
                     oracleTask.getPassword(),
-                    oracleTask.getTable(),
+                    oracleTask.getSchema().orNull(),
                     charset,
                     nationalCharset,
                     oracleTask.getBatchSize());

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

@@ -14,6 +14,7 @@ import java.util.List;
 import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.JdbcSchema;
+import org.embulk.output.jdbc.TimestampFormat;
 import org.embulk.output.oracle.oci.ColumnDefinition;
 import org.embulk.output.oracle.oci.OCI;
 import org.embulk.output.oracle.oci.OCIManager;
@@ -34,6 +35,7 @@ public class DirectBatchInsert implements BatchInsert
     private final String database;
     private final String user;
     private final String password;
+    private final String schema;
     private final OracleCharset charset;
     private final OracleCharset nationalCharset;
     private final int batchSize;
@@ -41,16 +43,18 @@ public class DirectBatchInsert implements BatchInsert
     private long totalRows;
     private int rowSize;
     private int batchWeight;
+    private boolean closed;
 
     private DateFormat[] formats;
 
 
-    public DirectBatchInsert(String database, String user, String password, String table,
+    public DirectBatchInsert(String database, String user, String password, String schema,
             OracleCharset charset, OracleCharset nationalCharset, int batchSize)
     {
         this.database = database;
         this.user = user;
         this.password = password;
+        this.schema = schema;
         this.charset = charset;
         this.nationalCharset = nationalCharset;
         this.batchSize = batchSize;
@@ -149,13 +153,21 @@ public class DirectBatchInsert implements BatchInsert
             rowSize += column.getDataSize();
         }
 
-        TableDefinition tableDefinition = new TableDefinition("\"" + loadTable + "\"", columns);
+        TableDefinition tableDefinition = new TableDefinition(quoteIdentifierString(schema), quoteIdentifierString(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()
     {
@@ -174,7 +186,10 @@ public class DirectBatchInsert implements BatchInsert
     @Override
     public void close() throws IOException, SQLException
     {
-        ociManager.close(ociKey);
+        if (!closed) {
+            ociManager.close(ociKey);
+            closed = true;
+        }
     }
 
     @Override

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

@@ -32,10 +32,10 @@ public class OracleOutputConnection
     private OracleCharset charset;
     private OracleCharset nationalCharset;
 
-    public OracleOutputConnection(Connection connection, boolean autoCommit, boolean direct)
+    public OracleOutputConnection(Connection connection, String schemaName, boolean autoCommit, boolean direct)
             throws SQLException
     {
-        super(connection, getSchema(connection));
+        super(connection, schemaName == null ? getSchema(connection) : schemaName);
         connection.setAutoCommit(autoCommit);
 
         this.direct = direct;
@@ -54,7 +54,10 @@ public class OracleOutputConnection
 
     @Override
     protected void setSearchPath(String schema) throws SQLException {
-        // NOP
+        if (!getSchema(connection).equals(schema)) {
+            // Because old Oracle JDBC drivers don't support Connection#setSchema method.
+            connection.setSchema(schema);
+        }
     }
 
     @Override

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

@@ -12,9 +12,10 @@ public class OracleOutputConnector
 {
     private final String url;
     private final Properties properties;
+    private final String schemaName;
     private final boolean direct;
 
-    public OracleOutputConnector(String url, Properties properties, boolean direct)
+    public OracleOutputConnector(String url, Properties properties, String schemaName, boolean direct)
     {
         try {
             Class.forName("oracle.jdbc.OracleDriver");
@@ -23,6 +24,7 @@ public class OracleOutputConnector
         }
         this.url = url;
         this.properties = properties;
+        this.schemaName = schemaName;
         this.direct = direct;
     }
 
@@ -36,7 +38,7 @@ public class OracleOutputConnector
         }
 
         try {
-            OracleOutputConnection con = new OracleOutputConnection(c, autoCommit, direct);
+            OracleOutputConnection con = new OracleOutputConnection(c, schemaName, autoCommit, direct);
             c = null;
             return con;
 

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

@@ -30,6 +30,7 @@ public interface OCI
     static int OCI_ATTR_DATA_TYPE = 2;
     static int OCI_ATTR_NAME = 4;
     static int OCI_ATTR_ROW_COUNT = 9;
+    static int OCI_ATTR_SCHEMA_NAME = 9;
     static int OCI_ATTR_CHARSET_ID = 31;
     static int OCI_ATTR_DATEFORMAT = 75;
     static int OCI_ATTR_NUM_ROWS = 81;

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

@@ -131,6 +131,17 @@ public class OCIWrapper
     {
         this.tableDefinition = tableDefinition;
 
+        if (tableDefinition.getSchemaName() != null) {
+            Pointer schemaName = createPointer(tableDefinition.getSchemaName());
+            check("OCIAttrSet(OCI_ATTR_NAME)", oci.OCIAttrSet(
+                    dpHandle,
+                    OCI.OCI_HTYPE_DIRPATH_CTX,
+                    schemaName,
+                    (int)schemaName.size()
+                    , OCI.OCI_ATTR_SCHEMA_NAME,
+                    errHandle));
+        }
+
         // load table name
         Pointer tableName = createPointer(tableDefinition.getTableName());
         check("OCIAttrSet(OCI_ATTR_NAME)", oci.OCIAttrSet(
@@ -398,7 +409,8 @@ public class OCIWrapper
 
     private Pointer createPointer(String s)
     {
-        return Pointer.wrap(Runtime.getSystemRuntime(), ByteBuffer.wrap(s.getBytes()));
+        // not database charset, but system charset of client
+        return Pointer.wrap(Runtime.getSystemRuntime(), ByteBuffer.wrap(s.getBytes(systemCharset)));
     }
 
     private Pointer createPointer(short n)

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

@@ -4,33 +4,40 @@ import java.util.List;
 
 public class TableDefinition
 {
+    private final String schemaName;
     private final String tableName;
     private final ColumnDefinition[] columns;
 
 
-    public TableDefinition(String tableName, ColumnDefinition... columns)
+    public TableDefinition(String schemaName, String tableName, ColumnDefinition... columns)
     {
+        this.schemaName = schemaName;
         this.tableName = tableName;
         this.columns = columns;
     }
 
-    public TableDefinition(String tableName, List<ColumnDefinition> columns)
+    public TableDefinition(String schemaName, String tableName, List<ColumnDefinition> columns)
     {
-        this(tableName, columns.toArray(new ColumnDefinition[columns.size()]));
+        this(schemaName, tableName, columns.toArray(new ColumnDefinition[columns.size()]));
+    }
+
+    public String getSchemaName()
+    {
+        return schemaName;
     }
 
     public String getTableName()
     {
-    	return tableName;
+        return tableName;
     }
 
     public int getColumnCount()
     {
-    	return columns.length;
+        return columns.length;
     }
 
     public ColumnDefinition getColumn(int index)
     {
-    	return columns[index];
+        return columns[index];
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -26,7 +26,6 @@ files:
 - 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/TimestampFormat.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
@@ -38,7 +37,6 @@ files:
 - 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/java/org/embulk/output/oracle/TimestampFormatTest.java
 - 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
@@ -56,8 +54,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.5.0.jar
-- classpath/embulk-output-oracle-0.5.0.jar
+- classpath/embulk-output-jdbc-0.5.1.jar
+- classpath/embulk-output-oracle-0.5.1.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0

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

@@ -1,37 +0,0 @@
-package org.embulk.output.oracle;
-
-import java.sql.Timestamp;
-import java.text.FieldPosition;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-
-public class TimestampFormat extends SimpleDateFormat
-{
-
-    private final int scale;
-
-    public TimestampFormat(String pattern, int scale)
-    {
-        super(pattern);
-
-        this.scale = scale;
-    }
-
-    @Override
-    public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition pos)
-    {
-        StringBuffer buffer = super.format(date, toAppendTo, pos);
-        if (scale > 0) {
-            buffer.append('.');
-            String nanos = Integer.toString(((Timestamp)date).getNanos());
-            int zeros = Math.min(scale, 9 - nanos.length());
-            for (int i = 0; i < zeros; i++) {
-                buffer.append('0');
-            }
-            buffer.append(nanos.substring(0, scale - zeros));
-        }
-        return buffer;
-    }
-
-}

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

@@ -1,57 +0,0 @@
-package org.embulk.output.oracle;
-
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class TimestampFormatTest {
-
-    @Test
-    public void test() throws ParseException
-    {
-        Date date = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse("2015/03/04 17:08:09");
-        Timestamp t = new Timestamp(date.getTime());
-
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
-            assertEquals("2015-03-04 17:08:09.000000000", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 0);
-            assertEquals("2015-03-04 17:08:09", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 1);
-            assertEquals("2015-03-04 17:08:09.0", format.format(t));
-        }
-
-        t.setNanos(1234567);
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
-            assertEquals("2015-03-04 17:08:09.001234567", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 2);
-            assertEquals("2015-03-04 17:08:09.00", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 3);
-            assertEquals("2015-03-04 17:08:09.001", format.format(t));
-        }
-
-        t.setNanos(123456789);
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
-            assertEquals("2015-03-04 17:08:09.123456789", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 1);
-            assertEquals("2015-03-04 17:08:09.1", format.format(t));
-        }
-    }
-
-}