- 07 10月, 2015 1 次提交
-
-
由 tanmay3011 提交于
-
- 02 9月, 2015 1 次提交
-
-
由 Marcin Olichwirowicz 提交于
-
- 26 8月, 2015 1 次提交
-
-
由 Aaron Patterson 提交于
controllers should always go through the `action` class method so that their middleware is respected.
-
- 25 8月, 2015 1 次提交
-
-
由 Aaron Patterson 提交于
the dispatcher class isn't configurable anymore, so pull up allocation to the method that needs it.
-
- 21 8月, 2015 1 次提交
-
-
由 Aaron Patterson 提交于
This way we can make the Route object a read-only data structure.
-
- 19 8月, 2015 2 次提交
-
-
由 Aaron Patterson 提交于
We shouldn't be messing with the NamedRouteCollection internals. Just ask the object if the named route is in there.
-
由 Aaron Patterson 提交于
```ruby require 'action_pack' require 'action_dispatch' require 'benchmark/ips' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set ObjectSpace::AllocationTracer.setup(%i{path line type}) result = ObjectSpace::AllocationTracer.trace do 500.times do routes.resources :foo end end sorted = ObjectSpace::AllocationTracer.allocated_count_table.sort_by(&:last) sorted.each do |k,v| next if v == 0 p k => v end __END__ Before: {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>99009} {:T_DATA=>100088} {:T_HASH=>122015} {:T_STRING=>159637} {:T_IMEMO=>363134} {:T_ARRAY=>433056} After: {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_OBJECT=>91009} {:T_DATA=>100088} {:T_HASH=>114013} {:T_STRING=>159637} {:T_ARRAY=>321056} {:T_IMEMO=>351133} ```
-
- 18 8月, 2015 4 次提交
-
-
由 Aaron Patterson 提交于
Rather than building a regexp for every route, lets use the strategy pattern to select among objects that can match HTTP verbs. This commit introduces strategy objects for each verb that has a predicate method on the request object like `get?`, `post?`, etc. When we build the route object, look up the strategy for the verbs the user specified. If we can't find it, fall back on string matching. Using a strategy / null object pattern (the `All` VerbMatcher is our "null" object in this case) we can: 1) Remove conditionals 2) Drop boot time allocations 2) Drop run time allocations 3) Improve runtime performance Here is our boot time allocation benchmark: ```ruby require 'action_pack' require 'action_dispatch' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set result = ObjectSpace::AllocationTracer.trace do 500.times do routes.resources :foo end end sorted = ObjectSpace::AllocationTracer.allocated_count_table.sort_by(&:last) sorted.each do |k,v| next if v == 0 p k => v end __END__ Before: $ be ruby -rallocation_tracer route_test.rb {:T_SYMBOL=>11} {:T_REGEXP=>4017} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_DATA=>84092} {:T_OBJECT=>99009} {:T_HASH=>122015} {:T_STRING=>216652} {:T_IMEMO=>355137} {:T_ARRAY=>441057} After: $ be ruby -rallocation_tracer route_test.rb {:T_SYMBOL=>11} {:T_REGEXP=>17} {:T_STRUCT=>6500} {:T_MATCH=>12004} {:T_DATA=>84092} {:T_OBJECT=>99009} {:T_HASH=>122015} {:T_STRING=>172647} {:T_IMEMO=>355136} {:T_ARRAY=>433056} ``` This benchmark adds 500 resources. Each resource has 8 routes, so it adds 4000 routes. You can see from the results that this patch eliminates 4000 Regexp allocations, ~44000 String allocations, and ~8000 Array allocations. With that, we can figure out that the previous code would allocate 1 regexp, 11 strings, and 2 arrays per route *more* than this patch in order to handle verb matching. Next lets look at runtime allocations: ```ruby require 'action_pack' require 'action_dispatch' require 'benchmark/ips' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set routes.resources :foo route = route_set.routes.first request = ActionDispatch::Request.new("REQUEST_METHOD" => "GET") result = ObjectSpace::AllocationTracer.trace do 500.times do route.matches? request end end sorted = ObjectSpace::AllocationTracer.allocated_count_table.sort_by(&:last) sorted.each do |k,v| next if v == 0 p k => v end __END__ Before: $ be ruby -rallocation_tracer route_test.rb {:T_MATCH=>500} {:T_STRING=>501} {:T_IMEMO=>1501} After: $ be ruby -rallocation_tracer route_test.rb {:T_IMEMO=>1001} ``` This benchmark runs 500 calls against the `matches?` method on the route object. We check this method in the case that there are two methods that match the same path, but they are differentiated by the verb (or other conditionals). For example `POST /users` vs `GET /users`, same path, different action. Previously, we were using regexps to match against the verb. You can see that doing the regexp match would allocate 1 match object and 1 string object each time it was called. This patch eliminates those allocations. Next lets look at runtime performance. ```ruby require 'action_pack' require 'action_dispatch' require 'benchmark/ips' route_set = ActionDispatch::Routing::RouteSet.new routes = ActionDispatch::Routing::Mapper.new route_set routes.resources :foo route = route_set.routes.first match = ActionDispatch::Request.new("REQUEST_METHOD" => "GET") no_match = ActionDispatch::Request.new("REQUEST_METHOD" => "POST") Benchmark.ips do |x| x.report("match") do route.matches? match end x.report("no match") do route.matches? no_match end end __END__ Before: $ be ruby -rallocation_tracer runtime.rb Calculating ------------------------------------- match 17.145k i/100ms no match 24.244k i/100ms ------------------------------------------------- match 259.708k (± 4.3%) i/s - 1.303M no match 453.376k (± 5.9%) i/s - 2.279M After: $ be ruby -rallocation_tracer runtime.rb Calculating ------------------------------------- match 23.958k i/100ms no match 29.402k i/100ms ------------------------------------------------- match 465.063k (± 3.8%) i/s - 2.324M no match 691.956k (± 4.5%) i/s - 3.469M ``` This tests tries to see how many times it can match a request per second. Switching to method calls and string comparison makes the successful match case about 79% faster, and the unsuccessful case about 52% faster. That was fun!
-
由 Aaron Patterson 提交于
We don't need to add and delete from the conditions hash anymore, just pass the regexp directly to the constructor.
-
由 Aaron Patterson 提交于
I want to change the real constructor to take a particular parameter for matching the request method
-
由 Aaron Patterson 提交于
The string we create is almost always the same, so rather than joining all the time, lets join once, then reuse that string everywhere.
-
- 16 8月, 2015 2 次提交
-
-
由 Aaron Patterson 提交于
I would like to change the signature of the Route constructor. Since the mapping object has all the data required to construct a Route object, move the allocation to a factory method.
-
由 Aaron Patterson 提交于
we can directly turn it in to a regular expression here, so we don't need to test its value twice
-
- 15 8月, 2015 12 次提交
-
-
由 Aaron Patterson 提交于
then we can let the mapping object derive stuff that the Route object needs.
-
由 Aaron Patterson 提交于
now that we aren't doing options manipulations, we can just pass the mapping object down and read values from it.
-
由 Aaron Patterson 提交于
since we've extracted the `to` initialization, there's no need for `process_path`
-
由 Aaron Patterson 提交于
if `to` was initialized, this method would return, so we can eliminate the to ||= in the conditional. Finally, let's return a nil in the else block so that it's explicit that this method can return nil
-
由 Aaron Patterson 提交于
Eventually we'll pull this up and delete `process_path`.
-
由 Aaron Patterson 提交于
-
由 Aaron Patterson 提交于
We don't need a method for something like this. I want to pull this up the stack as well and move the module + :controller ArgumentError up the stack as well
-
由 Aaron Patterson 提交于
-
由 Aaron Patterson 提交于
now we don't need to add it to a hash and delete it from the hash later just to pass it around
-
由 Aaron Patterson 提交于
`add_route` needs the AST, so rather than shove it in a hash and delete later, lets move parsing up the stack so we can pass down later
-
由 Aaron Patterson 提交于
we don't need to keep adding it and deleting if from hashes.
-
由 Aaron Patterson 提交于
Eventually I want to pull up AST generation so that we don't have to add it to the `conditions` hash.
-
- 14 8月, 2015 5 次提交
-
-
由 Aaron Patterson 提交于
-
由 Aaron Patterson 提交于
the caller already has access to `as`, so we can stop passing it around.
-
由 Aaron Patterson 提交于
the same value that is extracted from the options hash earlier is returned, so we don't need to pass it in in the first place. The caller already has the data, so stop passing it around.
-
由 Aaron Patterson 提交于
this way we don't have to mutate the options hash so far away from where the user passed it in
-
由 Aaron Patterson 提交于
The `anchor` parameter [is overridden](https://github.com/rails/rails/blob/b4b4a611d0eb9aa1c640c5f521c6a43bf2a65bab/actionpack/lib/action_dispatch/routing/mapper.rb#L1528) unless it is directly passed to `match`, so setting it in a scope must be a mistake.
-
- 13 8月, 2015 10 次提交
-
-
由 Aaron Patterson 提交于
I didn't like this method because it mutates the parameters. Now that the method is so small, just push it up to `initialize`
-
由 Aaron Patterson 提交于
now the `@defaults` variable doesn't need to be set before calling `normalize_defaults`
-
由 Aaron Patterson 提交于
These three options are stored in the `scope` chain outside of the options hash. If they are in the options hash, then someone passed them in to `match` and they don't really do anything. So lets remove the code.
-
由 Aaron Patterson 提交于
remove `format` from the options hash in the scope chain so that we don't need to remove it later
-
由 Aaron Patterson 提交于
this reduces the number of times we have to mutate the options hash.
-
由 Aaron Patterson 提交于
Now we don't have to manually remove this from the options hash since the scope stores it outside of "options"
-
由 Aaron Patterson 提交于
Remove the `options` reader from `Resource` because nobody needs to see that hash. Also remove mutations on the options hash in `apply_common_behavior_for` because leaving the side effects in that method makes it difficult to understand what is going on in the caller.
-
由 Aaron Patterson 提交于
these two keys have a different merge strategy, and they also just get removed from the options hash later in the code. If we store them in a separate place, then we don't need to remove them later
-
由 Aaron Patterson 提交于
Eventually we don't want to expose the "options" hash from scope, only read values from it. Lets start by adding a reader method.
-
由 Aaron Patterson 提交于
now we don't need to construct a Mapping object just to get an ArgumentError if there is no `via` parameter provided.
-