mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
c67c764aab
The FSM used to find matching routes was previously limited to patterns that contained parameters with the default regexp / no constraints. In large route sets where many parameters are constrained by custom regexp, these routes all fall back on a slow linear search over the route list. These custom regexes were not previously able to be included in the FSM because it transitioned between nodes using only fragments of the URI, or path separators [/.?], but a custom regex may cross a path separator boundary. To work around this, the TransitionTable is improved to support remembering a point within the matching string that we started, and continuing to attempt to match from that point up to the end of each token. Only parameters not on a path separator boundary must still match with a linear search after this change (e.g. `/foo-:bar/`). This results in performance for constrainted routes that matches that of ones using the default regexp. Benchmark: https://gist.github.com/theojulienne/e91fc338d180e1710e29c81a5d701fab Before: ``` Calculating ------------------------------------- without params 6.466k (±12.7%) i/s - 31.648k in 5.009453s params without constraints 5.867k (±12.9%) i/s - 28.842k in 5.032637s params with constraints 909.661 (± 7.9%) i/s - 4.536k in 5.023534s ``` After: ``` Calculating ------------------------------------- without params 6.387k (±11.9%) i/s - 31.728k in 5.068939s params without constraints 5.824k (±13.2%) i/s - 28.650k in 5.043701s params with constraints 5.406k (±11.7%) i/s - 26.931k in 5.076412s ``` For github.com which has many constrainted parameters, a random sampling of 10 URL patterns can be matched approximately 2-4x faster than before.
74 lines
2.1 KiB
Ruby
74 lines
2.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "abstract_unit"
|
|
|
|
module ActionDispatch
|
|
module Journey
|
|
class TestRoutes < ActiveSupport::TestCase
|
|
attr_reader :routes, :mapper
|
|
|
|
def setup
|
|
@route_set = ActionDispatch::Routing::RouteSet.new
|
|
@routes = @route_set.router.routes
|
|
@router = @route_set.router
|
|
@mapper = ActionDispatch::Routing::Mapper.new @route_set
|
|
super
|
|
end
|
|
|
|
def test_clear
|
|
mapper.get "/foo(/:id)", to: "foo#bar", as: "aaron"
|
|
assert_not_empty routes
|
|
assert_equal 1, routes.length
|
|
|
|
routes.clear
|
|
assert_empty routes
|
|
assert_equal 0, routes.length
|
|
end
|
|
|
|
def test_ast
|
|
mapper.get "/foo(/:id)", to: "foo#bar", as: "aaron"
|
|
ast = routes.ast
|
|
mapper.get "/foo(/:id)", to: "foo#bar", as: "gorby"
|
|
assert_not_equal ast, routes.ast
|
|
end
|
|
|
|
def test_simulator_changes
|
|
mapper.get "/foo(/:id)", to: "foo#bar", as: "aaron"
|
|
sim = routes.simulator
|
|
mapper.get "/foo(/:id)", to: "foo#bar", as: "gorby"
|
|
assert_not_equal sim, routes.simulator
|
|
end
|
|
|
|
def test_partition_route
|
|
mapper.get "/foo(/:id)", to: "foo#bar", as: "aaron"
|
|
|
|
assert_equal 1, @routes.anchored_routes.length
|
|
assert_empty @routes.custom_routes
|
|
|
|
mapper.get "/not_anchored/hello/:who-notanchored", to: "foo#bar", as: "bar", who: /\d/, anchor: false
|
|
|
|
assert_equal 1, @routes.custom_routes.length
|
|
assert_equal 1, @routes.anchored_routes.length
|
|
end
|
|
|
|
def test_custom_anchored_not_partition_route
|
|
mapper.get "/foo/:bar", to: "foo#bar", as: "aaron"
|
|
|
|
assert_equal 1, @routes.anchored_routes.length
|
|
assert_empty @routes.custom_routes
|
|
|
|
mapper.get "/:user/:repo", to: "foo#bar", as: "bar", repo: /[\w.]+/
|
|
|
|
assert_equal 2, @routes.anchored_routes.length
|
|
assert_empty @routes.custom_routes
|
|
end
|
|
|
|
def test_first_name_wins
|
|
mapper.get "/hello", to: "foo#bar", as: "aaron"
|
|
assert_raise(ArgumentError) do
|
|
mapper.get "/aaron", to: "foo#bar", as: "aaron"
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|