Kouhei Sutou
null+****@clear*****
Sat Jul 19 16:05:09 JST 2014
Kouhei Sutou 2014-07-19 16:05:09 +0900 (Sat, 19 Jul 2014) New Revision: 6d057b0a4e22de971080582f148b01f0f66b2856 https://github.com/droonga/droonga-engine/commit/6d057b0a4e22de971080582f148b01f0f66b2856 Message: Pass engine state to session planner instead of dispatcher Modified files: lib/droonga/dispatcher.rb Modified: lib/droonga/dispatcher.rb (+7 -7) =================================================================== --- lib/droonga/dispatcher.rb 2014-07-18 18:28:08 +0900 (468d901) +++ lib/droonga/dispatcher.rb 2014-07-19 16:05:09 +0900 (543633f) @@ -143,10 +143,10 @@ module Droonga else steps = message["steps"] if steps - session_planner = SessionPlanner.new(self, steps) + session_planner = SessionPlanner.new(@engine_state, steps) dataset = message["dataset"] || @message["dataset"] collector_runner = @collector_runners[dataset] - session = session_planner.create_session(id, collector_runner) + session = session_planner.create_session(id, self, collector_runner) @engine_state.register_session(id, session) else logger.error("no steps error: id=#{id}, message=#{message}") @@ -285,18 +285,18 @@ module Droonga class SessionPlanner attr_reader :steps - def initialize(dispatcher, steps) - @dispatcher = dispatcher + def initialize(engine_state, steps) + @engine_state = engine_state @steps = steps end - def create_session(id, collector_runner) + def create_session(id, dispatcher, collector_runner) resolve_descendants tasks = [] inputs = {} @steps.each do |step| step["routes"].each do |route| - next unles****@dispa*****?(route) + next unless @engine_state.local_route?(route) task = { "route" => route, "step" => step, @@ -310,7 +310,7 @@ module Droonga end end end - Session.new(id, @dispatcher, collector_runner, tasks, inputs) + Session.new(id, dispatcher, collector_runner, tasks, inputs) end def resolve_descendants -------------- next part -------------- HTML����������������������������...Download