YUKI Hiroshi
null+****@clear*****
Wed Mar 25 10:45:24 JST 2015
YUKI Hiroshi 2015-03-25 10:45:24 +0900 (Wed, 25 Mar 2015) New Revision: e952a89349bd15d727b2eed7f45eedb4cafb42a2 https://github.com/droonga/droonga-engine/commit/e952a89349bd15d727b2eed7f45eedb4cafb42a2 Message: Rename Address#name to Address#local_name. It was confusable with NodeName itself. Modified files: lib/droonga/address.rb lib/droonga/catalog/version2.rb test/unit/catalog/test_single_volume.rb test/unit/test_address.rb Modified: lib/droonga/address.rb (+6 -6) =================================================================== --- lib/droonga/address.rb 2015-03-25 10:21:30 +0900 (34acf5d) +++ lib/droonga/address.rb 2015-03-25 10:45:24 +0900 (2baae99) @@ -24,31 +24,31 @@ module Droonga :host => $1, :port => $2.to_i, :tag => $3, - :name => $4 + :local_name => $4 } new(components) else - format = "${host_name}:${port_number}/${tag}.${name}" + format = "${host_name}:${port_number}/${tag}.${local_name}" message = "volume address must be <#{format}> format: <#{string}>" raise ArgumentError, message end end end - attr_reader :name + attr_reader :local_name def initialize(components={}) super - @name = components[:name] + @local_name = components[:local_name] end def to_s string = super - string << ".#{@name}" if @name + string << ".#{@local_name}" if @local_name string end def to_a - super + [@name] + super + [@local_name] end def ==(other) Modified: lib/droonga/catalog/version2.rb (+3 -3) =================================================================== --- lib/droonga/catalog/version2.rb 2015-03-25 10:21:30 +0900 (277c788) +++ lib/droonga/catalog/version2.rb 2015-03-25 10:45:24 +0900 (7b316b3) @@ -44,10 +44,10 @@ module Droonga volume.slices.each do |slice| volume_address = slice.volume.address if volume_address.node == node - name = volume_address.name + local_name = volume_address.local_name path = Path.databases(base_path) + - device + name + "db" - migrate_database_location(path, device, name) + device + local_name + "db" + migrate_database_location(path, device, local_name) options = { :dataset => dataset_name, Modified: test/unit/catalog/test_single_volume.rb (+2 -2) =================================================================== --- test/unit/catalog/test_single_volume.rb 2015-03-25 10:21:30 +0900 (118b379) +++ test/unit/catalog/test_single_volume.rb 2015-03-25 10:45:24 +0900 (8558d0e) @@ -24,11 +24,11 @@ class CatalogSingleVolumeTest < Test::Unit::TestCase @volume = Droonga::Catalog::SingleVolume.new(data) end - def address(host, port, tag, name) + def address(host, port, tag, local_name) Droonga::Address.new(:host => host, :port => port, :tag => tag, - :name => name) + :local_name => local_name) end def test_address Modified: test/unit/test_address.rb (+4 -4) =================================================================== --- test/unit/test_address.rb 2015-03-25 10:21:30 +0900 (1a1095f) +++ test/unit/test_address.rb 2015-03-25 10:45:24 +0900 (4664c57) @@ -16,11 +16,11 @@ require "droonga/address" class AddressTest < Test::Unit::TestCase - def address(host, port, tag, name) + def address(host, port, tag, local_name) Droonga::Address.new(:host => host, :port => port, :tag => tag, - :name => name) + :local_name => local_name) end class ParseTest < self @@ -29,8 +29,8 @@ class AddressTest < Test::Unit::TestCase end def test_full - assert_equal(address("192.168.0.1", 2929, "droonga", "name"), - parse("192.168.0.1:2929/droonga.name")) + assert_equal(address("192.168.0.1", 2929, "droonga", "local_name"), + parse("192.168.0.1:2929/droonga.local_name")) end def test_internal_name -------------- next part -------------- HTML����������������������������...下载
