Apply max execution time limit to goals live query (#21625)

* Apply max execution time limit to goals live query * apply max execution time limit also to ecommerce query
matomo-org · Dec 7, 2023 · d81f28b · d81f28b
1 parent 2f30c45
commit d81f28b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/plugins/Ecommerce/VisitorDetails.php b/plugins/Ecommerce/VisitorDetails.php
@@ -9,9 +9,13 @@
 namespace Piwik\Plugins\Ecommerce;
 
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\DataAccess\LogAggregator;
+use Piwik\Date;
+use Piwik\DbHelper;
 use Piwik\Piwik;
 use Piwik\Plugins\Ecommerce\Columns\ProductCategory;
+use Piwik\Plugins\Live\Model;
 use Piwik\Plugins\Live\VisitorDetailsAbstract;
 use Piwik\Site;
 use Piwik\Tracker\GoalManager;
@@ -211,7 +215,17 @@ protected function queryEcommerceConversionsForVisits($idVisits)
 					WHERE log_conversion.idvisit IN ('" . implode("','", $idVisits) . "')
 						AND idgoal <= " . GoalManager::IDGOAL_ORDER . "
 					ORDER BY log_conversion.idvisit, log_conversion.server_time ASC";
-        $ecommerceDetails = $this->getDb()->fetchAll($sql);
+
+        $sql = DbHelper::addMaxExecutionTimeHintToQuery($sql, $this->getLiveQueryMaxExecutionTime());
+
+        try {
+            $ecommerceDetails = $this->getDb()->fetchAll($sql);
+        } catch (\Exception $e) {
+            $now = Date::now();
+            Model::handleMaxExecutionTimeError($this->getDb(), $e, '', $now, $now, null, 0, ['sql' => $sql]);
+            throw $e;
+        }
+
         return $ecommerceDetails;
     }
 
@@ -303,4 +317,9 @@ public function finalizeProfile($visits, &$profile)
             $profile['totalAbandonedCartsItems']   = $lastVisit->getColumn('totalAbandonedCartsItems');
         }
     }
+
+    private function getLiveQueryMaxExecutionTime()
+    {
+        return Config::getInstance()->General['live_query_max_execution_time'];
+    }
 }
diff --git a/plugins/Goals/VisitorDetails.php b/plugins/Goals/VisitorDetails.php
@@ -11,14 +11,16 @@
 namespace Piwik\Plugins\Goals;
 
 use Piwik\Common;
+use Piwik\Config;
+use Piwik\Date;
+use Piwik\DbHelper;
+use Piwik\Plugins\Live\Model;
 use Piwik\Plugins\Live\VisitorDetailsAbstract;
 
 use function Piwik\Plugins\Referrers\getReferrerTypeFromShortName;
 
 class VisitorDetails extends VisitorDetailsAbstract
 {
-    const EVENT_VALUE_PRECISION = 3;
-
     protected $lastGoalResults = [];
     protected $lastVisitIds    = [];
 
@@ -90,7 +92,16 @@ protected function queryGoalConversionsForVisits($idVisits)
 					AND log_conversion.idgoal > 0
                 ORDER BY log_conversion.idvisit, log_conversion.server_time ASC
 			";
-        $conversions = $this->getDb()->fetchAll($sql);
+
+        $sql = DbHelper::addMaxExecutionTimeHintToQuery($sql, $this->getLiveQueryMaxExecutionTime());
+
+        try {
+            $conversions = $this->getDb()->fetchAll($sql);
+        } catch (\Exception $e) {
+            $now = Date::now();
+            Model::handleMaxExecutionTimeError($this->getDb(), $e, '', $now, $now, null, 0, ['sql' => $sql]);
+            throw $e;
+        }
 
         foreach ($conversions as &$conversion) {
             $conversion['goalName'] = Common::unsanitizeInputValue($conversion['goalName']);
@@ -148,4 +159,9 @@ protected function getReferrerType($referrerTypeId)
 
         return $referrerType;
     }
+
+    private function getLiveQueryMaxExecutionTime()
+    {
+        return Config::getInstance()->General['live_query_max_execution_time'];
+    }
 }