From bfa49410a2d46e095ec63fe52f8033b488cd8259 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 12 Aug 2018 17:14:08 +0200 Subject: [PATCH] Drop support for xcache Signed-off-by: Daniel Kesselberg --- config/config.sample.php | 1 - lib/private/Memcache/XCache.php | 137 ------------------------------ lib/private/legacy/util.php | 8 -- tests/lib/Memcache/XCacheTest.php | 22 ----- 4 files changed, 168 deletions(-) delete mode 100644 lib/private/Memcache/XCache.php delete mode 100644 tests/lib/Memcache/XCacheTest.php diff --git a/config/config.sample.php b/config/config.sample.php index 2dddd5a7da..4f97034970 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1059,7 +1059,6 @@ $CONFIG = array( * * ``\OC\Memcache\ArrayCache`` In-memory array-based backend (not recommended) * * ``\OC\Memcache\Memcached`` Memcached backend * * ``\OC\Memcache\Redis`` Redis backend - * * ``\OC\Memcache\XCache`` XCache backend * * Advice on choosing between the various backends: * diff --git a/lib/private/Memcache/XCache.php b/lib/private/Memcache/XCache.php deleted file mode 100644 index 17dd972128..0000000000 --- a/lib/private/Memcache/XCache.php +++ /dev/null @@ -1,137 +0,0 @@ - - * @author Bart Visscher - * @author Clark Tomlinson - * @author Joas Schilling - * @author Morris Jobke - * @author Robin Appelman - * @author Roeland Jago Douma - * @author Thomas Müller - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License, version 3, - * along with this program. If not, see - * - */ - -namespace OC\Memcache; - -use OCP\IMemcache; - -/** - * See http://xcache.lighttpd.net/wiki/XcacheApi for provided constants and - * functions etc. - */ -class XCache extends Cache implements IMemcache { - use CASTrait; - - use CADTrait; - - /** - * entries in XCache gets namespaced to prevent collisions between ownCloud instances and users - */ - protected function getNameSpace() { - return $this->prefix; - } - - public function get($key) { - return xcache_get($this->getNameSpace() . $key); - } - - public function set($key, $value, $ttl = 0) { - if ($ttl > 0) { - return xcache_set($this->getNameSpace() . $key, $value, $ttl); - } else { - return xcache_set($this->getNameSpace() . $key, $value); - } - } - - public function hasKey($key) { - return xcache_isset($this->getNameSpace() . $key); - } - - public function remove($key) { - return xcache_unset($this->getNameSpace() . $key); - } - - public function clear($prefix = '') { - if (function_exists('xcache_unset_by_prefix')) { - return xcache_unset_by_prefix($this->getNameSpace() . $prefix); - } else { - // Since we can not clear by prefix, we just clear the whole cache. - xcache_clear_cache(\XC_TYPE_VAR, 0); - } - return true; - } - - /** - * Set a value in the cache if it's not already stored - * - * @param string $key - * @param mixed $value - * @param int $ttl Time To Live in seconds. Defaults to 60*60*24 - * @return bool - */ - public function add($key, $value, $ttl = 0) { - if ($this->hasKey($key)) { - return false; - } else { - return $this->set($key, $value, $ttl); - } - } - - /** - * Increase a stored number - * - * @param string $key - * @param int $step - * @return int | bool - */ - public function inc($key, $step = 1) { - return xcache_inc($this->getPrefix() . $key, $step); - } - - /** - * Decrease a stored number - * - * @param string $key - * @param int $step - * @return int | bool - */ - public function dec($key, $step = 1) { - return xcache_dec($this->getPrefix() . $key, $step); - } - - static public function isAvailable() { - if (!extension_loaded('xcache')) { - return false; - } - if (\OC::$CLI && !getenv('XCACHE_TEST')) { - return false; - } - if (!function_exists('xcache_unset_by_prefix') && \OC::$server->getIniWrapper()->getBool('xcache.admin.enable_auth')) { - // We do not want to use XCache if we can not clear it without - // using the administration function xcache_clear_cache() - // AND administration functions are password-protected. - return false; - } - $var_size = \OC::$server->getIniWrapper()->getBytes('xcache.var_size'); - if (!$var_size) { - return false; - } - return true; - } -} diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index 1b9f52008f..7916a13179 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -1403,14 +1403,6 @@ class OC_Util { if (function_exists('accelerator_reset')) { accelerator_reset(); } - // XCache - if (function_exists('xcache_clear_cache')) { - if (\OC::$server->getIniWrapper()->getBool('xcache.admin.enable_auth')) { - \OCP\Util::writeLog('core', 'XCache opcode cache will not be cleared because "xcache.admin.enable_auth" is enabled.', ILogger::WARN); - } else { - @xcache_clear_cache(XC_TYPE_PHP, 0); - } - } // Opcache (PHP >= 5.5) if (function_exists('opcache_reset')) { @opcache_reset(); diff --git a/tests/lib/Memcache/XCacheTest.php b/tests/lib/Memcache/XCacheTest.php deleted file mode 100644 index af720115d0..0000000000 --- a/tests/lib/Memcache/XCacheTest.php +++ /dev/null @@ -1,22 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -namespace Test\Memcache; - -class XCacheTest extends Cache { - protected function setUp() { - parent::setUp(); - - if (!\OC\Memcache\XCache::isAvailable()) { - $this->markTestSkipped('The xcache extension is not available.'); - return; - } - $this->instance = new \OC\Memcache\XCache($this->getUniqueID()); - } -}