embulk-output-redshift 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18d390db44513b18aa289d544f2523607aa6b048
-  data.tar.gz: e0dd7e14ad578964523debf800e97febb5fdd44b
+  metadata.gz: f2d854b3e26ff0e2ccee483017fc9450d8652b5d
+  data.tar.gz: d70bb02e125e2559c1f78b5bc7dcc60bbb66db38
 SHA512:
-  metadata.gz: 96ec00d340cd45380f3ced557b3aea4ea5dc595e0baadd0513130e82340e8cc0c36266a2b02740e29b4232a6d6011d8ef85d7f4f48388931d8bd522992e2c93f
-  data.tar.gz: 7c1e9092cbc3f5e51cfbe4e38414d3499330575ccbff0601d02a89efd3416b661f5d9f5c44e313374e9cbfa09288d466b5de751ec17fa6528998e1b949e3f17e
+  metadata.gz: 5f9ef7df4a29ee2349b8b33e9da685402c4567b2f00e922d4c63d135da0d9c9c876315b7e360a171da5feba08ad9b2dc758dbc39f4612d0cce5cbccf42eb2795
+  data.tar.gz: a6a6f12f171f003cffd9ce0edd10e014160b9430610dd7769588dad28aa8209751bd060cce4bc5ab2cbb63f36700545f79d852823e74726163c3a45de836316f

data/README.md

@@ -19,11 +19,11 @@ Redshift output plugin for Embulk loads records to Redshift.
 - **schema**: destination schema name (string, default: "public")
 - **temp_schema**: schema name for intermediate tables. by default, intermediate tables will be created in the schema specified by `schema`. replace mode doesn't support temp_schema. (string, optional)
 - **table**: destination table name (string, required)
-- **create_table_constraint** table constraint added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
-- **create_table_option** table option added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
+- **create_table_constraint**: table constraint added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
+- **create_table_option**: table option added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
 - **access_key_id**: deprecated. `aws_access_key_id` should be used (see "basic" in `aws_auth_method`).
 - **secret_access_key**: deprecated. `aws_secret_access_key` should be used (see "basic" in `aws_auth_method`).
-- **aws_auth_method**: name of mechanism to authenticate requests ("basic", "env", "instance", "profile", "properties", "anonymous", or "session". default: "basic")
+- **aws_auth_method**: name of mechanism to authenticate requests ("basic", "env", "instance", "profile", "properties", "anonymous", "session" or "default". default: "basic")
 
   - "basic": uses `access_key_id` and `secret_access_key` to authenticate.
 
@@ -62,14 +62,21 @@ Redshift output plugin for Embulk loads records to Redshift.
 
     - **aws_session_token**: session token (string, required)
 
+  - "default": uses AWS SDK's default strategy to look up available credentials from runtime environment. This method behaves like the combination of the following methods.
+
+    1. "env"
+    1. "properties"
+    1. "profile"
+    1. "instance"
+
 - **iam_user_name**: IAM user name for uploading temporary files to S3. The user should have permissions of `s3:GetObject`, `s3:PutObject`, `s3:DeleteObject`, `s3:ListBucket` and `sts:GetFederationToken`. And furthermore, the user should have permission of `s3:GetBucketLocation` if Redshift region and S3 bucket region are different. (string, default: "", but we strongly recommend that you use IAM user for security reasons. see below.)
 - **s3_bucket**: S3 bucket name for temporary files
 - **s3_key_prefix**: S3 key prefix for temporary files (string, default: "")
 - **delete_s3_temp_file**: whether to delete temporary files uploaded on S3 (boolean, default: true)
 - **options**: extra connection properties (hash, default: {})
-- **retry_limit** max retry count for database operations (integer, default: 12)
-- **retry_wait** initial retry wait time in milliseconds (integer, default: 1000 (1 second))
-- **max_retry_wait** upper limit of retry wait, which will be doubled at every retry (integer, default: 1800000 (30 minutes))
+- **retry_limit**: max retry count for database operations (integer, default: 12)
+- **retry_wait**: initial retry wait time in milliseconds (integer, default: 1000 (1 second))
+- **max_retry_wait**: upper limit of retry wait, which will be doubled at every retry (integer, default: 1800000 (30 minutes))
 - **mode**: "insert", "insert_direct", "truncate_insert", "replace" or "merge". See below. (string, required)
 - **merge_keys**: key column names for merging records in merge mode (string array, required in merge mode)
 - **batch_size**: size of a single batch insert (integer, default: 16777216)

data/build.gradle

@@ -4,7 +4,7 @@ dependencies {
 
     compile "com.amazonaws:aws-java-sdk-s3:1.10.77"
     compile "com.amazonaws:aws-java-sdk-sts:1.10.77"
-	compile 'org.embulk.input.s3:embulk-util-aws-credentials:0.2.8'
+    compile 'org.embulk.input.s3:embulk-util-aws-credentials:0.2.21'
 
     testCompile project(':embulk-output-jdbc').sourceSets.test.output
 }

data/src/main/java/org/embulk/output/redshift/RedshiftCopyBatchInsert.java

@@ -172,6 +172,23 @@ public class RedshiftCopyBatchInsert
         }
     }
 
+    // Add \ before \, \n, \t
+    // Remove \0
+    @Override
+    protected String escape(char c)
+    {
+        switch (c) {
+        case '\n':
+            return "\\\n";
+        case '\t':
+            return "\\\t";
+        case '\r':
+            return String.valueOf(c);
+        default:
+            return super.escape(c);
+        }
+    }
+
     private BasicSessionCredentials generateReaderSessionCredentials(String s3KeyName)
     {
         Policy policy = new Policy()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-redshift
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,20 +19,23 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/aws-java-sdk-core-1.10.77.jar
-- classpath/aws-java-sdk-kms-1.10.77.jar
-- classpath/aws-java-sdk-s3-1.10.77.jar
+- classpath/aws-java-sdk-core-1.11.253.jar
+- classpath/aws-java-sdk-kms-1.11.253.jar
+- classpath/aws-java-sdk-s3-1.11.253.jar
 - classpath/aws-java-sdk-sts-1.10.77.jar
-- classpath/commons-codec-1.6.jar
-- classpath/commons-logging-1.1.3.jar
-- classpath/embulk-output-jdbc-0.8.0.jar
-- classpath/embulk-output-postgresql-0.8.0.jar
-- classpath/embulk-output-redshift-0.8.0.jar
-- classpath/embulk-util-aws-credentials-0.2.8.jar
-- classpath/httpclient-4.3.6.jar
-- classpath/httpcore-4.3.3.jar
-- classpath/jackson-dataformat-cbor-2.5.3.jar
+- classpath/commons-codec-1.9.jar
+- classpath/commons-logging-1.2.jar
+- classpath/embulk-output-jdbc-0.8.1.jar
+- classpath/embulk-output-postgresql-0.8.1.jar
+- classpath/embulk-output-redshift-0.8.1.jar
+- classpath/embulk-util-aws-credentials-0.2.21.jar
+- classpath/httpclient-4.5.2.jar
+- classpath/httpcore-4.4.4.jar
+- classpath/ion-java-1.0.2.jar
+- classpath/jackson-databind-2.6.7.1.jar
+- classpath/jackson-dataformat-cbor-2.6.7.jar
 - classpath/jcl-over-slf4j-1.7.12.jar
+- classpath/jmespath-java-1.11.253.jar
 - classpath/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/output/redshift.rb
 - src/main/java/org/embulk/output/RedshiftOutputPlugin.java