embulk-output-oracle 0.7.10 → 0.7.11

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_multibyte_table.yml

@@ -0,0 +1,2 @@
+table: ＴＥＳＴ１
+mode: insert

data/src/test/resources/{oracle/data/test3/test3.csv → org/embulk/output/oracle/test/expect/basic/test_large.csv}

@@ -1,5 +1,6 @@
-0001,ABCDE,abcde,0,123.45,2015/03/05,2015/03/05 12:34:56
-0002,ＡＢ,ａｂｃｄｅｆ,-9999,-99999999.99,2015/03/06,2015/03/06 23:59:59
+ID:string,VARCHAR2_ITEM:string,NVARCHAR2_ITEM:string,INTEGER_ITEM:long,NUMBER_ITEM:string,DATE_ITEM:timestamp,TIMESTAMP_ITEM:timestamp
+0001,ABCDE,abcde,0,123.45,2015-03-05 00:00:00.000 +0900,2015-03-05 12:34:56.000 +0900
+0002,ＡＢ,ａｂｃｄｅｆ,-9999,-99999999.99,2015-03-06 00:00:00.000 +0900,2015-03-06 23:59:59.000 +0900
 0003,,,,,,
 0004,XXXXXX,ＸＸＸＸＸＸ,1234,12345678.9,,
 0005,XXXXXX,ＸＸＸＸＸＸ,1234,12345678.9,,
@@ -9996,4 +9997,3 @@
 9996,XXXXXX,ＸＸＸＸＸＸ,1234,12345678.9,,
 9997,XXXXXX,ＸＸＸＸＸＸ,1234,12345678.9,,
 9998,XXXXXX,ＸＸＸＸＸＸ,1234,12345678.9,,
-9999,XXXXXX,ＸＸＸＸＸＸ,1234,12345678.9,,

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_column.csv

@@ -0,0 +1,4 @@
+id:string,varchar2_item:string,nvarchar2_item:string,integer_item:long,number_item:string,date_item:timestamp,timestamp_item:timestamp
+A001,ABCDE,abcde,0,123.45,2015-03-05 00:00:00.000 +0900,2015-03-05 12:34:56.000 +0900
+A002,ＡＢ,ａｂｃｄｅｆ,-9999,-99999999.99,2015-03-06 00:00:00.000 +0900,2015-03-06 23:59:59.000 +0900
+A003,,,,,,

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_column.yml

@@ -0,0 +1,2 @@
+table: TEST1
+mode: insert_direct

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_column_options.csv

@@ -0,0 +1,4 @@
+id:string,varchar2_item:string,nvarchar2_item:string,integer_item:long,number_item:string,date_item:string,timestamp_item:string
+A001,ABCDE,abcde,0,123.45,2015/03/04,2015/03/05 03:34:56
+A002,ＡＢ,ａｂｃｄｅｆ,-9999,-99999999.99,2015/03/05,2015/03/06 14:59:59
+A003,,,,,,

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_column_options.yml

@@ -0,0 +1,5 @@
+table: TEST1
+mode: insert_direct
+column_options:
+  date_item: {value_type: pass}
+  timestamp_item: {value_type: pass}

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_table.yml

@@ -0,0 +1,2 @@
+table: test1
+mode: insert_direct

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge.csv

@@ -0,0 +1,6 @@
+ID:string,VARCHAR2_ITEM:string,NUMBER_ITEM:double
+A001,aaa,99.99
+A002,bbb,88.88
+A003,ccc,77.77
+A004,,
+A005,,

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge.yml

@@ -0,0 +1,2 @@
+table: TEST_MERGE1
+mode: merge

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_expected.csv

@@ -0,0 +1,6 @@
+A001,aaa   ,      99.99
+A002,bbb   ,      88.88
+A003,ccc   ,      77.77
+A004,      ,
+A005,      ,
+A006,FFF   ,          0

data/src/test/resources/{oracle/data/test5/test5.csv → org/embulk/output/oracle/test/expect/basic/test_merge_keys.csv}

