YUKI Hiroshi
null+****@clear*****
Wed Feb 12 18:37:10 JST 2014
YUKI Hiroshi 2014-02-12 18:37:10 +0900 (Wed, 12 Feb 2014) New Revision: 6ec3e8a5742626c2329fc72317ba30bb2fc1dd15 https://github.com/droonga/fluent-plugin-droonga/commit/6ec3e8a5742626c2329fc72317ba30bb2fc1dd15 Message: Don't validate relations of datasets if there is no farm Modified files: lib/droonga/catalog/base.rb Modified: lib/droonga/catalog/base.rb (+7 -1) =================================================================== --- lib/droonga/catalog/base.rb 2014-02-12 18:31:09 +0900 (96e3a47) +++ lib/droonga/catalog/base.rb 2014-02-12 18:37:10 +0900 (c143c9e) @@ -331,6 +331,8 @@ module Droonga end def validate_database_relations + return if unless @data["farms"] + farm_names = @data["farms"].keys.collect do |name| Regexp.escape(name) end @@ -338,8 +340,12 @@ module Droonga datasets.each do |dataset_name, dataset| ring = dataset["ring"] + next if ring.nil? || !ring.is_a?(Hash) ring.each do |ring_key, part| - part["partitions"].each do |range, partitions| + partitions_set = part["partitions"] + next if partitions_set.nil? || !partitions_set.is_a?(Hash) + partitions_set.each do |range, partitions| + next if !partitions_set.is_a?(Array) partitions.each_with_index do |partition, index| name = "datasets.#{dataset_name}.ring.#{ring_key}." + "partitions.#{range}[#{index}]" -------------- next part -------------- HTML����������������������������...Descargar
