embulk-input-elasticsearch 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c40bf4a901edaa1d60167d30aab965d2dba2fa48
-  data.tar.gz: 1a565534d57b45d03363fdc1f7535405fe054eee
+  metadata.gz: 5ec0ae29517a8e4b843226eb79c9353a8e2a5a8a
+  data.tar.gz: 126f307337464bb350737e6aef30b920dacdbb8c
 SHA512:
-  metadata.gz: beedbb1fb8ad15cba9fa52d84b1c92d0f00b050b308e5efe03a60d190f34a9b79588ac1eeeb8cb2dcbae3e76ff9f34d85ed970015936ad76517a8fd516eb447d
-  data.tar.gz: 45d30e6c0be97b35de24ed9ae309fb2d20deca4daef112b8d9bc75b7a845ceb2ea20f97fb518064749024359ede7f07c8d10676c6695c18ed4e78550bfda3870
+  metadata.gz: 58b66876e8accac787fefa4d621759ef216f2b87f31eaffaf2deb45386012e519ab1d269cc1307626a522783a30cb959335c5de0d1da20d5a0840af088105a9e
+  data.tar.gz: e92bf4881d21d53471cddc12faef687a81a9ab9453f1ed64ef4c329d548dca57076da415b46b34db32d1106de49a083bdf1eea5226d1abb70d87e6db49910eea

data/.gitignore

@@ -4,3 +4,4 @@
 /.bundle/
 /vendor/
 /Gemfile.lock
+*.jar

data/.travis.yml

@@ -1,13 +1,17 @@
 language: ruby
-cache: bundler
-rvm:
-  - jruby-9.0.5.0
-  - jruby-9.1.5.0
-  - jruby-head
-jdk:
-  - openjdk7
-before_install:
-  - gem install bundler
+install: ./embulk.jar bundle install --path vendor/bundle
 matrix:
+  include:
+    - env: EMBULK_VERSION=0.9.15
+      rvm: jruby-9.1.5.0 # bundled jruby version
+      jdk: openjdk8 # embulk 0.9.x uses jdk8
+    - env: EMBULK_VERSION=latest
+      rvm: jruby-9.1.5.0 # ?
+      jdk: openjdk8 # ?
   allow_failures:
-    - rvm: jruby-head
+    - env: EMBULK_VERSION=latest
+before_install:
+  - curl -o embulk.jar --create-dirs -L "http://dl.embulk.org/embulk-${EMBULK_VERSION}.jar"
+  - chmod +x embulk.jar
+  - ./embulk.jar gem install bundler
+script: ./embulk.jar bundle exec rake test

data/README.md

@@ -72,6 +72,23 @@ in:
 * json
 * boolean
 
+## test
+
+### setup
+
+```
+curl -o embulk.jar --create-dirs -L "http://dl.embulk.org/embulk-latest.jar"
+chmod +x embulk.jar
+./embulk.jar gem install bundler
+./embulk.jar bundle install --path vendor/bundle
+```
+
+### run test
+
+```
+./embulk.jar bundle exec rake test
+```
+
 ## Build
 
 ```

data/embulk-input-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-elasticsearch"
-  spec.version       = "0.3.5"
+  spec.version       = "0.3.6"
   spec.authors       = ["toyama0919"]
   spec.summary       = "Elasticsearch input plugin for Embulk"
   spec.description   = "Loads records from Elasticsearch. parallel query support."

data/lib/embulk/input/elasticsearch.rb

@@ -1,6 +1,7 @@
 require_relative 'elasticsearch/connection'
 require_relative 'elasticsearch/input_thread'
 require_relative 'elasticsearch/converter'
+require_relative 'elasticsearch/error'
 
 module Embulk
   module Input

data/lib/embulk/input/elasticsearch/connection.rb

@@ -73,8 +73,8 @@ module Embulk
               sleep 2**retries
               retry
             end
-            Embulk.logger.error "Could not search to Elasticsearch after #{retries} retries. #{e.message}"
-            return nil
+            msg = "Could not search to Elasticsearch after #{retries} retries. #{e.message}"
+            raise Elasticsearch::ConnectionError.new e, msg
           end
         end
 

data/lib/embulk/input/elasticsearch/converter.rb

@@ -40,7 +40,7 @@ module Embulk
           when "json"
             value
           else
-            raise "Unsupported type #{field['type']}"
+            raise Elasticsearch::TypecastError.new "Unsupported type #{field['type']}"
           end
         end
       end

data/lib/embulk/input/elasticsearch/error.rb

@@ -0,0 +1,39 @@
+module Embulk
+  module Input
+
+    class Elasticsearch < InputPlugin
+
+      module Traceable
+        def initialize(e, more_msg = nil)
+          message = e.is_a?(String) ? '' : "(#{e.class}) "
+          message << "#{e}#{more_msg}\n"
+          message << "\tat #{e.backtrace.join("\n\tat ")}\n" if e.respond_to?(:backtrace)
+
+          while e.respond_to?(:cause) and e.cause
+            # Java Exception cannot follow the JRuby causes.
+            message << "Caused by (#{e.cause.class}) #{e.cause}\n"
+            message << "\tat #{e.cause.backtrace.join("\n\tat ")}\n" if e.cause.respond_to?(:backtrace)
+            e = e.cause
+          end
+
+          super(message)
+        end
+      end
+
+      class ConfigError < ::Embulk::ConfigError
+        include Traceable
+      end
+
+      class ConnectionError < ConfigError
+      end
+
+      class DataError < ::Embulk::DataError
+        include Traceable
+      end
+
+      class TypecastError < DataError
+      end
+
+    end
+  end
+end

data/test/helper.rb

@@ -4,7 +4,13 @@ require 'test/unit'
 
 # require 'embulk/java/bootstrap'
 require 'embulk'
-Embulk.setup
+begin
+  # Embulk ~> 0.8.x
+  Embulk.setup
+rescue NotImplementedError
+  # Embulk ~> 0.9.x
+  require 'embulk/java/bootstrap'
+end
 Embulk.logger = Embulk::Logger.new('/dev/null')
 
 APP_ROOT = File.expand_path('../', __dir__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - toyama0919
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,7 @@ files:
 - lib/embulk/input/elasticsearch.rb
 - lib/embulk/input/elasticsearch/connection.rb
 - lib/embulk/input/elasticsearch/converter.rb
+- lib/embulk/input/elasticsearch/error.rb
 - lib/embulk/input/elasticsearch/input_thread.rb
 - test/helper.rb
 - test/test_converter.rb