Skip to content
Extraits de code Groupes Projets
Valider 1948b754 rédigé par mattab's avatar mattab
Parcourir les fichiers

Call Table\Manager::deleteAll() for both Days and Periods, not only for Periods

parent 39e7d13c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -194,8 +194,6 @@ class ArchiveProcessor ...@@ -194,8 +194,6 @@ class ArchiveProcessor
&$columnsAggregationOperation = null, &$columnsAggregationOperation = null,
$columnsToRenameAfterAggregation = null) $columnsToRenameAfterAggregation = null)
{ {
// We clean up below all tables created during this function call (and recursive calls)
$latestUsedTableId = Manager::getInstance()->getMostRecentTableId();
if (!is_array($recordNames)) { if (!is_array($recordNames)) {
$recordNames = array($recordNames); $recordNames = array($recordNames);
} }
...@@ -210,7 +208,6 @@ class ArchiveProcessor ...@@ -210,7 +208,6 @@ class ArchiveProcessor
Common::destroy($table); Common::destroy($table);
$this->insertBlobRecord($recordName, $blob); $this->insertBlobRecord($recordName, $blob);
} }
Manager::getInstance()->deleteAll($latestUsedTableId);
return $nameToCount; return $nameToCount;
} }
......
...@@ -15,6 +15,7 @@ use Piwik\Archive; ...@@ -15,6 +15,7 @@ use Piwik\Archive;
use Piwik\ArchiveProcessor; use Piwik\ArchiveProcessor;
use Piwik\DataAccess\ArchiveSelector; use Piwik\DataAccess\ArchiveSelector;
use Piwik\DataAccess\ArchiveWriter; use Piwik\DataAccess\ArchiveWriter;
use Piwik\DataTable\Manager;
use Piwik\Metrics; use Piwik\Metrics;
use Piwik\Plugin\Archiver; use Piwik\Plugin\Archiver;
...@@ -87,6 +88,10 @@ class PluginsArchiver ...@@ -87,6 +88,10 @@ class PluginsArchiver
$archivers = $this->getPluginArchivers(); $archivers = $this->getPluginArchivers();
foreach($archivers as $pluginName => $archiverClass) { foreach($archivers as $pluginName => $archiverClass) {
// We clean up below all tables created during this function call (and recursive calls)
$latestUsedTableId = Manager::getInstance()->getMostRecentTableId();
/** @var Archiver $archiver */ /** @var Archiver $archiver */
$archiver = new $archiverClass($this->archiveProcessor); $archiver = new $archiverClass($this->archiveProcessor);
...@@ -97,6 +102,9 @@ class PluginsArchiver ...@@ -97,6 +102,9 @@ class PluginsArchiver
$archiver->aggregateMultipleReports(); $archiver->aggregateMultipleReports();
} }
} }
Manager::getInstance()->deleteAll($latestUsedTableId);
unset($archiver);
} }
} }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter