YUKI Hiroshi
null+****@clear*****
Fri Nov 7 14:04:00 JST 2014
YUKI Hiroshi 2014-11-07 14:04:00 +0900 (Fri, 07 Nov 2014) New Revision: c3434e025723363e311057b46fd9a95bc94d328a https://github.com/droonga/droonga-engine/commit/c3434e025723363e311057b46fd9a95bc94d328a Message: Detect path to databases correctly Modified files: lib/droonga/catalog/version1.rb lib/droonga/catalog/version2.rb lib/droonga/path.rb test/unit/catalog/test_version1.rb test/unit/catalog/test_version2.rb Modified: lib/droonga/catalog/version1.rb (+1 -1) =================================================================== --- lib/droonga/catalog/version1.rb 2014-11-07 14:03:25 +0900 (f5d2db2) +++ lib/droonga/catalog/version1.rb 2014-11-07 14:04:00 +0900 (87cadae) @@ -54,7 +54,7 @@ module Droonga partitions.each do |partition| if partition =~ pattern database_name = $POSTMATCH - path = Pathname(Path.databases).expand_path(base_path) + + path = Path.databases(base_path) + device + database_name + "db" migrate_database_location(path, device, database_name) options = { Modified: lib/droonga/catalog/version2.rb (+1 -1) =================================================================== --- lib/droonga/catalog/version2.rb 2014-11-07 14:03:25 +0900 (fa47fa9) +++ lib/droonga/catalog/version2.rb 2014-11-07 14:04:00 +0900 (2561b65) @@ -45,7 +45,7 @@ module Droonga volume_address = slice.volume.address if volume_address.node == node name = volume_address.name - path = Path.databases.expand_path(base_path) + + path = Path.databases(base_path) + device + name + "db" migrate_database_location(path, device, name) Modified: lib/droonga/path.rb (+4 -2) =================================================================== --- lib/droonga/path.rb 2014-11-07 14:03:25 +0900 (435807b) +++ lib/droonga/path.rb 2014-11-07 14:04:00 +0900 (fe0c60b) @@ -34,8 +34,10 @@ module Droonga ENV[BASE_DIR_ENV_NAME] = new_base end - def databases - base + "databases" + def databases(base_path=nil) + base_path ||= base + path = Pathname(base_path) + "databases" + path.expand_path(base_path) end def state Modified: test/unit/catalog/test_version1.rb (+2 -2) =================================================================== --- test/unit/catalog/test_version1.rb 2014-11-07 14:03:25 +0900 (0ae719b) +++ test/unit/catalog/test_version1.rb 2014-11-07 14:04:00 +0900 (eea15d7) @@ -46,13 +46,13 @@ class CatalogVersion1Test < Test::Unit::TestCase partitions =****@catal*****_partitions("localhost:23003/test") assert_equal({ "localhost:23003/test.000" => { - :database => "#{base_path}/database/000/db", + :database => "#{base_path}/databases/000/db", :dataset => "Test", :plugins => ["for_dataset"], :n_workers => 0 }, "localhost:23003/test.002" => { - :database => "#{base_path}/database/002/db", + :database => "#{base_path}/databases/002/db", :dataset => "Test", :plugins => ["for_dataset"], :n_workers => 0 Modified: test/unit/catalog/test_version2.rb (+3 -3) =================================================================== --- test/unit/catalog/test_version2.rb 2014-11-07 14:03:25 +0900 (d3549bf) +++ test/unit/catalog/test_version2.rb 2014-11-07 14:04:00 +0900 (17bc966) @@ -45,19 +45,19 @@ class CatalogVersion2Test < Test::Unit::TestCase slices =****@catal*****("localhost:23003/test") assert_equal({ "localhost:23003/test.000" => { - :database => "#{base_path}/database/000/db", + :database => "#{base_path}/databases/000/db", :dataset => "Test", :plugins => ["plugin1", "plugin2", "plugin3"], :n_workers => 4, }, "localhost:23003/test.001" => { - :database => "#{base_path}/database/001/db", + :database => "#{base_path}/databases/001/db", :dataset => "Test", :plugins => ["plugin1", "plugin2", "plugin3"], :n_workers => 4, }, "localhost:23003/test.002" => { - :database => "#{base_path}/database/002/db", + :database => "#{base_path}/databases/002/db", :dataset => "Test", :plugins => ["plugin1", "plugin2", "plugin3"], :n_workers => 4, -------------- next part -------------- HTML����������������������������...下載
