diff --git a/core/includes/entity.inc b/core/includes/entity.inc index b651e32..9a37f30 100644 --- a/core/includes/entity.inc +++ b/core/includes/entity.inc @@ -6,6 +6,7 @@ */ use \InvalidArgumentException; +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Entity\EntityFieldQuery; use Drupal\Core\Entity\EntityMalformedException; use Drupal\Core\Entity\EntityStorageException; @@ -82,7 +83,7 @@ function entity_get_info($entity_type = NULL) { } // Let other modules alter the entity info. drupal_alter('entity_info', $entity_info); - cache()->set("entity_info:$langcode", $entity_info); + cache()->set("entity_info:$langcode", $entity_info, CacheBackendInterface::CACHE_PERMANENT, array('entity_info' => TRUE)); } } @@ -100,7 +101,7 @@ function entity_get_info($entity_type = NULL) { function entity_info_cache_clear() { drupal_static_reset('entity_get_info'); // Clear all languages. - cache()->deletePrefix('entity_info:'); + cache()->invalidateTags(array('entity_info' => TRUE)); } /** diff --git a/core/includes/menu.inc b/core/includes/menu.inc index f21bd1f..36a92c9 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -5,6 +5,7 @@ * API for the Drupal menu system. */ +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Template\Attribute; /** @@ -1109,7 +1110,7 @@ function menu_tree_all_data($menu_name, $link = NULL, $max_depth = NULL) { } // Cache the tree building parameters using the page-specific cid. - cache('menu')->set($cid, $tree_parameters); + cache('menu')->set($cid, $tree_parameters, CacheBackendInterface::CACHE_PERMANENT, array('menu' => $menu_name)); } // Build the tree using the parameters; the resulting tree will be cached @@ -1282,7 +1283,7 @@ function menu_tree_page_data($menu_name, $max_depth = NULL, $only_active_trail = $tree_parameters['active_trail'] = $active_trail; } // Cache the tree building parameters using the page-specific cid. - cache('menu')->set($cid, $tree_parameters); + cache('menu')->set($cid, $tree_parameters, CacheBackendInterface::CACHE_PERMANENT, array('menu' => $menu_name)); } // Build the tree using the parameters; the resulting tree will be cached @@ -1419,7 +1420,7 @@ function _menu_build_tree($menu_name, array $parameters = array()) { menu_tree_collect_node_links($data['tree'], $data['node_links']); // Cache the data, if it is not already in the cache. - cache('menu')->set($tree_cid, $data); + cache('menu')->set($tree_cid, $data, CacheBackendInterface::CACHE_PERMANENT, array('menu' => $menu_name)); $trees[$tree_cid] = $data; } @@ -2608,7 +2609,7 @@ function menu_link_load($mlid) { * Clears the cached cached data for a single named menu. */ function menu_cache_clear($menu_name = 'navigation') { - cache('menu')->deletePrefix('links:' . $menu_name . ':'); + cache('menu')->invalidateTags(array('menu' => $menu_name)); // Also clear the menu system static caches. menu_reset_static_cache(); } diff --git a/core/includes/schema.inc b/core/includes/schema.inc index 7b0c690..155bb6b 100644 --- a/core/includes/schema.inc +++ b/core/includes/schema.inc @@ -5,6 +5,7 @@ * Schema API handling functions. */ +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Database\Database; use Drupal\Core\Utility\SchemaCache; @@ -97,7 +98,7 @@ function drupal_get_complete_schema($rebuild = FALSE) { cache()->set('schema', $schema); } if ($rebuild) { - cache()->deletePrefix('schema:'); + cache()->invalidateTags(array('schema' => TRUE)); } } } diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 7766952..fe5ec9a 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -8,8 +8,9 @@ * customized by user themes. */ -use Drupal\Core\Utility\ThemeRegistry; +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Template\Attribute; +use Drupal\Core\Utility\ThemeRegistry; /** * @defgroup content_flags Content markers @@ -316,7 +317,7 @@ function _theme_load_registry($theme, $base_theme = NULL, $theme_engine = NULL, return $registry; } else { - return new ThemeRegistry('theme_registry:runtime:' . $theme->name, 'cache'); + return new ThemeRegistry('theme_registry:runtime:' . $theme->name, 'cache', array('theme_registry' => TRUE)); } } @@ -324,7 +325,7 @@ function _theme_load_registry($theme, $base_theme = NULL, $theme_engine = NULL, * Write the theme_registry cache into the database. */ function _theme_save_registry($theme, $registry) { - cache()->set("theme_registry:$theme->name", $registry); + cache()->set("theme_registry:$theme->name", $registry, CacheBackendInterface::CACHE_PERMANENT, array('theme_registry' => TRUE)); } /** @@ -334,7 +335,7 @@ function _theme_save_registry($theme, $registry) { */ function drupal_theme_rebuild() { drupal_static_reset('theme_get_registry'); - cache()->deletePrefix('theme_registry'); + cache()->invalidateTags(array('theme_registry' => TRUE)); } /** @@ -562,7 +563,7 @@ function _theme_build_registry($theme, $base_theme, $theme_engine) { } // Only cache this registry if all modules are loaded. if (module_load_all(NULL)) { - cache()->set('theme_registry:build:modules', $cache); + cache()->set("theme_registry:build:modules", $cache, CacheBackendInterface::CACHE_PERMANENT, array('theme_registry' => TRUE)); } } diff --git a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php index 2140960..02c9dd2 100644 --- a/core/lib/Drupal/Core/Cache/CacheBackendInterface.php +++ b/core/lib/Drupal/Core/Cache/CacheBackendInterface.php @@ -130,14 +130,6 @@ interface CacheBackendInterface { function deleteMultiple(Array $cids); /** - * Deletes items from the cache using a wildcard prefix. - * - * @param $prefix - * A wildcard prefix. - */ - function deletePrefix($prefix); - - /** * Flushes all cache items in a bin. */ function flush(); diff --git a/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/core/lib/Drupal/Core/Cache/DatabaseBackend.php index d4de8bf..e62f1da 100644 --- a/core/lib/Drupal/Core/Cache/DatabaseBackend.php +++ b/core/lib/Drupal/Core/Cache/DatabaseBackend.php @@ -169,15 +169,6 @@ class DatabaseBackend implements CacheBackendInterface { } /** - * Implements Drupal\Core\Cache\CacheBackendInterface::deletePrefix(). - */ - function deletePrefix($prefix) { - Database::getConnection()->delete($this->bin) - ->condition('cid', Database::getConnection()->escapeLike($prefix) . '%', 'LIKE') - ->execute(); - } - - /** * Implements Drupal\Core\Cache\CacheBackendInterface::flush(). */ function flush() { diff --git a/core/lib/Drupal/Core/Cache/InstallBackend.php b/core/lib/Drupal/Core/Cache/InstallBackend.php index b507684..73aae39 100644 --- a/core/lib/Drupal/Core/Cache/InstallBackend.php +++ b/core/lib/Drupal/Core/Cache/InstallBackend.php @@ -77,18 +77,6 @@ class InstallBackend extends DatabaseBackend { } /** - * Overrides Drupal\Core\Cache\DatabaseBackend::deletePrefix(). - */ - function deletePrefix($prefix) { - try { - if (class_exists('Drupal\Core\Database\Database')) { - parent::deletePrefix($prefix); - } - } - catch (Exception $e) {} - } - - /** * Overrides Drupal\Core\Cache\DatabaseBackend::invalidateTags(). */ function invalidateTags(array $tags) { diff --git a/core/lib/Drupal/Core/Cache/MemoryBackend.php b/core/lib/Drupal/Core/Cache/MemoryBackend.php index 021b818..ce74c2f 100644 --- a/core/lib/Drupal/Core/Cache/MemoryBackend.php +++ b/core/lib/Drupal/Core/Cache/MemoryBackend.php @@ -136,17 +136,6 @@ class MemoryBackend implements CacheBackendInterface { } /** - * Implements Drupal\Core\Cache\CacheBackendInterface::deletePrefix(). - */ - public function deletePrefix($prefix) { - foreach ($this->cache as $cid => $item) { - if (strpos($cid, $prefix) === 0) { - unset($this->cache[$cid]); - } - } - } - - /** * Implements Drupal\Core\Cache\CacheBackendInterface::flush(). */ public function flush() { diff --git a/core/lib/Drupal/Core/Cache/NullBackend.php b/core/lib/Drupal/Core/Cache/NullBackend.php index dedd033..862a3bd 100644 --- a/core/lib/Drupal/Core/Cache/NullBackend.php +++ b/core/lib/Drupal/Core/Cache/NullBackend.php @@ -55,11 +55,6 @@ class NullBackend implements CacheBackendInterface { function deleteMultiple(array $cids) {} /** - * Implements Drupal\Core\Cache\CacheBackendInterface::deletePrefix(). - */ - function deletePrefix($prefix) {} - - /** * Implements Drupal\Core\Cache\CacheBackendInterface::flush(). */ function flush() {} diff --git a/core/lib/Drupal/Core/Utility/CacheArray.php b/core/lib/Drupal/Core/Utility/CacheArray.php index 24ab4d9..0be081d 100644 --- a/core/lib/Drupal/Core/Utility/CacheArray.php +++ b/core/lib/Drupal/Core/Utility/CacheArray.php @@ -8,6 +8,7 @@ namespace Drupal\Core\Utility; use ArrayAccess; +use Drupal\Core\Cache\CacheBackendInterface; /** * Provides a caching wrapper to be used in place of large array structures. @@ -71,6 +72,11 @@ abstract class CacheArray implements ArrayAccess { protected $cid; /** + * A tags array to pass to cache()->set(). + */ + protected $tags; + + /** * A bin to pass to cache()->set() and cache()->get(). */ protected $bin; @@ -92,10 +98,13 @@ abstract class CacheArray implements ArrayAccess { * The cid for the array being cached. * @param $bin * The bin to cache the array. + * @param $tags + * The tags to specify for all cache items. */ - public function __construct($cid, $bin) { + public function __construct($cid, $bin, $tags = array()) { $this->cid = $cid; $this->bin = $bin; + $this->tags = $tags; if ($cached = cache($bin)->get($this->cid)) { $this->storage = $cached->data; @@ -185,7 +194,7 @@ abstract class CacheArray implements ArrayAccess { if ($cached = cache($this->bin)->get($this->cid)) { $data = $cached->data + $data; } - cache($this->bin)->set($this->cid, $data); + cache($this->bin)->set($this->cid, $data, CacheBackendInterface::CACHE_PERMANENT, $this->tags); if ($lock) { lock()->release($lock_name); } diff --git a/core/lib/Drupal/Core/Utility/SchemaCache.php b/core/lib/Drupal/Core/Utility/SchemaCache.php index d8c3a50..5bbd96f 100644 --- a/core/lib/Drupal/Core/Utility/SchemaCache.php +++ b/core/lib/Drupal/Core/Utility/SchemaCache.php @@ -19,7 +19,7 @@ class SchemaCache extends CacheArray { */ public function __construct() { // Cache by request method. - parent::__construct('schema:runtime:' . ($_SERVER['REQUEST_METHOD'] == 'GET'), 'cache'); + parent::__construct('schema:runtime:' . ($_SERVER['REQUEST_METHOD'] == 'GET'), 'cache', array('schema' => TRUE)); } /** diff --git a/core/lib/Drupal/Core/Utility/ThemeRegistry.php b/core/lib/Drupal/Core/Utility/ThemeRegistry.php index bde6ecb..fae2b2e 100644 --- a/core/lib/Drupal/Core/Utility/ThemeRegistry.php +++ b/core/lib/Drupal/Core/Utility/ThemeRegistry.php @@ -7,6 +7,8 @@ namespace Drupal\Core\Utility; +use Drupal\Core\Cache\CacheBackendInterface; + /** * Builds the run-time theme registry. * @@ -31,9 +33,10 @@ class ThemeRegistry extends CacheArray { */ protected $completeRegistry; - function __construct($cid, $bin) { + function __construct($cid, $bin, $tags) { $this->cid = $cid; $this->bin = $bin; + $this->tags = $tags; $this->persistable = module_load_all(NULL) && $_SERVER['REQUEST_METHOD'] == 'GET'; $data = array(); @@ -109,7 +112,7 @@ class ThemeRegistry extends CacheArray { $registry = $this->initializeRegistry(); $data = array_merge($registry, $data); } - cache($this->bin)->set($this->cid, $data); + cache($this->bin)->set($this->cid, $data, CacheBackendInterface::CACHE_PERMANENT, $this->tags); if ($lock) { lock()->release($lock_name); } diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc index 65c6bcc..136dff8 100644 --- a/core/modules/field/field.info.inc +++ b/core/modules/field/field.info.inc @@ -5,6 +5,8 @@ * Field Info API, providing information about available fields and field types. */ +use Drupal\Core\Cache\CacheBackendInterface; + /** * @defgroup field_info Field Info API * @{ @@ -151,7 +153,7 @@ function _field_info_collate_types() { } drupal_alter('field_storage_info', $info['storage types']); - cache('field')->set("field_info_types:$langcode", $info); + cache('field')->set("field_info_types:$langcode", $info, CacheBackendInterface::CACHE_PERMANENT, array('field_info_types' => TRUE)); } } @@ -164,7 +166,7 @@ function _field_info_collate_types() { function _field_info_collate_types_reset() { drupal_static_reset('_field_info_collate_types'); // Clear all languages. - cache('field')->deletePrefix('field_info_types:'); + cache('field')->invalidateTags(array('field_info_types' => TRUE)); } /** diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 6c54fae..8b98bbe 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -4,6 +4,7 @@ * @file * Framework for handling the filtering of content. */ +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Template\Attribute; /** @@ -285,7 +286,7 @@ function filter_format_save($format) { $return = SAVED_UPDATED; // Clear the filter cache whenever a text format is updated. - cache('filter')->deletePrefix($format->format . ':'); + cache('filter')->invalidateTags(array('filter_format' => $format->format)); } filter_formats_reset(); @@ -315,7 +316,7 @@ function filter_format_disable($format) { // Clear the filter cache whenever a text format is disabled. filter_formats_reset(); - cache('filter')->deletePrefix($format->format . ':'); + cache('filter')->invalidateTags(array('filter_format' => $format->format)); } /** @@ -439,7 +440,7 @@ function filter_formats($account = NULL) { ->execute() ->fetchAllAssoc('format'); - cache()->set("filter_formats:{$language_interface->langcode}", $formats['all']); + cache()->set("filter_formats:{$language_interface->langcode}", $formats['all'], CacheBackendInterface::CACHE_PERMANENT, array('filter_formats' => TRUE)); } } @@ -462,8 +463,8 @@ function filter_formats($account = NULL) { * @see filter_formats() */ function filter_formats_reset() { - cache()->deletePrefix('filter_formats'); - cache()->deletePrefix('filter_list_format'); + cache()->invalidateTags(array('filter_formats' => TRUE)); + cache()->delete('filter_list_format'); drupal_static_reset('filter_list_format'); drupal_static_reset('filter_formats'); } @@ -810,7 +811,7 @@ function check_markup($text, $format_id = NULL, $langcode = '', $cache = FALSE) // automatically flushed when the text format is updated. // @see filter_format_save() if ($cache) { - cache('filter')->set($cache_id, $text); + cache('filter')->set($cache_id, $text, CacheBackendInterface::CACHE_PERMANENT, array('filter_format' => $format->format)); } return $text; diff --git a/core/modules/locale/lib/Drupal/locale/LocaleLookup.php b/core/modules/locale/lib/Drupal/locale/LocaleLookup.php index 897eaa1..77aa4dd 100644 --- a/core/modules/locale/lib/Drupal/locale/LocaleLookup.php +++ b/core/modules/locale/lib/Drupal/locale/LocaleLookup.php @@ -37,7 +37,7 @@ class LocaleLookup extends CacheArray { // example, strings for admin menu items and settings forms are not cached // for anonymous users. $rids = implode(':', array_keys($GLOBALS['user']->roles)); - parent::__construct("locale:$langcode:$context:$rids", 'cache'); + parent::__construct("locale:$langcode:$context:$rids", 'cache', array('locale' => TRUE)); } /** diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc index 76a5ee1..becacd8 100644 --- a/core/modules/locale/locale.bulk.inc +++ b/core/modules/locale/locale.bulk.inc @@ -543,7 +543,7 @@ function locale_translate_batch_finished($success, $results) { // Clear cache and force refresh of JavaScript translations. _locale_invalidate_js(); - cache()->deletePrefix('locale:'); + cache()->invalidateTags(array('locale' => TRUE)); } } diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index 5fdba76..312aa94 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -444,7 +444,7 @@ function locale_translate_edit_form_submit($form, &$form_state) { // Force JavaScript translation file recreation for this language. _locale_invalidate_js($langcode); // Clear locale cache. - cache()->deletePrefix('locale:'); + cache()->invalidateTags(array('locale' => TRUE)); } /** diff --git a/core/modules/node/node.module b/core/modules/node/node.module index bca8d9b..a36df1f 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -10,6 +10,7 @@ use Symfony\Component\HttpFoundation\Response; +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Database\Query\AlterableInterface; use Drupal\Core\Database\Query\SelectExtender; use Drupal\Core\Database\Query\SelectInterface; @@ -870,7 +871,7 @@ function _node_types_build($rebuild = FALSE) { asort($_node_types->names); - cache()->set($cid, $_node_types); + cache()->set($cid, $_node_types, CacheBackendInterface::CACHE_PERMANENT, array('node_types' => TRUE)); return $_node_types; } @@ -879,7 +880,7 @@ function _node_types_build($rebuild = FALSE) { * Clears the node type cache. */ function node_type_cache_reset() { - cache()->deletePrefix('node_types:'); + cache()->invalidateTags(array('node_types' => TRUE)); drupal_static_reset('_node_types_build'); } diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php index 5cc023b..760d3ca 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/Cache/GenericCacheBackendUnitTestBase.php @@ -336,41 +336,6 @@ abstract class GenericCacheBackendUnitTestBase extends UnitTestBase { } /** - * Test Drupal\Core\Cache\CacheBackendInterface::deletePrefix(). - */ - public function testDeletePrefix() { - $backend = $this->getCacheBackend(); - - // Set numerous testing keys. - $backend->set('banana_test1', 1); - $backend->set('monkey_test2', 3); - $backend->set('monkey_banana_test3', 5); - $backend->set('banana_test_4', 7); - $backend->set('pony_monkey_test5_banana', 11); - $backend->set('monkey_test6', 13); - $backend->set('banana_pony_test7_monkey', 17); - - $backend->deletePrefix('banana'); - // Keys starting with banana have been deleted. - $this->assertIdentical(FALSE, $backend->get('banana_test1'), "Cache id banana_test1 deleted."); - $this->assertIdentical(FALSE, $backend->get('banana_test_4'), "Cache id banana_test_4 deleted."); - $this->assertIdentical(FALSE, $backend->get('banana_pony_test7_monkey'), "Cache id banana_pony_test7_monkey deleted."); - // Keys not starting with banana still exist. - $this->assertNotIdentical(FALSE, $backend->get('monkey_test2'), "Cache id monkey_test2 exists."); - $this->assertNotIdentical(FALSE, $backend->get('monkey_banana_test3'), "Cache id monkey_banana_test3 exists."); - $this->assertNotIdentical(FALSE, $backend->get('pony_monkey_test5_banana'), "Cache id poney_monkey_test5_banana exists."); - $this->assertNotIdentical(FALSE, $backend->get('monkey_test6'), "Cache id monkey_test6 exists."); - - $backend->deletePrefix('monkey'); - // Keys starting with monkey have been deleted. - $this->assertIdentical(FALSE, $backend->get('monkey_test2'), "Cache id monkey_test2 deleted."); - $this->assertIdentical(FALSE, $backend->get('monkey_banana_test3'), "Cache id monkey_banana_test3 deleted."); - $this->assertIdentical(FALSE, $backend->get('banana_pony_test7_monkey'), "Cache id banana_pony_test7_monkey deleted."); - // Keys not starting with monkey still exist. - $this->assertNotIdentical(FALSE, $backend->get('pony_monkey_test5_banana'), "Cache id pony_monkey_test5_banana exists."); - } - - /** * Test Drupal\Core\Cache\CacheBackendInterface::flush(). */ public function testFlush() { diff --git a/core/modules/system/lib/Drupal/system/Tests/Cache/InstallTest.php b/core/modules/system/lib/Drupal/system/Tests/Cache/InstallTest.php index a2199c2..58078cd 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Cache/InstallTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Cache/InstallTest.php @@ -79,17 +79,6 @@ class InstallTest extends CacheTestBase { $this->assertFalse($database_cache->get('cache_two')); // Store multiple items in the database cache, then use the installer's - // cache backend to delete them via a wildcard prefix. Afterwards, confirm - // that they are no longer in the database cache. - $database_cache->set('cache_one', 'One'); - $database_cache->set('cache_two', 'Two'); - $this->assertEqual($database_cache->get('cache_one')->data, 'One'); - $this->assertEqual($database_cache->get('cache_two')->data, 'Two'); - $install_cache->deletePrefix('cache_'); - $this->assertFalse($database_cache->get('cache_one')); - $this->assertFalse($database_cache->get('cache_two')); - - // Store multiple items in the database cache, then use the installer's // cache backend to flush the cache. Afterwards, confirm that they are no // longer in the database cache. $database_cache->set('cache_one', 'One'); @@ -117,7 +106,6 @@ class InstallTest extends CacheTestBase { $install_cache->isEmpty(); $install_cache->delete('cache_one'); $install_cache->deleteMultiple(array('cache_one', 'cache_two')); - $install_cache->deletePrefix('cache_'); $install_cache->flush(); $install_cache->expire(); $install_cache->garbageCollection();