bricolage 5.22.2 → 5.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421cba4c1e08c2f0a0e915b0ba98a6ab18a726ee
-  data.tar.gz: 7458e51782caa425498889ff6e7db532707bc154
+  metadata.gz: 888f08c5389eb2cd139787f0d1e5953dffb4ba73
+  data.tar.gz: 4a6ef9137c4e5ac55976e9a4620a8b407294563b
 SHA512:
-  metadata.gz: 359a1e98d6a75a5f4102b9ebe9478868cdcecbf6e3cc73856a53a83a722f879d72340f56e0dc10f8f82d3a5b1023d0b8bfb7d5a55e3a337847db4646980d0984
-  data.tar.gz: 05b59b3de45b25baa445391d710786fd18a91aaff0c614015d619863e2e749cd48db6f63ceeb4c49790ad78f4c07c6e7d9a8c42012cb06dd71f0339d4daae8f6
+  metadata.gz: c7467cfe78a919f20a07555bd67c7088faf3bfa9b40e2fa3240644bbf7d69fb87fb6a65c41152ea3ffa978a54625efca08b1b829522ed117c85368303a2148c8
+  data.tar.gz: 90fdf06402e01edee7f53302c97ac43ebe47f8684b806372d818188fb6c4f8d64378b8025f3b1b74af70f85ed7bc6a35c4d153accd609306f529af0ef73037b0

data/jobclass/insert.rb

@@ -23,11 +23,13 @@ JobClass.define('insert') {
   script {|params, script|
     script.task(params['data-source']) {|task|
       task.truncate_if params['truncate']
-      task.drop_force_if params['drop']
-      task.exec params['table-def'] if params['table-def']
-      task.exec params['sql-file']
+      task.transaction {
+        task.drop_force_if params['drop']
+        task.exec params['table-def'] if params['table-def']
+        task.exec params['sql-file']
+        task.analyze_if params['analyze']
+      }
       task.vacuum_if params['vacuum'], params['vacuum-sort']
-      task.analyze_if params['analyze']
     }
   }
 }

data/jobclass/load.rb

@@ -26,14 +26,47 @@ JobClass.define('load') {
 
   script {|params, script|
     script.task(params['dest-ds']) {|task|
-      task.drop_force_if params['drop']
-      task.exec params['table-def'] if params['table-def']
-      task.truncate_if params['truncate']
-      task.load params['src-ds'], params['src-file'], params['dest-table'],
-          params['format'], params['jsonpath'], params['options']
-      task.vacuum_if params['vacuum'], params['vacuum-sort']
-      task.analyze_if params['analyze']
-      task.grant_if params['grant'], params['dest-table']
+      if params['drop']
+        # drop - create - load pattern
+        unless params['table-def']
+          raise ParameterError, "--table-def is required when --drop is enabled"
+        end
+
+        task.transaction {
+          task.drop_force '${dest_table}'
+          task.exec params['table-def']
+          task.load params['src-ds'], params['src-file'], params['dest-table'],
+              params['format'], params['jsonpath'], params['options']
+          task.grant_if params['grant'], params['dest-table']
+        }
+        # ANALYZE, VACUUM is needless for newly loaded table, skip always.
+
+      elsif params['truncate']
+        # truncate - load pattern
+        if params['drop'] or params['table-def']
+          raise ParameterError, "--truncate and --drop/--table-def is exclusive"
+        end
+
+        task.truncate_if params['truncate']
+        task.transaction {
+          task.load params['src-ds'], params['src-file'], params['dest-table'],
+              params['format'], params['jsonpath'], params['options']
+          task.grant_if params['grant'], params['dest-table']
+        }
+        # ANALYZE, VACUUM is needless for newly loaded table, skip always.
+
+      else
+        # load only pattern
+
+        task.transaction {
+          task.load params['src-ds'], params['src-file'], params['dest-table'],
+              params['format'], params['jsonpath'], params['options']
+          task.grant_if params['grant'], params['dest-table']
+          task.analyze_if params['analyze']
+        }
+        # We cannot execute VACUUM in transaction
+        task.vacuum_if params['vacuum'], params['vacuum-sort']
+      end
     }
   }
 }

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.22.2'
+  VERSION = '5.22.3'
 end

data/test/home/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    bricolage (5.22.2)
+    bricolage (5.22.3)
       aws-sdk (~> 2)
       mysql2
       pg (~> 0.18.0)
@@ -69,4 +69,4 @@ DEPENDENCIES
   pry
 
 BUNDLED WITH
-   1.13.6
+   1.14.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.22.2
+  version: 5.22.3
 platform: ruby
 authors:
 - Minero Aoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -300,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: SQL Batch Framework