From 376bae1e2d056512b8ac49be40af5499fe77c254 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Tue, 28 May 2013 10:09:57 +0200
Subject: [PATCH] Moved setCache method into StatsCacheClass

* Allow calling method via memcache wrapping call
* Make it available to all classes using StatsCache
---
 public/include/classes/statistics.class.php | 33 +++++++--------------
 public/include/classes/statscache.class.php | 13 ++++++++
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/public/include/classes/statistics.class.php b/public/include/classes/statistics.class.php
index a38fb14e..8b12391e 100644
--- a/public/include/classes/statistics.class.php
+++ b/public/include/classes/statistics.class.php
@@ -43,19 +43,6 @@ class Statistics {
     return true;
   }
 
-  /**
-   * Another wrapper, we want to store data in memcache and return the actual data
-   * for further processing
-   * @param key string Our memcache key
-   * @param data mixed Our data to store in Memcache
-   * @param expiration time Our expiration time, see Memcached documentation
-   * @return data mixed Return our stored data unchanged
-   **/
-  public function setCache($key, $data, $expiration=NULL) {
-    if ($this->config['memcache']['enabled']) $this->memcache->set($key, $data, $expiration);
-    return $data;
-  }
-
   /**
    * Get our last $limit blocks found
    * @param limit int Last limit blocks
@@ -71,7 +58,7 @@ class Statistics {
       ON b.account_id = a.id
       ORDER BY height DESC LIMIT ?");
     if ($this->checkStmt($stmt) && $stmt->bind_param("i", $limit) && $stmt->execute() && $result = $stmt->get_result())
-      return $this->setCache(__FUNCTION__ . $limit, $result->fetch_all(MYSQLI_ASSOC), 5);
+      return $this->memcache->setCache(__FUNCTION__ . $limit, $result->fetch_all(MYSQLI_ASSOC), 5);
     // Catchall
     $this->debug->append("Failed to find blocks:" . $this->mysqli->error);
     return false;
@@ -110,7 +97,7 @@ class Statistics {
         SELECT ROUND(COUNT(id) * POW(2, " . $this->config['difficulty'] . ")/600/1000) AS hashrate FROM " . $this->share->getArchiveTableName() . " WHERE time > DATE_SUB(now(), INTERVAL 10 MINUTE)
       ) AS sum");
     // Catchall
-    if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result() ) return $this->setCache(__FUNCTION__, $result->fetch_object()->hashrate);
+    if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result() ) return $this->memcache->setCache(__FUNCTION__, $result->fetch_object()->hashrate);
     $this->debug->append("Failed to get hashrate: " . $this->mysqli->error);
     return false;
   }
@@ -130,7 +117,7 @@ class Statistics {
         UNION ALL
         SELECT COUNT(id) AS sharerate FROM " . $this->share->getArchiveTableName() . " WHERE time > DATE_SUB(now(), INTERVAL 10 MINUTE)
       ) AS sum");
-    if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result() ) return $this->setCache(__FUNCTION__, $result->fetch_object()->sharerate);
+    if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result() ) return $this->memcache->setCache(__FUNCTION__, $result->fetch_object()->sharerate);
     // Catchall
     $this->debug->append("Failed to fetch share rate: " . $this->mysqli->error);
     return false;
@@ -155,7 +142,7 @@ class Statistics {
       WHERE UNIX_TIMESTAMP(time) >IFNULL((SELECT MAX(time) FROM blocks),0)
         AND our_result = 'N' ) as invalid");
     if ( $this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result() )
-      return $this->setCache(__FUNCTION__, $result->fetch_assoc());
+      return $this->memcache->setCache(__FUNCTION__, $result->fetch_assoc());
     // Catchall
     $this->debug->append("Failed to fetch round shares: " . $this->mysqli->error);
     return false;
@@ -190,7 +177,7 @@ class Statistics {
           AND u.id = ?
       ) AS invalid"); 
     if ($stmt && $stmt->bind_param("ii", $account_id, $account_id) && $stmt->execute() && $result = $stmt->get_result())
-      return $this->setCache(__FUNCTION__ . $account_id, $result->fetch_assoc());
+      return $this->memcache->setCache(__FUNCTION__ . $account_id, $result->fetch_assoc());
     // Catchall
     $this->debug->append("Unable to fetch user round shares: " . $this->mysqli->error);
     return false;
@@ -211,7 +198,7 @@ class Statistics {
         AND s.time > DATE_SUB(now(), INTERVAL 10 MINUTE)
         AND u.id = ?");
     if ($this->checkStmt($stmt) && $stmt->bind_param("i", $account_id) && $stmt->execute() && $result = $stmt->get_result() )
-      return $this->setCache(__FUNCTION__ . $account_id, $result->fetch_object()->hashrate);
+      return $this->memcache->setCache(__FUNCTION__ . $account_id, $result->fetch_object()->hashrate);
     // Catchall
     $this->debug->append("Failed to fetch hashrate: " . $this->mysqli->error);
     return false;
@@ -233,7 +220,7 @@ class Statistics {
         AND s.time > DATE_SUB(now(), INTERVAL 10 MINUTE)
         AND u.id = ?");
     if ($this->checkStmt($stmt) && $stmt->bind_param("i", $account_id) && $stmt->execute() && $result = $stmt->get_result() )
-      return $this->setCache(__FUNCTION__ . $worker_id, $result->fetch_object()->hashrate);
+      return $this->memcache->setCache(__FUNCTION__ . $worker_id, $result->fetch_object()->hashrate);
     // Catchall
     $this->debug->append("Failed to fetch hashrate: " . $this->mysqli->error);
     return false;
@@ -259,7 +246,7 @@ class Statistics {
         ORDER BY shares DESC
         LIMIT ?");
       if ($this->checkStmt($stmt) && $stmt->bind_param("i", $limit) && $stmt->execute() && $result = $stmt->get_result())
-        return $this->setCache(__FUNCTION__ . $type . $limit, $result->fetch_all(MYSQLI_ASSOC));
+        return $this->memcache->setCache(__FUNCTION__ . $type . $limit, $result->fetch_all(MYSQLI_ASSOC));
       $this->debug->append("Fetching shares failed: ");
       return false;
       break;
@@ -274,7 +261,7 @@ class Statistics {
         GROUP BY account
         ORDER BY hashrate DESC LIMIT ?");
       if ($this->checkStmt($stmt) && $stmt->bind_param("i", $limit) && $stmt->execute() && $result = $stmt->get_result())
-        return $this->setCache(__FUNCTION__ . $type . $limit, $result->fetch_all(MYSQLI_ASSOC));
+        return $this->memcache->setCache(__FUNCTION__ . $type . $limit, $result->fetch_all(MYSQLI_ASSOC));
       $this->debug->append("Fetching shares failed: ");
       return false;
       break;
@@ -309,7 +296,7 @@ class Statistics {
           AND a.id = ?
           GROUP BY HOUR(time)");
     if ($this->checkStmt($stmt) && $stmt->bind_param("ii", $account_id, $account_id) && $stmt->execute() && $result = $stmt->get_result())
-      return $this->setCache(__FUNCTION__ . $account_id, $result->fetch_all(MYSQLI_ASSOC), 3600);
+      return $this->memcache->setCache(__FUNCTION__ . $account_id, $result->fetch_all(MYSQLI_ASSOC), 3600);
     // Catchall
     $this->debug->append("Failed to fetch hourly hashrate: " . $this->mysqli->error);
     return false;
diff --git a/public/include/classes/statscache.class.php b/public/include/classes/statscache.class.php
index b6884d61..e84386da 100644
--- a/public/include/classes/statscache.class.php
+++ b/public/include/classes/statscache.class.php
@@ -43,6 +43,19 @@ class StatsCache extends Memcached {
       $this->debug->append("Key not found", 3);
     }
   }
+  /**
+   * Another wrapper, we want to store data in memcache and return the actual data
+   * for further processing
+   * @param key string Our memcache key
+   * @param data mixed Our data to store in Memcache
+   * @param expiration time Our expiration time, see Memcached documentation
+   * @return data mixed Return our stored data unchanged
+   **/
+  public function setCache($key, $data, $expiration=NULL) {
+    if ($this->config['memcache']['enabled']) $this->set($key, $data, $expiration);
+    return $data;
+  }
+
 }
 
 $memcache = new StatsCache($config, $debug);