Kouhei Sutou
null+****@clear*****
Wed Mar 19 23:48:53 JST 2014
Kouhei Sutou 2014-03-19 23:48:53 +0900 (Wed, 19 Mar 2014) New Revision: d9d1db8b5e350da2b2418d5b38f62c4dab890c80 https://github.com/droonga/drntest/commit/d9d1db8b5e350da2b2418d5b38f62c4dab890c80 Message: Extract sub codes Modified files: lib/drntest/engine.rb Modified: lib/drntest/engine.rb (+24 -16) =================================================================== --- lib/drntest/engine.rb 2014-03-19 23:40:29 +0900 (3b4fbc2) +++ lib/drntest/engine.rb 2014-03-19 23:48:53 +0900 (a410803) @@ -49,23 +49,31 @@ module Drntest @config.catalog_version = catalog_json["version"] case****@confi*****_version when 1 - zone = catalog_json["zones"].first - /\A([^:]+):(\d+)\/(.+)\z/ =~ zone - @config.host = "localhost" # $1 - @config.port = $2.to_i - @config.tag = $3 + prepare_catalog_v1(catalog_json) when 2 - catch do |tag| - datasets = catalog_json["datasets"] - datasets.each do |name, dataset| - dataset["replicas"].each do |replica| - replica["slices"].each do |slice| - if /\A([^:]+):(\d+)\/([^.]+)/ =~ slice["volume"]["address"] - @config.host = "localhost" # $1 - @config.port = $2.to_i - @config.tag = $3 - throw(tag) - end + prepare_catalog_v2(catalog_json) + end + end + + def prepare_catalog_v1(catalog_json) + zone = catalog_json["zones"].first + /\A([^:]+):(\d+)\/(.+)\z/ =~ zone + @config.host = "localhost" # $1 + @config.port = $2.to_i + @config.tag = $3 + end + + def prepare_catalog_v2(catalog_json) + catch do |tag| + datasets = catalog_json["datasets"] + datasets.each do |name, dataset| + dataset["replicas"].each do |replica| + replica["slices"].each do |slice| + if /\A([^:]+):(\d+)\/([^.]+)/ =~ slice["volume"]["address"] + @config.host = "localhost" # $1 + @config.port = $2.to_i + @config.tag = $3 + throw(tag) end end end -------------- next part -------------- HTML����������������������������...Download