Skip to content
Snippets Groups Projects
Verified Commit 1f1d1ab3 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3436804 by longwave: CacheCollector::normalizeLockName() is pointless

parent 8d5b54ef
Branches
Tags
31 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8540Issue #3457061: Bootstrap Modal dialog Not closing after 10.3.0 Update,!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8373Issue #3427374 by danflanagan8, Vighneshh: taxonomy_tid ViewsArgumentDefault...,!7526Expose roles in response,!7352Draft: Resolve #3203489 "Set filename as",!5423Draft: Resolve #3329907 "Test2",!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3478Issue #3337882: Deleted menus are not removed from content type config,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2794Issue #3100732: Allow specifying `meta` data on JSON:API objects,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #132486 canceled
Pipeline: drupal

#132489

    ......@@ -3,7 +3,6 @@
    namespace Drupal\Core\Cache;
    use Drupal\Component\Assertion\Inspector;
    use Drupal\Component\Utility\Crypt;
    use Drupal\Core\DestructableInterface;
    use Drupal\Core\Lock\LockBackendInterface;
    ......@@ -229,7 +228,7 @@ protected function updateCache($lock = TRUE) {
    // Lock cache writes to help avoid stampedes.
    $cid = $this->getCid();
    $lock_name = $this->normalizeLockName($cid . ':' . __CLASS__);
    $lock_name = $cid . ':' . __CLASS__;
    if (!$lock || $this->lock->acquire($lock_name)) {
    // Set and delete operations invalidate the cache item. Try to also load
    // an eventually invalidated cache entry, only update an invalidated cache
    ......@@ -273,30 +272,6 @@ protected function updateCache($lock = TRUE) {
    $this->keysToRemove = [];
    }
    /**
    * Normalizes a cache ID in order to comply with database limitations.
    *
    * @param string $cid
    * The passed in cache ID.
    *
    * @return string
    * An ASCII-encoded cache ID that is at most 255 characters long.
    */
    protected function normalizeLockName($cid) {
    // Nothing to do if the ID is a US ASCII string of 255 characters or less.
    $cid_is_ascii = mb_check_encoding($cid, 'ASCII');
    if (strlen($cid) <= 255 && $cid_is_ascii) {
    return $cid;
    }
    // Return a string that uses as much as possible of the original cache ID
    // with the hash appended.
    $hash = Crypt::hashBase64($cid);
    if (!$cid_is_ascii) {
    return $hash;
    }
    return substr($cid, 0, 255 - strlen($hash)) . $hash;
    }
    /**
    * {@inheritdoc}
    */
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment