This project is archived and is in readonly mode.
Fix for routing optimization code
Related info: http://dev.rubyonrails.org/ticke... - original patch http://hobo.lighthouseapp.com/pr... - observed failure
The routing optimization code introduced by #10835 above has a serious bug - it only generates the recognize_optimized method once. This causes errors when routes are reloaded - if any are different, then the generated indexing code is not correct.
The changes in commit a5db1488251304ec93256654859b430148f0c506 caused the code to be generated at initialization, when no routes were loaded. While this prevents the above bug, it converts the efficient search intended by #10835 back into a linear search of all routes.
The attached patch re-enables efficient search while clearing the generated code when the routes are reloaded. A test for correct code generation is included - it fails on the 2.1.0 version.
--Matt Jones
-
fix_routing_optimization.patch
4.33 KB
-
Matt Jones- Tag set to actionpack, bug, patch, routing, tested
Forgot to include the timing info:
Before change: Generation (RouteSet): (40000 urls) 0.0556527018547058 ms/url 17968.5795419372 url/s
Recognition (215 routes): 0.258163173993429 ms/url 3873.5191566302 url/s
After change: Generation (RouteSet): (40000 urls) 0.0557102739810944 ms/url 17950.0104476125 url/s
Recognition (215 routes): 0.0320691665013631 ms/url 31182.6002698728 url/s
(from routing_test.rb timing test)
-
Pratik- Assigned user set to Michael Koziarski
-
Michael Koziarski- Assigned user changed from Michael Koziarski to josh
This looks ok to me, I don't have reliable internet for a few days.
Josh, can you take care of this?
-
Michael Koziarski
- Milestone changed from 2.x to 2.1.2
-
Michael Koziarski
Matt, could you upload a 2-1-stable friendly version of this patch
-
Matt Jones
As requested - patch against 2-1-stable.
Performance for this case is identical before/after, the slowdown was in trunk.
-
2-1-stable-routing-fix.patch
3.98 KB
-
-
Repository
- State changed from new to resolved
(from [7e6cda15f8dae517f9605f73aa1c966a29d4930a]) Ensure routing optimizations are cleared when new routes are added [#981 state:resolved] Signed-off-by: Joshua Peek josh@joshpeek.com http://github.com/rails/rails/co...
-
Repository
(from [d4ef5908edfd471dfd3635a7264b5f8aafe246b6]) Ensure routing optimizations are cleared when new routes are added [#981 state:resolved] Signed-off-by: Joshua Peek josh@joshpeek.com http://github.com/rails/rails/co...