fix a couple of bugs and actually only count the recursive rows count if needed

14 files changed, 55 insertions, 32 deletions

diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php
index 9995b3e2dc..5110130b84 100644
--- a/plugins/Actions/Archiver.php
+++ b/plugins/Actions/Archiver.php
@@ -498,7 +498,7 @@ class Archiver extends \Piwik\Plugin\Archiver
             ArchivingHelper::$columnToSortByBeforeTruncation,
             Metrics::$columnsAggregationOperation,
             Metrics::$columnsToRenameAfterAggregation,
-            $countRowsRecursive = false
+            $countRowsRecursive = array()
         );
 
         $dataTableToSum = array(
@@ -512,7 +512,8 @@ class Archiver extends \Piwik\Plugin\Archiver
             ArchivingHelper::$maximumRowsInSubDataTable,
             ArchivingHelper::$columnToSortByBeforeTruncation,
             $aggregation,
-            Metrics::$columnsToRenameAfterAggregation
+            Metrics::$columnsToRenameAfterAggregation,
+            $countRowsRecursive = array()
         );
 
         $this->getProcessor()->aggregateNumericMetrics($this->getMetricNames());
diff --git a/plugins/Contents/Archiver.php b/plugins/Contents/Archiver.php
index 9cd6fbfc49..ba8df12d79 100644
--- a/plugins/Contents/Archiver.php
+++ b/plugins/Contents/Archiver.php
@@ -48,14 +48,15 @@ class Archiver extends \Piwik\Plugin\Archiver
     public function aggregateMultipleReports()
     {
         $dataTableToSum = $this->getRecordNames();
+        $columnsAggregationOperation = null;
         $this->getProcessor()->aggregateDataTableRecords(
             $dataTableToSum,
             $this->maximumRowsInDataTable,
             $this->maximumRowsInSubDataTable,
             $this->columnToSortByBeforeTruncation,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false);
+            $countRowsRecursive = array());
     }
 
     private function getRecordNames()
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index f7b9c9ddff..b613f65d02 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -50,14 +50,16 @@ class Archiver extends \Piwik\Plugin\Archiver
 
     public function aggregateMultipleReports()
     {
+        $columnsAggregationOperation = null;
+
         $this->getProcessor()->aggregateDataTableRecords(
             self::CUSTOM_VARIABLE_RECORD_NAME,
             $this->maximumRowsInDataTableLevelZero,
             $this->maximumRowsInSubDataTable,
             $columnToSort = Metrics::INDEX_NB_VISITS,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false);
+            $countRowsRecursive = array());
     }
 
     public function aggregateDayReport()
diff --git a/plugins/DevicePlugins/Archiver.php b/plugins/DevicePlugins/Archiver.php
index 798efec2e0..acec8c0cde 100644
--- a/plugins/DevicePlugins/Archiver.php
+++ b/plugins/DevicePlugins/Archiver.php
@@ -40,14 +40,15 @@ class Archiver extends \Piwik\Plugin\Archiver
         $dataTableRecords = array(
             self::PLUGIN_RECORD_NAME,
         );
+        $columnsAggregationOperation = null;
         $this->getProcessor()->aggregateDataTableRecords(
             $dataTableRecords,
             $this->maximumRows,
             $maximumRowsInSubDataTable = null,
             $columnToSortByBeforeTruncation = null,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false
+            $countRowsRecursive = array()
         );
     }
 
diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php
index e19a064172..21e4b4cf01 100644
--- a/plugins/DevicesDetection/Archiver.php
+++ b/plugins/DevicesDetection/Archiver.php
@@ -56,15 +56,18 @@ class Archiver extends \Piwik\Plugin\Archiver
             self::BROWSER_ENGINE_RECORD_NAME,
             self::BROWSER_VERSION_RECORD_NAME
         );
+
+        $columnsAggregationOperation = null;
+
         foreach ($dataTablesToSum as $dt) {
             $this->getProcessor()->aggregateDataTableRecords(
                 $dt,
                 $this->maximumRows,
                 $this->maximumRows,
                 $columnToSort = 'nb_visits',
-                $columnsAggregationOperation = null,
+                $columnsAggregationOperation,
                 $columnsToRenameAfterAggregation = null,
-                $countRowsRecursive = false);
+                $countRowsRecursive = array());
         }
     }
 
