From a349e1e060b00f9ef089a374dfc63128c537826d Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 18 Sep 2013 11:38:51 +0200
Subject: [PATCH] use archive table for sharerate calcs

---
 public/include/classes/statistics.class.php | 47 +++++++++++++++------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/public/include/classes/statistics.class.php b/public/include/classes/statistics.class.php
index fe7436a7..39ae1562 100644
--- a/public/include/classes/statistics.class.php
+++ b/public/include/classes/statistics.class.php
@@ -126,14 +126,24 @@ class Statistics {
    * @param none
    * @return data object Our share rate in shares per second
    **/
-  public function getCurrentShareRate() {
+  public function getCurrentShareRate($interval=600) {
     $this->debug->append("STA " . __METHOD__, 4);
     if ($data = $this->memcache->get(__FUNCTION__)) return $data;
     $stmt = $this->mysqli->prepare("
-      SELECT ROUND(COUNT(id) / 600, 2) AS sharerate
-      FROM " . $this->share->getTableName() . "
-      WHERE time > DATE_SUB(now(), INTERVAL 10 MINUTE)");
-    if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result() ) return $this->memcache->setCache(__FUNCTION__, $result->fetch_object()->sharerate);
+      SELECT
+      (
+        (
+          SELECT ROUND(COUNT(id) / ?, 2) AS sharerate
+          FROM " . $this->share->getTableName() . "
+          WHERE time > DATE_SUB(now(), INTERVAL ? SECOND)
+        ) + (
+          SELECT ROUND(COUNT(id) / ?, 2) AS sharerate
+          FROM " . $this->share->getArchiveTableName() . "
+          WHERE time > DATE_SUB(now(), INTERVAL ? SECOND)
+        )
+      ) AS sharerate
+      FROM DUAL");
+    if ($this->checkStmt($stmt) && $stmt->bind_param('iiii', $interval, $interval, $interval, $interval) && $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;
@@ -319,13 +329,26 @@ class Statistics {
     $this->debug->append("STA " . __METHOD__, 4);
     if ($data = $this->memcache->get(__FUNCTION__ . $account_id)) return $data;
     $stmt = $this->mysqli->prepare("
-      SELECT COUNT(s.id)/600 AS sharerate
-      FROM " . $this->share->getTableName() . " AS s,
-           " . $this->user->getTableName() . " AS u
-      WHERE u.username = SUBSTRING_INDEX( s.username, '.', 1 )
-        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() )
+      SELECT
+      (
+        (
+          SELECT COUNT(s.id) / ? AS sharerate
+          FROM " . $this->share->getTableName() . " AS s,
+               " . $this->user->getTableName() . " AS u
+          WHERE u.username = SUBSTRING_INDEX( s.username, '.', 1 )
+            AND s.time > DATE_SUB(now(), INTERVAL ? SECOND)
+            AND u.id = ?
+        ) + (
+          SELECT COUNT(s.id) / ? AS sharerate
+          FROM " . $this->share->getArchiveTableName() . " AS s,
+               " . $this->user->getTableName() . " AS u
+          WHERE u.username = SUBSTRING_INDEX( s.username, '.', 1 )
+            AND s.time > DATE_SUB(now(), INTERVAL ? SECOND)
+            AND u.id = ?
+        )
+      ) AS sharerate
+      FROM DUAL");
+    if ($this->checkStmt($stmt) && $stmt->bind_param("iiiiii", $interval, $interval, $account_id, $interval, $interval, $account_id) && $stmt->execute() && $result = $stmt->get_result() )
       return $this->memcache->setCache(__FUNCTION__ . $account_id, $result->fetch_object()->sharerate);
     // Catchall
     $this->debug->append("Failed to fetch sharerate: " . $this->mysqli->error);