diff --git a/lib/private/memcache/apc.php b/lib/private/memcache/apc.php index 50b942e72973f088f099ed4b4079f766182c83bc..f768cdc1c6ef33ce8e9bcce5dec2bf09c0c9f339 100644 --- a/lib/private/memcache/apc.php +++ b/lib/private/memcache/apc.php @@ -31,6 +31,8 @@ class APC extends Cache implements IMemcache { cas as casEmulated; } + use CADTrait; + public function get($key) { $result = apc_fetch($this->getPrefix() . $key, $success); if (!$success) { diff --git a/lib/private/memcache/arraycache.php b/lib/private/memcache/arraycache.php index 2b1b87a9eb3e5a6f25a2cbc4e8aa7b69d615b8a7..8a3fdd2f7c59c53b4dbc644f77e611facbd0b25e 100644 --- a/lib/private/memcache/arraycache.php +++ b/lib/private/memcache/arraycache.php @@ -28,6 +28,8 @@ class ArrayCache extends Cache implements IMemcache { /** @var array Array with the cached data */ protected $cachedData = array(); + use CADTrait; + /** * {@inheritDoc} */ diff --git a/lib/private/memcache/cadtrait.php b/lib/private/memcache/cadtrait.php new file mode 100644 index 0000000000000000000000000000000000000000..e9836e240402e57cc3adb0996208f419a856e0eb --- /dev/null +++ b/lib/private/memcache/cadtrait.php @@ -0,0 +1,53 @@ +<?php +/** + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @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 <http://www.gnu.org/licenses/> + * + */ + +namespace OC\Memcache; + +trait CADTrait { + abstract public function get($key); + + abstract public function remove($key); + + abstract public function add($key, $value, $ttl = 0); + + /** + * Compare and delete + * + * @param string $key + * @param mixed $old + * @return bool + */ + public function cad($key, $old) { + //no native cas, emulate with locking + if ($this->add($key . '_lock', true)) { + if ($this->get($key) === $old) { + $this->remove($key); + $this->remove($key . '_lock'); + return true; + } else { + $this->remove($key . '_lock'); + return false; + } + } else { + return false; + } + } +} diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php index cf1d651b55196665d82f4dff510c65c093af83fd..1503851fd730d382ccc012cf3ba01fb4d5424373 100644 --- a/lib/private/memcache/memcached.php +++ b/lib/private/memcache/memcached.php @@ -34,6 +34,8 @@ class Memcached extends Cache implements IMemcache { */ private static $cache = null; + use CADTrait; + public function __construct($prefix = '') { parent::__construct($prefix); if (is_null(self::$cache)) { diff --git a/lib/private/memcache/nullcache.php b/lib/private/memcache/nullcache.php index 77eadba4eba2b19389e32ee19f4a7dc1ce0d9a1e..f971ffc9b2dac5eb8814a95a80eb27401353bfba 100644 --- a/lib/private/memcache/nullcache.php +++ b/lib/private/memcache/nullcache.php @@ -55,6 +55,10 @@ class NullCache extends Cache implements \OCP\IMemcache { return true; } + public function cad($key, $old) { + return true; + } + public function clear($prefix = '') { return true; } diff --git a/lib/private/memcache/xcache.php b/lib/private/memcache/xcache.php index 0be79d06ed9eb99cff0188332b48dbea700bdc3f..a6265ed56225a796f4641bf61fa2eeae11750056 100644 --- a/lib/private/memcache/xcache.php +++ b/lib/private/memcache/xcache.php @@ -34,6 +34,8 @@ use OCP\IMemcache; class XCache extends Cache implements IMemcache { use CASTrait; + use CADTrait; + /** * entries in XCache gets namespaced to prevent collisions between ownCloud instances and users */ diff --git a/lib/public/imemcache.php b/lib/public/imemcache.php index f8b898e54c655de169f529babf492e5d64741f2a..a1a00791b63a6b5e4634a6740ed442c01cc0f119 100644 --- a/lib/public/imemcache.php +++ b/lib/public/imemcache.php @@ -76,4 +76,14 @@ interface IMemcache extends ICache { * @since 8.1.0 */ public function cas($key, $old, $new); + + /** + * Compare and delete + * + * @param string $key + * @param mixed $old + * @return bool + * @since 8.1.0 + */ + public function cad($key, $old); } diff --git a/tests/lib/memcache/cache.php b/tests/lib/memcache/cache.php index 9d977cf02471b0878f7c42e00e4c048632934da6..3ff72ee931c7ba77ebc7e47cbfc5f56ad89186f2 100644 --- a/tests/lib/memcache/cache.php +++ b/tests/lib/memcache/cache.php @@ -103,6 +103,18 @@ abstract class Cache extends \Test_Cache { $this->assertEquals('bar1', $this->instance->get('foo')); } + public function testCadNotChanged() { + $this->instance->set('foo', 'bar'); + $this->assertTrue($this->instance->cad('foo', 'bar')); + $this->assertFalse($this->instance->hasKey('foo')); + } + + public function testCadChanged() { + $this->instance->set('foo', 'bar1'); + $this->assertFalse($this->instance->cad('foo', 'bar')); + $this->assertTrue($this->instance->hasKey('foo')); + } + protected function tearDown() { if ($this->instance) {