summaryrefslogtreecommitdiffstats
path: root/Bugzilla/WebService
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-07-26 05:48:22 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-07-26 05:48:22 +0200
commitd780cce675a9fbc7eaa0872315f1761a9de79be8 (patch)
treeb5649be9f9c45ee13cf8673ec928474415e92eb7 /Bugzilla/WebService
parenta292abb599cdaccc1e01ab281a163211e40b5b0a (diff)
downloadbugzilla-d780cce675a9fbc7eaa0872315f1761a9de79be8.tar.gz
bugzilla-d780cce675a9fbc7eaa0872315f1761a9de79be8.tar.xz
Bug 898259 - Backport bug 880093 to BMO (Cache filter_wants)
Diffstat (limited to 'Bugzilla/WebService')
-rw-r--r--Bugzilla/WebService/Util.pm24
1 files changed, 17 insertions, 7 deletions
diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index 20ed6170a..cda88e260 100644
--- a/Bugzilla/WebService/Util.pm
+++ b/Bugzilla/WebService/Util.pm
@@ -48,28 +48,38 @@ sub filter ($$;$) {
sub filter_wants ($$;$) {
my ($params, $field, $prefix) = @_;
- my %include = map { $_ => 1 } @{ $params->{'include_fields'} || [] };
- my %exclude = map { $_ => 1 } @{ $params->{'exclude_fields'} || [] };
+ # Since this is operation is resource intensive, we will cache the results
+ # This assumes that $params->{*_fields} doesn't change between calls
+ my $cache = Bugzilla->request_cache->{filter_wants} ||= {};
$field = "${prefix}.${field}" if $prefix;
+ if (exists $cache->{$field}) {
+ return $cache->{$field};
+ }
+
+ my %include = map { $_ => 1 } @{ $params->{'include_fields'} || [] };
+ my %exclude = map { $_ => 1 } @{ $params->{'exclude_fields'} || [] };
+
+ my $wants = 1;
if (defined $params->{exclude_fields} && $exclude{$field}) {
- return 0;
+ $wants = 0;
}
- if (defined $params->{include_fields} && !$include{$field}) {
+ elsif (defined $params->{include_fields} && !$include{$field}) {
if ($prefix) {
# Include the field if the parent is include (and this one is not excluded)
- return 0 if !$include{$prefix};
+ $wants = 0 if !$include{$prefix};
}
else {
# We want to include this if one of the sub keys is included
my $key = $field . '.';
my $len = length($key);
- return 0 if ! grep { substr($_, 0, $len) eq $key } keys %include;
+ $wants = 0 if ! grep { substr($_, 0, $len) eq $key } keys %include;
}
}
- return 1;
+ $cache->{$field} = $wants;
+ return $wants;
}
sub taint_data {