From b38b568a0eb431b5c548df5585cc44d914332e0f Mon Sep 17 00:00:00 2001 From: eileenmcnaugton Date: Fri, 19 Feb 2016 19:13:19 +1300 Subject: [PATCH] CRM-18109 towards removal of unindexed queries Signed-off-by: JKingsnorth --- CRM/Contact/BAO/GroupContactCache.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php index ba013e276d..2d3d087b65 100644 --- a/CRM/Contact/BAO/GroupContactCache.php +++ b/CRM/Contact/BAO/GroupContactCache.php @@ -334,24 +334,27 @@ SET cache_date = null, "; } else { + $query = " DELETE gc FROM civicrm_group_contact_cache gc INNER JOIN civicrm_group g ON g.id = gc.group_id -WHERE TIMESTAMPDIFF(MINUTE, g.cache_date, $now) >= $smartGroupCacheTimeout +WHERE g.cache_date >= %1 "; $update = " UPDATE civicrm_group g SET cache_date = null, refresh_date = null -WHERE TIMESTAMPDIFF(MINUTE, cache_date, $now) >= $smartGroupCacheTimeout +WHERE g.cache_date >= %1 "; $refresh = " UPDATE civicrm_group g SET refresh_date = $refreshTime -WHERE TIMESTAMPDIFF(MINUTE, cache_date, $now) < $smartGroupCacheTimeout +WHERE g.cache_date < %1 AND refresh_date IS NULL "; + $cacheTime = date('Y-m-d H-i-s', strtotime("- $smartGroupCacheTimeout minutes")); + $params = array(1 => array($cacheTime, 'String')); } } elseif (is_array($groupID)) { -- 2.25.1