diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-09-27 05:02:35 +0300 |
---|---|---|
committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-09-27 05:02:35 +0300 |
commit | 9a2ef80577e54c2ca839decd2bcada41cb57c660 (patch) | |
tree | fac7b05b73d8c2685b4818d14bf7fbca53017a50 | |
parent | 8ab36f57d4c66d3833ec61197c36c1e4f9e350f4 (diff) |
Improve performance of Visitor Log (#10568)
* Improve performance of Visitor Log by tweaking the MySQL query
fixes #10567
* fix integration tests
-rw-r--r-- | plugins/Live/Model.php | 2 | ||||
-rw-r--r-- | plugins/Live/tests/Integration/ModelTest.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Live/Model.php b/plugins/Live/Model.php index 5504f38b85..81b7119e87 100644 --- a/plugins/Live/Model.php +++ b/plugins/Live/Model.php @@ -402,7 +402,7 @@ class Model $orderBy = ''; if (count($bindIdSites) <= 1) { - $orderBy = 'idsite, '; + $orderBy = 'idsite ' . $filterSortOrder . ', '; } $orderBy .= "visit_last_action_time " . $filterSortOrder; diff --git a/plugins/Live/tests/Integration/ModelTest.php b/plugins/Live/tests/Integration/ModelTest.php index 3002b847ba..5f12a69004 100644 --- a/plugins/Live/tests/Integration/ModelTest.php +++ b/plugins/Live/tests/Integration/ModelTest.php @@ -52,7 +52,7 @@ class ModelTest extends IntegrationTestCase WHERE log_visit.idsite in (?) AND log_visit.visit_last_action_time >= ? AND log_visit.visit_last_action_time <= ? - ORDER BY idsite, visit_last_action_time DESC + ORDER BY idsite DESC, visit_last_action_time DESC LIMIT 0, 100 ) AS sub GROUP BY sub.idvisit @@ -132,7 +132,7 @@ class ModelTest extends IntegrationTestCase WHERE log_visit.idsite in (?) AND log_visit.visit_last_action_time >= ? AND log_visit.visit_last_action_time <= ? - ORDER BY idsite, visit_last_action_time DESC + ORDER BY idsite DESC, visit_last_action_time DESC LIMIT 15, 100 ) AS sub GROUP BY sub.idvisit @@ -177,10 +177,10 @@ class ModelTest extends IntegrationTestCase AND log_visit.visit_last_action_time >= ? AND log_visit.visit_last_action_time <= ? ) AND ( log_link_visit_action.custom_var_k1 = ? ) - ORDER BY idsite, visit_last_action_time DESC + ORDER BY idsite DESC, visit_last_action_time DESC LIMIT 10, 1000 ) AS log_inner - ORDER BY idsite, visit_last_action_time DESC + ORDER BY idsite DESC, visit_last_action_time DESC ) AS sub GROUP BY sub.idvisit ORDER BY sub.visit_last_action_time DESC |