Cache collected all nodes

lib/droonga/catalog/collection_volume.rb

@@ -70,11 +70,7 @@ def ratio_scaled_slicer?
       end
 
       def all_nodes
-        nodes = []
-        slices.each do |slice|
-          nodes += slice.all_nodes
-        end
-        nodes.uniq.sort
+        @all_nodes ||= collect_all_nodes
       end
 
       private
@@ -109,6 +105,14 @@ def stringify_key(key)
           key
         end
       end
+
+      def collect_all_nodes
+        nodes = []
+        slices.each do |slice|
+          nodes += slice.all_nodes
+        end
+        nodes.uniq.sort
+      end
     end
   end
 end

lib/droonga/catalog/dataset.rb

@@ -59,22 +59,22 @@ def replicas
       end
 
       def all_nodes
-        replicas.all_nodes
+        @all_nodes ||= replicas.all_nodes
       end
 
       def get_routes(args)
         routes = []
         case args["type"]
         when "broadcast"
-          volumes = replicas.select(args["replica"].to_sym)
+          volumes = replicas.select(args["replica"].to_sym, args["live_nodes"])
           volumes.each do |volume|
             slices = volume.select_slices
             slices.each do |slice|
               routes << slice.volume.address
             end
           end
         when "scatter"
-          volumes = replicas.select(args["replica"].to_sym)
+          volumes = replicas.select(args["replica"].to_sym, args["live_nodes"])
           volumes.each do |volume|
             slice = volume.choose_slice(args["record"])
             routes << slice.volume.address

lib/droonga/catalog/single_volume.rb

@@ -25,7 +25,7 @@ def address
       end
 
       def all_nodes
-        [address.split("/").first]
+        @all_nodes ||= [address.split("/").first]
       end
     end
   end

lib/droonga/catalog/slice.rb

@@ -38,7 +38,7 @@ def volume
       end
 
       def all_nodes
-        volume.all_nodes
+        @all_nodes ||= volume.all_nodes
       end
     end
   end

lib/droonga/catalog/version1.rb

@@ -67,10 +67,7 @@ def get_partitions(name)
       end
 
       def all_nodes
-        nodes = @data["zones"].collect do |zone|
-          zone.split("/").first
-        end
-        nodes.sort.uniq
+        @all_nodes ||= collect_all_nodes
       end
 
       private
@@ -100,6 +97,13 @@ def compute_total_weight(dataset)
         end
       end
 
+      def collect_all_nodes
+        nodes = @data["zones"].collect do |zone|
+          zone.split("/").first
+        end
+        nodes.sort.uniq
+      end
+
       def validate
         do_validation do
           validate_effective_date

lib/droonga/catalog/version2.rb

@@ -58,11 +58,7 @@ def slices(name)
       end
 
       def all_nodes
-        nodes = []
-        @datasets.each do |name, dataset|
-          nodes += dataset.all_nodes
-        end
-        nodes.sort.uniq
+        @all_nodes ||= collect_all_nodes
       end
 
       private
@@ -77,6 +73,14 @@ def prepare_data
           @datasets[name] = Dataset.new(name, dataset)
         end
       end
+
+      def collect_all_nodes
+        nodes = []
+        @datasets.each do |name, dataset|
+          nodes += dataset.all_nodes
+        end
+        nodes.sort.uniq
+      end
     end
   end
 end

lib/droonga/catalog/volume_collection.rb

@@ -53,6 +53,11 @@ def select(how=nil)
       end
 
       def all_nodes
+        @all_nodes ||= collect_all_nodes
+      end
+
+      private
+      def collect_all_nodes
         nodes = []
         @volumes.each do |volume|
           nodes += volume.all_nodes