@@ -1,4 +1,5 @@
-A004,BBB,22.21
-A005,BBB,22.22
-A006,BBB,22.23
-A007,CCC,33.33
+ID:string,VARCHAR2_ITEM:string,NUMBER_ITEM:double
+A004,BBB,22.21
+A005,BBB,22.22
+A006,BBB,22.23
+A007,CCC,33.33

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_keys.yml

@@ -0,0 +1,3 @@
+table: TEST_MERGE1
+mode: merge
+merge_keys: [VARCHAR2_ITEM,NUMBER_ITEM]

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_keys_expected.csv

@@ -0,0 +1,5 @@
+A001,AAA   ,      11.11
+A004,BBB   ,      22.21
+A005,BBB   ,      22.22
+A006,BBB   ,      22.23
+A007,CCC   ,      33.33

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_rule.csv

@@ -0,0 +1,6 @@
+ID:string,VARCHAR2_ITEM:string,NUMBER_ITEM:double
+A001,aaa,99.99
+A002,bbb,88.88
+A003,ccc,77.77
+A004,,
+A005,,

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_rule.yml

@@ -0,0 +1,3 @@
+table: TEST_MERGE1
+mode: merge
+merge_rule: ["VARCHAR2_ITEM = 'x'", "NUMBER_ITEM = T.NUMBER_ITEM + S.NUMBER_ITEM"]

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_rule_expected.csv

@@ -0,0 +1,6 @@
+A001,aaa   ,      99.99
+A002,x     ,      111.1
+A003,ccc   ,      77.77
+A004,x     ,
+A005,      ,
+A006,FFF   ,      66.66

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace.yml

@@ -0,0 +1,2 @@
+table: TEST1
+mode: replace

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace_column_options.yml

@@ -0,0 +1,10 @@
+table: TEST1
+mode: replace
+column_options:
+  ID: {type: 'CHAR(4)'}
+  VARCHAR2_ITEM: {type: 'VARCHAR2(6)'}
+  NVARCHAR2_ITEM: {type: 'NVARCHAR2(6)'}
+  INTEGER_ITEM: {type: 'NUMBER(4,0)'}
+  NUMBER_ITEM: {type: 'NUMBER(10,2)'}
+  DATE_ITEM: {type: 'DATE'}
+  TIMESTAMP_ITEM: {type: 'TIMESTAMP'}

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace_longname.yml

@@ -0,0 +1,2 @@
+table: TEST12345678901234567890123456
+mode: replace

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace_longname_multibyte.yml

@@ -0,0 +1,2 @@
+table: ＴＥＳＴ123456789012345678
+mode: replace

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace_oci.yml

@@ -0,0 +1,3 @@
+table: TEST1
+mode: replace
+insert_method: oci

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_string_timestamp.csv

@@ -0,0 +1,4 @@
+ID:string,VARCHAR2_ITEM:string,NVARCHAR2_ITEM:string,INTEGER_ITEM:long,NUMBER_ITEM:string,DATE_ITEM:string,TIMESTAMP_ITEM:string
+A001,ABCDE,abcde,0,123.45,2015/03/04,2015/03/05 03:34:56
+A002,ＡＢ,ａｂｃｄｅｆ,-9999,-99999999.99,2015/03/05,2015/03/06 14:59:59
+A003,,,,,,

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_string_timestamp.yml

@@ -0,0 +1,5 @@
+table: TEST1
+mode: insert_direct
+column_options:
+  DATE_ITEM: {value_type: pass}
+  TIMESTAMP_ITEM: {value_type: pass}

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_string_timestamp_expected.csv

@@ -0,0 +1,4 @@
+9999,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL
+A001,0,1234,123456,12345678901,0,1.23,3.456,12.3400,123.4567,0.1234567,0.12345678901234,a   ,b,c,A   ,B,C,2015-12-31,2016-12-31 16:02:03.123,2018-01-01 01:02:03.1234567,2018-12-31 16:02:03.12,2019-12-31 16:02:00,03:04:05.1234567,21:07:08.12
+A002,255,-32768,-2147483648,-9223372036854775808,1,-9999999999.99,-99.999,-214748.3648,-922337203685477.5808,-9.9989996E+9,-9.9999999999900006E+17,あい,あいうえ,あいうえお,かき  ,かきくけ,かきくけこ,2016-12-30,2017-12-31 14:59:59.997,2018-12-31 23:59:59.9999999,2019-12-31 14:59:59.99,2020-12-31 15:00:00,23:59:59.9999999,14:59:59.99
+A003,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_truncate_insert.yml

