Check idarchive caching

Author: mneudert

core/Archive.php

@@ -213,6 +213,12 @@ public function __construct(
         $this->forceIndexedByDate = $forceIndexedByDate;
     }
 
+    public function clearCache(): void
+    {
+        $this->idarchives = [];
+        $this->idarchiveStates = [];
+    }
+
     /**
      * Returns a new Archive instance that will query archive data for the given set of
      * sites and periods, using an optional Segment.
@@ -985,6 +991,7 @@ private function prepareArchive(array $archiveNamesByPlugin, Site $site, Period
                     continue;
                 }
 
+                // "all plugins" done flag used for plugin idarchive
                 $this->idarchives[$doneFlag][$periodString][] = $idArchive;
                 $this->idarchiveStates[$idSite][$doneFlag][$periodString][$idArchive] = ArchiveWriter::DONE_OK;
             }

core/ArchiveProcessor/PluginsArchiver.php

@@ -172,6 +172,10 @@ public function callAggregateAllPlugins($visits, $visitsConverted, $forceArchivi
             }
 
             if ($this->shouldProcessReportsForPlugin($pluginName)) {
+                if (null !== $this->archiveProcessor->archive) {
+                    $this->archiveProcessor->archive->clearCache();
+                }
+
                 $this->logAggregator->setQueryOriginHint($pluginName);
 
                 try {

tests/PHPUnit/Integration/ArchiveCronReusePluginArchivesTest.php

@@ -80,7 +80,7 @@ public function testSegmentArchivingUsesExistingPluginArchivesForAllPluginsArchi
         $dataTable = VisitsSummaryAPI::getInstance()->get($this->idSite, 'week', $this->dateTime->toString('Y-m-d'), $this->segmentDef);
         self::assertEquals(2, $dataTable->getFirstRow()->getColumn('nb_visits'));
         $dataTable = GoalsAPI::getInstance()->get($this->idSite, 'week', $this->dateTime->toString('Y-m-d'), $this->segmentDef);
-        self::assertEquals(0, $dataTable->getFirstRow()->getColumn('nb_conversions'));
+        self::assertEquals(2, $dataTable->getFirstRow()->getColumn('nb_conversions'));
 
         // force rearchiving of the days using cron to verify 2 conversions for the week
         $invalidator = StaticContainer::get(ArchiveInvalidator::class);