embulk-output-elasticsearch 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72c4cd366c2fa4f119b7c7c51d181363680bbca
-  data.tar.gz: 1261ff1b930b18629e625434c2952a1d63c1a1db
+  metadata.gz: 77e76440b56eee33e80dfce250dce8209c3a9831
+  data.tar.gz: 6ac309248b002ce2cd34d27078ed9f7fbde854ff
 SHA512:
-  metadata.gz: d2acb45304e3a79c05c6a68e83816cb157154ad587bc3032775fb67c876fba120b5a22d39b5314ff80bcd4e4ba33627a2e3586c6e56e9c1a74ff7072dd6efb4a
-  data.tar.gz: 592397a3ca552668f0fb7b31cbed40dcf6600817cd526f17731b6c3e744202e271064086900ac6808dbc750b34a79437e47d9f56cabb2b8dc0fe31c726756860
+  metadata.gz: 55339564362bc859925dd0e8f79c0d4b5cec268f901b3145c0920b865eab8abc804af39c2e5ddbf37ca07f9370e74d350beeb6f4fb4e82f484bd8498ee1a1f9d
+  data.tar.gz: ee5114f6ead0fd0d89353f5cc9717b83c383758bed77f739b361800371fb5d31f6f952295481ea083b80080c2db7c69deb05f02474b8618b957a17f3420e58c6

data/build.gradle

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

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

@@ -37,9 +37,12 @@ import org.embulk.spi.TransactionalPageOutput;
 import org.slf4j.Logger;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static com.google.common.base.Preconditions.checkState;
+
 public class ElasticsearchOutputPlugin
         implements OutputPlugin
 {
@@ -60,15 +63,15 @@ public class ElasticsearchOutputPlugin
         @Config("nodes")
         public List<NodeAddressTask> getNodes();
 
-        @Config("index_name")
+        @Config("index")
         public String getIndex();
 
         @Config("index_type")
-        public String getIndexType();
+        public String getType();
 
-        @Config("doc_id_column")
+        @Config("id")
         @ConfigDefault("null")
-        public Optional<String> getIdColumn();
+        public Optional<String> getId();
 
         @Config("bulk_actions")
         @ConfigDefault("1000")
@@ -94,9 +97,22 @@ public class ElasticsearchOutputPlugin
     {
         final RunnerTask task = config.loadConfig(RunnerTask.class);
 
+        // confirm that a client can be initialized
         try (Client client = createClient(task)) {
         }
 
+        // check that id is included in the schema or not if the id is not null.
+        if (task.getId().isPresent()) {
+            String id = task.getId().get();
+            boolean found = false;
+            for (Column column : schema.getColumns()) {
+                if (column.equals(id)) {
+                    found = true;
+                }
+            }
+            checkState(found, "id is not included in column names of the Schema.");
+        }
+
         try {
             control.run(task.dump());
         } catch (Exception e) {
@@ -199,8 +215,8 @@ public class ElasticsearchOutputPlugin
         private PageReader pageReader;
 
         private final String index;
-        private final String indexType;
-        private final String docIdColumn;
+        private final String type;
+        private final String id;
 
         ElasticsearchPageOutput(RunnerTask task, Client client, BulkProcessor bulkProcessor)
         {
@@ -210,8 +226,8 @@ public class ElasticsearchOutputPlugin
             this.bulkProcessor = bulkProcessor;
 
             this.index = task.getIndex();
-            this.indexType = task.getIndexType();
-            this.docIdColumn = task.getIdColumn().orNull();
+            this.type = task.getType();
+            this.id = task.getId().orNull();
         }
 
         void open(final Schema schema)
@@ -282,7 +298,15 @@ public class ElasticsearchOutputPlugin
 
                         @Override
                         public void timestampColumn(Column column) {
-                            //  TODO
+                            try {
+                                contextBuilder.field(column.getName(), new Date(pageReader.getTimestamp(column).toEpochMilli()));
+                            } catch (IOException e) {
+                                try {
+                                    contextBuilder.nullField(column.getName());
+                                } catch (IOException ex) {
+                                    throw Throwables.propagate(ex);
+                                }
+                            }
                         }
                     });
 
@@ -297,7 +321,7 @@ public class ElasticsearchOutputPlugin
 
         private IndexRequest newIndexRequest()
         {
-            return Requests.indexRequest(index).type(indexType).id(docIdColumn);
+            return Requests.indexRequest(index).type(type).id(id);
         }
 
         @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,11 +69,10 @@ files:
 - lib/embulk/output/elasticsearch.rb
 - settings.gradle
 - src/main/java/org/embulk/output/ElasticsearchOutputPlugin.java
-- src/main/java/org/embulk/output/ElasticsearchOutputPluginModule.java
 - 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.2.jar
+- classpath/embulk-output-elasticsearch-0.1.3.jar
 - classpath/lucene-analyzers-common-4.10.2.jar
 - classpath/lucene-core-4.10.2.jar
 - classpath/lucene-grouping-4.10.2.jar

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

@@ -1,31 +0,0 @@
-package org.embulk.output;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.inject.Binder;
-import com.google.inject.Module;
-import org.embulk.config.ConfigSource;
-import org.embulk.spi.Extension;
-import org.embulk.spi.OutputPlugin;
-
-import java.util.List;
-
-import static org.embulk.plugin.InjectedPluginSource.registerPluginTo;
-
-public class ElasticsearchOutputPluginModule
-        implements Extension, Module
-{
-
-    @Override
-    public void configure(Binder binder)
-    {
-        Preconditions.checkNotNull(binder, "binder is null.");
-        registerPluginTo(binder, OutputPlugin.class, "elasticsearch", ElasticsearchOutputPlugin.class);
-    }
-
-    @Override
-    public List<Module> getModules(ConfigSource systemConfig)
-    {
-        return ImmutableList.<Module>of(this);
-    }
-}