From 8c2575aae2bbb36f34da8f030808c7e772b323e7 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 29 Jul 2013 10:22:44 -0400 Subject: [PATCH] Use query to calculate folder size --- lib/files/cache/cache.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index f605d72a6b3..bc8b07db1a0 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -503,19 +503,22 @@ class Cache { $entry = $this->get($path); if ($entry && $entry['mimetype'] === 'httpd/unix-directory') { $id = $entry['fileid']; - $sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `parent` = ? AND `storage` = ?'; + $sql = 'SELECT SUM(`size`), MIN(`size`) FROM `*PREFIX*filecache` '. + 'WHERE `parent` = ? AND `storage` = ?'; $result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId())); - while ($row = $result->fetchRow()) { - $size = (int)$row['size']; - if ($size === -1) { - $totalSize = -1; - break; + if ($row = $result->fetchRow()) { + list($sum, $min) = array_values($row); + $sum = (int)$sum; + $min = (int)$min; + if ($min === -1) { + $totalSize = $min; } else { - $totalSize += $size; + $totalSize = $sum; } - } - if ($entry['size'] !== $totalSize) { - $this->update($id, array('size' => $totalSize)); + if ($entry['size'] !== $totalSize) { + $this->update($id, array('size' => $totalSize)); + } + } } return $totalSize; -- 2.39.5