Item13817: Don't re-read topic repeatedly

Change ERP from using Func::getRevisionInfo() to use Meta functions on the loaded meta object. Very significant performance boost for large tables.
foswiki · Oct 19, 2015 · b8d4648 · b8d4648
1 parent f379321
commit b8d4648
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Table.pm b/EditRowPlugin/lib/Foswiki/Plugins/EditRowPlugin/Table.pm
@@ -124,6 +124,11 @@ sub getTopic {
     return $this->{meta}->topic();
 }
 
+sub getTopicObject {
+    my $this = shift;
+    return $this->{meta};
+}
+
 # Calculate row labels
 sub _assignLabels {
     my $this  = shift;
@@ -455,11 +460,12 @@ sub getParams {
 
     $prefix ||= '';
 
-    # Get the active (most recent) version number for the topic with this table
-    my @ri = Foswiki::Func::getRevisionInfo( $this->getWeb, $this->getTopic );
+    my $meta = $this->getTopicObject();
+    my $info = $meta->getRevisionInfo();
+
     return (
         "${prefix}topic"   => $this->getWeb . '.' . $this->getTopic,
-        "${prefix}version" => "$ri[2]_$ri[0]",
+        "${prefix}version" => "$info->{version}_$info->{date}",
         "${prefix}table"   => $this->getID()
     );
 }

diff --git a/EditRowPlugin/test/unit/EditRowPlugin/HTML.pm b/EditRowPlugin/test/unit/EditRowPlugin/HTML.pm
@@ -16,6 +16,9 @@ sub loadExtraConfig {
     my $this = shift;
 
     $this->SUPER::loadExtraConfig();
+    $Foswiki::cfg{Plugins}{EditRowPlugin}{Enabled}   = 1;
+    $Foswiki::cfg{Plugins}{EditRowPlugin}{Macro}     = 'EDITTABLE';
+    $Foswiki::cfg{Plugins}{EditTablePlugin}{Enabled} = 0;
 }
 
 sub test_simple_view {

diff --git a/EditRowPlugin/test/unit/EditRowPlugin/Parser.pm b/EditRowPlugin/test/unit/EditRowPlugin/Parser.pm
@@ -16,6 +16,9 @@ sub loadExtraConfig {
     my $this = shift;
 
     $this->SUPER::loadExtraConfig();
+    $Foswiki::cfg{Plugins}{EditRowPlugin}{Enabled}   = 1;
+    $Foswiki::cfg{Plugins}{EditRowPlugin}{Macro}     = 'EDITTABLE';
+    $Foswiki::cfg{Plugins}{EditTablePlugin}{Enabled} = 0;
 }
 
 sub test_EDITTABLE {

diff --git a/EditTablePlugin/test/unit/EditTablePlugin/EditTablePluginTests.pm b/EditTablePlugin/test/unit/EditTablePlugin/EditTablePluginTests.pm
@@ -31,6 +31,8 @@ sub set_up {
     $Foswiki::cfg{AllowInlineScript} = 0;
     $Foswiki::cfg{Plugins}{TablePlugin}{DefaultAttributes} =
 'tableborder="1" valign="top" headercolor="#fff" headerbg="#687684" headerbgsorted="#334455" databg="#ddd,#edf4f9" databgsorted="#f1f7fc,#ddebf6" tablerules="rows" headerrules="cols"';
+    $Foswiki::cfg{Plugins}{EditRowPlugin}{Enabled} = 0;
+    $Foswiki::cfg{Plugins}{EditTablePlugin}{Enabled} = 1;
 
     local $ENV{SCRIPT_NAME} = ''; #  required by fake sort URLs in expected text