@@ -0,0 +1,2 @@
+table: TEST1
+mode: truncate_insert

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_truncate_insert_expected.csv

@@ -0,0 +1,3 @@
+A001,ABCDE ,abcde ,           0,     123.45,15-03-04,15-03-05 03:34:56.000000000
+A002,ＡＢ  ,ａｂｃｄｅｆ,       -9999, -100000000,15-03-05,15-03-06 14:59:59.000000000
+A003,      ,      ,            ,           ,        ,

data/src/test/resources/org/embulk/output/oracle/test/expect/basic/test_truncate_insert_oci.yml

@@ -0,0 +1,3 @@
+table: TEST1
+mode: truncate_insert
+insert_method: oci

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.7.10.jar
-- classpath/embulk-output-oracle-0.7.10.jar
+- classpath/embulk-output-jdbc-0.7.11.jar
+- classpath/embulk-output-oracle-0.7.11.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
@@ -44,38 +44,53 @@ files:
 - 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/resources/oracle/data/test1/test1.csv
-- src/test/resources/oracle/data/test3/test3.csv
-- src/test/resources/oracle/data/test4/test4.csv
-- src/test/resources/oracle/data/test5/test5.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
-- 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-merge-keys.yml
-- src/test/resources/oracle/yml/test-merge-rule.yml
-- src/test/resources/oracle/yml/test-merge.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
-- src/test/resources/oracle/yml/test-replace-oci-method.yml
-- src/test/resources/oracle/yml/test-replace.yml
-- src/test/resources/oracle/yml/test-string-timestamp.yml
-- 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
+- src/test/java/org/embulk/output/oracle/BasicTest.java
+- src/test/java/org/embulk/output/oracle/DummyFileSystem.java
+- src/test/java/org/embulk/output/oracle/DummyFileSystemProvider.java
+- src/test/java/org/embulk/output/oracle/DummyPath.java
+- src/test/java/org/embulk/output/oracle/OracleTests.java
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/setup.sql
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test1.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_expected.diff
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_create_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_direct.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_direct_direct.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_direct_large.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_direct_multibyte_table.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_direct_oci.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_direct_oci_large.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_direct_oci_multibyte_table.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_empty_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_large_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_insert_multibyte_table.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_large.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_column.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_column.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_column_options.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_column_options.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_lower_table.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_keys.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_keys.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_keys_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_rule.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_rule.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_merge_rule_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace_column_options.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace_longname.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace_longname_multibyte.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_replace_oci.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_string_timestamp.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_string_timestamp.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_string_timestamp_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_truncate_insert.yml
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_truncate_insert_expected.csv
+- src/test/resources/org/embulk/output/oracle/test/expect/basic/test_truncate_insert_oci.yml
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0

data/src/test/java/org/embulk/input/filesplit/LocalFileSplitInputPlugin.java

