Minor optimisations to Archiving (matomo-org#18156)

samjf · web-flow · commit c75aa0a67379 · 2021-10-15T15:08:03.000+13:00
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
@@ -473,6 +473,7 @@ private function isSummableColumn($columnName)
      */
     public function sumRow(Row $rowToSum, $enableCopyMetadata = true, $aggregationOperations = false)
     {
+        $operationsIsArray = is_array($aggregationOperations);
         foreach ($rowToSum as $columnToSumName => $columnToSumValue) {
             if (!$this->isSummableColumn($columnToSumName)) {
                 continue;
@@ -481,11 +482,12 @@ public function sumRow(Row $rowToSum, $enableCopyMetadata = true, $aggregationOp
             $thisColumnValue = $this->getColumn($columnToSumName);
 
             $operation = 'sum';
-            if (is_array($aggregationOperations) && isset($aggregationOperations[$columnToSumName])) {
-                if (is_string($aggregationOperations[$columnToSumName])) {
-                    $operation = strtolower($aggregationOperations[$columnToSumName]);
-                } elseif (is_callable($aggregationOperations[$columnToSumName])) {
-                    $operation = $aggregationOperations[$columnToSumName];
+            if ($operationsIsArray && isset($aggregationOperations[$columnToSumName])) {
+                $operationName = $aggregationOperations[$columnToSumName];
+                if (is_string($operationName)) {
+                    $operation = strtolower($operationName);
+                } elseif (is_callable($operationName)) {
+                    $operation = $operationName;
                 }
             }
 
@@ -650,6 +652,10 @@ public function setComparisons(DataTable $table)
      */
     protected function sumRowArray($thisColumnValue, $columnToSumValue, $columnName = null)
     {
+        if ($columnToSumValue === false) {
+            return $thisColumnValue;
+        }
+
         if (is_numeric($columnToSumValue)) {
             if ($thisColumnValue === false) {
                 $thisColumnValue = 0;
@@ -664,10 +670,6 @@ protected function sumRowArray($thisColumnValue, $columnToSumValue, $columnName
             return $thisColumnValue + $columnToSumValue;
         }
 
-        if ($columnToSumValue === false) {
-            return $thisColumnValue;
-        }
-
         if ($thisColumnValue === false) {
             return $columnToSumValue;
         }