diff --git a/plugins/Events/Archiver.php b/plugins/Events/Archiver.php
index 256c49491e..c928ec318e 100644
--- a/plugins/Events/Archiver.php
+++ b/plugins/Events/Archiver.php
@@ -98,14 +98,16 @@ class Archiver extends \Piwik\Plugin\Archiver
     public function aggregateMultipleReports()
     {
         $dataTableToSum = $this->getRecordNames();
+        $columnsAggregationOperation = null;
+
         $this->getProcessor()->aggregateDataTableRecords(
             $dataTableToSum,
             $this->maximumRowsInDataTable,
             $this->maximumRowsInSubDataTable,
             $this->columnToSortByBeforeTruncation,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false);
+            $countRowsRecursive = array());
     }
 
     protected function getRecordNames()
diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php
index 447ae5a267..b96d9b94b7 100644
--- a/plugins/Goals/Archiver.php
+++ b/plugins/Goals/Archiver.php
@@ -361,13 +361,15 @@ class Archiver extends \Piwik\Plugin\Archiver
         foreach ($this->dimensionRecord as $recordName) {
             $dataTableToSum[] = self::getItemRecordNameAbandonedCart($recordName);
         }
+        $columnsAggregationOperation = null;
+
         $this->getProcessor()->aggregateDataTableRecords($dataTableToSum,
             $maximumRowsInDataTableLevelZero = null,
             $maximumRowsInSubDataTable = null,
             $columnToSortByBeforeTruncation = null,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false);
