embulk-output-elasticsearch_1.x 0.1.8 → 0.1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7d5473cbc2fdad178a9d50b9b9b5e4c416290dc
-  data.tar.gz: edabbc01a70b8350e5963d668602fe5e5e923fbb
+  metadata.gz: e4cd6eba07a1058d83926455094df427b0d6b711
+  data.tar.gz: e680c29e344f94f07dd34493ad1b1c5280f46410
 SHA512:
-  metadata.gz: 4b455b0eda32674f9e6c64d5af0c1a5b191b824b59d82b9180d5c3d1c0ad220b409c959fa8b125b757d5aa6d4b0fec185626f31b21a2726e8372b34ca772d5d4
-  data.tar.gz: f077a539cc227e714110ffe60e2e19ebe53ab9b527c907a005483d30c07ccc549323f115921ad6c8b30ff3281a36373ec3f6603aa0ffe423e54a5a894c145194
+  metadata.gz: 7fc8d2e629b5c45f85e14b7edd2e712bd583cc2eec8014b8fa05d69acbad3c657e276495ce89083d5079951960b4321304c8bdc9b8f49f773bc54b7a91a71cd2
+  data.tar.gz: ce8d65f1dd556061725c0cf80c31e8c54a99c9c8a456e7d94f110104805fb1359d21b627f417b1cb0bdec61d3a7632795f6ab9c67cd1fb1301036673eb5a721f

data/README.md

@@ -20,9 +20,10 @@ Plugin uses [Transport Client](https://www.elastic.co/guide/en/elasticsearch/cli
 - **index**: index name (string, required)
 - **index_type**: index type (string, required)
 - **id**: document id column (string, default is null)
+- **drop_id_column**: drop document id column (boolean, default is false)
 - **bulk_actions**: Sets when to flush a new bulk request based on the number of actions currently added. (int, default is 1000)
 - **bulk_size**: Sets when to flush a new bulk request based on the size of actions currently added. (long, default is 5242880)
-- **concurrent_requests**: concurrent_requests (int, default is 5)
+- **concurrent_requests**: concurrent_requests (int, default is 3)
 
 ### Modes
 
@@ -114,4 +115,4 @@ $ launchctl load ~/Library/LaunchAgents/environment.plist
 $ launchctl getenv ES_INDEX //try to get value.
 
 Then start your applications.
-```
+```

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.8"
+version = "0.1.8.1"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.7

data/src/main/java/org/embulk/output/elasticsearch/ElasticsearchOutputPlugin.java

@@ -80,6 +80,10 @@ public class ElasticsearchOutputPlugin
         @ConfigDefault("null")
         public Optional<String> getId();
 
+        @Config("drop_id_column")
+        @ConfigDefault("false")
+        public Boolean getDropIdColumn();
+
         @Config("bulk_actions")
         @ConfigDefault("1000")
         public int getBulkActions();
@@ -89,7 +93,7 @@ public class ElasticsearchOutputPlugin
         public long getBulkSize();
 
         @Config("concurrent_requests")
-        @ConfigDefault("5")
+        @ConfigDefault("3")
         public int getConcurrentRequests();
     }
 
@@ -218,6 +222,7 @@ public class ElasticsearchOutputPlugin
         private final String index;
         private final String type;
         private final String id;
+        private final Boolean dropIdColumn;
 
         public ElasticsearchPageOutput(PluginTask task, Client client, BulkProcessor bulkProcessor)
         {
@@ -229,6 +234,7 @@ public class ElasticsearchOutputPlugin
             this.index = task.getIndex();
             this.type = task.getType();
             this.id = task.getId().orNull();
+            this.dropIdColumn = task.getDropIdColumn();
         }
 
         void open(final Schema schema)
@@ -249,6 +255,7 @@ public class ElasticsearchOutputPlugin
                         @Override
                         public void booleanColumn(Column column) {
                             try {
+                                if (dropIdColumn == true && column.getName().equals(id)) return;
                                 if (pageReader.isNull(column)) {
                                     contextBuilder.nullField(column.getName());
                                 } else {
@@ -266,6 +273,7 @@ public class ElasticsearchOutputPlugin
                         @Override
                         public void longColumn(Column column) {
                             try {
+                                if (dropIdColumn == true && column.getName().equals(id)) return;
                                 if (pageReader.isNull(column)) {
                                     contextBuilder.nullField(column.getName());
                                 } else {
@@ -283,6 +291,7 @@ public class ElasticsearchOutputPlugin
                         @Override
                         public void doubleColumn(Column column) {
                             try {
+                                if (dropIdColumn == true && column.getName().equals(id)) return;
                                 if (pageReader.isNull(column)) {
                                     contextBuilder.nullField(column.getName());
                                 } else {
@@ -300,6 +309,7 @@ public class ElasticsearchOutputPlugin
                         @Override
                         public void stringColumn(Column column) {
                             try {
+                                if (dropIdColumn == true && column.getName().equals(id)) return;
                                 if (pageReader.isNull(column)) {
                                     contextBuilder.nullField(column.getName());
                                 } else {
@@ -317,6 +327,7 @@ public class ElasticsearchOutputPlugin
                         @Override
                         public void jsonColumn(Column column) {
                             try {
+                                if (dropIdColumn == true && column.getName().equals(id)) return;
                                 if (pageReader.isNull(column)) {
                                     contextBuilder.nullField(column.getName());
                                 } else {
@@ -334,6 +345,7 @@ public class ElasticsearchOutputPlugin
                         @Override
                         public void timestampColumn(Column column) {
                             try {
+                                if (dropIdColumn == true && column.getName().equals(id)) return;
                                 if (pageReader.isNull(column)) {
                                     contextBuilder.nullField(column.getName());
                                 } else {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch_1.x
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.8.1
 platform: ruby
 authors:
 - Muga Nishizawa
@@ -75,7 +75,7 @@ files:
 - src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPlugin.java
 - src/test/resources/sample_01.csv
 - classpath/elasticsearch-1.7.2.jar
-- classpath/embulk-output-elasticsearch_1.x-0.1.8.jar
+- classpath/embulk-output-elasticsearch_1.x-0.1.8.1.jar
 - classpath/lucene-analyzers-common-4.10.4.jar
 - classpath/lucene-core-4.10.4.jar
 - classpath/lucene-grouping-4.10.4.jar