Kouhei Sutou
null+****@clear*****
Thu Feb 27 15:04:00 JST 2014
Kouhei Sutou 2014-02-27 15:04:00 +0900 (Thu, 27 Feb 2014) New Revision: e03c515b8feeed905fcdad9ea6763c18daf89862 https://github.com/droonga/fluent-plugin-droonga/commit/e03c515b8feeed905fcdad9ea6763c18daf89862 Message: catalog: return Dataset object Modified files: lib/droonga/catalog/base.rb lib/droonga/catalog/version1.rb lib/droonga/catalog/version2.rb Modified: lib/droonga/catalog/base.rb (+0 -4) =================================================================== --- lib/droonga/catalog/base.rb 2014-02-27 15:03:21 +0900 (295a7a7) +++ lib/droonga/catalog/base.rb 2014-02-27 15:04:00 +0900 (5cb51ca) @@ -29,10 +29,6 @@ module Droonga @base_path = File.dirname(path) end - def datasets - @data["datasets"] || {} - end - def have_dataset?(name) datasets.key?(name) end Modified: lib/droonga/catalog/version1.rb (+7 -1) =================================================================== --- lib/droonga/catalog/version1.rb 2014-02-27 15:03:21 +0900 (3c65098) +++ lib/droonga/catalog/version1.rb 2014-02-27 15:04:00 +0900 (0abe47f) @@ -29,6 +29,10 @@ module Droonga prepare_data end + def datasets + @datasets + end + def slices(name) get_partitions(name) end @@ -113,6 +117,7 @@ module Droonga private def prepare_data + @datasets = {} @data["datasets"].each do |name, dataset| number_of_partitions = dataset["number_of_partitions"] next if number_of_partitions < 2 @@ -126,6 +131,7 @@ module Droonga end end dataset["continuum"] = continuum.sort do |a, b| a[0] - b[0]; end + @datasets[name] = Dataset.new(name, dataset) end @options = @data["options"] || {} end @@ -387,7 +393,7 @@ module Droonga end valid_farms_matcher = Regexp.new("^(#{farm_names.join("|")})\.") - datasets.each do |dataset_name, dataset| + @data["datasets"].each do |dataset_name, dataset| ring = dataset["ring"] next if ring.nil? or !ring.is_a?(Hash) ring.each do |ring_key, part| Modified: lib/droonga/catalog/version2.rb (+7 -2) =================================================================== --- lib/droonga/catalog/version2.rb 2014-02-27 15:03:21 +0900 (e0dbb45) +++ lib/droonga/catalog/version2.rb 2014-02-27 15:04:00 +0900 (f08a8e8) @@ -24,12 +24,15 @@ module Droonga prepare_data end + def datasets + @datasets + end + def slices(name) device = "." pattern = Regexp.new("^#{name}\.") results = {} - @data["datasets"].each do |dataset_name, dataset_data| - dataset = Dataset.new(dataset_name, dataset_data) + @datasets.each do |dataset_name, dataset| n_workers = dataset["nWorkers"] plugins = dataset["plugins"] dataset["replicas"].each do |replica| @@ -80,6 +83,7 @@ module Droonga end def prepare_data + @datasets = {} @data["datasets"].each do |name, dataset| replicas = dataset["replicas"] replicas.each do |replica| @@ -99,6 +103,7 @@ module Droonga a[0] - b[0] end end + @datasets[name] = Dataset.new(name, dataset) end end -------------- next part -------------- HTML����������������������������...Download