Daijiro MORI
null+****@clear*****
Fri Feb 7 13:10:28 JST 2014
Daijiro MORI 2014-02-07 13:10:28 +0900 (Fri, 07 Feb 2014) New Revision: 75b80a12f4d84fff149467b8a998e262178eb8dd https://github.com/droonga/fluent-plugin-droonga/commit/75b80a12f4d84fff149467b8a998e262178eb8dd Message: Move ditribute method to DistributionPlanner. Modified files: lib/droonga/dispatcher.rb lib/droonga/distribution_planner.rb lib/droonga/planner.rb lib/droonga/planner_plugin.rb Modified: lib/droonga/dispatcher.rb (+3 -1) =================================================================== --- lib/droonga/dispatcher.rb 2014-02-07 12:26:55 +0900 (c962f7c) +++ lib/droonga/dispatcher.rb 2014-02-07 13:10:28 +0900 (91f6593) @@ -25,6 +25,7 @@ require "droonga/session" require "droonga/replier" require "droonga/message_processing_error" require "droonga/catalog_observer" +require "droonga/distribution_planner" module Droonga class Dispatcher @@ -213,7 +214,8 @@ module Droonga def process_input_message(message) adapted_message = @adapter_runner.adapt_input(message) plan =****@plann*****(adapted_message["type"], adapted_message) - @planner.distribute(plan) + distributor = DistributionPlanner.new(self, plan) + distributor.distribute rescue Droonga::Pluggable::UnknownPlugin => error raise UnknownCommand.new(error.command, message["dataset"]) end Modified: lib/droonga/distribution_planner.rb (+5 -0) =================================================================== --- lib/droonga/distribution_planner.rb 2014-02-07 12:26:55 +0900 (0e9254e) +++ lib/droonga/distribution_planner.rb 2014-02-07 13:10:28 +0900 (e5cfad2) @@ -42,6 +42,11 @@ module Droonga @components = components end + def distribute + planned_components = plan + @dispatcher.dispatch_components(planned_components) + end + def plan @dependency = {} @components.each do |component| Modified: lib/droonga/planner.rb (+0 -7) =================================================================== --- lib/droonga/planner.rb 2014-02-07 12:26:55 +0900 (43789f1) +++ lib/droonga/planner.rb 2014-02-07 13:10:28 +0900 (7762988) @@ -17,7 +17,6 @@ require "droonga/pluggable" require "droonga/planner_plugin" -require "droonga/distribution_planner" module Droonga class Planner @@ -30,12 +29,6 @@ module Droonga load_plugins(@options.plugins) end - def distribute(components) - planner = DistributionPlanner.new(@dispatcher, components) - planned_components = planner.plan - @dispatcher.dispatch_components(planned_components) - end - private def instantiate_plugin(name) PlannerPlugin.repository.instantiate(name, self) Modified: lib/droonga/planner_plugin.rb (+0 -4) =================================================================== --- lib/droonga/planner_plugin.rb 2014-02-07 12:26:55 +0900 (e0d6f46) +++ lib/droonga/planner_plugin.rb 2014-02-07 13:10:28 +0900 (6f37608) @@ -27,10 +27,6 @@ module Droonga @planner = planner end - def distribute(messages) - @planner.distribute(messages) - end - def scatter(message, options={}) planner = DistributedCommandPlanner.new(message) planner.scatter -------------- next part -------------- HTML����������������������������...Download