improve url_for performance significantly (closes #914)

mojolicious · Feb 23, 2016 · eac8210 · eac8210 · rewolfe · May 20, 2016
1 parent 6375642
commit eac8210
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 27 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@
 6.48  2016-02-23
   - Added files function to Mojo::Util.
   - Updated jQuery to version 2.2.1.
+  - Improved url_for performance significantly.
   - Fixed bug where the results of the list_files method in Mojo::Home would
     include directories.
 

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -53,13 +53,7 @@ sub is_hidden {
   return !!($h->{$method} || index($method, '_') == 0 || $method !~ /[a-z]/);
 }
 
-sub lookup {
-  my ($self, $name) = @_;
-  my $reverse = $self->{reverse} ||= {};
-  return $reverse->{$name} if exists $reverse->{$name};
-  return undef unless my $route = $self->find($name);
-  return $reverse->{$name} = $route;
-}
+sub lookup { ($_[0]{reverse} //= $_[0]->_index)->{$_[1]} }
 
 sub match {
   my ($self, $c) = @_;

diff --git a/lib/Mojolicious/Routes/Route.pm b/lib/Mojolicious/Routes/Route.pm
@@ -36,21 +36,7 @@ sub delete { shift->_generate_route(DELETE => @_) }
 
 sub detour { shift->partial(1)->to(@_) }
 
-sub find {
-  my ($self, $name) = @_;
-
-  my @children = (@{$self->children});
-  my $candidate;
-  while (my $child = shift @children) {
-
-    # Custom names have priority
-    $candidate = $child->has_custom_name ? return $child : $child
-      if $child->name eq $name;
-    push @children, @{$child->children};
-  }
-
-  return $candidate;
-}
+sub find { shift->_index->{shift()} }
 
 sub get { shift->_generate_route(GET => @_) }
 
@@ -221,6 +207,20 @@ sub _generate_route {
   return defined $name ? $route->name($name) : $route;
 }
 
+sub _index {
+  my $self = shift;
+
+  my %index;
+  my @children = (@{$self->children});
+  while (my $child = shift @children) {
+    if ($child->has_custom_name) { $index{$child->name} = $child }
+    else                         { $index{$child->name} ||= $child }
+    push @children, @{$child->children};
+  }
+
+  return \%index;
+}
+
 1;
 
 =encoding utf8

diff --git a/t/mojolicious/routes.t b/t/mojolicious/routes.t
@@ -228,11 +228,6 @@ is $r->lookup('fast'), $fast, 'fast route found';
 my $faster = $r->route('/faster')->name('fast');
 is $r->find('fast'),   $faster, 'faster route found';
 is $r->lookup('fast'), $fast,   'fast route found';
-is $r->find('fastest'),   undef, 'fastest route not found';
-is $r->lookup('fastest'), undef, 'fastest route not found';
-my $fastest = $r->route('/fastest');
-is $r->find('fastest'),   $fastest, 'fastest route found';
-is $r->lookup('fastest'), $fastest, 'fastest route found';
 
 # Make sure stash stays clean
 my $c = Mojolicious::Controller->new;