embulk-output-elasticsearch 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 035179327a377d9871fab2c41e3d5e58e9ae1c8a
-  data.tar.gz: 782610c5af444153a9b4d0d2d5252d0c9f0e5616
+  metadata.gz: 17a43eb01895594c2923a7390d4e8d09a1700cf9
+  data.tar.gz: c7c96752d024bc7db265dbbae1f6f512f0f040d4
 SHA512:
-  metadata.gz: 5e8938dfd6551445c5b814a9facbba97eba8b1ac459f0977d2866d6db97f45238bd6b12c2226d4713d4ebc9f72f31d411e2ce97df5896065b227e4052b095a0b
-  data.tar.gz: b05bded4e3bc2eaff9c1d1fd06806dc076cf7ae113f8e966e1a37b269c83b9b1cb669e7570c4ad23f5763c83638e7364c80af4070f9d79060612e6ba02908f5f
+  metadata.gz: 087a8375db096a288f1bab97ce21e3cebee9b8919179284fef981040252c3bf474d5f829704f82da64781214eb18394ffe9068a5b9e5db8c869b4cdae805d746
+  data.tar.gz: 122ae097b4f1811b58e312040e11a232396e3b029114f55567394d3e1dad1620dd3b8b25718683a623da51e8f6d75fef5a652eef2892c0a2538481fa414731ae

data/README.md

@@ -10,6 +10,7 @@
 ## Configuration
 
 - **nodes**: list of nodes. nodes are pairs of host and port (list, required)
+- **cluster_name**: name of the cluster (string, default is "elasticsearch")
 - **index**: index name (string, required)
 - **index_type**: index type (string, required)
 - **id**: document id column (string, default is null)

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.4"
+version = "0.1.5"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.4.0"

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

@@ -57,12 +57,16 @@ public class ElasticsearchOutputPlugin
         public int getPort();
     }
 
-    public interface RunnerTask
+    public interface PluginTask
             extends Task
     {
         @Config("nodes")
         public List<NodeAddressTask> getNodes();
 
+        @Config("cluster_name")
+        @ConfigDefault("\"elasticsearch\"")
+        public String getClusterName();
+
         @Config("index")
         public String getIndex();
 
@@ -80,7 +84,6 @@ public class ElasticsearchOutputPlugin
         @Config("concurrent_requests")
         @ConfigDefault("5")
         public int getConcurrentRequests();
-
     }
 
     private final Logger log;
@@ -95,7 +98,7 @@ public class ElasticsearchOutputPlugin
     public ConfigDiff transaction(ConfigSource config, Schema schema,
                                   int processorCount, Control control)
     {
-        final RunnerTask task = config.loadConfig(RunnerTask.class);
+        final PluginTask task = config.loadConfig(PluginTask.class);
 
         // confirm that a client can be initialized
         try (Client client = createClient(task)) {
@@ -138,11 +141,12 @@ public class ElasticsearchOutputPlugin
                         List<CommitReport> successCommitReports)
     { }
 
-    private Client createClient(final RunnerTask task)
+    private Client createClient(final PluginTask task)
     {
         //  @see http://www.elasticsearch.org/guide/en/elasticsearch/client/java-api/current/client.html
         Settings settings = ImmutableSettings.settingsBuilder()
                 .classLoader(Settings.class.getClassLoader())
+                .put("cluster.name", task.getClusterName())
                 .build();
         TransportClient client = new TransportClient(settings);
         List<NodeAddressTask> nodes = task.getNodes();
@@ -152,7 +156,7 @@ public class ElasticsearchOutputPlugin
         return client;
     }
 
-    private BulkProcessor newBulkProcessor(final RunnerTask task, final Client client)
+    private BulkProcessor newBulkProcessor(final PluginTask task, final Client client)
     {
         return BulkProcessor.builder(client, new BulkProcessor.Listener() {
             @Override
@@ -196,7 +200,7 @@ public class ElasticsearchOutputPlugin
     public TransactionalPageOutput open(TaskSource taskSource, Schema schema,
                                         int processorIndex)
     {
-        final RunnerTask task = taskSource.loadTask(RunnerTask.class);
+        final PluginTask task = taskSource.loadTask(PluginTask.class);
 
         Client client = createClient(task);
         BulkProcessor bulkProcessor = newBulkProcessor(task, client);
@@ -218,7 +222,7 @@ public class ElasticsearchOutputPlugin
         private final String type;
         private final String id;
 
-        ElasticsearchPageOutput(RunnerTask task, Client client, BulkProcessor bulkProcessor)
+        ElasticsearchPageOutput(PluginTask task, Client client, BulkProcessor bulkProcessor)
         {
             this.log = Exec.getLogger(getClass());
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -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.4.jar
+- classpath/embulk-output-elasticsearch-0.1.5.jar
 - classpath/lucene-analyzers-common-4.10.2.jar
 - classpath/lucene-core-4.10.2.jar
 - classpath/lucene-grouping-4.10.2.jar