Kouhei Sutou
null+****@clear*****
Thu Jul 17 20:28:27 JST 2014
Kouhei Sutou 2014-07-17 20:28:27 +0900 (Thu, 17 Jul 2014) New Revision: 2d26d086934e767a5a40e7adc83db2f57761f587 https://github.com/droonga/droonga-engine/commit/2d26d086934e767a5a40e7adc83db2f57761f587 Message: catalog-generator: simplify Modified files: lib/droonga/catalog_generator.rb Modified: lib/droonga/catalog_generator.rb (+12 -13) =================================================================== --- lib/droonga/catalog_generator.rb 2014-07-17 20:26:27 +0900 (da3918a) +++ lib/droonga/catalog_generator.rb 2014-07-17 20:28:27 +0900 (a627284) @@ -56,8 +56,8 @@ module Droonga end def load(catalog) - catalog["datasets"].each do |name, dataset| - add_dataset(name, dataset_to_params(dataset)) + catalog["datasets"].each do |name, catalog_dataset| + load_dataset(name, catalog_dataset) end self end @@ -102,6 +102,16 @@ module Droonga catalog_datasets end + def load_dataset(name, catalog_dataset) + options = {} + options[:n_workers] = catalog_dataset["nWorkers"] + options[:plugins] = catalog_dataset["plugins"] + options[:schema] = catalog_dataset["schema"] + options[:fact] = catalog_dataset["fact"] + options[:replicas] = catalog_dataset["replicas"] + add_dataset(name, options) + end + class Dataset attr_reader :name @@ -229,16 +239,5 @@ module Droonga @weight ||= 100 / @n_slices end end - - def dataset_to_params(dataset) - params = {} - params[:n_workers] = dataset["nWorkers"] - params[:n_slices] = dataset["replicas"].first["slices"].size - params[:plugins] = dataset["plugins"] - params[:schema] = dataset["schema"] if dataset["schema"] - params[:fact] = dataset["fact"] if dataset["fact"] - params[:replicas] = dataset["replicas"] - params - end end end -------------- next part -------------- HTML����������������������������...Download
