embulk-output-elasticsearch 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17a43eb01895594c2923a7390d4e8d09a1700cf9
-  data.tar.gz: c7c96752d024bc7db265dbbae1f6f512f0f040d4
+  metadata.gz: a9a377e6e336582cb8ff3d844913b58bad465eb5
+  data.tar.gz: f8f2aef37e54cedb0a9d8cb23b11db00ff25d123
 SHA512:
-  metadata.gz: 087a8375db096a288f1bab97ce21e3cebee9b8919179284fef981040252c3bf474d5f829704f82da64781214eb18394ffe9068a5b9e5db8c869b4cdae805d746
-  data.tar.gz: 122ae097b4f1811b58e312040e11a232396e3b029114f55567394d3e1dad1620dd3b8b25718683a623da51e8f6d75fef5a652eef2892c0a2538481fa414731ae
+  metadata.gz: 0ec56683e3922d010c4b8de4bcfae73a00191b1af05af98019727d397b49aeb332dc7ab7d3be6ccb479fc224dc95835b99a21a33ed05a3ae92663600d5b9fd5f
+  data.tar.gz: e1611e02edf0f0eaa5adcdeb987d6aa25b9f8d08852e1f513eb16efe99ac2a1cdacdaeeace203d505fc0323492baa6ad88ba5a56bc55896cd8392dd12968b977

data/README.md

@@ -14,7 +14,8 @@
 - **index**: index name (string, required)
 - **index_type**: index type (string, required)
 - **id**: document id column (string, default is null)
-- **bulk_actions**: bulk_actions (int, default is 1000)
+- **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)
 
 ## Example

data/build.gradle

@@ -13,7 +13,11 @@ configurations {
     provided
 }
 
-version = "0.1.5"
+version = "0.1.6"
+
+compileJava.options.encoding = 'UTF-8' // source encoding
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
 
 dependencies {
     compile  "org.embulk:embulk-core:0.4.0"

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

@@ -12,6 +12,8 @@ import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.client.transport.TransportClient;
+import org.elasticsearch.common.unit.ByteSizeValue;
+import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
@@ -81,6 +83,10 @@ public class ElasticsearchOutputPlugin
         @ConfigDefault("1000")
         public int getBulkActions();
 
+        @Config("bulk_size")
+        @ConfigDefault("5242880")
+        public long getBulkSize();
+
         @Config("concurrent_requests")
         @ConfigDefault("5")
         public int getConcurrentRequests();
@@ -192,6 +198,7 @@ public class ElasticsearchOutputPlugin
                 log.warn("Got the error during bulk processing", failure);
             }
         }).setBulkActions(task.getBulkActions())
+          .setBulkSize(new ByteSizeValue(task.getBulkSize()))
           .setConcurrentRequests(task.getConcurrentRequests())
           .build();
     }

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: bundler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+        version: '10.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: test-unit
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
+        version: 3.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.2
-  name: test-unit
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.2
 description: Elasticsearch output plugin is an Embulk plugin that loads records to Elasticsearch read by any input plugins. Search the input plugins by "embulk-input" keyword.
 email:
 - muga.nishizawa@gmail.com
@@ -72,7 +72,7 @@ files:
 - src/main/resources/META-INF/services/org.embulk.spi.Extension
 - src/test/java/org/embulk/output/TestElasticsearchOutputPlugin.java
 - classpath/elasticsearch-1.4.2.jar
-- classpath/embulk-output-elasticsearch-0.1.5.jar
+- classpath/embulk-output-elasticsearch-0.1.6.jar
 - classpath/lucene-analyzers-common-4.10.2.jar
 - classpath/lucene-core-4.10.2.jar
 - classpath/lucene-grouping-4.10.2.jar