Merge pull request #12331 from totten/master-default-prefix

(dev/core#174) CRM_Utils_Cache - Always use a prefix. Standardize delimiter
civicrm · Jun 21, 2018 · 74a8b12 · 74a8b12
2 parents b7b5b7b + 1d521e7
commit 74a8b12
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/CRM/Cxn/CiviCxnHttp.php b/CRM/Cxn/CiviCxnHttp.php
@@ -106,4 +106,11 @@ protected function createStreamOpts($verb, $url, $blob, $headers) {
     return $result;
   }
 
+  /**
+   * @return \CRM_Utils_Cache_Interface|null
+   */
+  public function getCache() {
+    return $this->cache;
+  }
+
 }
diff --git a/CRM/Utils/Cache.php b/CRM/Utils/Cache.php
@@ -35,6 +35,9 @@
  * Cache is an empty base object, we'll modify the scheme when we have different caching schemes
  */
 class CRM_Utils_Cache {
+
+  const DELIMITER = '/';
+
   /**
    * (Quasi-Private) Treat this as private. It is marked public to facilitate testing.
    *
@@ -83,6 +86,7 @@ public static function &singleton() {
       // a generic method for utilizing any of the available db caches.
       $dbCacheClass = 'CRM_Utils_Cache_' . $className;
       $settings = self::getCacheSettings($className);
+      $settings['prefix'] = CRM_Utils_Array::value('prefix', $settings, '') . self::DELIMITER . 'default' . self::DELIMITER;
       self::$_singleton = new $dbCacheClass($settings);
     }
     return self::$_singleton;
@@ -186,7 +190,7 @@ public static function create($params = array()) {
           if (defined('CIVICRM_DB_CACHE_CLASS') && in_array(CIVICRM_DB_CACHE_CLASS, array('Memcache', 'Memcached', 'Redis'))) {
             $dbCacheClass = 'CRM_Utils_Cache_' . CIVICRM_DB_CACHE_CLASS;
             $settings = self::getCacheSettings(CIVICRM_DB_CACHE_CLASS);
-            $settings['prefix'] = $settings['prefix'] . '_' . $params['name'];
+            $settings['prefix'] = CRM_Utils_Array::value('prefix', $settings, '') . self::DELIMITER . $params['name'] . self::DELIMITER;
             return new $dbCacheClass($settings);
           }
           break;

diff --git a/CRM/Utils/Cache/SqlGroup.php b/CRM/Utils/Cache/SqlGroup.php
@@ -121,12 +121,16 @@ public function getFromFrontCache($key, $default = NULL) {
    * @param string $key
    */
   public function delete($key) {
-    CRM_Core_BAO_Cache::deleteGroup($this->group, $key);
+    CRM_Core_BAO_Cache::deleteGroup($this->group, $key, FALSE);
+    CRM_Core_BAO_Cache::$_cache = NULL; // FIXME: remove multitier cache
+    CRM_Utils_Cache::singleton()->flush(); // FIXME: remove multitier cache
     unset($this->frontCache[$key]);
   }
 
   public function flush() {
-    CRM_Core_BAO_Cache::deleteGroup($this->group);
+    CRM_Core_BAO_Cache::deleteGroup($this->group, NULL, FALSE);
+    CRM_Core_BAO_Cache::$_cache = NULL; // FIXME: remove multitier cache
+    CRM_Utils_Cache::singleton()->flush(); // FIXME: remove multitier cache
     $this->frontCache = array();
   }
 

diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
@@ -1416,8 +1416,14 @@ public static function civiExit($status = 0) {
   public static function flushCache() {
     // flush out all cache entries so we can reload new data
     // a bit aggressive, but livable for now
-    $cache = CRM_Utils_Cache::singleton();
-    $cache->flush();
+    CRM_Utils_Cache::singleton()->flush();
+    if (Civi\Core\Container::isContainerBooted()) {
+      Civi::cache('settings')->flush();
+      Civi::cache('js_strings')->flush();
+      Civi::cache('community_messages')->flush();
+      CRM_Extension_System::singleton()->getCache()->flush();
+      CRM_Cxn_CiviCxnHttp::singleton()->getCache()->flush();
+    }
 
     // also reset the various static memory caches