diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-11-20 06:24:50 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-20 06:24:50 +0900 |
| commit | eeaf9cf61c3cd14929583878785c31dab79e2196 (patch) | |
| tree | 7ab2830102c670ff6f4df0cc700f380c0ce8b5ae | |
| parent | bc2769774808cbc33b90dc8156ea53542cbde6f6 (diff) | |
| download | rails-eeaf9cf61c3cd14929583878785c31dab79e2196.tar.gz rails-eeaf9cf61c3cd14929583878785c31dab79e2196.tar.bz2 rails-eeaf9cf61c3cd14929583878785c31dab79e2196.zip | |
Prevent extra `spawn` to make `klass.all` faster (#29009)
These extra `spawn` are called via `klass.all` and `klass.all` is called
everywhere in the internal. Avoiding the extra `spawn` makes` klass.all`
30% faster for STI classes.
https://gist.github.com/kamipo/684d03817a8115848cec8e8b079560b7
```
Warming up --------------------------------------
fast relation 4.410k i/100ms
slow relation 3.334k i/100ms
Calculating -------------------------------------
fast relation 47.373k (± 5.2%) i/s - 238.140k in 5.041836s
slow relation 35.757k (±15.9%) i/s - 176.702k in 5.104625s
Comparison:
fast relation: 47373.2 i/s
slow relation: 35756.7 i/s - 1.32x slower
```
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 3 | ||||
| -rw-r--r-- | activerecord/lib/active_record/scoping/default.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index b97b14644e..481159e501 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -277,7 +277,8 @@ module ActiveRecord relation = Relation.create(self, arel_table, predicate_builder) if finder_needs_type_condition? && !ignore_default_scope? - relation.where(type_condition).create_with(inheritance_column.to_s => sti_name) + relation.where!(type_condition) + relation.create_with!(inheritance_column.to_s => sti_name) else relation end diff --git a/activerecord/lib/active_record/scoping/default.rb b/activerecord/lib/active_record/scoping/default.rb index 86ae374318..8c612df27a 100644 --- a/activerecord/lib/active_record/scoping/default.rb +++ b/activerecord/lib/active_record/scoping/default.rb @@ -111,7 +111,7 @@ module ActiveRecord # The user has defined their own default scope method, so call that evaluate_default_scope do if scope = default_scope - (base_rel ||= relation).merge(scope) + (base_rel ||= relation).merge!(scope) end end elsif default_scopes.any? @@ -119,7 +119,7 @@ module ActiveRecord evaluate_default_scope do default_scopes.inject(base_rel) do |default_scope, scope| scope = scope.respond_to?(:to_proc) ? scope : scope.method(:call) - default_scope.merge(base_rel.instance_exec(&scope)) + default_scope.merge!(base_rel.instance_exec(&scope)) end end end |