Skip to content

[stable24] Enable binary protocol again #33078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 2 commits into from
Jul 1, 2022
Merged

[stable24] Enable binary protocol again #33078

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f32c53e
Enable binary protocol again
CarlSchwan Jun 17, 2022
4744a62
memcached should not throw arbitrary exceptions
blizzz Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 6 additions & 24 deletions lib/private/Memcache/Memcached.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function __construct($prefix = '') {
\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,

// Enable Binary Protocol
//\Memcached::OPT_BINARY_PROTOCOL => true,
\Memcached::OPT_BINARY_PROTOCOL => true,
];
/**
* By default enable igbinary serializer if available
Expand Down Expand Up @@ -119,10 +119,7 @@ public function set($key, $value, $ttl = 0) {
} else {
$result = self::$cache->set($this->getNameSpace() . $key, $value);
}
if ($result !== true) {
$this->verifyReturnCode();
}
return $result;
return $result || $this->isSuccess();
}

public function hasKey($key) {
Expand All @@ -132,10 +129,7 @@ public function hasKey($key) {

public function remove($key) {
$result = self::$cache->delete($this->getNameSpace() . $key);
if (self::$cache->getResultCode() !== \Memcached::RES_NOTFOUND) {
$this->verifyReturnCode();
}
return $result;
return $result || $this->isSuccess() || self::$cache->getResultCode() === \Memcached::RES_NOTFOUND;
}

public function clear($prefix = '') {
Expand All @@ -151,14 +145,10 @@ public function clear($prefix = '') {
* @param mixed $value
* @param int $ttl Time To Live in seconds. Defaults to 60*60*24
* @return bool
* @throws \Exception
*/
public function add($key, $value, $ttl = 0) {
$result = self::$cache->add($this->getPrefix() . $key, $value, $ttl);
if (self::$cache->getResultCode() !== \Memcached::RES_NOTSTORED) {
$this->verifyReturnCode();
}
return $result;
return $result || $this->isSuccess();
}

/**
Expand Down Expand Up @@ -200,15 +190,7 @@ public static function isAvailable(): bool {
return extension_loaded('memcached');
}

/**
* @throws \Exception
*/
private function verifyReturnCode() {
$code = self::$cache->getResultCode();
if ($code === \Memcached::RES_SUCCESS) {
return;
}
$message = self::$cache->getResultMessage();
throw new \Exception("Error $code interacting with memcached : $message");
private function isSuccess(): bool {
return self::$cache->getResultCode() === \Memcached::RES_SUCCESS;
}
}