Skip to content

Commit ac9d028

Browse files
committed
AC-10860::Investigate colinmollenhour/cache-backend-redis and colinmollenhour/credis latest versions
1 parent 39e9ac3 commit ac9d028

File tree

2 files changed

+22
-2
lines changed
  • lib/internal/Magento/Framework/Cache/Backend
  • setup/src/Magento/Setup/Model/ConfigOptionsList

2 files changed

+22
-2
lines changed

lib/internal/Magento/Framework/Cache/Backend/Redis.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ class Redis extends \Cm_Cache_Backend_Redis
3131
public function __construct($options = [])
3232
{
3333
$this->preloadKeys = $options['preload_keys'] ?? [];
34-
$options['use_lua'] = false;
35-
$options['_useLua'] = true;
3634
parent::__construct($options);
3735
}
3836

setup/src/Magento/Setup/Model/ConfigOptionsList/Cache.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ class Cache implements ConfigOptionsListInterface
3131
public const INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD = 'cache-backend-redis-password';
3232
public const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA = 'cache-backend-redis-compress-data';
3333
public const INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB = 'cache-backend-redis-compression-lib';
34+
public const INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY = 'cache-backend-redis-lua-key';
35+
public const INPUT_KEY_CACHE_BACKEND_REDIS_LUA_VALUE = 'cache-backend-redis-lua-value';
3436
public const INPUT_KEY_CACHE_ID_PREFIX = 'cache-id-prefix';
3537
public const INPUT_KEY_CACHE_ALLOW_PARALLEL_CACHE_GENERATION = 'allow-parallel-generation';
3638

@@ -41,6 +43,8 @@ class Cache implements ConfigOptionsListInterface
4143
public const CONFIG_PATH_CACHE_BACKEND_PASSWORD = 'cache/frontend/default/backend_options/password';
4244
public const CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA = 'cache/frontend/default/backend_options/compress_data';
4345
public const CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB = 'cache/frontend/default/backend_options/compression_lib';
46+
public const CONFIG_PATH_CACHE_BACKEND_USE_LUA = 'cache/frontend/default/backend_options/_useLua';
47+
public const CONFIG_PATH_CACHE_BACKEND_USE_LUA_VALUE = 'cache/frontend/default/backend_options/use_lua';
4448
public const CONFIG_PATH_CACHE_ID_PREFIX = 'cache/frontend/default/id_prefix';
4549
public const CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION = 'cache/allow_parallel_generation';
4650

@@ -55,6 +59,8 @@ class Cache implements ConfigOptionsListInterface
5559
self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => '1',
5660
self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB => '',
5761
self::INPUT_KEY_CACHE_ALLOW_PARALLEL_CACHE_GENERATION => 'false',
62+
self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY => 'true',
63+
self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_VALUE => 'false'
5864
];
5965

6066
/**
@@ -75,6 +81,8 @@ class Cache implements ConfigOptionsListInterface
7581
self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESS_DATA => self::CONFIG_PATH_CACHE_BACKEND_COMPRESS_DATA,
7682
self::INPUT_KEY_CACHE_BACKEND_REDIS_COMPRESSION_LIB => self::CONFIG_PATH_CACHE_BACKEND_COMPRESSION_LIB,
7783
self::INPUT_KEY_CACHE_ALLOW_PARALLEL_CACHE_GENERATION => self::CONFIG_PATH_ALLOW_PARALLEL_CACHE_GENERATION,
84+
self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY => self::CONFIG_PATH_CACHE_BACKEND_USE_LUA,
85+
self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_VALUE => self::CONFIG_PATH_CACHE_BACKEND_USE_LUA_VALUE,
7886
];
7987

8088
/**
@@ -252,6 +260,20 @@ private function validateRedisConfig(array $options, DeploymentConfig $deploymen
252260
$this->getDefaultConfigValue(self::INPUT_KEY_CACHE_BACKEND_REDIS_PASSWORD)
253261
);
254262

263+
$config['_useLua'] = isset($options[self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY])
264+
? $options[self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_KEY]
265+
: $deploymentConfig->get(
266+
self::CONFIG_PATH_CACHE_BACKEND_USE_LUA,
267+
$this->getDefaultConfigValue(self::CONFIG_PATH_CACHE_BACKEND_USE_LUA)
268+
);
269+
270+
$config['use_lua'] = isset($options[self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_VALUE])
271+
? $options[self::INPUT_KEY_CACHE_BACKEND_REDIS_LUA_VALUE]
272+
: $deploymentConfig->get(
273+
self::CONFIG_PATH_CACHE_BACKEND_USE_LUA_VALUE,
274+
$this->getDefaultConfigValue(self::CONFIG_PATH_CACHE_BACKEND_USE_LUA_VALUE)
275+
);
276+
255277
return $this->redisValidator->isValidConnection($config);
256278
}
257279

0 commit comments

Comments
 (0)