From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 22 Oct 2012 03:31:29 +0000 (-0700)
Subject: Avoid unnecessary array allocations
X-Git-Tag: live~5231
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/31dae1bac102bdf30d62aacd24e6821a2fbbc542?hp=e64bcf335a95f7cc35cd19c190b8111c2d7b275f

Avoid unnecessary array allocations
---

diff --git a/app/models/relation.rb b/app/models/relation.rb
index ce19f7b98..e402d0d08 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -167,13 +167,9 @@ class Relation < ActiveRecord::Base
 
   # FIXME is this really needed?
   def members
-    unless @members
-      @members = Array.new
-      self.relation_members.each do |member|
-        @members += [[member.member_type,member.member_id,member.member_role]]
-      end
+    @members ||= self.relation_members.map do |member|
+      [member.member_type, member.member_id, member.member_role]
     end
-    @members
   end
 
   def tags
@@ -194,9 +190,9 @@ class Relation < ActiveRecord::Base
     @tags = t
   end
 
-  def add_member(type,id,role)
-    @members = Array.new unless @members
-    @members += [[type,id.to_i,role]]
+  def add_member(type, id, role)
+    @members ||= []
+    @members << [type, id.to_i, role]
   end
 
   def add_tag_keyval(k, v)