Kouhei Sutou
null+****@clear*****
Thu Jul 17 23:38:12 JST 2014
Kouhei Sutou 2014-07-17 23:38:12 +0900 (Thu, 17 Jul 2014) New Revision: 2af94eb01db535680585db03182b11573ede4c9f https://github.com/droonga/droonga-engine/commit/2af94eb01db535680585db03182b11573ede4c9f Message: Use more meaningful name for computing routes method Modified files: lib/droonga/catalog/dataset.rb lib/droonga/catalog/version1.rb lib/droonga/dispatcher.rb Modified: lib/droonga/catalog/dataset.rb (+5 -5) =================================================================== --- lib/droonga/catalog/dataset.rb 2014-07-17 23:28:52 +0900 (36a6def) +++ lib/droonga/catalog/dataset.rb 2014-07-17 23:38:12 +0900 (242dd3b) @@ -62,11 +62,11 @@ module Droonga @all_nodes ||= replicas.all_nodes end - def get_routes(args, live_nodes=nil) + def compute_routes(message, live_nodes) routes = [] - case args["type"] + case message["type"] when "broadcast" - volumes = replicas.select(args["replica"].to_sym, live_nodes) + volumes = replicas.select(message["replica"].to_sym, live_nodes) volumes.each do |volume| slices = volume.select_slices slices.each do |slice| @@ -74,9 +74,9 @@ module Droonga end end when "scatter" - volumes = replicas.select(args["replica"].to_sym, live_nodes) + volumes = replicas.select(message["replica"].to_sym, live_nodes) volumes.each do |volume| - slice = volume.choose_slice(args["record"]) + slice = volume.choose_slice(message["record"]) routes << slice.volume.address end end Modified: lib/droonga/catalog/version1.rb (+1 -1) =================================================================== --- lib/droonga/catalog/version1.rb 2014-07-17 23:28:52 +0900 (f674497) +++ lib/droonga/catalog/version1.rb 2014-07-17 23:38:12 +0900 (d20601e) @@ -385,7 +385,7 @@ module Droonga end class Dataset < Catalog::Dataset - def get_routes(args, live_nodes=nil) + def compute_routes(args, live_nodes=nil) routes = [] case args["type"] when "broadcast" Modified: lib/droonga/dispatcher.rb (+1 -1) =================================================================== --- lib/droonga/dispatcher.rb 2014-07-17 23:28:52 +0900 (fded5ca) +++ lib/droonga/dispatcher.rb 2014-07-17 23:38:12 +0900 (468d901) @@ -175,7 +175,7 @@ module Droonga steps.each do |step| dataset =****@catal*****(step["dataset"]) if dataset - routes = dataset.get_routes(step, @engine_state.live_nodes) + routes = dataset.compute_routes(step, @engine_state.live_nodes) step["routes"] = routes else step["routes"] ||= [id] -------------- next part -------------- HTML����������������������������...Download