Kouhei Sutou
null+****@clear*****
Wed Feb 26 17:31:42 JST 2014
Kouhei Sutou 2014-02-26 17:31:42 +0900 (Wed, 26 Feb 2014) New Revision: afe8446923df6c5a1762db4e645a878fc467ba04 https://github.com/droonga/fluent-plugin-droonga/commit/afe8446923df6c5a1762db4e645a878fc467ba04 Message: Rename partition to slice Modified files: lib/droonga/catalog/errors.rb lib/droonga/catalog/version1.rb lib/droonga/catalog/version2.rb lib/droonga/dispatcher.rb lib/droonga/farm.rb Renamed files: lib/droonga/slice.rb (from lib/droonga/partition.rb) Modified: lib/droonga/catalog/errors.rb (+2 -2) =================================================================== --- lib/droonga/catalog/errors.rb 2014-02-26 17:29:50 +0900 (d4e1033) +++ lib/droonga/catalog/errors.rb 2014-02-26 17:31:42 +0900 (c712847) @@ -80,8 +80,8 @@ module Droonga end class UnknownFarmForPartition < ValidationError - def initialize(name, partition, path) - super("The farm is unknown: <{#name}>, partition=<#{partition}>", path) + def initialize(name, slice, path) + super("The farm is unknown: <{#name}>, slice=<#{slice}>", path) end end Modified: lib/droonga/catalog/version1.rb (+4 -0) =================================================================== --- lib/droonga/catalog/version1.rb 2014-02-26 17:29:50 +0900 (03505af) +++ lib/droonga/catalog/version1.rb 2014-02-26 17:31:42 +0900 (d1c07e8) @@ -28,6 +28,10 @@ module Droonga prepare_data end + def slices(name) + get_partitions(name) + end + def get_partitions(name) device = @data["farms"][name]["device"] pattern = Regexp.new("^#{name}\.") Modified: lib/droonga/catalog/version2.rb (+2 -6) =================================================================== --- lib/droonga/catalog/version2.rb 2014-02-26 17:29:50 +0900 (2b77d52) +++ lib/droonga/catalog/version2.rb 2014-02-26 17:31:42 +0900 (fc5cbe0) @@ -23,10 +23,6 @@ module Droonga prepare_data end - def get_partitions(name) - slices(name) - end - def slices(name) device = "." pattern = Regexp.new("^#{name}\.") @@ -88,10 +84,10 @@ module Droonga total_weight = compute_total_weight(replica) continuum = [] slices = replica["slices"] - n_partitions = slices.size + n_slices = slices.size slices.each do |slice| weight = slice["weight"] || default_weight - points = n_partitions * 160 * weight / total_weight + points = n_slices * 160 * weight / total_weight points.times do |point| hash = Digest::SHA1.hexdigest("#{name}:#{point}") continuum << [hash[0..7].to_i(16), slice] Modified: lib/droonga/dispatcher.rb (+2 -2) =================================================================== --- lib/droonga/dispatcher.rb 2014-02-26 17:29:50 +0900 (dae9365) +++ lib/droonga/dispatcher.rb 2014-02-26 17:31:42 +0900 (87fe668) @@ -191,7 +191,7 @@ module Droonga def process_local_message(local_message) task = local_message["task"] - partition_name = task["route"] + slice_name = task["route"] step = task["step"] command = step["command"] descendants = {} @@ -203,7 +203,7 @@ module Droonga local_message["descendants"] = descendants farm_message =****@messa*****("body" => local_message, "type" => command) - @farm.process(partition_name, farm_message) + @farm.process(slice_name, farm_message) end def local?(route) Modified: lib/droonga/farm.rb (+13 -13) =================================================================== --- lib/droonga/farm.rb 2014-02-26 17:29:50 +0900 (96aeddc) +++ lib/droonga/farm.rb 2014-02-26 17:31:42 +0900 (0c7640a) @@ -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/partition" +require "droonga/slice" module Droonga class Farm @@ -24,29 +24,29 @@ module Droonga @catalog = catalog @loop = loop @options = options - @partitions = {} - partitions =****@catal*****_partitions(name) - partitions.each do |partition_name, partition_options| - partition = Droonga::Partition.new(@loop, - @options.merge(partition_options)) - @partitions[partition_name] = partition + @slices = {} + slices =****@catal*****(name) + slices.each do |slice_name, slice_options| + slice = Droonga::Slice.new(@loop, + @options.merge(slice_options)) + @slices[slice_name] = slice end end def start - @partitions.each_value do |partition| - partition.start + @slices.each_value do |slice| + slice.start end end def shutdown - @partitions.each_value do |partition| - partition.shutdown + @slices.each_value do |slice| + slice.shutdown end end - def process(partition_name, message) - @partitions[partition_name].process(message) + def process(slice_name, message) + @slices[slice_name].process(message) end end end Renamed: lib/droonga/slice.rb (+5 -5) 93% =================================================================== --- lib/droonga/partition.rb 2014-02-26 17:29:50 +0900 (93de8c0) +++ lib/droonga/slice.rb 2014-02-26 17:31:42 +0900 (8194aa0) @@ -24,7 +24,7 @@ require "droonga/message_pusher" require "droonga/processor" module Droonga - class Partition + class Slice def initialize(loop, options={}) @options = options @n_workers = @options[:n_workers] || 0 @@ -43,17 +43,17 @@ module Droonga end def shutdown - $log.trace("partition: shutdown: start") + $log.trace("slice: shutdown: start") shutdown_supervisor if @supervisor @message_pusher.shutdown @processor.shutdown - $log.trace("partition: shutdown: done") + $log.trace("slice: shutdown: done") end def process(message) - $log.trace("partition: process: start") + $log.trace("slice: process: start") @processor.process(message) - $log.trace("partition: process: done") + $log.trace("slice: process: done") end private -------------- next part -------------- HTML����������������������������...Download