Item13593: MetaCache not checking if cache exists

This change reduced a problem search from >60 seconds to 17 seconds. Delivers same or slightly better performance now than 1.1.9
foswiki · Aug 3, 2015 · 4e7a760 · 4e7a760
1 parent 774bdbe
commit 4e7a760
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/lib/Foswiki/MetaCache.pm b/core/lib/Foswiki/MetaCache.pm
@@ -144,6 +144,14 @@ sub removeMeta {
 sub addMeta {
     my ( $this, $web, $topic, $meta ) = @_;
 
+    my $user = $this->current_user();
+
+    # If the cache is already populated, return it, don't add it again
+    if ( $this->hasCached( $web, $topic ) ) {
+        print STDERR "Cache hit for $web.$topic for $user\n" if (TRACE);
+        return $this->{cache}->{$user}{$web}{$topic}->{tom};
+    }
+
     if ( not defined($meta) ) {
         $meta = Foswiki::Meta->load( $this->{session}, $web, $topic );
     }
@@ -160,8 +168,6 @@ sub addMeta {
         return;
     }
 
-    my $user = $this->current_user();
-
     unless ( $this->{cache}->{$user}{$web} ) {
         $this->{cache}->{$user}{$web} = {};
     }