mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
aeab405878
I was looking at (yet another) flamegraph in speedscope, and used the 'left hand heavy' and was shocked to realize that 0.5s of the 1.7s is spent in DepProxy#name. This method _only_ delegates the name to an underlying spec, so it's not complex at all. It seems to be of how often this line ends up calling it: next if handled.any?{|d| d.name == dep.name && (match_current_platform || d.__platform == dep.__platform) } || dep.name == "bundler" The `handled` array is built up as dependencies are handled, so this get slower as more dependencies are installed. This change changes how `handled` is track. Instead of just an array, I've tried using a Hash, with the key being a dep's name, and the value being a list of deps with that name. This means it's constant time to find the dependencies with the same name. I saw a drop from 1.7s to 1.0s against master, and from 0.95s to 0.24s when used with https://github.com/rubygems/rubygems/pull/5533 https://github.com/rubygems/rubygems/commit/844dac30d4
192 lines
4.7 KiB
Ruby
192 lines
4.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require_relative "vendored_tsort"
|
|
|
|
module Bundler
|
|
class SpecSet
|
|
include Enumerable
|
|
include TSort
|
|
|
|
def initialize(specs)
|
|
@specs = specs
|
|
end
|
|
|
|
def for(dependencies, check = false, match_current_platform = false)
|
|
# dep.name => [list, of, deps]
|
|
handled = Hash.new {|h, k| h[k] = [] }
|
|
deps = dependencies.dup
|
|
specs = []
|
|
|
|
loop do
|
|
break unless dep = deps.shift
|
|
next if handled[dep.name].any? {|d| match_current_platform || d.__platform == dep.__platform } || dep.name == "bundler"
|
|
|
|
# use a hash here to ensure constant lookup time in the `any?` call above
|
|
handled[dep.name] << dep
|
|
|
|
specs_for_dep = spec_for_dependency(dep, match_current_platform)
|
|
if specs_for_dep.any?
|
|
specs.concat(specs_for_dep)
|
|
|
|
specs_for_dep.first.dependencies.each do |d|
|
|
next if d.type == :development
|
|
d = DepProxy.get_proxy(d, dep.__platform) unless match_current_platform
|
|
deps << d
|
|
end
|
|
elsif check
|
|
return false
|
|
end
|
|
end
|
|
|
|
if spec = lookup["bundler"].first
|
|
specs << spec
|
|
end
|
|
|
|
specs.uniq! unless match_current_platform
|
|
|
|
check ? true : specs
|
|
end
|
|
|
|
def [](key)
|
|
key = key.name if key.respond_to?(:name)
|
|
lookup[key].reverse
|
|
end
|
|
|
|
def []=(key, value)
|
|
@specs << value
|
|
@lookup = nil
|
|
@sorted = nil
|
|
end
|
|
|
|
def sort!
|
|
self
|
|
end
|
|
|
|
def to_a
|
|
sorted.dup
|
|
end
|
|
|
|
def to_hash
|
|
lookup.dup
|
|
end
|
|
|
|
def materialize(deps)
|
|
materialized = self.for(deps, false, true)
|
|
|
|
materialized.map! do |s|
|
|
next s unless s.is_a?(LazySpecification)
|
|
s.source.local!
|
|
s.__materialize__ || s
|
|
end
|
|
SpecSet.new(materialized)
|
|
end
|
|
|
|
# Materialize for all the specs in the spec set, regardless of what platform they're for
|
|
# This is in contrast to how for does platform filtering (and specifically different from how `materialize` calls `for` only for the current platform)
|
|
# @return [Array<Gem::Specification>]
|
|
def materialized_for_all_platforms
|
|
@specs.map do |s|
|
|
next s unless s.is_a?(LazySpecification)
|
|
s.source.local!
|
|
s.source.remote!
|
|
spec = s.__materialize__
|
|
raise GemNotFound, "Could not find #{s.full_name} in any of the sources" unless spec
|
|
spec
|
|
end
|
|
end
|
|
|
|
def missing_specs
|
|
@specs.select {|s| s.is_a?(LazySpecification) }
|
|
end
|
|
|
|
def merge(set)
|
|
arr = sorted.dup
|
|
set.each do |set_spec|
|
|
full_name = set_spec.full_name
|
|
next if arr.any? {|spec| spec.full_name == full_name }
|
|
arr << set_spec
|
|
end
|
|
SpecSet.new(arr)
|
|
end
|
|
|
|
def find_by_name_and_platform(name, platform)
|
|
@specs.detect {|spec| spec.name == name && spec.match_platform(platform) }
|
|
end
|
|
|
|
def what_required(spec)
|
|
unless req = find {|s| s.dependencies.any? {|d| d.type == :runtime && d.name == spec.name } }
|
|
return [spec]
|
|
end
|
|
what_required(req) << spec
|
|
end
|
|
|
|
def <<(spec)
|
|
@specs << spec
|
|
end
|
|
|
|
def length
|
|
@specs.length
|
|
end
|
|
|
|
def size
|
|
@specs.size
|
|
end
|
|
|
|
def empty?
|
|
@specs.empty?
|
|
end
|
|
|
|
def each(&b)
|
|
sorted.each(&b)
|
|
end
|
|
|
|
private
|
|
|
|
def sorted
|
|
rake = @specs.find {|s| s.name == "rake" }
|
|
begin
|
|
@sorted ||= ([rake] + tsort).compact.uniq
|
|
rescue TSort::Cyclic => error
|
|
cgems = extract_circular_gems(error)
|
|
raise CyclicDependencyError, "Your bundle requires gems that depend" \
|
|
" on each other, creating an infinite loop. Please remove either" \
|
|
" gem '#{cgems[1]}' or gem '#{cgems[0]}' and try again."
|
|
end
|
|
end
|
|
|
|
def extract_circular_gems(error)
|
|
error.message.scan(/@name="(.*?)"/).flatten
|
|
end
|
|
|
|
def lookup
|
|
@lookup ||= begin
|
|
lookup = Hash.new {|h, k| h[k] = [] }
|
|
Index.sort_specs(@specs).reverse_each do |s|
|
|
lookup[s.name] << s
|
|
end
|
|
lookup
|
|
end
|
|
end
|
|
|
|
def tsort_each_node
|
|
# MUST sort by name for backwards compatibility
|
|
@specs.sort_by(&:name).each {|s| yield s }
|
|
end
|
|
|
|
def spec_for_dependency(dep, match_current_platform)
|
|
specs_for_platforms = lookup[dep.name]
|
|
if match_current_platform
|
|
GemHelpers.select_best_platform_match(specs_for_platforms.select {|s| Gem::Platform.match_spec?(s) }, Bundler.local_platform)
|
|
else
|
|
GemHelpers.select_best_platform_match(specs_for_platforms, dep.__platform)
|
|
end
|
|
end
|
|
|
|
def tsort_each_child(s)
|
|
s.dependencies.sort_by(&:name).each do |d|
|
|
next if d.type == :development
|
|
lookup[d.name].each {|s2| yield s2 }
|
|
end
|
|
end
|
|
end
|
|
end
|