Item14111: performance and memory fixes

foswiki · Jul 11, 2016 · 977897b · 977897b
1 parent 44a614d
commit 977897b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
 *.swp
-DBCachePlugin.md5
-DBCachePlugin.sha1
-DBCachePlugin.tgz
-DBCachePlugin.txt
-DBCachePlugin.zip
-DBCachePlugin_installer
-DBCachePlugin_installer.pl
+*,v
+/DBCachePlugin.md5
+/DBCachePlugin.sha1
+/DBCachePlugin.tgz
+/DBCachePlugin.txt
+/DBCachePlugin.zip
+/DBCachePlugin_installer
+/DBCachePlugin_installer.pl
diff --git a/data/System/DBCachePlugin.txt b/data/System/DBCachePlugin.txt
@@ -454,6 +454,7 @@ automatically from there on.
 ---++ Change History
 
 %TABLE{columnwidths="7em" tablewidth="100%"}%
+|  11 Jul 2016: | make use of clean-up feature of latest <nop>DBCacheContrib; performance improvements |
 |  08 Mar 2016: | fixed use of uninitialized variable in sorting code; \
                   add support for Inheritance field in Foswiki:Extensions/WikiWorkbenchContrib;\
                   added =warn= parameter to all macros to switch off warnings optionally; \

diff --git a/lib/Foswiki/Plugins/DBCachePlugin.pm b/lib/Foswiki/Plugins/DBCachePlugin.pm
@@ -25,8 +25,8 @@ use Foswiki::Plugins();
 #Monitor::MonitorMethod('Foswiki::Contrib::DBCachePlugin::Core');
 #Monitor::MonitorMethod('Foswiki::Contrib::DBCachePlugin::WebDB');
 
-our $VERSION = '9.20';
-our $RELEASE = '09 Mar 2016';
+our $VERSION = '9.30';
+our $RELEASE = '11 Mar 2016';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION = 'Lightweighted frontend to the <nop>DBCacheContrib';
 

diff --git a/lib/Foswiki/Plugins/DBCachePlugin/Core.pm b/lib/Foswiki/Plugins/DBCachePlugin/Core.pm
@@ -414,14 +414,17 @@ sub handleDBQUERY {
   my @result = ();
   if ($theFormat && $hits) {
     my $index = $hits->skip($theSkip);
+    my $lastWeb = '';
+    my $theDB;
     while (my $topicObj = $hits->next) {
       #writeDebug("topicName=$topicName");
       $index++;
 
       my $topicName = $topicObj->fastget("topic");
       my $web = $topicObj->fastget("web");
       $web =~ s/\//./g;
-      my $theDB = getDB($web);
+      $theDB = getDB($web) if !$theDB || $lastWeb ne $web;
+      $lastWeb = $web;
       unless ($theWeb) {
         print STDERR "ERROR: no such web $theWeb in DBQUERY\n";
         next;

diff --git a/lib/Foswiki/Plugins/DBCachePlugin/DEPENDENCIES b/lib/Foswiki/Plugins/DBCachePlugin/DEPENDENCIES
@@ -1,4 +1,4 @@
-Foswiki::Contrib::DBCacheContrib,>=4.00,perl,Required
+Foswiki::Contrib::DBCacheContrib,>=4.10,perl,Required
 Time::ParseDate,>=2003.0211,cpan,Required
 Storable,>=2.07,cpan,Required
 Sereal,>=3.00,cpan,Optional
diff --git a/lib/Foswiki/Plugins/DBCachePlugin/WebDB.pm b/lib/Foswiki/Plugins/DBCachePlugin/WebDB.pm
@@ -97,7 +97,7 @@ sub onReload {
 
     # get meta object
     my ($meta, $text) = Foswiki::Func::readTopic($this->{web}, $topic);
-    my $origText = $text;
+    $this->cleanUpText($text);
 
     # SMELL: call getRevisionInfo to make sure the latest revision is loaded
     # for get('TOPICINFO') further down the code

diff --git a/lib/Foswiki/Plugins/DBCachePlugin/build.pl b/lib/Foswiki/Plugins/DBCachePlugin/build.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # Build for DBCachePlugin
 #