From c1fa6aec41cbcf0a3008f25b4b4a1966bb32a6d9 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Thu, 27 Jun 2019 18:21:42 +0200 Subject: [PATCH] Rename `$batchCount` to `$loopCount` --- .../files/lib/data/AbstractDatabaseObjectAction.class.php | 6 +++--- .../install/files/lib/data/DatabaseObjectEditor.class.php | 4 ++-- .../files/lib/system/edit/EditHistoryManager.class.php | 4 ++-- .../system/search/mysql/MysqlSearchIndexManager.class.php | 4 ++-- .../user/activity/event/UserActivityEventHandler.class.php | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php index b3ad8863a0..99f32de225 100644 --- a/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php +++ b/wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php @@ -368,7 +368,7 @@ abstract class AbstractDatabaseObjectAction implements IDatabaseObjectAction, ID // instead of executing one query per object id, execute queries // for batches of up to 1000 object ids at once $itemsPerLoop = 1000; - $batchCount = ceil(count($this->objectIDs) / $itemsPerLoop); + $loopCount = ceil(count($this->objectIDs) / $itemsPerLoop); if (!empty($this->parameters['data'])) { $updateSQL = ''; @@ -380,7 +380,7 @@ abstract class AbstractDatabaseObjectAction implements IDatabaseObjectAction, ID } WCF::getDB()->beginTransaction(); - for ($i = 0; $i < $batchCount; $i++) { + for ($i = 0; $i < $loopCount; $i++) { $batchObjectIDs = array_slice($this->objectIDs, $i * $itemsPerLoop, $itemsPerLoop); $sql = "UPDATE " . $tableName . " @@ -402,7 +402,7 @@ abstract class AbstractDatabaseObjectAction implements IDatabaseObjectAction, ID } WCF::getDB()->beginTransaction(); - for ($i = 0; $i < $batchCount; $i++) { + for ($i = 0; $i < $loopCount; $i++) { $batchObjectIDs = array_slice($this->objectIDs, $i * $itemsPerLoop, $itemsPerLoop); $sql = "UPDATE " . $tableName . " diff --git a/wcfsetup/install/files/lib/data/DatabaseObjectEditor.class.php b/wcfsetup/install/files/lib/data/DatabaseObjectEditor.class.php index 1dfa9c0ef6..f85108cf43 100644 --- a/wcfsetup/install/files/lib/data/DatabaseObjectEditor.class.php +++ b/wcfsetup/install/files/lib/data/DatabaseObjectEditor.class.php @@ -105,10 +105,10 @@ abstract class DatabaseObjectEditor extends DatabaseObjectDecorator implements I // instead of executing one query per object id, execute queries // for batches of up to 1000 object ids at once $itemsPerLoop = 1000; - $batchCount = ceil(count($objectIDs) / $itemsPerLoop); + $loopCount = ceil(count($objectIDs) / $itemsPerLoop); WCF::getDB()->beginTransaction(); - for ($i = 0; $i < $batchCount; $i++) { + for ($i = 0; $i < $loopCount; $i++) { $batchObjectIDs = array_slice($objectIDs, $i * $itemsPerLoop, $itemsPerLoop); $sql = "DELETE FROM " . static::getDatabaseTableName() . " diff --git a/wcfsetup/install/files/lib/system/edit/EditHistoryManager.class.php b/wcfsetup/install/files/lib/system/edit/EditHistoryManager.class.php index 663881a3e4..9206348026 100644 --- a/wcfsetup/install/files/lib/system/edit/EditHistoryManager.class.php +++ b/wcfsetup/install/files/lib/system/edit/EditHistoryManager.class.php @@ -80,10 +80,10 @@ class EditHistoryManager extends SingletonFactory { // instead of executing one query per object id, execute queries // for batches of up to 1000 object ids at once $itemsPerLoop = 1000; - $batchCount = ceil(count($objectIDs) / $itemsPerLoop); + $loopCount = ceil(count($objectIDs) / $itemsPerLoop); WCF::getDB()->beginTransaction(); - for ($i = 0; $i < $batchCount; $i++) { + for ($i = 0; $i < $loopCount; $i++) { $batchObjectIDs = array_slice($objectIDs, $i * $itemsPerLoop, $itemsPerLoop); $sql = "DELETE FROM wcf".WCF_N."_edit_history_entry diff --git a/wcfsetup/install/files/lib/system/search/mysql/MysqlSearchIndexManager.class.php b/wcfsetup/install/files/lib/system/search/mysql/MysqlSearchIndexManager.class.php index b160a89c42..4bad6d155d 100644 --- a/wcfsetup/install/files/lib/system/search/mysql/MysqlSearchIndexManager.class.php +++ b/wcfsetup/install/files/lib/system/search/mysql/MysqlSearchIndexManager.class.php @@ -47,11 +47,11 @@ class MysqlSearchIndexManager extends AbstractSearchIndexManager { // instead of executing one query per object id, execute queries // for batches of up to 1000 object ids at once $itemsPerLoop = 1000; - $batchCount = ceil(count($objectIDs) / $itemsPerLoop); + $loopCount = ceil(count($objectIDs) / $itemsPerLoop); $tableName = SearchIndexManager::getTableName($objectType); WCF::getDB()->beginTransaction(); - for ($i = 0; $i < $batchCount; $i++) { + for ($i = 0; $i < $loopCount; $i++) { $batchObjectIDs = array_slice($objectIDs, $i * $itemsPerLoop, $itemsPerLoop); $sql = "DELETE FROM " . $tableName . " diff --git a/wcfsetup/install/files/lib/system/user/activity/event/UserActivityEventHandler.class.php b/wcfsetup/install/files/lib/system/user/activity/event/UserActivityEventHandler.class.php index 906a907ce3..8f46089edb 100644 --- a/wcfsetup/install/files/lib/system/user/activity/event/UserActivityEventHandler.class.php +++ b/wcfsetup/install/files/lib/system/user/activity/event/UserActivityEventHandler.class.php @@ -115,10 +115,10 @@ class UserActivityEventHandler extends SingletonFactory { } $itemsPerLoop = 1000; - $batchCount = ceil(count($eventData) / $itemsPerLoop); + $loopCount = ceil(count($eventData) / $itemsPerLoop); WCF::getDB()->beginTransaction(); - for ($i = 0; $i < $batchCount; $i++) { + for ($i = 0; $i < $loopCount; $i++) { $batchEventData = array_slice($eventData, $i * $itemsPerLoop, $itemsPerLoop); $parameters = []; -- 2.20.1