embulk-output-vertica 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6a6bc55961d3c9ee7f0eeac61c4c845f408fe43
-  data.tar.gz: 709e04e684eeeadc11b461e834a8406de183f1d5
+  metadata.gz: ffcbf6b8e38f5b340f40ef6276d1d60eec24e7d1
+  data.tar.gz: 1db857854d517fa3121c212e779cc7cb7fd1a888
 SHA512:
-  metadata.gz: 3a7a9383471db1bfb5c4b2f8d05d0dcbdd9e6f731bad883c03c17167cba706a9ea99c75f8eda99b5c622b247ccca7846245b3f8ee2e82d28482a775722dd242d
-  data.tar.gz: 01f088c282721e8f231fa58574f2ac3459780e7ef0af274c78f6d7e45e7a6665314d58b3597492fafa072a95fed39e13d9e6a124834cfa37195cf5688789f311
+  metadata.gz: 465771451e26a38c2d50278422aec461856b3301cc0dc4bf3a06a57e4520723c88a75abfa94e284e0195903015404d32377555722fc92a3e7c0a5a85004a8fb5
+  data.tar.gz: 0eed14f90d9a8ea9e3080282a653e90f90120fdb347f2cd5958d6e11f497b75d95e656bc2174559ba93452c0324194cc33b5c3d976350b0f27944cd52ce087f5

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.5.2 (2016/01/09)
+
+Fixes:
+
+* Add nil check for timestamp converter
+* Fix error handling of output thread
+
 # 0.5.1 (2015/12/04)
 
 Fixes:

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'embulk'
 gem 'embulk-input-random'
 gem 'embulk-filter-stdout'
 gem 'pry'

data/README.md

@@ -71,8 +71,8 @@ out:
 Run example:
 
 ```
-$ bundle install
-$ bundle exec embulk run -l debug example.yml
+$ embulk bundle install --path vendor/bundle
+$ embulk -J-O -R--dev run -b . run -l debug example.yml
 ```
 
 Release gem:

data/embulk-output-vertica.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-vertica"
-  spec.version       = "0.5.1"
+  spec.version       = "0.5.2"
   spec.authors       = ["eiji.sekiya", "Naotoshi Seo"]
   spec.email         = ["eiji.sekiya.0326@gmail.com", "sonots@gmail.com"]
   spec.summary       = "Vertica output plugin for Embulk"

data/lib/embulk/output/vertica/output_thread.rb

@@ -35,15 +35,17 @@ module Embulk
           @num_input_rows = 0
           @num_output_rows = 0
           @num_rejected_rows = 0
+          @outer_thread = Thread.current
+          @thread_active = false
         end
 
         def enqueue(page)
-          if @thread.status.nil? # thread died by an error
-            @thread.join # raise the same error raised inside thread
-          end
-          if @thread.alive?
+          if @thread_active and @thread.alive?
             Embulk.logger.trace { "embulk-output-vertica: enqueued" }
             @queue.push(page)
+          else
+            Embulk.logger.info { "embulk-output-vertica: thread is dead, but still trying to enqueue" }
+            raise RuntimeError, "embulk-output-vertica: thread is died, but still trying to enqueue"
           end
         end
 
@@ -81,18 +83,34 @@ module Embulk
                 Embulk.logger.warn "embulk-output-vertica: ROLLBACK!"
               end
               raise e # die transaction
+            rescue => e
+              Embulk.logger.warn "embulk-output-vertica: ROLLBACK!"
+              jv.rollback
+              raise e
             end
           end
+        rescue => e
+          @thread_active = false # not to be enqueued any more
+          while @queue.size > 0
+            @queue.pop # dequeue all because some might be still trying @queue.push and get blocked, need to release
+          end
+          @outer_thread.raise e.class.new("#{e.message}\n  #{e.backtrace.join("\n  ")}")
         end
 
         def start
           @thread = Thread.new(&method(:run))
+          @thread_active = true
         end
 
         def commit
-          @queue.push('finish') if @thread.alive?
-          Thread.pass
-          @thread.join # the same error with run would be raised at here
+          @thread_active = false
+          if @thread.alive?
+            @queue.push('finish')
+            Thread.pass
+            @thread.join
+          else
+            raise RuntimeError, "embulk-output-vertica: thread died accidently"
+          end
 
           task_report = {
             'num_input_rows' => @num_input_rows,

data/lib/embulk/output/vertica/value_converter_factory.rb

@@ -61,7 +61,7 @@ module Embulk
           when 'long'       then Proc.new {|val| val }
           when 'double'     then Proc.new {|val| val.to_f }
           when 'string'     then Proc.new {|val| val.to_s }
-          when 'timestamp'  then Proc.new {|val| Time.at(val).localtime(zone_offset) }
+          when 'timestamp'  then Proc.new {|val| val ? Time.at(val).localtime(zone_offset) : nil }
           else raise NotSupportedType, "embulk-output-vertica cannot take column value_type #{value_type} for long column"
           end
         end
@@ -72,7 +72,7 @@ module Embulk
           when 'long'      then Proc.new {|val| val.to_i }
           when 'double'    then Proc.new {|val| val }
           when 'string'    then Proc.new {|val| val.to_s }
-          when 'timestamp' then Proc.new {|val| Time.at(val).localtime(zone_offset) }
+          when 'timestamp' then Proc.new {|val| val ? Time.at(val).localtime(zone_offset) : nil }
           else raise NotSupportedType, "embulk-output-vertica cannot take column value_type #{value_type} for double column"
           end
         end
@@ -83,7 +83,7 @@ module Embulk
           when 'long'      then Proc.new {|val| val.to_i }
           when 'double'    then Proc.new {|val| val.to_f }
           when 'string'    then Proc.new {|val| val }
-          when 'timestamp' then Proc.new {|val| strptime_with_zone(val, timestamp_format, zone_offset) }
+          when 'timestamp' then Proc.new {|val| val ? strptime_with_zone(val, timestamp_format, zone_offset) : nil }
           else raise NotSupportedType, "embulk-output-vertica cannot take column value_type #{value_type} for string column"
           end
         end
@@ -93,8 +93,8 @@ module Embulk
           when 'boolean'   then Proc.new {|val| !!val }
           when 'long'      then Proc.new {|val| val.to_i }
           when 'double'    then Proc.new {|val| val.to_f }
-          when 'string'    then Proc.new {|val| val.localtime(zone_offset).strftime(timestamp_format) }
-          when 'timestamp' then Proc.new {|val| val.localtime(zone_offset) }
+          when 'string'    then Proc.new {|val| val ? val.localtime(zone_offset).strftime(timestamp_format) : nil }
+          when 'timestamp' then Proc.new {|val| val ? val.localtime(zone_offset) : nil }
           else raise NotSupportedType, "embulk-output-vertica cannot take column value_type #{value_type} for timesatmp column"
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-vertica
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - eiji.sekiya
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jvertica