YUKI Hiroshi
null+****@clear*****
Fri Dec 26 15:34:12 JST 2014
YUKI Hiroshi 2014-12-26 15:34:12 +0900 (Fri, 26 Dec 2014) New Revision: baddd73a6b71f5297b4c817d6685169348edb408 https://github.com/droonga/droonga-engine/commit/baddd73a6b71f5297b4c817d6685169348edb408 Message: Use the term "active_nodes" instead of "live_nodes". The "live_nodes_list" has been unified to the cluster state. Modified files: lib/droonga/catalog/dataset.rb lib/droonga/catalog/replicas_volume.rb lib/droonga/catalog/single_volume.rb lib/droonga/catalog/slice.rb lib/droonga/catalog/slices_volume.rb lib/droonga/catalog/version1.rb Modified: lib/droonga/catalog/dataset.rb (+2 -2) =================================================================== --- lib/droonga/catalog/dataset.rb 2014-12-26 15:31:32 +0900 (8d79a9f) +++ lib/droonga/catalog/dataset.rb 2014-12-26 15:34:12 +0900 (eaf0b6a) @@ -67,8 +67,8 @@ module Droonga @all_nodes ||= replicas.all_nodes end - def compute_routes(message, live_nodes) - @replicas.compute_routes(message, live_nodes) + def compute_routes(message, active_nodes) + @replicas.compute_routes(message, active_nodes) end def sliced? Modified: lib/droonga/catalog/replicas_volume.rb (+12 -12) =================================================================== --- lib/droonga/catalog/replicas_volume.rb 2014-12-26 15:31:32 +0900 (7c42e7f) +++ lib/droonga/catalog/replicas_volume.rb 2014-12-26 15:34:12 +0900 (6d29e9e) @@ -40,16 +40,16 @@ module Droonga to_a.hash end - def select(how=nil, live_nodes=nil) + def select(how=nil, active_nodes=nil) case how when :top - replicas = live_replicas(live_nodes) + replicas = live_replicas(active_nodes) [replicas.first] when :random - replicas = live_replicas(live_nodes) + replicas = live_replicas(active_nodes) [replicas.sample] when :all - live_replicas(live_nodes) + live_replicas(active_nodes) else super end @@ -63,27 +63,27 @@ module Droonga @all_nodes ||= collect_all_nodes end - def live_replicas(live_nodes=nil) - return replicas unless live_nodes + def live_replicas(active_nodes=nil) + return replicas unless active_nodes replicas.select do |volume| - dead_nodes = volume.all_nodes - live_nodes + dead_nodes = volume.all_nodes - active_nodes dead_nodes.empty? end end - def compute_routes(message, live_nodes) + def compute_routes(message, active_nodes) routes = [] case message["type"] when "broadcast" - replicas = select(message["replica"].to_sym, live_nodes) + replicas = select(message["replica"].to_sym, active_nodes) replicas.each do |volume| - routes.concat(volume.compute_routes(message, live_nodes)) + routes.concat(volume.compute_routes(message, active_nodes)) end when "scatter" - replicas = select(message["replica"].to_sym, live_nodes) + replicas = select(message["replica"].to_sym, active_nodes) replicas.each do |volume| - routes.concat(volume.compute_routes(message, live_nodes)) + routes.concat(volume.compute_routes(message, active_nodes)) end end routes Modified: lib/droonga/catalog/single_volume.rb (+1 -1) =================================================================== --- lib/droonga/catalog/single_volume.rb 2014-12-26 15:31:32 +0900 (63dad42) +++ lib/droonga/catalog/single_volume.rb 2014-12-26 15:34:12 +0900 (36b48d3) @@ -32,7 +32,7 @@ module Droonga @all_nodes ||= [node] end - def compute_routes(message, live_nodes) + def compute_routes(message, active_nodes) [address.to_s] end Modified: lib/droonga/catalog/slice.rb (+2 -2) =================================================================== --- lib/droonga/catalog/slice.rb 2014-12-26 15:31:32 +0900 (f33b5c1) +++ lib/droonga/catalog/slice.rb 2014-12-26 15:34:12 +0900 (ef4f483) @@ -41,8 +41,8 @@ module Droonga @all_nodes ||= volume.all_nodes end - def compute_routes(message, live_nodes) - volume.compute_routes(message, live_nodes) + def compute_routes(message, active_nodes) + volume.compute_routes(message, active_nodes) end end end Modified: lib/droonga/catalog/slices_volume.rb (+3 -3) =================================================================== --- lib/droonga/catalog/slices_volume.rb 2014-12-26 15:31:32 +0900 (c0a694a) +++ lib/droonga/catalog/slices_volume.rb 2014-12-26 15:34:12 +0900 (e3d7944) @@ -71,17 +71,17 @@ module Droonga @all_nodes ||= collect_all_nodes end - def compute_routes(message, live_nodes) + def compute_routes(message, active_nodes) routes = [] case message["type"] when "broadcast" slices = select_slices slices.each do |slice| - routes.concat(slice.compute_routes(message, live_nodes)) + routes.concat(slice.compute_routes(message, active_nodes)) end when "scatter" slice = choose_slice(message["record"]) - routes.concat(slice.compute_routes(message, live_nodes)) + routes.concat(slice.compute_routes(message, active_nodes)) end routes end Modified: lib/droonga/catalog/version1.rb (+1 -1) =================================================================== --- lib/droonga/catalog/version1.rb 2014-12-26 15:31:32 +0900 (6fbb416) +++ lib/droonga/catalog/version1.rb 2014-12-26 15:34:12 +0900 (d3a51e7) @@ -389,7 +389,7 @@ module Droonga end class Dataset < Catalog::Dataset - def compute_routes(args, live_nodes=nil) + def compute_routes(args, active_nodes=nil) routes = [] case args["type"] when "broadcast" -------------- next part -------------- HTML����������������������������...Télécharger
