embulk-output-vertica 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e89fddffd4579262fb1d91d92a3288c0e8a8ba2
-  data.tar.gz: e5708526eb702e7008e2758126251a4e306e75f1
+  metadata.gz: 8a242b2cf1e51a66b6437732cbe452462e4c8cf2
+  data.tar.gz: c246522c98e21f209d91b68eb822963b85b72f4f
 SHA512:
-  metadata.gz: efa9d97f5d999a983f4d55ffc5cb5413bf1b9da63f825276682e01c14fbdc9541da1277a108b2b639f9960f7e6af21f4b1c7b99894ca51ae1954814e777e5e27
-  data.tar.gz: c4c1b97985f3211d187192b8581f1602109cb2eb9b2d1f58dc05e30e232a7b823e00fd7b76831fea95883b80232e759d632d621892f3c69429612cf3b5e1fe12
+  metadata.gz: d5b433c8a06ad2c3d0be6fc90d9bc31e0e4a919bd292e7a994d9dace14587ee5cbcc09f05c5760d3f0f02c4504d6ee94bc3fd39ad7c453d7acadb1a93967ae59
+  data.tar.gz: 1a3f92018cbcfa04ed2e5cd18a07459ec2e2288398bc5e6422c3aa6d6b842be68b32aa4290135f307d22be7cd4f8d740d72649adeb7580961c36f6bd2aa04c33

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.7.4 (2016/05/07)
+
+Fixes:
+
+* Add missing "require 'timeout'"
+
 # 0.7.3 (2016/03/27)
 
 Enhancements:

data/README.md

@@ -75,7 +75,7 @@ Run example:
 
 ```
 $ embulk bundle install --path vendor/bundle
-$ embulk -J-O -R--dev run -b . -l debug example.yml
+$ embulk -J-O -R--dev run -b . -l debug example/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.7.3"
+  spec.version       = "0.7.4"
   spec.authors       = ["Naotoshi Seo", "Eiji Sekiya"]
   spec.email         = ["sonots@gmail.com", "eiji.sekiya.0326@gmail.com"]
   spec.summary       = "Vertica output plugin for Embulk"

data/lib/embulk/output/vertica.rb

@@ -1,4 +1,5 @@
 require 'jvertica'
+require 'securerandom'
 require_relative 'vertica/value_converter_factory'
 require_relative 'vertica/output_thread'
 
@@ -14,6 +15,23 @@ module Embulk
         @thread_pool ||= @thread_pool_proc.call
       end
 
+      def self.transaction_report(jv, task, task_reports)
+        quoted_schema     = ::Jvertica.quote_identifier(task['schema'])
+        quoted_temp_table = ::Jvertica.quote_identifier(task['temp_table'])
+
+        num_input_rows = task_reports.map {|report| report['num_input_rows'].to_i }.inject(:+)
+        num_response_rows = task_reports.map {|report| report['num_output_rows'].to_i }.inject(:+)
+        result = query(jv, %[SELECT COUNT(*) FROM #{quoted_schema}.#{quoted_temp_table}])
+        num_output_rows = result.map {|row| row.values }.flatten.first.to_i
+        num_rejected_rows = num_input_rows - num_output_rows
+        transaction_report = {
+          'num_input_rows' => num_input_rows,
+          'num_response_rows' => num_response_rows,
+          'num_output_rows' => num_output_rows,
+          'num_rejected_rows' => num_rejected_rows,
+        }
+      end
+
       def self.transaction(config, schema, task_count, &control)
         task = {
           'host'             => config.param('host',             :string,  :default => 'localhost'),
@@ -65,7 +83,7 @@ module Embulk
         end
 
         now = Time.now
-        unique_name = "%08x%08x" % [now.tv_sec, now.tv_nsec]
+        unique_name = SecureRandom.uuid
         task['temp_table'] = "#{task['table']}_LOAD_TEMP_#{unique_name}"
 
         quoted_schema     = ::Jvertica.quote_identifier(task['schema'])
@@ -108,6 +126,16 @@ module Embulk
           Embulk.logger.info { "embulk-output-vertica: task_reports: #{task_reports.to_json}" }
 
           connect(task) do |jv|
+            transaction_report = self.transaction_report(jv, task, task_reports)
+            Embulk.logger.info { "embulk-output-vertica: transaction_report: #{transaction_report.to_json}" }
+
+            if task['abort_on_error'] # double-meaning, also used for COPY statement
+              if transaction_report['num_input_rows'] != transaction_report['num_output_rows']
+                raise Error, "ABORT: `num_input_rows (#{transaction_report['num_input_rows']})` and " \
+                  "`num_output_rows (#{transaction_report['num_output_rows']})` does not match"
+              end
+            end
+
             if task['mode'] == 'REPLACE'
               # swap table and drop the old table
               quoted_old_table = ::Jvertica.quote_identifier("#{task['table']}_LOAD_OLD_#{unique_name}")

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

@@ -1,4 +1,5 @@
 require 'zlib'
+require 'timeout'
 
 module Embulk
   module Output

metadata

@@ -1,72 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-vertica
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Naotoshi Seo
 - Eiji Sekiya
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jvertica
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  prerelease: false
+  type: :development
 description: Dump records to vertica
 email:
 - sonots@gmail.com
@@ -97,7 +97,7 @@ homepage: https://github.com/sonots/embulk-output-vertica
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,9 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+signing_key:
 specification_version: 4
 summary: Vertica output plugin for Embulk
 test_files: []