YUKI Hiroshi
null+****@clear*****
Wed Apr 15 14:30:42 JST 2015
YUKI Hiroshi 2015-04-15 14:30:42 +0900 (Wed, 15 Apr 2015) New Revision: b3dadb51d2ae08fcb6d270f0494b1947497a7f46 https://github.com/droonga/droonga-engine/commit/b3dadb51d2ae08fcb6d270f0494b1947497a7f46 Message: Move CatalogModifier and CatalogFetcher under the namespace Catalog Modified files: lib/droonga/command/remote.rb lib/droonga/data_absorber_client.rb Renamed files: lib/droonga/catalog/fetcher.rb (from lib/droonga/catalog_fetcher.rb) lib/droonga/catalog/modifier.rb (from lib/droonga/catalog_modifier.rb) Renamed: lib/droonga/catalog/fetcher.rb (+3 -1) 97% =================================================================== --- lib/droonga/catalog_fetcher.rb 2015-04-15 14:27:33 +0900 (9c22f3b) +++ lib/droonga/catalog/fetcher.rb 2015-04-15 14:30:42 +0900 (48cf590) @@ -21,7 +21,8 @@ require "droonga/node_name" require "droonga/catalog/dataset" module Droonga - class CatalogFetcher + module Catalog + class Fetcher class EmptyResponse < StandardError end @@ -59,4 +60,5 @@ module Droonga } end end + end end Renamed: lib/droonga/catalog/modifier.rb (+3 -1) 96% =================================================================== --- lib/droonga/catalog_modifier.rb 2015-04-15 14:27:33 +0900 (3307490) +++ lib/droonga/catalog/modifier.rb 2015-04-15 14:30:42 +0900 (6a7152f) @@ -20,7 +20,8 @@ require "droonga/catalog/generator" require "droonga/safe_file_writer" module Droonga - class CatalogModifier + module Catalog + class Modifier def initialize(source_catalog) @generator = Catalog::Generator.new @generator.load(source_catalog) @@ -33,4 +34,5 @@ module Droonga end end end + end end Modified: lib/droonga/command/remote.rb (+11 -11) =================================================================== --- lib/droonga/command/remote.rb 2015-04-15 14:27:33 +0900 (740ff32) +++ lib/droonga/command/remote.rb 2015-04-15 14:30:42 +0900 (d4fa938) @@ -20,8 +20,8 @@ require "droonga/serf" require "droonga/node_name" require "droonga/node_metadata" require "droonga/catalog/generator" -require "droonga/catalog_modifier" -require "droonga/catalog_fetcher" +require "droonga/catalog/modifier" +require "droonga/catalog/fetcher" require "droonga/data_absorber" require "droonga/safe_file_writer" require "droonga/service_installation" @@ -217,10 +217,10 @@ module Droonga end def fetch_catalog - fetcher = CatalogFetcher.new(:host => source_host, - :port => port, - :tag => tag, - :receiver_host => host) + fetcher = Catalog::Fetcher.new(:host => source_host, + :port => port, + :tag => tag, + :receiver_host => host) fetcher.fetch(:dataset => dataset) end @@ -229,7 +229,7 @@ module Droonga @serf.join(*@other_hosts) log("update catalog.json from fetched catalog") - CatalogModifier.new(catalog).modify do |modifier, file| + Catalog::Modifier.new(catalog).modify do |modifier, file| modifier.datasets[dataset].replicas.hosts += [joining_host] modifier.datasets[dataset].replicas.hosts.uniq! @service_installation.ensure_correct_file_permission(file) @@ -266,7 +266,7 @@ module Droonga @serf.join(*hosts) log("setting replicas to the cluster") - CatalogModifier.new(catalog).modify do |modifier, file| + Catalog::Modifier.new(catalog).modify do |modifier, file| modifier.datasets[dataset].replicas.hosts = hosts @service_installation.ensure_correct_file_permission(file) end @@ -286,7 +286,7 @@ module Droonga @serf.join(*added_hosts) log("adding replicas to the cluster") - CatalogModifier.new(catalog).modify do |modifier, file| + Catalog::Modifier.new(catalog).modify do |modifier, file| modifier.datasets[dataset].replicas.hosts += added_hosts modifier.datasets[dataset].replicas.hosts.uniq! @service_installation.ensure_correct_file_permission(file) @@ -302,7 +302,7 @@ module Droonga log("removing replicas: #{hosts.join(",")}") log("removing replicas from the cluster") - CatalogModifier.new(catalog).modify do |modifier, file| + Catalog::Modifier.new(catalog).modify do |modifier, file| modifier.datasets[dataset].replicas.hosts -= hosts @service_installation.ensure_correct_file_permission(file) end @@ -317,7 +317,7 @@ module Droonga log("unjoining replicas: #{hosts.join(",")}") log("unjoining from the cluster") - CatalogModifier.new(catalog).modify do |modifier, file| + Catalog::Modifier.new(catalog).modify do |modifier, file| if unjoining_node? modifier.datasets[dataset].replicas.hosts = hosts else Modified: lib/droonga/data_absorber_client.rb (+5 -5) =================================================================== --- lib/droonga/data_absorber_client.rb 2015-04-15 14:27:33 +0900 (e471d92) +++ lib/droonga/data_absorber_client.rb 2015-04-15 14:30:42 +0900 (7e5cac2) @@ -18,7 +18,7 @@ require "droonga/node_name" require "droonga/catalog/dataset" require "droonga/client" require "droonga/catalog/generator" -require "droonga/catalog_fetcher" +require "droonga/catalog/fetcher" module Droonga class DataAbsorberClient @@ -165,10 +165,10 @@ module Droonga end def fetch_source_catalog - fetcher = CatalogFetcher.new(:host => @source_host, - :port => @source_port, - :tag => @source_tag, - :receiver_host => @receiver_host) + fetcher = Catalog::Fetcher.new(:host => @source_host, + :port => @source_port, + :tag => @source_tag, + :receiver_host => @receiver_host) fetcher.fetch(:dataset => @source_dataset) end -------------- next part -------------- HTML����������������������������...Download