Close cursor early in calculateFolderSize

This method triggers additional queries in $this->update() so to avoid potential database locks or delays, we close the cursor as soon as it is not needed any more
owncloud · Jan 29, 2015 · 234f33e · 234f33e
1 parent 80560e7
commit 234f33e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
@@ -540,6 +540,7 @@ public function calculateFolderSize($path, $entry = null) {
 				'WHERE `parent` = ? AND `storage` = ?';
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 			if ($row = $result->fetchRow()) {
+				$result->closeCursor();
 				list($sum, $min, $unencryptedSum) = array_values($row);
 				$sum = 0 + $sum;
 				$min = 0 + $min;
@@ -562,6 +563,8 @@ public function calculateFolderSize($path, $entry = null) {
 				if ($totalSize !== -1 and $unencryptedSum > 0) {
 					$totalSize = $unencryptedSum;
 				}
+			} else {
+				$result->closeCursor();
 			}
 		}
 		return $totalSize;

diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php
@@ -35,6 +35,7 @@ public function calculateFolderSize($path, $entry = null) {
 				'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 			if ($row = $result->fetchRow()) {
+				$result->closeCursor();
 				list($sum, $unencryptedSum) = array_values($row);
 				$totalSize = 0 + $sum;
 				$unencryptedSize = 0 + $unencryptedSum;