Merge pull request #90 from CocoaPods/gb-uniq-requirement-trees

Make `Vertex#requirements` array unique
CocoaPods · Oct 29, 2017 · 1f66e42 · 1f66e42
2 parents ccd39a5 + fb27154
commit 1f66e42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,10 @@
 
 ##### Enhancements
 
-* None.  
+* Reduce memory usage during resolution by making the `Vertex#requirements`
+  array unique.  
+  [Grey Baker](https://github.com/greysteil)
+  [Jan Krutisch](https://github.com/halfbyte)
 
 ##### Bug Fixes
 

diff --git a/lib/molinillo/dependency_graph/vertex.rb b/lib/molinillo/dependency_graph/vertex.rb
@@ -33,7 +33,7 @@ def initialize(name, payload)
       # @return [Array<Object>] all of the requirements that required
       #   this vertex
       def requirements
-        incoming_edges.map(&:requirement) + explicit_requirements
+        (incoming_edges.map(&:requirement) + explicit_requirements).uniq
       end
 
       # @return [Array<Edge>] the edges of {#graph} that have `self` as their

diff --git a/lib/molinillo/resolution.rb b/lib/molinillo/resolution.rb
@@ -218,7 +218,7 @@ def resolve_activated_specs
           next unless vertex.payload
 
           latest_version = vertex.payload.possibilities.reverse_each.find do |possibility|
-            vertex.requirements.uniq.all? { |req| requirement_satisfied_by?(req, activated, possibility) }
+            vertex.requirements.all? { |req| requirement_satisfied_by?(req, activated, possibility) }
           end
 
           activated.set_payload(vertex.name, latest_version)