Daijiro MORI
null+****@clear*****
Fri Feb 7 10:40:26 JST 2014
Daijiro MORI 2014-02-07 10:40:26 +0900 (Fri, 07 Feb 2014) New Revision: 17615684e0d46727f8bf7c30245ff8d4a2e3c12c https://github.com/droonga/fluent-plugin-droonga/commit/17615684e0d46727f8bf7c30245ff8d4a2e3c12c Message: Rename Distributor to Planner. Modified files: lib/droonga/catalog/base.rb lib/droonga/dispatcher.rb lib/droonga/test.rb sample/cluster/catalog.json test/command/config/default/catalog.json test/unit/catalog/test_version1.rb test/unit/helper/distributed_search_planner_helper.rb Renamed files: lib/droonga/planner.rb (from lib/droonga/distributor.rb) lib/droonga/planner_options.rb (from lib/droonga/distributor_options.rb) lib/droonga/planner_plugin.rb (from lib/droonga/distributor_plugin.rb) lib/droonga/plugin/planner/crud.rb (from lib/droonga/plugin/distributor/crud.rb) lib/droonga/plugin/planner/distributed_search_planner.rb (from lib/droonga/plugin/distributor/distributed_search_planner.rb) lib/droonga/plugin/planner/groonga.rb (from lib/droonga/plugin/distributor/groonga.rb) lib/droonga/plugin/planner/search.rb (from lib/droonga/plugin/distributor/search.rb) lib/droonga/plugin/planner/watch.rb (from lib/droonga/plugin/distributor/watch.rb) lib/droonga/test/stub_planner.rb (from lib/droonga/test/stub_distributor.rb) test/unit/planner/test_options.rb (from test/unit/distributor/test_options.rb) test/unit/plugin/planner/search_planner/test_basic.rb (from test/unit/plugin/distributor/search_planner/test_basic.rb) test/unit/plugin/planner/search_planner/test_group_by.rb (from test/unit/plugin/distributor/search_planner/test_group_by.rb) test/unit/plugin/planner/search_planner/test_output.rb (from test/unit/plugin/distributor/search_planner/test_output.rb) test/unit/plugin/planner/search_planner/test_sort_by.rb (from test/unit/plugin/distributor/search_planner/test_sort_by.rb) test/unit/plugin/planner/test_search.rb (from test/unit/plugin/distributor/test_search.rb) Modified: lib/droonga/catalog/base.rb (+3 -3) =================================================================== --- lib/droonga/catalog/base.rb 2014-02-07 10:17:45 +0900 (b97e38f) +++ lib/droonga/catalog/base.rb 2014-02-07 10:40:26 +0900 (a8ad9ae) @@ -19,7 +19,7 @@ require "droonga/message_processing_error" require "droonga/input_adapter_options" require "droonga/output_adapter_options" require "droonga/collector_options" -require "droonga/distributor_options" +require "droonga/planner_options" module Droonga module Catalog @@ -151,8 +151,8 @@ module Droonga CollectorOptions.new(@data["collector"]) end - def distributor_options - DistributorOptions.new(@data["distributor"]) + def planner_options + PlannerOptions.new(@data["planner"]) end private Modified: lib/droonga/dispatcher.rb (+4 -4) =================================================================== --- lib/droonga/dispatcher.rb 2014-02-07 10:17:45 +0900 (659ec1c) +++ lib/droonga/dispatcher.rb 2014-02-07 10:40:26 +0900 (192b3f4) @@ -18,7 +18,7 @@ require "tsort" require "droonga/input_adapter" require "droonga/output_adapter" -require "droonga/distributor" +require "droonga/planner" require "droonga/catalog" require "droonga/collector" require "droonga/farm" @@ -59,7 +59,7 @@ module Droonga @farm = Farm.new(name, @loop, :dispatcher => self) @forwarder = Forwarder.new(@loop) @replier = Replier.new(@forwarder) - @distributor = Distributor.new(self, Droonga.catalog.distributor_options) + @planner = Planner.new(self, Droonga.catalog.planner_options) @collector = Collector.new(Droonga.catalog.collector_options) end @@ -73,7 +73,7 @@ module Droonga def shutdown @forwarder.shutdown - @distributor.shutdown + @planner.shutdown @collector.shutdown @input_adapter.shutdown @output_adapter.shutdown @@ -215,7 +215,7 @@ module Droonga def process_input_message(message) adapted_message = @input_adapter.adapt(message) - @distributor.process(adapted_message["type"], adapted_message) + @planner.process(adapted_message["type"], adapted_message) rescue Droonga::Pluggable::UnknownPlugin => error raise UnknownCommand.new(error.command, message["dataset"]) end Renamed: lib/droonga/planner.rb (+4 -4) 89% =================================================================== --- lib/droonga/distributor.rb 2014-02-07 10:17:45 +0900 (213ec6c) +++ lib/droonga/planner.rb 2014-02-07 10:40:26 +0900 (43789f1) @@ -16,11 +16,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA require "droonga/pluggable" -require "droonga/distributor_plugin" +require "droonga/planner_plugin" require "droonga/distribution_planner" module Droonga - class Distributor + class Planner include Pluggable def initialize(dispatcher, options={}) @@ -38,11 +38,11 @@ module Droonga private def instantiate_plugin(name) - DistributorPlugin.repository.instantiate(name, self) + PlannerPlugin.repository.instantiate(name, self) end def log_tag - "[#{Process.pid}] distributor" + "[#{Process.pid}] planner" end end end Renamed: lib/droonga/planner_options.rb (+1 -1) 96% =================================================================== --- lib/droonga/distributor_options.rb 2014-02-07 10:17:45 +0900 (2f61031) +++ lib/droonga/planner_options.rb 2014-02-07 10:40:26 +0900 (597780b) @@ -14,7 +14,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA module Droonga - class DistributorOptions + class PlannerOptions def initialize(data) @data = data || {} end Renamed: lib/droonga/planner_plugin.rb (+4 -4) 91% =================================================================== --- lib/droonga/distributor_plugin.rb 2014-02-07 10:17:45 +0900 (de0b8e4) +++ lib/droonga/planner_plugin.rb 2014-02-07 10:40:26 +0900 (ef4b109) @@ -19,16 +19,16 @@ require "droonga/plugin" require "droonga/distributed_command_planner" module Droonga - class DistributorPlugin < Plugin + class PlannerPlugin < Plugin extend PluginRegisterable - def initialize(distributor) + def initialize(planner) super() - @distributor = distributor + @planner = planner end def distribute(messages) - @distributor.distribute(messages) + @planner.distribute(messages) end def scatter(message, options={}) Renamed: lib/droonga/plugin/planner/crud.rb (+2 -2) 93% =================================================================== --- lib/droonga/plugin/distributor/crud.rb 2014-02-07 10:17:45 +0900 (9532078) +++ lib/droonga/plugin/planner/crud.rb 2014-02-07 10:40:26 +0900 (c569f64) @@ -15,10 +15,10 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "droonga/distributor_plugin" +require "droonga/planner_plugin" module Droonga - class CRUDDistributor < Droonga::DistributorPlugin + class CRUDPlanner < Droonga::PlannerPlugin repository.register("crud", self) command :add Renamed: lib/droonga/plugin/planner/distributed_search_planner.rb (+0 -0) 100% =================================================================== Renamed: lib/droonga/plugin/planner/groonga.rb (+2 -2) 94% =================================================================== --- lib/droonga/plugin/distributor/groonga.rb 2014-02-07 10:17:45 +0900 (60eb8cb) +++ lib/droonga/plugin/planner/groonga.rb 2014-02-07 10:40:26 +0900 (665a5be) @@ -15,10 +15,10 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "droonga/distributor_plugin" +require "droonga/planner_plugin" module Droonga - class GroongaDistributor < Droonga::DistributorPlugin + class GroongaPlanner < Droonga::PlannerPlugin repository.register("groonga", self) command :table_create Renamed: lib/droonga/plugin/planner/search.rb (+3 -3) 85% =================================================================== --- lib/droonga/plugin/distributor/search.rb 2014-02-07 10:17:45 +0900 (746f7bf) +++ lib/droonga/plugin/planner/search.rb 2014-02-07 10:40:26 +0900 (43b6c7c) @@ -15,11 +15,11 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "droonga/distributor_plugin" -require "droonga/plugin/distributor/distributed_search_planner" +require "droonga/planner_plugin" +require "droonga/plugin/planner/distributed_search_planner" module Droonga - class SearchDistributor < Droonga::DistributorPlugin + class SearchPlanner < Droonga::PlannerPlugin repository.register("search", self) command :search Renamed: lib/droonga/plugin/planner/watch.rb (+2 -2) 93% =================================================================== --- lib/droonga/plugin/distributor/watch.rb 2014-02-07 10:17:45 +0900 (cc4c1d8) +++ lib/droonga/plugin/planner/watch.rb 2014-02-07 10:40:26 +0900 (8e87ed1) @@ -15,10 +15,10 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "droonga/distributor_plugin" +require "droonga/planner_plugin" module Droonga - class WatchDistributor < Droonga::DistributorPlugin + class WatchPlanner < Droonga::PlannerPlugin repository.register("watch", self) command "watch.feed" => :feed Modified: lib/droonga/test.rb (+1 -1) =================================================================== --- lib/droonga/test.rb 2014-02-07 10:17:45 +0900 (3b579b7) +++ lib/droonga/test.rb 2014-02-07 10:40:26 +0900 (97b0f94) @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "droonga/test/stub_distributor" +require "droonga/test/stub_planner" require "droonga/test/stub_handler" require "droonga/test/stub_handler_message" require "droonga/test/stub_handler_messenger" Renamed: lib/droonga/test/stub_planner.rb (+1 -1) 97% =================================================================== --- lib/droonga/test/stub_distributor.rb 2014-02-07 10:17:45 +0900 (87927bb) +++ lib/droonga/test/stub_planner.rb 2014-02-07 10:40:26 +0900 (19aad7c) @@ -17,7 +17,7 @@ module Droonga module Test - class StubDistributor + class StubPlanner attr_reader :messages def initialize @messages = [] Modified: sample/cluster/catalog.json (+1 -1) =================================================================== --- sample/cluster/catalog.json 2014-02-07 10:17:45 +0900 (0aa10fd) +++ sample/cluster/catalog.json 2014-02-07 10:40:26 +0900 (098a0b1) @@ -49,7 +49,7 @@ "collector": { "plugins": ["basic", "search"] }, - "distributor": { + "planner": { "plugins": ["search", "crud", "groonga", "watch"] } } Modified: test/command/config/default/catalog.json (+1 -1) =================================================================== --- test/command/config/default/catalog.json 2014-02-07 10:17:45 +0900 (4464b03) +++ test/command/config/default/catalog.json 2014-02-07 10:40:26 +0900 (60988d8) @@ -68,7 +68,7 @@ "collector": { "plugins": ["basic", "search"] }, - "distributor": { + "planner": { "plugins": ["search", "crud", "groonga", "watch"] } } Modified: test/unit/catalog/test_version1.rb (+4 -4) =================================================================== --- test/unit/catalog/test_version1.rb 2014-02-07 10:17:45 +0900 (c92fba8) +++ test/unit/catalog/test_version1.rb 2014-02-07 10:40:26 +0900 (2e649fa) @@ -294,10 +294,10 @@ class CatalogTest < Test::Unit::TestCase end end - class DistributorOptionsTest < self + class PlannerOptionsTest < self def options(data) catalog = create_catalog(minimum_data.merge(data), "base-path") - catalog.distributor_options + catalog.planner_options end class PluginsTest < self @@ -309,9 +309,9 @@ class CatalogTest < Test::Unit::TestCase assert_equal([], plugins({})) end - def test_distributor + def test_planner data = { - "distributor" => { + "planner" => { "plugins" => ["search", "crud", "groonga", "watch"], } } Modified: test/unit/helper/distributed_search_planner_helper.rb (+1 -1) =================================================================== --- test/unit/helper/distributed_search_planner_helper.rb 2014-02-07 10:17:45 +0900 (2aa0ca0) +++ test/unit/helper/distributed_search_planner_helper.rb 2014-02-07 10:40:26 +0900 (b81b61b) @@ -13,7 +13,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "droonga/plugin/distributor/distributed_search_planner" +require "droonga/plugin/planner/distributed_search_planner" module DistributedSearchPlannerHelper def plan(search_request) Renamed: test/unit/planner/test_options.rb (+3 -3) 88% =================================================================== --- test/unit/distributor/test_options.rb 2014-02-07 10:17:45 +0900 (bba58e9) +++ test/unit/planner/test_options.rb 2014-02-07 10:40:26 +0900 (c50e37a) @@ -13,11 +13,11 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "droonga/distributor_options" +require "droonga/planner_options" -class DistributorOptionsTest < Test::Unit::TestCase +class PlannerOptionsTest < Test::Unit::TestCase def options(data) - Droonga::DistributorOptions.new(data) + Droonga::PlannerOptions.new(data) end class PluginsTest < self Renamed: test/unit/plugin/planner/search_planner/test_basic.rb (+0 -0) 100% =================================================================== Renamed: test/unit/plugin/planner/search_planner/test_group_by.rb (+0 -0) 100% =================================================================== Renamed: test/unit/plugin/planner/search_planner/test_output.rb (+0 -0) 100% =================================================================== Renamed: test/unit/plugin/planner/search_planner/test_sort_by.rb (+0 -0) 100% =================================================================== Renamed: test/unit/plugin/planner/test_search.rb (+5 -5) 94% =================================================================== --- test/unit/plugin/distributor/test_search.rb 2014-02-07 10:17:45 +0900 (0468ea3) +++ test/unit/plugin/planner/test_search.rb 2014-02-07 10:40:26 +0900 (6f2fb67) @@ -13,13 +13,13 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -require "droonga/plugin/distributor/search" +require "droonga/plugin/planner/search" -class SearchDistributorTest < Test::Unit::TestCase +class SearchPlannerTest < Test::Unit::TestCase def setup setup_database - @distributor = Droonga::Test::StubDistributor.new - @plugin = Droonga::SearchDistributor.new(@distributor) + @planner = Droonga::Test::StubPlanner.new + @plugin = Droonga::SearchPlanner.new(@planner) end def teardown @@ -169,6 +169,6 @@ class SearchDistributorTest < Test::Unit::TestCase } message << searcher - assert_equal([message], @distributor.messages) + assert_equal([message], @planner.messages) end end -------------- next part -------------- HTML����������������������������...Download