Skip to content

detect change in getMulti() signature #85

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

Open
webaware wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

detect change in getMulti() signature #85

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d455bc
detect change in `getMulti()` signature
webaware Sep 19, 2016
95ce328
get the CAS tokens using GET_EXTENDED flag
webaware Sep 19, 2016
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
70 changes: 66 additions & 4 deletions src/object-cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,13 @@ class WP_Object_Cache {
*/
public $blog_prefix = '';

/**
* whether Memcached::getMulti() has $cas_tokens parameter
*
* @var bool
*/
protected $getmulti_has_cas = false;

/**
* Instantiate the Memcached class.
*
Expand Down Expand Up @@ -857,6 +864,15 @@ public function __construct( $persistent_id = NULL ) {
// Setup cacheable values for handling expiration times
$this->thirty_days = 60 * 60 * 24 * 30;
$this->now = time();

// Detect method signature for getMulti() which has changed since PHP 7.0
$refMethod = new ReflectionMethod( 'Memcached', 'getMulti' );
foreach ( $refMethod->getParameters() as $param ) {
if ( $param->name === 'cas_tokens' ) {
$this->getmulti_has_cas = true;
break;
}
}
}

/**
Expand Down Expand Up @@ -1383,6 +1399,52 @@ public function getDelayedByKey( $server_key, $keys, $groups = 'default', $with_
return $this->m->getDelayedByKey( $server_key, $derived_keys, $with_cas, $value_cb );
}

/**
* wrap calls to Memcached::getMultiByKey() because of signature differences
*/
protected function _getMultiByKey( $server_key, $derived_keys, &$cas_tokens, $flags ) {
if ($this->getmulti_has_cas) {
$values = $this->m->getMultiByKey( $server_key, $derived_keys, $cas_tokens, $flags );
}
else {
// need to get extended result from Memcached to get the CAS tokens
$result = $this->m->getMultiByKey( $server_key, $derived_keys, $flags | Memcached::GET_EXTENDED );

$cas_tokens = array();
$values = array();

foreach ( $result as $key => $extended ) {
$values[$key] = $extended['value'];
$cas_tokens[$key] = $extended['cas'];
}
}

return $values;
}

/**
* wrap calls to Memcached::getMulti() because of signature differences
*/
protected function _getMulti( $derived_keys, &$cas_tokens, $flags ) {
if ($this->getmulti_has_cas) {
$values = $this->m->getMulti( $derived_keys, $cas_tokens, $flags );
}
else {
// need to get extended result from Memcached to get the CAS tokens
$result = $this->m->getMulti( $derived_keys, $flags | Memcached::GET_EXTENDED );

$cas_tokens = array();
$values = array();

foreach ( $result as $key => $extended ) {
$values[$key] = $extended['value'];
$cas_tokens[$key] = $extended['cas'];
}
}

return $values;
}

/**
* Gets multiple values from memcached in one request.
*
Expand All @@ -1407,9 +1469,9 @@ public function getMulti( $keys, $groups = 'default', $server_key = '', &$cas_to
*/
if ( func_num_args() > 3 && ! $this->contains_no_mc_group( $groups ) ) {
if ( ! empty( $server_key ) )
$values = $this->m->getMultiByKey( $server_key, $derived_keys, $cas_tokens, $flags );
$values = $this->_getMultiByKey( $server_key, $derived_keys, $cas_tokens, $flags );
else
$values = $this->m->getMulti( $derived_keys, $cas_tokens, $flags );
$values = $this->_getMulti( $derived_keys, $cas_tokens, $flags );
} else {
$values = array();
$need_to_get = array();
Expand All @@ -1425,9 +1487,9 @@ public function getMulti( $keys, $groups = 'default', $server_key = '', &$cas_to
// Get those keys not found in the runtime cache
if ( ! empty( $need_to_get ) ) {
if ( ! empty( $server_key ) )
$result = $this->m->getMultiByKey( $server_key, array_keys( $need_to_get ) );
$result = $this->_getMultiByKey( $server_key, array_keys( $need_to_get ) );
else
$result = $this->m->getMulti( array_keys( $need_to_get ) );
$result = $this->_getMulti( array_keys( $need_to_get ) );
}

// Merge with values found in runtime cache
Expand Down