bricolage 5.11.0 → 5.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ff4f8adcd84bf94e55cb1d285a3b5671210906e
-  data.tar.gz: b1f3f08b9c0e74a5e6d469ba197a29d08b51551f
+  metadata.gz: a2a7116f2a283155f91b6b272454abf1515850ef
+  data.tar.gz: d6f816f16389853b0acb524deb11824bfb9ed366
 SHA512:
-  metadata.gz: aec57849ed95f3c50bd0befdcaf66ddad3f6ab2aeb241e139f51e996a64e18ae63023e624a13f44daa9a5330d75d2928cc0df447f4ecae3c9055934b519647c5
-  data.tar.gz: dab80eab00b0e147249fcf6f53a6a75314a0b2161991d46fc0ffe21cedbc29fae3a6e0f00c6d95c60f3ddc26a5438c7d93061ca132a3714d0192b02abc63c593
+  metadata.gz: 3c165aea2e6e48000218965f89f57889d17677e13a1e1894a958f4c615e20aea8da4672c4718b12a4a7e0df4acdc6b70865bad77a3dd19cfae7ef34f46906be5
+  data.tar.gz: 1c3845da421375c166485d502ca51172d877cfedefe6db8896fb65869a030dbb3e71d8a96ab20804e67d952920fbd6e89ae2efec2ee9bc2a559ede07fb52ac09

data/README.md

@@ -13,6 +13,12 @@ MIT license.
 See LICENSES file for details.
 
 
+Running Test
+------------
+
+% rake test
+
+
 Author
 ------
 

data/jobclass/insert-delta.rb

