X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSet%2FParameterizedJoinHack.pm;fp=lib%2FDBIx%2FClass%2FResultSet%2FParameterizedJoinHack.pm;h=6097215022481aa832aa6bed89fd05b15ea78992;hb=c2ae4b8d1df614d1d609cef3f4923101bfd3e583;hp=53a04b0c9ad35bce22d872e5e757aff2a2628873;hpb=7e2b784d13c2048c02906b9c72536ee3b843ff72;p=dbsrgits%2FDBIx-Class-ParameterizedJoinHack.git

diff --git a/lib/DBIx/Class/ResultSet/ParameterizedJoinHack.pm b/lib/DBIx/Class/ResultSet/ParameterizedJoinHack.pm
index 53a04b0..6097215 100644
--- a/lib/DBIx/Class/ResultSet/ParameterizedJoinHack.pm
+++ b/lib/DBIx/Class/ResultSet/ParameterizedJoinHack.pm
@@ -37,22 +37,30 @@ sub with_parameterized_join {
   );
 }
 
-sub _localize_parameters {
-  my ($self, $final, $params, $store, $first, @rest) = @_;
-  return $final->() unless $first;
-  local $store->{$first}{params} = $params->{$first};
-  $self->_localize_parameters($final, $params, $store, @rest);
-}
-
 sub call_with_parameters {
   my ($self, $method, @args) = @_;
-  my %params = %{$self->{attrs}{join_parameters}||{}};
+  my $params = $self->{attrs}{join_parameters}||{};
+  my @param_names = keys %$params;
   my $store = $self->_parameterized_join_store;
-  return $self->_localize_parameters(
-    sub { $self->$method(@args) },
-    \%params, $store,
-    keys %params
-  );
+  # This loop is implemented using "goto"; this means the "local" doesn't have
+  # to be in a separate scope, which would defeat the point. Nor does "local
+  # ... foreach ..." work; the localization doesn't survive the loop. The
+  # alternative would be to use recursive subroutine calls, but that would
+  # require not only the N save-stack entries for the localized parameters, but
+  # N call frames too, so this approach saves both time and memory. It also
+  # avoids any risk of a "deep recursion" warning if you have a lot of
+  # parameters; and it avoids cluttering stack traces if the called method
+  # throws an exception. The downside is obviously that it uses "goto" for an
+  # otherwise-simple loop, but at least it's confined to this method. Further,
+  # the result is more than twice as fast as the recursive approach even when
+  # there are no parameters, and the "goto" version wins even more with larger
+  # parameter lists.
+  Loop:
+    return $self->$method(@args)
+      unless @param_names;
+    my $key = shift @param_names;
+    local $store->{$key}{params} = $params->{$key};
+    goto Loop; # Watch Dijkstra roll in his grave
 }
 
 sub _resolved_attrs { my $self = shift; $self->call_with_parameters($self->next::can, @_) }