nextcloud / server

lib/private/Memcache/Redis.php

Indentation +153 added lines, -153 removed lines

@@ -32,157 +32,157 @@
 use OCP\IMemcacheTTL;
 
 class Redis extends Cache implements IMemcacheTTL {
-	/**
-	 * @var \Redis|\RedisCluster $cache
-	 */
-	private static $cache = null;
-
-	public function __construct($prefix = '', string $logFile = '') {
-		parent::__construct($prefix);
-	}
-
-	/**
-	 * @return \Redis|\RedisCluster|null
-	 * @throws \Exception
-	 */
-	public function getCache() {
-		if (is_null(self::$cache)) {
-			self::$cache = \OC::$server->getGetRedisFactory()->getInstance();
-		}
-		return self::$cache;
-	}
-
-	public function get($key) {
-		$result = $this->getCache()->get($this->getPrefix() . $key);
-		if ($result === false && !$this->getCache()->exists($this->getPrefix() . $key)) {
-			return null;
-		} else {
-			return json_decode($result, true);
-		}
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if ($ttl > 0) {
-			return $this->getCache()->setex($this->getPrefix() . $key, $ttl, json_encode($value));
-		} else {
-			return $this->getCache()->set($this->getPrefix() . $key, json_encode($value));
-		}
-	}
-
-	public function hasKey($key) {
-		return (bool)$this->getCache()->exists($this->getPrefix() . $key);
-	}
-
-	public function remove($key) {
-		if ($this->getCache()->unlink($this->getPrefix() . $key)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public function clear($prefix = '') {
-		$prefix = $this->getPrefix() . $prefix . '*';
-		$keys = $this->getCache()->keys($prefix);
-		$deleted = $this->getCache()->del($keys);
-
-		return (is_array($keys) && (count($keys) === $deleted));
-	}
-
-	/**
-	 * 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) {
-		// don't encode ints for inc/dec
-		if (!is_int($value)) {
-			$value = json_encode($value);
-		}
-
-		$args = ['nx'];
-		if ($ttl !== 0 && is_int($ttl)) {
-			$args['ex'] = $ttl;
-		}
-
-		return $this->getCache()->set($this->getPrefix() . $key, (string)$value, $args);
-	}
-
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		return $this->getCache()->incrBy($this->getPrefix() . $key, $step);
-	}
-
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		if (!$this->hasKey($key)) {
-			return false;
-		}
-		return $this->getCache()->decrBy($this->getPrefix() . $key, $step);
-	}
-
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		if (!is_int($new)) {
-			$new = json_encode($new);
-		}
-		$this->getCache()->watch($this->getPrefix() . $key);
-		if ($this->get($key) === $old) {
-			$result = $this->getCache()->multi()
-				->set($this->getPrefix() . $key, $new)
-				->exec();
-			return $result !== false;
-		}
-		$this->getCache()->unwatch();
-		return false;
-	}
-
-	/**
-	 * Compare and delete
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @return bool
-	 */
-	public function cad($key, $old) {
-		$this->getCache()->watch($this->getPrefix() . $key);
-		if ($this->get($key) === $old) {
-			$result = $this->getCache()->multi()
-				->unlink($this->getPrefix() . $key)
-				->exec();
-			return $result !== false;
-		}
-		$this->getCache()->unwatch();
-		return false;
-	}
-
-	public function setTTL($key, $ttl) {
-		$this->getCache()->expire($this->getPrefix() . $key, $ttl);
-	}
-
-	public static function isAvailable(): bool {
-		return \OC::$server->getGetRedisFactory()->isAvailable();
-	}
+    /**
+     * @var \Redis|\RedisCluster $cache
+     */
+    private static $cache = null;
+
+    public function __construct($prefix = '', string $logFile = '') {
+        parent::__construct($prefix);
+    }
+
+    /**
+     * @return \Redis|\RedisCluster|null
+     * @throws \Exception
+     */
+    public function getCache() {
+        if (is_null(self::$cache)) {
+            self::$cache = \OC::$server->getGetRedisFactory()->getInstance();
+        }
+        return self::$cache;
+    }
+
+    public function get($key) {
+        $result = $this->getCache()->get($this->getPrefix() . $key);
+        if ($result === false && !$this->getCache()->exists($this->getPrefix() . $key)) {
+            return null;
+        } else {
+            return json_decode($result, true);
+        }
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if ($ttl > 0) {
+            return $this->getCache()->setex($this->getPrefix() . $key, $ttl, json_encode($value));
+        } else {
+            return $this->getCache()->set($this->getPrefix() . $key, json_encode($value));
+        }
+    }
+
+    public function hasKey($key) {
+        return (bool)$this->getCache()->exists($this->getPrefix() . $key);
+    }
+
+    public function remove($key) {
+        if ($this->getCache()->unlink($this->getPrefix() . $key)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function clear($prefix = '') {
+        $prefix = $this->getPrefix() . $prefix . '*';
+        $keys = $this->getCache()->keys($prefix);
+        $deleted = $this->getCache()->del($keys);
+
+        return (is_array($keys) && (count($keys) === $deleted));
+    }
+
+    /**
+     * 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) {
+        // don't encode ints for inc/dec
+        if (!is_int($value)) {
+            $value = json_encode($value);
+        }
+
+        $args = ['nx'];
+        if ($ttl !== 0 && is_int($ttl)) {
+            $args['ex'] = $ttl;
+        }
+
+        return $this->getCache()->set($this->getPrefix() . $key, (string)$value, $args);
+    }
+
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        return $this->getCache()->incrBy($this->getPrefix() . $key, $step);
+    }
+
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        if (!$this->hasKey($key)) {
+            return false;
+        }
+        return $this->getCache()->decrBy($this->getPrefix() . $key, $step);
+    }
+
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        if (!is_int($new)) {
+            $new = json_encode($new);
+        }
+        $this->getCache()->watch($this->getPrefix() . $key);
+        if ($this->get($key) === $old) {
+            $result = $this->getCache()->multi()
+                ->set($this->getPrefix() . $key, $new)
+                ->exec();
+            return $result !== false;
+        }
+        $this->getCache()->unwatch();
+        return false;
+    }
+
+    /**
+     * Compare and delete
+     *
+     * @param string $key
+     * @param mixed $old
+     * @return bool
+     */
+    public function cad($key, $old) {
+        $this->getCache()->watch($this->getPrefix() . $key);
+        if ($this->get($key) === $old) {
+            $result = $this->getCache()->multi()
+                ->unlink($this->getPrefix() . $key)
+                ->exec();
+            return $result !== false;
+        }
+        $this->getCache()->unwatch();
+        return false;
+    }
+
+    public function setTTL($key, $ttl) {
+        $this->getCache()->expire($this->getPrefix() . $key, $ttl);
+    }
+
+    public static function isAvailable(): bool {
+        return \OC::$server->getGetRedisFactory()->isAvailable();
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -53,8 +53,8 @@ 
 	}
 
 	public function get($key) {
-		$result = $this->getCache()->get($this->getPrefix() . $key);
-		if ($result === false && !$this->getCache()->exists($this->getPrefix() . $key)) {
+		$result = $this->getCache()->get($this->getPrefix().$key);
+		if ($result === false && !$this->getCache()->exists($this->getPrefix().$key)) {
 			return null;
 		} else {
 			return json_decode($result, true);
@@ -63,18 +63,18 @@ 
 
 	public function set($key, $value, $ttl = 0) {
 		if ($ttl > 0) {
-			return $this->getCache()->setex($this->getPrefix() . $key, $ttl, json_encode($value));
+			return $this->getCache()->setex($this->getPrefix().$key, $ttl, json_encode($value));
 		} else {
-			return $this->getCache()->set($this->getPrefix() . $key, json_encode($value));
+			return $this->getCache()->set($this->getPrefix().$key, json_encode($value));
 		}
 	}
 
 	public function hasKey($key) {
-		return (bool)$this->getCache()->exists($this->getPrefix() . $key);
+		return (bool) $this->getCache()->exists($this->getPrefix().$key);
 	}
 
 	public function remove($key) {
-		if ($this->getCache()->unlink($this->getPrefix() . $key)) {
+		if ($this->getCache()->unlink($this->getPrefix().$key)) {
 			return true;
 		} else {
 			return false;
@@ -82,7 +82,7 @@ 
 	}
 
 	public function clear($prefix = '') {
-		$prefix = $this->getPrefix() . $prefix . '*';
+		$prefix = $this->getPrefix().$prefix.'*';
 		$keys = $this->getCache()->keys($prefix);
 		$deleted = $this->getCache()->del($keys);
 
@@ -108,7 +108,7 @@ 
 			$args['ex'] = $ttl;
 		}
 
-		return $this->getCache()->set($this->getPrefix() . $key, (string)$value, $args);
+		return $this->getCache()->set($this->getPrefix().$key, (string) $value, $args);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	 * @return int | bool
 	 */
 	public function inc($key, $step = 1) {
-		return $this->getCache()->incrBy($this->getPrefix() . $key, $step);
+		return $this->getCache()->incrBy($this->getPrefix().$key, $step);
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 		if (!$this->hasKey($key)) {
 			return false;
 		}
-		return $this->getCache()->decrBy($this->getPrefix() . $key, $step);
+		return $this->getCache()->decrBy($this->getPrefix().$key, $step);
 	}
 
 	/**
@@ -148,10 +148,10 @@ 
 		if (!is_int($new)) {
 			$new = json_encode($new);
 		}
-		$this->getCache()->watch($this->getPrefix() . $key);
+		$this->getCache()->watch($this->getPrefix().$key);
 		if ($this->get($key) === $old) {
 			$result = $this->getCache()->multi()
-				->set($this->getPrefix() . $key, $new)
+				->set($this->getPrefix().$key, $new)
 				->exec();
 			return $result !== false;
 		}
@@ -167,10 +167,10 @@ 
 	 * @return bool
 	 */
 	public function cad($key, $old) {
-		$this->getCache()->watch($this->getPrefix() . $key);
+		$this->getCache()->watch($this->getPrefix().$key);
 		if ($this->get($key) === $old) {
 			$result = $this->getCache()->multi()
-				->unlink($this->getPrefix() . $key)
+				->unlink($this->getPrefix().$key)
 				->exec();
 			return $result !== false;
 		}
@@ -179,7 +179,7 @@ 
 	}
 
 	public function setTTL($key, $ttl) {
-		$this->getCache()->expire($this->getPrefix() . $key, $ttl);
+		$this->getCache()->expire($this->getPrefix().$key, $ttl);
 	}
 
 	public static function isAvailable(): bool {