#184: Fix ttl for xFetch algo

arthurkushman · arthurkushman · commit 4e309fd84e40 · 2019-10-19T09:27:26.000+02:00
diff --git a/src/Extension/CacheTrait.php b/src/Extension/CacheTrait.php
@@ -94,7 +94,7 @@ private function getXFetched(Request $request, SqlOptions $sqlOptions)
         $hashKey   = $this->getKeyHash($request);
         $delta     = Redis::get($this->getDeltaKey($hashKey));
         $ttl       = $this->configOptions->getCacheTtl();
-        $recompute = $this->xFetch((float)$delta, $ttl);
+        $recompute = $this->xFetch((float)$delta, Redis::ttl($hashKey));
         if ($delta === null || $recompute === true) {
             return $this->recompute($sqlOptions, $hashKey, $ttl);
         }

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private function getXFetched(Request $request, SqlOptions $sqlOptions)`
`94`	`94`	`$hashKey = $this->getKeyHash($request);`
`95`	`95`	`$delta = Redis::get($this->getDeltaKey($hashKey));`
`96`	`96`	`$ttl = $this->configOptions->getCacheTtl();`
`97`		`- $recompute = $this->xFetch((float)$delta, $ttl);`
	`97`	`+ $recompute = $this->xFetch((float)$delta, Redis::ttl($hashKey));`
`98`	`98`	`if ($delta === null \|\| $recompute === true) {`
`99`	`99`	`return $this->recompute($sqlOptions, $hashKey, $ttl);`
`100`	`100`	`}`