YUKI Hiroshi
null+****@clear*****
Wed Apr 15 14:27:33 JST 2015
YUKI Hiroshi 2015-04-15 14:27:33 +0900 (Wed, 15 Apr 2015) New Revision: a3d2c8b8632b5aa8952f1e58e8867e6cca7b1d8f https://github.com/droonga/droonga-engine/commit/a3d2c8b8632b5aa8952f1e58e8867e6cca7b1d8f Message: Move CatalogGenerator to Catalog::Generator Modified files: lib/droonga/catalog_modifier.rb lib/droonga/command/remote.rb lib/droonga/data_absorber_client.rb Renamed files: lib/droonga/catalog/generator.rb (from lib/droonga/catalog_generator.rb) Renamed: lib/droonga/catalog/generator.rb (+3 -1) 99% =================================================================== --- lib/droonga/catalog_generator.rb 2015-04-15 14:24:26 +0900 (e437723) +++ lib/droonga/catalog/generator.rb 2015-04-15 14:27:33 +0900 (8d7f104) @@ -19,7 +19,8 @@ require "droonga/node_name" require "droonga/catalog/dataset" module Droonga - class CatalogGenerator + module Catalog + class Generator DEFAULT_DATASET = Catalog::Dataset::DEFAULT_NAME DEFAULT_HOSTS = [NodeName::DEFAULT_HOST] DEFAULT_N_WORKERS = 4 @@ -240,4 +241,5 @@ module Droonga end end end + end end Modified: lib/droonga/catalog_modifier.rb (+2 -2) =================================================================== --- lib/droonga/catalog_modifier.rb 2015-04-15 14:24:26 +0900 (83ed0d1) +++ lib/droonga/catalog_modifier.rb 2015-04-15 14:27:33 +0900 (3307490) @@ -16,13 +16,13 @@ require "json" require "droonga/path" -require "droonga/catalog_generator" +require "droonga/catalog/generator" require "droonga/safe_file_writer" module Droonga class CatalogModifier def initialize(source_catalog) - @generator = CatalogGenerator.new + @generator = Catalog::Generator.new @generator.load(source_catalog) end Modified: lib/droonga/command/remote.rb (+2 -2) =================================================================== --- lib/droonga/command/remote.rb 2015-04-15 14:24:26 +0900 (15a1e06) +++ lib/droonga/command/remote.rb 2015-04-15 14:27:33 +0900 (740ff32) @@ -19,7 +19,7 @@ require "droonga/path" require "droonga/serf" require "droonga/node_name" require "droonga/node_metadata" -require "droonga/catalog_generator" +require "droonga/catalog/generator" require "droonga/catalog_modifier" require "droonga/catalog_fetcher" require "droonga/data_absorber" @@ -208,7 +208,7 @@ module Droonga end def replica_hosts - generator = CatalogGenerator.new + generator = Catalog::Generator.new generator.load(catalog) dataset = generator.dataset_for_host(source_host) || generator.dataset_for_host(host) Modified: lib/droonga/data_absorber_client.rb (+2 -2) =================================================================== --- lib/droonga/data_absorber_client.rb 2015-04-15 14:24:26 +0900 (d7ba19c) +++ lib/droonga/data_absorber_client.rb 2015-04-15 14:27:33 +0900 (e471d92) @@ -17,7 +17,7 @@ require "droonga/loggable" require "droonga/node_name" require "droonga/catalog/dataset" require "droonga/client" -require "droonga/catalog_generator" +require "droonga/catalog/generator" require "droonga/catalog_fetcher" module Droonga @@ -153,7 +153,7 @@ module Droonga end def get_source_replica_hosts - generator = CatalogGenerator.new + generator = Catalog::Generator.new generator.load(source_catalog) dataset = generator.dataset_for_host(@source_host) return [] unless dataset -------------- next part -------------- HTML����������������������������...Download
