From f445700ccc6f7f48158ae27d2cd13004675fd431 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 1 Aug 2019 16:16:39 -0400 Subject: [PATCH] objectcache: avoid using deprecated phpredis::delete() alias Change-Id: I3ca8bd9160eefff6590228082f030a32d0edb511 --- includes/libs/objectcache/RedisBagOStuff.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/libs/objectcache/RedisBagOStuff.php b/includes/libs/objectcache/RedisBagOStuff.php index 87d26ef8fd..6e467dab3a 100644 --- a/includes/libs/objectcache/RedisBagOStuff.php +++ b/includes/libs/objectcache/RedisBagOStuff.php @@ -21,8 +21,9 @@ */ /** - * Redis-based caching module for redis server >= 2.6.12 + * Redis-based caching module for redis server >= 2.6.12 and phpredis >= 2.2.4 * + * @see https://github.com/phpredis/phpredis/blob/d310ed7c8/Changelog.md * @note Avoid use of Redis::MULTI transactions for twemproxy support * * @ingroup Cache @@ -143,7 +144,7 @@ class RedisBagOStuff extends MediumSpecificBagOStuff { $e = null; try { // Note that redis does not return false if the key was not there - $result = ( $conn->delete( $key ) !== false ); + $result = ( $conn->del( $key ) !== false ); } catch ( RedisException $e ) { $result = false; $this->handleException( $conn, $e ); @@ -269,7 +270,7 @@ class RedisBagOStuff extends MediumSpecificBagOStuff { // Avoid delete() with array to reduce CPU hogging from a single request $conn->multi( Redis::PIPELINE ); foreach ( $batchKeys as $key ) { - $conn->delete( $key ); + $conn->del( $key ); } $batchResult = $conn->exec(); if ( $batchResult === false ) { -- 2.20.1