Kouhei Sutou
null+****@clear*****
Fri Mar 21 14:43:20 JST 2014
Kouhei Sutou 2014-03-21 14:43:20 +0900 (Fri, 21 Mar 2014) New Revision: d4fb11431306daa4eaf65afd97a5968b3c9391bb https://github.com/droonga/fluent-plugin-droonga/commit/d4fb11431306daa4eaf65afd97a5968b3c9391bb Message: Add Dataset#replicas Modified files: lib/droonga/catalog/dataset.rb lib/droonga/catalog/version2.rb test/unit/catalog/test_dataset.rb Modified: lib/droonga/catalog/dataset.rb (+4 -0) =================================================================== --- lib/droonga/catalog/dataset.rb 2014-03-21 14:39:02 +0900 (e31700b) +++ lib/droonga/catalog/dataset.rb 2014-03-21 14:43:20 +0900 (bd7db06) @@ -49,6 +49,10 @@ module Droonga def n_workers @data["nWorkers"] || 0 end + + def replicas + @data["replicas"] + end end end end Modified: lib/droonga/catalog/version2.rb (+3 -3) =================================================================== --- lib/droonga/catalog/version2.rb 2014-03-21 14:39:02 +0900 (596264a) +++ lib/droonga/catalog/version2.rb 2014-03-21 14:43:20 +0900 (e10a2de) @@ -37,7 +37,7 @@ module Droonga @datasets.each do |dataset_name, dataset| n_workers = dataset.n_workers plugins = dataset.plugins - dataset["replicas"].each do |replica| + dataset.replicas.each do |replica| replica["slices"].each do |slice| volume_address = slice["volume"]["address"] if pattern =~ volume_address @@ -62,7 +62,7 @@ module Droonga dataset = dataset(name) case args["type"] when "broadcast" - replicas = select_replicas(dataset["replicas"], args["replica"]) + replicas = select_replicas(dataset.replicas, args["replica"]) replicas.each do |replica| slices = select_slices(replica) slices.each do |slice| @@ -70,7 +70,7 @@ module Droonga end end when "scatter" - replicas = select_replicas(dataset["replicas"], args["replica"]) + replicas = select_replicas(dataset.replicas, args["replica"]) replicas.each do |replica| dimension = replica["dimension"] || "_key" key = args["key"] || args["record"][dimension] Modified: test/unit/catalog/test_dataset.rb (+10 -0) =================================================================== --- test/unit/catalog/test_dataset.rb 2014-03-21 14:39:02 +0900 (e326ea4) +++ test/unit/catalog/test_dataset.rb 2014-03-21 14:43:20 +0900 (828a8a7) @@ -83,4 +83,14 @@ class CatalogDatasetTest < Test::Unit::TestCase assert_equal("Users", dataset.fact) end end + + class ReplicasTest < self + def test_empty + data = { + "replicas" => [], + } + dataset = create_dataset(data) + assert_equal([], dataset.replicas) + end + end end -------------- next part -------------- HTML����������������������������...Download