preserve key TTL when calling (in|de)crement

Author: tillkruss

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
 
 ## Unreleased
-- Changed `wp_cache_*()` function signatures to match core
+- Fixed (in|de)crement calls removing key TTL
+- Updated `wp_cache_*()` function signatures to match core
 - Removed deprecated HHVM support
 - Removed deprecated `WP_REDIS_SERIALIZER` constant
 

includes/object-cache.php

@@ -384,6 +384,13 @@ class WP_Object_Cache {
      */
     private $fail_gracefully = true;
 
+    /**
+     * Whether to use igbinary serialization.
+     *
+     * @var bool
+     */
+    private $use_igbinary = false;
+
     /**
      * Holds the non-Redis objects.
      *
@@ -519,6 +526,8 @@ public function __construct( $fail_gracefully = false ) {
 
         $this->cache_group_types();
 
+        $this->use_igbinary = defined( 'WP_REDIS_IGBINARY' ) && WP_REDIS_IGBINARY && extension_loaded( 'igbinary' );
+
         $client = $this->determine_client();
         $parameters = $this->build_parameters();
 
@@ -2342,13 +2351,28 @@ public function increment( $key, $offset = 1, $group = 'default' ) {
         }
 
         try {
-            $value = (int) $this->parse_redis_response( $this->maybe_unserialize( $this->redis->get( $derived_key ) ) );
-            $value += $offset;
-            $result = $this->parse_redis_response( $this->redis->set( $derived_key, $this->maybe_serialize( $value ) ) );
+            if ( $this->use_igbinary ) {
+                $value = (int) $this->parse_redis_response( $this->maybe_unserialize( $this->redis->get( $derived_key ) ) );
+                $value += $offset;
+                $serialized = $this->maybe_serialize( $value );
+
+                if ( ($pttl = $this->redis->pttl( $derived_key )) > 0 ) {
+                    if ( $this->is_predis() ) {
+                        $result = $this->parse_redis_response( $this->redis->set( $derived_key, $serialized, 'px', $pttl ) );
+                    } else {
+                        $result = $this->parse_redis_response( $this->redis->set( $derived_key, $serialized, [ 'px' => $pttl ] ) );
+                    }
+                } else {
+                    $result = $this->parse_redis_response( $this->redis->set( $derived_key, $serialized ) );
+                }
 
-            if ( $result ) {
-                $this->add_to_internal_cache( $derived_key, $value );
-                $result = $value;
+                if ( $result ) {
+                    $this->add_to_internal_cache( $derived_key, $value );
+                    $result = $value;
+                }
+            } else {
+                $result = $this->parse_redis_response( $this->redis->incrBy( $derived_key, $offset ) );
+                $this->add_to_internal_cache( $derived_key, (int) $this->redis->get( $derived_key ) );
             }
         } catch ( Exception $exception ) {
             $this->handle_exception( $exception );
@@ -2404,13 +2428,28 @@ public function decrement( $key, $offset = 1, $group = 'default' ) {
         }
 
         try {
-            $value = (int) $this->parse_redis_response( $this->maybe_unserialize( $this->redis->get( $derived_key ) ) );
-            $value -= $offset;
-            $result = $this->parse_redis_response( $this->redis->set( $derived_key, $this->maybe_serialize( $value ) ) );
+            if ( $this->use_igbinary ) {
+                $value = (int) $this->parse_redis_response( $this->maybe_unserialize( $this->redis->get( $derived_key ) ) );
+                $value -= $offset;
+                $serialized = $this->maybe_serialize( $value );
 
-            if ( $result ) {
-                $this->add_to_internal_cache( $derived_key, $value );
-                $result = $value;
+                if ( ($pttl = $this->redis->pttl( $derived_key )) > 0 ) {
+                    if ( $this->is_predis() ) {
+                        $result = $this->parse_redis_response( $this->redis->set( $derived_key, $serialized, 'px', $pttl ) );
+                    } else {
+                        $result = $this->parse_redis_response( $this->redis->set( $derived_key, $serialized, [ 'px' => $pttl ] ) );
+                    }
+                } else {
+                    $result = $this->parse_redis_response( $this->redis->set( $derived_key, $serialized ) );
+                }
+
+                if ( $result ) {
+                    $this->add_to_internal_cache( $derived_key, $value );
+                    $result = $value;
+                }
+            } else {
+                $result = $this->parse_redis_response( $this->redis->decrBy( $derived_key, $offset ) );
+                $this->add_to_internal_cache( $derived_key, (int) $this->redis->get( $derived_key ) );
             }
         } catch ( Exception $exception ) {
             $this->handle_exception( $exception );
@@ -2738,7 +2777,7 @@ protected function validate_expiration( $expiration ) {
      * @return mixed            Unserialized data can be any type.
      */
     protected function maybe_unserialize( $original ) {
-        if ( defined( 'WP_REDIS_IGBINARY' ) && WP_REDIS_IGBINARY && function_exists( 'igbinary_unserialize' ) ) {
+        if ( $this->use_igbinary ) {
             return igbinary_unserialize( $original );
         }
 
@@ -2764,7 +2803,7 @@ protected function maybe_serialize( $data ) {
             $data = clone $data;
         }
 
-        if ( defined( 'WP_REDIS_IGBINARY' ) && WP_REDIS_IGBINARY && function_exists( 'igbinary_serialize' ) ) {
+        if ( $this->use_igbinary ) {
             return igbinary_serialize( $data );
         }