Convert custom data and CiviCRM Search PrevNextCache search groups

civicrm · Jun 10, 2019 · 6272ddf · 6272ddf
1 parent c1653b4
commit 6272ddf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/CRM/Campaign/Selector/Search.php b/CRM/Campaign/Selector/Search.php
@@ -296,7 +296,7 @@ public function buildPrevNextCache($sort) {
 
       if (Civi::service('prevnext') instanceof CRM_Core_PrevNextCache_Sql) {
         // SQL-backed prevnext cache uses an extra record for pruning the cache.
-        CRM_Core_BAO_Cache::setItem($cacheKey, 'CiviCRM Search PrevNextCache', $cacheKey);
+        Civi::cache('prevNextCache')->set($cacheKey, $cacheKey);
       }
     }
   }

diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php
@@ -1063,7 +1063,7 @@ public function fillupPrevNextCache($sort, $cacheKey, $start = 0, $end = self::C
 
     if (Civi::service('prevnext') instanceof CRM_Core_PrevNextCache_Sql) {
       // SQL-backed prevnext cache uses an extra record for pruning the cache.
-      CRM_Core_BAO_Cache::setItem($cacheKey, 'CiviCRM Search PrevNextCache', $cacheKey);
+      Civi::cache('prevNextCache')->set($cacheKey, $cacheKey);
     }
   }
 

diff --git a/CRM/Core/BAO/Cache/Psr16.php b/CRM/Core/BAO/Cache/Psr16.php
@@ -181,9 +181,6 @@ public static function clearDBCache() {
    */
   public static function getLegacyGroups() {
     return [
-      // Core
-      'CiviCRM Search PrevNextCache',
-      'custom data',
 
       // Universe
 

diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
@@ -1816,10 +1816,11 @@ public static function formatGroupTree(&$groupTree, $groupCount = 1, &$form = NU
 
     // retrieve qf key from url
     $qfKey = CRM_Utils_Request::retrieve('qf', 'String');
+    $cache = Civi::cache('customData');
 
     // fetch submitted custom field values later use to set as a default values
     if ($qfKey) {
-      $submittedValues = CRM_Core_BAO_Cache::getItem('custom data', $qfKey);
+      $submittedValues = $cache->get($qfKey);
     }
 
     foreach ($groupTree as $key => $value) {
@@ -1878,7 +1879,7 @@ public static function formatGroupTree(&$groupTree, $groupCount = 1, &$form = NU
       if (count($formValues)) {
         $qf = $form->get('qfKey');
         $form->assign('qfKey', $qf);
-        CRM_Core_BAO_Cache::setItem($formValues, 'custom data', $qf);
+        $cache->set($qf, $formValues);
       }
 
       // hack for field type File

diff --git a/CRM/Core/BAO/PrevNextCache.php b/CRM/Core/BAO/PrevNextCache.php
@@ -424,9 +424,10 @@ public static function cleanupCache() {
 AND        c.created_date < date_sub( NOW( ), INTERVAL %2 day )
 ";
     $params = [
-      1 => ['CiviCRM Search PrevNextCache', 'String'],
+      1 => [CRM_Core_BAO_Cache::cleanKey('CiviCRM Search PrevNextCache'), 'String'],
       2 => [$cacheTimeIntervalDays, 'Integer'],
     ];
+    print_r(json_encode($params));
     CRM_Core_DAO::executeQuery($sql, $params);
   }
 

diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
@@ -159,6 +159,8 @@ public function createContainer() {
       'fields' => 'contact fields',
       'navigation' => 'navigation',
       'groups' => 'contact groups',
+      'prevNextCache' => 'CiviCRM Search PrevNextCache',
+      'customData' => 'custom data',
     ];
     foreach ($basicCaches as $cacheSvc => $cacheGrp) {
       $container->setDefinition("cache.{$cacheSvc}", new Definition(