+            $countRowsRecursive = array());
 
         /*
          *  Archive General Goal metrics
@@ -389,6 +391,8 @@ class Archiver extends \Piwik\Plugin\Archiver
         }
         $this->getProcessor()->aggregateNumericMetrics($fieldsToSum);
 
+        $columnsAggregationOperation = null;
+
         foreach ($goalIdsToSum as $goalId) {
             // sum up the visits to conversion data table & the days to conversion data table
             $this->getProcessor()->aggregateDataTableRecords(
@@ -397,11 +401,12 @@ class Archiver extends \Piwik\Plugin\Archiver
                 $maximumRowsInDataTableLevelZero = null,
                 $maximumRowsInSubDataTable = null,
                 $columnToSortByBeforeTruncation = null,
-                $columnsAggregationOperation = null,
+                $columnsAggregationOperation,
                 $columnsToRenameAfterAggregation = null,
-                $countRowsRecursive = false);
+                $countRowsRecursive = array());
         }
 
+        $columnsAggregationOperation = null;
         // sum up goal overview reports
         $this->getProcessor()->aggregateDataTableRecords(
                 array(self::getRecordName(self::VISITS_UNTIL_RECORD_NAME),
@@ -409,8 +414,8 @@ class Archiver extends \Piwik\Plugin\Archiver
                 $maximumRowsInDataTableLevelZero = null,
                 $maximumRowsInSubDataTable = null,
                 $columnToSortByBeforeTruncation = null,
-                $columnsAggregationOperation = null,
+                $columnsAggregationOperation,
                 $columnsToRenameAfterAggregation = null,
-                $countRowsRecursive = false);
+                $countRowsRecursive = array());
     }
 }
diff --git a/plugins/Provider/Archiver.php b/plugins/Provider/Archiver.php
index c152807385..ed140b05e7 100644
--- a/plugins/Provider/Archiver.php
+++ b/plugins/Provider/Archiver.php
@@ -24,14 +24,16 @@ class Archiver extends \Piwik\Plugin\Archiver
 
     public function aggregateMultipleReports()
     {
+        $columnsAggregationOperation = null;
+
         $this->getProcessor()->aggregateDataTableRecords(
             array(self::PROVIDER_RECORD_NAME),
             $this->maximumRows,
             $maximumRowsInSubDataTable = null,
             $columnToSortByBeforeTruncation = null,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false
+            $countRowsRecursive = array()
         );
     }
 }
diff --git a/plugins/Referrers/Archiver.php b/plugins/Referrers/Archiver.php
index f520aed00e..ea4939f138 100644
--- a/plugins/Referrers/Archiver.php
+++ b/plugins/Referrers/Archiver.php
@@ -217,14 +217,15 @@ class Archiver extends \Piwik\Plugin\Archiver
     public function aggregateMultipleReports()
     {
         $dataTableToSum = $this->getRecordNames();
+        $columnsAggregationOperation = null;
         $nameToCount = $this->getProcessor()->aggregateDataTableRecords(
             $dataTableToSum,
             $this->maximumRowsInDataTableLevelZero,
             $this->maximumRowsInSubDataTable,
             $this->columnToSortByBeforeTruncation,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false
+            $countRowsRecursive = array(self::WEBSITES_RECORD_NAME)
         );
 
         $mappingFromArchiveName = array(
diff --git a/plugins/Resolution/Archiver.php b/plugins/Resolution/Archiver.php
index cc1b82e056..06937c24f3 100644
--- a/plugins/Resolution/Archiver.php
+++ b/plugins/Resolution/Archiver.php
@@ -39,14 +39,15 @@ class Archiver extends \Piwik\Plugin\Archiver
             self::RESOLUTION_RECORD_NAME,
             self::CONFIGURATION_RECORD_NAME,
         );
+        $columnsAggregationOperation = null;
         $this->getProcessor()->aggregateDataTableRecords(
             $dataTableRecords,
             $this->maximumRows,
             $maximumRowsInSubDataTable = null,
             $columnToSortByBeforeTruncation = null,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false);
+            $countRowsRecursive = array());
     }
 
     protected function aggregateByConfiguration()
diff --git a/plugins/UserCountry/Archiver.php b/plugins/UserCountry/Archiver.php
index dcb96e2c66..03a789b14c 100644
--- a/plugins/UserCountry/Archiver.php
+++ b/plugins/UserCountry/Archiver.php
@@ -61,15 +61,16 @@ class Archiver extends \Piwik\Plugin\Archiver
             self::REGION_RECORD_NAME,
             self::CITY_RECORD_NAME,
         );
+        $columnsAggregationOperation = null;
 
         $nameToCount = $this->getProcessor()->aggregateDataTableRecords(
             $dataTableToSum,
             $maximumRowsInDataTableLevelZero = null,
             $maximumRowsInSubDataTable = null,
             $columnToSortByBeforeTruncation = null,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false
+            $countRowsRecursive = array()
         );
         $this->getProcessor()->insertNumericRecord(self::DISTINCT_COUNTRIES_METRIC,
             $nameToCount[self::COUNTRY_RECORD_NAME]['level0']);
diff --git a/plugins/UserLanguage/Archiver.php b/plugins/UserLanguage/Archiver.php
index edfbfd8608..161630b7f2 100644
--- a/plugins/UserLanguage/Archiver.php
+++ b/plugins/UserLanguage/Archiver.php
@@ -46,14 +46,15 @@ class Archiver extends \Piwik\Plugin\Archiver
         $dataTableRecords = array(
             self::LANGUAGE_RECORD_NAME,
         );
+        $columnsAggregationOperation = null;
         $this->getProcessor()->aggregateDataTableRecords(
             $dataTableRecords,
             $this->maximumRows,
             $maximumRowsInSubDataTable = null,
             $columnToSortByBeforeTruncation = null,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false);
+            $countRowsRecursive = array());
     }
 
     protected function aggregateByLanguage()
diff --git a/plugins/VisitTime/Archiver.php b/plugins/VisitTime/Archiver.php
index 63be1dbecb..30bb3dd869 100644
--- a/plugins/VisitTime/Archiver.php
+++ b/plugins/VisitTime/Archiver.php
@@ -30,14 +30,15 @@ class Archiver extends \Piwik\Plugin\Archiver
             self::LOCAL_TIME_RECORD_NAME,
             self::SERVER_TIME_RECORD_NAME,
         );
+        $columnsAggregationOperation = null;
         $this->getProcessor()->aggregateDataTableRecords(
             $dataTableRecords,
             $maximumRowsInDataTableLevelZero = null,
             $maximumRowsInSubDataTable = null,
             $columnToSortByBeforeTruncation = null,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false);
+            $countRowsRecursive = array());
     }
 
     protected function aggregateByServerTime()
diff --git a/plugins/VisitorInterest/Archiver.php b/plugins/VisitorInterest/Archiver.php
index 67a963ffcf..8d432a70b2 100644
--- a/plugins/VisitorInterest/Archiver.php
+++ b/plugins/VisitorInterest/Archiver.php
@@ -128,14 +128,15 @@ class Archiver extends \Piwik\Plugin\Archiver
             self::VISITS_COUNT_RECORD_NAME,
             self::DAYS_SINCE_LAST_RECORD_NAME
         );
+        $columnsAggregationOperation = null;
         $this->getProcessor()->aggregateDataTableRecords(
             $dataTableRecords,
             $maximumRowsInDataTableLevelZero = null,
             $maximumRowsInSubDataTable = null,
             $columnToSortByBeforeTruncation = null,
-            $columnsAggregationOperation = null,
+            $columnsAggregationOperation,
             $columnsToRenameAfterAggregation = null,
-            $countRowsRecursive = false);
+            $countRowsRecursive = array());
     }
 
     /**