@@ -4,7 +4,7 @@ JobClass.define('insert-delta') {
     params.add DestTableParam.new
     params.add SrcTableParam.new
     params.add StringParam.new('delete-cond', 'SQL_EXPR', 'DELETE condition.')
-    params.add OptionalBoolParam.new('analyze', 'ANALYZE table after SQL is executed.')
+    params.add OptionalBoolParam.new('analyze', 'ANALYZE table after SQL is executed.', default: true)
     params.add OptionalBoolParam.new('vacuum', 'VACUUM table after SQL is executed.')
     params.add OptionalBoolParam.new('vacuum-sort', 'VACUUM SORT table after SQL is executed.')
     params.add DataSourceParam.new('sql')

data/jobclass/insert.rb

@@ -6,7 +6,7 @@ JobClass.define('insert') {
     params.add SQLFileParam.new('table-def', 'PATH', 'Create table file.', optional: true)
     params.add OptionalBoolParam.new('drop', 'DROP table before CREATE.')
     params.add OptionalBoolParam.new('truncate', 'TRUNCATE table before SQL is executed.')
-    params.add OptionalBoolParam.new('analyze', 'ANALYZE table after SQL is executed.')
+    params.add OptionalBoolParam.new('analyze', 'ANALYZE table after SQL is executed.', default: true)
     params.add OptionalBoolParam.new('vacuum', 'VACUUM table after SQL is executed.')
     params.add OptionalBoolParam.new('vacuum-sort', 'VACUUM SORT table after SQL is executed.')
     params.add DataSourceParam.new('sql')

data/lib/bricolage/context.rb

@@ -87,7 +87,8 @@ module Bricolage
     end
 
     def load_global_variables
-      vars_list = config_pathes(GLOBAL_VARIABLE_FILE).map {|path|
+      subsys_path = scoped? ? [@filesystem.relative(GLOBAL_VARIABLE_FILE)] : []
+      vars_list = (config_pathes(GLOBAL_VARIABLE_FILE) + subsys_path).map {|path|
         path.exist? ? load_variables(path) : nil
       }
       Variables.union(*vars_list.compact)

data/lib/bricolage/job.rb

@@ -73,6 +73,7 @@ module Bricolage
     end
 
     def compile
+      param_vals_default = @param_decls.parse_default_values(@global_variables.get_force('defaults'))
       @job_class.invoke_parameters_filter(self)
 
       job_file_rest_vars = @param_vals ? @param_vals.variables : Variables.new
@@ -87,7 +88,7 @@ module Bricolage
         job_v_opt_vars
         #          v High precedence
       )
-      pvals = @param_decls.union_intermediate_values(*[@param_vals, @param_vals_opt].compact)
+      pvals = @param_decls.union_intermediate_values(*[param_vals_default, @param_vals, @param_vals_opt].compact)
       @params = pvals.resolve(@context, base_vars.resolve)
 
       # Then, expand SQL variables and check with declarations.

data/lib/bricolage/jobnetrunner.rb

@@ -148,6 +148,9 @@ module Bricolage
       }
     end
 
+    public :puts
+    public :exit
+
     def usage_exit(msg, usage)
       print_error msg
       $stderr.puts usage

data/lib/bricolage/parameters.rb

@@ -34,6 +34,11 @@ module Bricolage
         @decls.each_value(&block)
       end
 
+      def parse_default_values(values)
+        return IntermediateValues.empty(self) unless values
+        DefaultValuesHandler.new(self).parse(values)
+      end
+
       def parse_direct_values(values)
         DirectValueHandler.new(self).parse(values)
       end
@@ -49,6 +54,29 @@ module Bricolage
       end
     end
 
+    # Handles default values given by variable.yml (global or subsystem variables)
+    # Declarations + values -> IntermediateValues
+    class DefaultValuesHandler
+      def initialize(decls)
+        @decls = decls
+      end
+
+      def parse(values)
+        unless values.kind_of?(Hash)
+          raise ParameterError, "invalid type for 'defaults' global variable: #{values.class}"
+        end
+        parsed_values = {}
+        values.each do |name, value|
+          decl = @decls[name]
+          next unless decl   # ignore undeclared option
+          val = decl.parse_value(value)
+          # nil means really nil for default values.
+          parsed_values[name] = val
+        end
+        IntermediateValues.new(@decls, parsed_values, Variables.new)
+      end
+    end
+
     # Handles *.job file values.
     # Declarations + values -> IntermediateValues
     class DirectValueHandler
@@ -626,6 +654,8 @@ module Bricolage
       when String   # FIXME: should be removed after changing all load options
         raise ParameterError, "bad type for parameter #{name}: #{h.class}" unless @value_handler
         h.strip.empty? ? nil : h
+      when nil, false   # disables option explicitly
+        {}
       else
         raise ParameterError, "bad type for parameter #{name}: #{h.class}"
       end

data/lib/bricolage/variables.rb

@@ -38,6 +38,11 @@ module Bricolage
       var.value
     end
 
+    def get_force(name)
+      var = @vars[name]
+      var ? var.value : nil
+    end
+
     def []=(name, value)
       add Variable.new(name, value)
     end

data/lib/bricolage/version.rb

@@ -1,4 +1,4 @@
 module Bricolage
   APPLICATION_NAME = 'Bricolage'
-  VERSION = '5.11.0'
+  VERSION = '5.12.0'
 end

data/test/home/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    bricolage (5.11.0)
+    bricolage (5.12.0)
       aws-sdk (< 2)
       mysql2
       pg

data/test/home/subsys/insert.sql.job

@@ -0,0 +1,7 @@
+/*
+class: insert
+dest-table: d
+src-tables: {s: s}
+*/
+
+insert into $dest_table select * from $s;

data/test/home/subsys/rebuild.sql.job

@@ -6,6 +6,7 @@
         s: s
     analyze: true
     vacuum-sort: true
+    #grant: false
 */
 
 insert into $dest_table

data/test/home/subsys/variable.yml

@@ -0,0 +1,4 @@
+defaults:
+    grant:
+        privilege: "select"
+        to: "$test_group"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bricolage
 version: !ruby/object:Gem::Version
-  version: 5.11.0
+  version: 5.12.0
 platform: ruby
 authors:
 - Minero Aoki
@@ -172,6 +172,7 @@ files:
 - test/home/put.sh
 - test/home/revert.sh
 - test/home/subsys/d.ct
+- test/home/subsys/insert.sql.job
 - test/home/subsys/job1.job
 - test/home/subsys/job2.job
 - test/home/subsys/job3.job
@@ -191,6 +192,7 @@ files:
 - test/home/subsys/separated.sql
 - test/home/subsys/unified.jobnet
 - test/home/subsys/unified.sql.job
+- test/home/subsys/variable.yml
 - test/test_c_streaming_load.rb
 - test/test_filesystem.rb
 - test/test_parameters.rb