tweak(Tinebase/Path): optimize table after purgeDeletedRecords/rebuil…

…dPaths - also update phpstan baseline
tine20 · Mar 17, 2022 · 35bb91a · 35bb91a
1 parent 56a9852
commit 35bb91a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -772,11 +772,6 @@ parameters:
 			count: 1
 			path: tine20/Admin/Controller/EmailAccount.php
 
-		-
-			message: "#^Call to an undefined method Tinebase_User_Plugin_Abstract\\:\\:getEmailuser\\(\\)\\.$#"
-			count: 2
-			path: tine20/Admin/Controller/EmailAccount.php
-
 		-
 			message: "#^Method Tinebase_Backend_Interface\\:\\:search\\(\\) invoked with 5 parameters, 0\\-3 required\\.$#"
 			count: 1
@@ -7936,7 +7931,7 @@ parameters:
 
 		-
 			message: "#^Call to an undefined method Tinebase_Controller_Abstract\\:\\:get\\(\\)\\.$#"
-			count: 2
+			count: 1
 			path: tine20/Tinebase/Frontend/Http.php
 
 		-
@@ -7984,11 +7979,6 @@ parameters:
 			count: 4
 			path: tine20/Tinebase/Frontend/Http.php
 
-		-
-			message: "#^Variable \\$node might not be defined\\.$#"
-			count: 1
-			path: tine20/Tinebase/Frontend/Http.php
-
 		-
 			message: "#^Variable \\$record might not be defined\\.$#"
 			count: 1
@@ -10519,6 +10509,11 @@ parameters:
 			count: 1
 			path: tine20/Tinebase/OpenId/Provider/User/Tine20.php
 
+		-
+			message: "#^Access to an undefined property Zend_Db_Adapter_Abstract\\:\\:\\$table_prefix\\.$#"
+			count: 1
+			path: tine20/Tinebase/Path/Backend/Sql.php
+
 		-
 			message: "#^Method Tinebase_Path_Backend_Sql\\:\\:delete\\(\\) should return int but return statement is missing\\.$#"
 			count: 1

diff --git a/tests/tine20/Tinebase/Frontend/CliTest.php b/tests/tine20/Tinebase/Frontend/CliTest.php
@@ -132,6 +132,8 @@ public function testPurgeDeletedRecordsAddressbook()
      */
     public function testPurgeDeletedRecordsAllTables()
     {
+        $this->_testNeedsTransaction();
+
         $opts = $this->_getOpts();
         if (Tinebase_Config::getInstance()->{Tinebase_Config::FILESYSTEM}->{Tinebase_Config::FILESYSTEM_MODLOGACTIVE}) {
             $deletedFile = $this->_addAndDeleteFile();

diff --git a/tine20/Tinebase/Controller.php b/tine20/Tinebase/Controller.php
@@ -978,6 +978,8 @@ public function rebuildPaths()
             }
         }
 
+        Tinebase_Path_Backend_Sql::optimizePathsTable();
+
         return true;
     }
 

diff --git a/tine20/Tinebase/Frontend/Cli.php b/tine20/Tinebase/Frontend/Cli.php
@@ -547,6 +547,9 @@ public function purgeDeletedRecords(Zend_Console_Getopt $_opts)
 
             echo "\nCleaning files...";
             $this->clearDeletedFiles();
+
+            echo "\nOptimizing path table...";
+            Tinebase_Path_Backend_Sql::optimizePathsTable();
         }
 
         echo "\n\n";

diff --git a/tine20/Tinebase/Path/Backend/Sql.php b/tine20/Tinebase/Path/Backend/Sql.php
@@ -642,4 +642,12 @@ protected function _addToModelStore(Tinebase_Model_Path $_record, $_replace = fa
         static::$_shadowPathMapping[$shadow_path] = $id;
         static::$_idToShadowPath[$id] = $shadow_path;
     }
+
+    public static function optimizePathsTable()
+    {
+        Tinebase_Core::getLogger()->info(__METHOD__ . '::' . __LINE__ . ' Optimizing path table ...');
+        $db = Tinebase_Core::getDb();
+        $stmt = $db->query('OPTIMIZE TABLE ' . $db->table_prefix . 'path;');
+        $stmt->closeCursor();
+    }
 }