aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix Railties test failure for asset routeseileencodes2015-08-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since none of the action pack tests failed without this conditional it didn't seem necessary. This fixes the build because it correctly returns a 404 instead of a 500 for the asset routes test. Test that was failing was in the `assets_test.rb` file and was the test named `test_assets_routes_are_not_drawn_when_compilation_is_disabled`.
* | | Refactor to remove controller class from route to requesteileencodes2015-08-222-40/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactoring moves the controller class name that was on the route set to the request. The purpose of this refactoring is for changes we need to move controller tests to integration tests, mainly being able to access the controller on the request instead of having to go through the router. [Eileen M. Uchitelle & Aaron Patterson]
* | | set cached values in the env hashAaron Patterson2015-08-211-6/+9
| | |
* | | stop directly accessing `@env` in mime_negotiationAaron Patterson2015-08-211-8/+8
| | | | | | | | | | | | | | | we want to go through methods to access `env` because in the future that ivar may not be available, or may be calculated lazily
* | | use public API to fetch the parameter filterAaron Patterson2015-08-211-2/+2
| | | | | | | | | | | | | | | now the parameter filter doesn't need to know about the env hash in these two methds.
* | | use methods on the request object to implement `fetch`Aaron Patterson2015-08-211-2/+8
| | | | | | | | | | | | Now the Headers internals don't depend on the env hash.
* | | dup the env hash on Header#envAaron Patterson2015-08-211-1/+1
| | | | | | | | | | | | | | | This prevents external mutations from impacting the internals of the request or the Header object.
* | | use accessors on the request object for manipulating envAaron Patterson2015-08-211-3/+3
| | | | | | | | | | | | | | | this reduces the API footprint for the env hash so that we can be more flexible when changing API in the future
* | | use `set_header` rather than []=Aaron Patterson2015-08-211-1/+1
| | | | | | | | | | | | This allows us to avoid calling `env_name` twice.
* | | dup the request and mutate its headers object.Aaron Patterson2015-08-211-2/+2
| | | | | | | | | | | | duping the request will dup it's underlying env hash.
* | | Remove unnecessary cachingeileencodes2015-08-211-5/+1
| | | | | | | | | | | | | | | | | | | | | `ActiveSupport::Dependencies.constantize(const_name)` calls `Reference.new` which is defined as `ActiveSupport::Dependencies.constantize(const_name)` meaning this call is already cached and we're doing caching that isn't necessary.
* | | pass a request object to the headers objectAaron Patterson2015-08-213-12/+18
| | |
* | | set route precedence at allocation timeAaron Patterson2015-08-202-8/+6
| | | | | | | | | | | | This way we can make the Route object a read-only data structure.
* | | point at rack masterAaron Patterson2015-08-201-2/+2
| | |
* | | make the routes reader privateAaron Patterson2015-08-181-0/+1
| | | | | | | | | | | | | | | nobody should be touching the routes hash without going through the NamedRouteCollection object.
* | | don't touch internalsAaron Patterson2015-08-181-1/+1
| | | | | | | | | | | | | | | We shouldn't be messing with the NamedRouteCollection internals. Just ask the object if the named route is in there.
* | | drop array allocations when building pathsAaron Patterson2015-08-182-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```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} ```
* | | drop string allocations for each resourceAaron Patterson2015-08-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eagerly calculate and cache the name of Symbol objects in the path AST. This drops about 26 string allocations per resource: ```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=>116084} {:T_HASH=>122015} {:T_STRING=>172647} {:T_IMEMO=>371132} {:T_ARRAY=>433056} After: {: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} ```
* | | Remove unreached default valueRafael Mendonça França2015-08-171-1/+1
| | | | | | | | | | | | verb_matcher never returns nil.
* | | use the strategy pattern to match request verbsAaron Patterson2015-08-172-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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!
* | | switch Route constructors and pass in the regexpAaron Patterson2015-08-171-9/+15
| | | | | | | | | | | | | | | We don't need to add and delete from the conditions hash anymore, just pass the regexp directly to the constructor.
* | | split the verb regex from the constraints hashAaron Patterson2015-08-171-6/+17
| | | | | | | | | | | | | | | | | | verb matching is very common (all routes besides rack app endpoints require one). We will extract verb matching for now, and use a more efficient method of matching (then regexp) later
* | | introduce an alternate constructor for Route objectsAaron Patterson2015-08-172-1/+5
| | | | | | | | | | | | | | | I want to change the real constructor to take a particular parameter for matching the request method
* | | drop object allocation during routes setupAaron Patterson2015-08-172-44/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a functional Path AST visitor and implements `each` on the AST in terms of the functional visitor. The functional visitor doesn't maintain state, so we only need to allocate one of them. Given this benchmark route file: ```ruby require 'action_pack' require 'action_dispatch' 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{|i| routes.resource :omglol } end result.find_all { |k,v| k.first =~ /git\/rails/ }.sort_by { |k,v| v.first }.each { |k,v| p k => v } ``` node.rb line 17 was in our top 3 allocation spot: ``` {["/Users/aaron/git/rails/actionpack/lib/action_dispatch/journey/nodes/node.rb", 17, :T_OBJECT]=>[31526, 0, 28329, 0, 2, 1123160]} {["/Users/aaron/git/rails/actionpack/lib/action_dispatch/routing/mapper.rb", 2080, :T_IMEMO]=>[34002, 0, 30563, 0, 2, 1211480]} {["/Users/aaron/git/rails/actionpack/lib/action_dispatch/routing/mapper.rb", 2071, :T_IMEMO]=>[121934, 1, 109608, 0, 7, 4344400]} ``` This commit eliminates allocations at that place.
* | | avoid is_a? checksAaron Patterson2015-08-172-2/+4
| | | | | | | | | | | | add another predicate method so we can avoid is_a checks
* | | pull RegexpOffsets in to a methodAaron Patterson2015-08-171-27/+14
| | | | | | | | | | | | we don't really need this visitor
* | | `required_defaults` is always passed in, remove conditionalAaron Patterson2015-08-171-1/+1
| | | | | | | | | | | | | | | Routes are always constructed with a list of required_defaults, so there's no need to check whether or not it's nil
* | | use predicate methods to avoid is_a? checksAaron Patterson2015-08-172-1/+3
| | | | | | | | | | | | | | | we may want to change the name of the class at some point, so it's better to use a predicate
* | | default pattern to use a joined stringAaron Patterson2015-08-172-3/+5
| | | | | | | | | | | | | | | The string we create is almost always the same, so rather than joining all the time, lets join once, then reuse that string everywhere.
* | | Merge pull request #21252 from rodzyn/improve_params_parserRafael Mendonça França2015-08-171-2/+11
|\ \ \ | | | | | | | | Improve params parser
| * | | Cleanup ActionDispatch:ParamsParserMarcin Olichwirowicz2015-08-171-2/+11
| | | |
* | | | move route allocation to a factory method on the mapping objectAaron Patterson2015-08-152-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | only process `via` onceAaron Patterson2015-08-151-5/+3
|/ / / | | | | | | | | | | | | we can directly turn it in to a regular expression here, so we don't need to test its value twice
* | | only keep one hash of named routesAaron Patterson2015-08-143-6/+4
| | | | | | | | | | | | | | | The outer router object already keeps a hash of named routes, so we should just use that.
* | | rm add_route2Aaron Patterson2015-08-142-8/+2
| | | | | | | | | | | | | | | refactor the tests with a backwards compatible method call so we can rm add_route2 from the journey router
* | | pass pass the mapping object down the add_route stackAaron Patterson2015-08-143-55/+72
| | | | | | | | | | | | | | | then we can let the mapping object derive stuff that the Route object needs.
* | | pass the mapping object to build_routeAaron Patterson2015-08-142-10/+10
| | | | | | | | | | | | | | | now that we aren't doing options manipulations, we can just pass the mapping object down and read values from it.
* | | remove `process_path`Aaron Patterson2015-08-141-6/+2
| | | | | | | | | | | | | | | since we've extracted the `to` initialization, there's no need for `process_path`
* | | explicitly return nil from `get_to_from_path`Aaron Patterson2015-08-141-3/+3
| | | | | | | | | | | | | | | | | | 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
* | | extract method on determining :to from the pathAaron Patterson2015-08-141-5/+9
| | | | | | | | | | | | Eventually we'll pull this up and delete `process_path`.
* | | deprecate passing a string for both the beginning path and :path optionAaron Patterson2015-08-141-1/+16
| | |
* | | rm path_params methodAaron Patterson2015-08-141-5/+1
| | | | | | | | | | | | | | | | | | 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
* | | extract method on wildcard path parameter handlingAaron Patterson2015-08-141-6/+11
| | |
* | | pass the path ast downAaron Patterson2015-08-142-5/+3
| | | | | | | | | | | | | | | now we don't need to add it to a hash and delete it from the hash later just to pass it around
* | | pull up path parsingAaron Patterson2015-08-142-10/+10
| | | | | | | | | | | | | | | `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
* | | use predicate methods instead of hard coding verb stringsAaron Patterson2015-08-141-1/+1
| | | | | | | | | | | | | | | also change the feeler to subclass AD::Request so that it has all the methods that Request has
* | | remove hard coded regular expressionAaron Patterson2015-08-142-1/+5
| | |
* | | stop adding path_info to the conditions hashAaron Patterson2015-08-142-2/+0
| | | | | | | | | | | | we don't need to keep adding it and deleting if from hashes.
* | | pull up path normalization.Aaron Patterson2015-08-141-18/+18
| | | | | | | | | | | | | | | Eventually I want to pull up AST generation so that we don't have to add it to the `conditions` hash.
* | | `build_path` doesn't need the path variable anymoreAaron Patterson2015-08-131-2/+2
| | | | | | | | | | | | | | | It just constructs a Path::Pattern object with the AST that it already has
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 08:39:19 +0000