@@ -1,185 +0,0 @@
-package org.embulk.input.filesplit;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.SequenceInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.embulk.config.Config;
-import org.embulk.config.ConfigDefault;
-import org.embulk.config.ConfigDiff;
-import org.embulk.config.ConfigInject;
-import org.embulk.config.ConfigSource;
-import org.embulk.config.Task;
-import org.embulk.config.TaskReport;
-import org.embulk.config.TaskSource;
-import org.embulk.spi.BufferAllocator;
-import org.embulk.spi.Exec;
-import org.embulk.spi.FileInputPlugin;
-import org.embulk.spi.TransactionalFileInput;
-import org.embulk.spi.util.InputStreamFileInput;
-
-import com.google.common.base.Optional;
-
-
-public class LocalFileSplitInputPlugin
-        implements FileInputPlugin
-{
-    public interface PluginTask
-            extends Task
-    {
-        @Config("path")
-        public String getPath();
-
-        @Config("tasks")
-        @ConfigDefault("null")
-        public Optional<Integer> getTasks();
-
-        @Config("header_line")
-        @ConfigDefault("false")
-        public boolean getHeaderLine();
-
-        public List<PartialFile> getFiles();
-        public void setFiles(List<PartialFile> files);
-
-        @ConfigInject
-        public BufferAllocator getBufferAllocator();
-    }
-
-    @Override
-    public ConfigDiff transaction(ConfigSource config, FileInputPlugin.Control control)
-    {
-        PluginTask task = config.loadConfig(PluginTask.class);
-
-        int tasks;
-        if (task.getTasks().isPresent()) {
-            tasks = task.getTasks().get();
-            if (tasks <= 0) {
-                throw new IllegalArgumentException(String.format("'tasks' is %d but must be greater than 0", tasks));
-            }
-        } else {
-            tasks = Runtime.getRuntime().availableProcessors() * 2;
-        }
-
-        long size = new File(task.getPath()).length();
-        List<PartialFile> files = new ArrayList<PartialFile>();
-        for (int i = 0; i < tasks; i++) {
-            long start = size * i / tasks;
-            long end = size * (i + 1) / tasks;
-            if (start < end) {
-                files.add(new PartialFile(task.getPath(), start, end));
-            }
-        }
-
-        task.setFiles(files);
-
-        return resume(task.dump(), task.getFiles().size(), control);
-    }
-
-    @Override
-    public ConfigDiff resume(TaskSource taskSource,
-            int taskCount,
-            FileInputPlugin.Control control)
-    {
-        control.run(taskSource, taskCount);
-
-        return Exec.newConfigDiff();
-    }
-
-    @Override
-    public void cleanup(TaskSource taskSource, int taskCount, List<TaskReport> successCommitReports)
-    { }
-
-    @Override
-    public TransactionalFileInput open(TaskSource taskSource, int taskIndex)
-    {
-        PluginTask task = taskSource.loadTask(PluginTask.class);
-        return new LocalFileSplitInput(task, taskIndex);
-    }
-
-    public static class LocalFileSplitInput
-            extends InputStreamFileInput
-            implements TransactionalFileInput
-    {
-        public static class FileSplitProvider
-                implements InputStreamFileInput.Provider
-        {
-            private final PartialFile file;
-            private final boolean hasHeader;
-            private boolean opened = false;
-
-            public FileSplitProvider(PartialFile file, boolean hasHeader)
-            {
-                this.file = file;
-                this.hasHeader = hasHeader;
-            }
-
-            @Override
-            public InputStream openNext() throws IOException
-            {
-                if (opened) {
-                    return null;
-                }
-                opened = true;
-
-                InputStream in = new PartialFileInputStream(new FileInputStream(file.getPath()), file.getStart(), file.getEnd());
-                if (file.getStart() > 0 && hasHeader) {
-                    in = new SequenceInputStream(openHeader(file.getPath()), in);
-                }
-                return in;
-            }
-
-            @Override
-            public void close() { }
-
-            private InputStream openHeader(String path) throws IOException
-            {
-                ByteArrayOutputStream header = new ByteArrayOutputStream();
-                try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(path))) {
-                    while (true) {
-                        int c = in.read();
-                        if (c < 0) {
-                            break;
-                        }
-
-                        header.write(c);
-
-                        if (c == '\n') {
-                            break;
-                        }
-
-                        if (c == '\r') {
-                            int c2 = in.read();
-                            if (c2 == '\n') {
-                                header.write(c2);
-                            }
-                            break;
-                        }
-                    }
-                }
-                header.close();
-                return new ByteArrayInputStream(header.toByteArray());
-            }
-        }
-
-        public LocalFileSplitInput(PluginTask task, int taskIndex)
-        {
-            super(task.getBufferAllocator(), new FileSplitProvider(task.getFiles().get(taskIndex), task.getHeaderLine()));
-        }
-
-        @Override
-        public void abort() { }
-
-        @Override
-        public TaskReport commit()
-        {
-            return Exec.newTaskReport();
-        }
-    }
-}