Merge pull request #8892 from piwik/remove_lazy_flush

Segment subquery cache: minor code review items

core/Tracker/TableLogAction.php

@@ -11,6 +11,7 @@ namespace Piwik\Tracker;
 
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\Segment\SegmentExpression;
 
 /**
@@ -189,7 +190,7 @@ class TableLogAction
         // special case
         $sql = TableLogAction::getSelectQueryWhereNameContains($matchType, $actionType);
 
-        $cache = new TableLogAction\Cache();
+        $cache = StaticContainer::get('Piwik\Tracker\TableLogAction\Cache');
         return $cache->getIdActionFromSegment($valueToMatch, $sql);
     }
 

core/Tracker/TableLogAction/Cache.php

@@ -38,12 +38,13 @@ class Cache
      */
     static public $hits = 0;
 
-    public function __construct()
+    public function __construct($logger = null, $config = null)
     {
-        $this->isEnabled = (bool)Config::getInstance()->General['enable_segments_subquery_cache'];
-        $this->limitActionIds = Config::getInstance()->General['segments_subquery_cache_limit'];
-        $this->lifetime = Config::getInstance()->General['segments_subquery_cache_ttl'];
-        $this->logger = StaticContainer::get('Psr\Log\LoggerInterface');
+        $config = $config ?: Config::getInstance();
+        $this->isEnabled = (bool)$config->General['enable_segments_subquery_cache'];
+        $this->limitActionIds = $config->General['segments_subquery_cache_limit'];
+        $this->lifetime = $config->General['segments_subquery_cache_ttl'];
+        $this->logger = $logger ?: StaticContainer::get('Psr\Log\LoggerInterface');
     }
 
     /**

tests/PHPUnit/Framework/Fixture.php

@@ -350,6 +350,7 @@ class Fixture extends \PHPUnit_Framework_Assert
         Cache::deleteTrackerCache();
         PiwikCache::getTransientCache()->flushAll();
         PiwikCache::getEagerCache()->flushAll();
+        PiwikCache::getLazyCache()->flushAll();
         ArchiveTableCreator::clear();
         \Piwik\Plugins\ScheduledReports\API::$cache = array();
         Singleton::clearAll();

tests/PHPUnit/Integration/SegmentTest.php

@@ -37,7 +37,6 @@ class SegmentTest extends IntegrationTestCase
     {
         parent::tearDown();
 
-        Cache::getLazyCache()->flushAll();
         TableLogAction\Cache::$hits = 0;
     }