Speed up fetching range reports, evolution and sparkline reports

core/DataAccess/ArchiveSelector.php

@@ -163,7 +163,6 @@ public static function getArchiveIds($siteIds, $periods, $segment, $plugins, $in
                                FROM %s
                               WHERE idsite IN (" . implode(',', $siteIds) . ")
                                 AND " . self::getNameCondition($plugins, $segment, $includeInvalidated) . "
-                                AND ts_archived IS NOT NULL
                                 AND %s
                            GROUP BY idsite, date1, date2";
 

core/DataAccess/Model.php

@@ -64,7 +64,6 @@ public function getInvalidatedArchiveIdsSafeToDelete($archiveTable, $setGroupCon
                        GROUP_CONCAT(idarchive, '.', value ORDER BY ts_archived DESC) as archives
                   FROM `$archiveTable`
                  WHERE name LIKE 'done%'
-                   AND ts_archived IS NOT NULL
                    AND `value` NOT IN (" . ArchiveWriter::DONE_ERROR . ")
               GROUP BY idsite, date1, date2, period, name HAVING count(*) > 1";
 
@@ -461,7 +460,6 @@ public function getArchiveIdAndVisits($numericTable, $idSite, $period, $dateStar
                          AND arc1.period = ?
                          AND ($sqlWhereArchiveName)
                          $timeStampWhere
-                         AND arc1.ts_archived IS NOT NULL
                      ORDER BY arc1.ts_archived DESC, arc1.idarchive DESC";
 
         $results = Db::fetchAll($sqlQuery, $bindSQL);

core/Db/Schema/Mysql.php

@@ -298,7 +298,7 @@ public function getTablesCreateSql()
                                       ts_archived DATETIME NULL,
                                       value DOUBLE NULL,
                                         PRIMARY KEY(idarchive, name),
-                                        INDEX index_idsite_dates_period(idsite, date1, date2, period, ts_archived),
+                                        INDEX index_idsite_dates_period(idsite, date1, date2, period, name(6)),
                                         INDEX index_period_archived(period, ts_archived)
                                       ) ENGINE=$engine DEFAULT CHARSET=$charset
             ",

core/Updates/5.0.0-b1.php

@@ -10,6 +10,7 @@
 
 namespace Piwik\Updates;
 
+use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Db;
 use Piwik\Common;
 use Piwik\Updater;
@@ -44,17 +45,34 @@ public function doUpdate(Updater $updater)
 
     public function getMigrations(Updater $updater)
     {
+        $migrations = $this->getUpdateArchiveIndexMigrations();
+
         if ($this->requiresUpdatedLogVisitTableIndex()) {
-            return $this->getLogVisitTableMigrations();
+            return $this->getLogVisitTableMigrations($migrations);
         }
 
         return [];
     }
 
-    private function getLogVisitTableMigrations()
+    private function getUpdateArchiveIndexMigrations()
     {
         $migrations = [];
 
+        $tables = ArchiveTableCreator::getTablesArchivesInstalled('numeric');
+        foreach ($tables as $table) {
+            $hasPrefix = strpos($table, 'archive') !== 0;
+            if ($hasPrefix) {
+                $table = Common::unprefixTable($table);
+            }
+            $migrations[] = $this->migration->db->dropIndex($table, 'index_idsite_dates_period');
+            $migrations[] = $this->migration->db->addIndex($table, ['idsite', 'date1', 'date2', 'period', 'name(6)'], 'index_idsite_dates_period');
+        }
+
+        return $migrations;
+    }
+
+    private function getLogVisitTableMigrations($migrations)
+    {
         $migrations[] = $this->migration->db->dropIndex('log_visit', $this->indexName);
 
         // Using the custom `sql` method instead of the `addIndex` method as it doesn't support DESC collation
@@ -88,4 +106,4 @@ private function requiresUpdatedLogVisitTableIndex()
 
         return true;
     }
-}
+}