From 31328433a88c921b6a9afe43a788d6fa261b8cf6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 27 Aug 2021 11:46:00 +0200 Subject: [PATCH] Remove SearchEngineConvertInnoDbWorker --- com.woltlab.wcf/fileDelete.xml | 1 + com.woltlab.wcf/objectType.xml | 11 +- .../SearchEngineConvertInnoDbWorker.class.php | 106 ------------------ 3 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 wcfsetup/install/files/lib/system/worker/SearchEngineConvertInnoDbWorker.class.php diff --git a/com.woltlab.wcf/fileDelete.xml b/com.woltlab.wcf/fileDelete.xml index 28d4ebf404..39e62ef1e8 100644 --- a/com.woltlab.wcf/fileDelete.xml +++ b/com.woltlab.wcf/fileDelete.xml @@ -1884,6 +1884,7 @@ lib/system/user/online/location/UserLocation.class.php lib/system/version/VersionHandler.class.php lib/system/worker/DatabaseConvertEncodingWorker.class.php + lib/system/worker/SearchEngineConvertInnoDbWorker.class.php lib/system/worker/UserActivityPointUpdateCacheWorker.class.php lib/system/worker/UserRankUpdateWorker.class.php lib/util/BasicFileUtil.class.php diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml index 9038daf045..eec0869dbc 100644 --- a/com.woltlab.wcf/objectType.xml +++ b/com.woltlab.wcf/objectType.xml @@ -509,12 +509,6 @@ - - com.woltlab.wcf.searchEngineConvertInnoDb - com.woltlab.wcf.rebuildData - wcf\system\worker\SearchEngineConvertInnoDbWorker - -200 - com.woltlab.wcf.like com.woltlab.wcf.rebuildData @@ -1803,4 +1797,9 @@ + + + com.woltlab.wcf.rebuildData + + diff --git a/wcfsetup/install/files/lib/system/worker/SearchEngineConvertInnoDbWorker.class.php b/wcfsetup/install/files/lib/system/worker/SearchEngineConvertInnoDbWorker.class.php deleted file mode 100644 index d3050da5c3..0000000000 --- a/wcfsetup/install/files/lib/system/worker/SearchEngineConvertInnoDbWorker.class.php +++ /dev/null @@ -1,106 +0,0 @@ - - * @package WoltLabSuite\Core\System\Worker - * @since 5.4 - */ -class SearchEngineConvertInnoDbWorker extends AbstractRebuildDataWorker -{ - /** - * @inheritDoc - */ - protected $limit = 1; - - /** - * @inheritDoc - */ - public function initObjectList() - { - // This rebuild worker has no database object list and - // therefore, we do nothing in this method and overwrite - // the parent method so no exception is thrown. - } - - /** - * @inheritDoc - */ - public function countObjects() - { - if ($this->count === null) { - $this->count = \count($this->getTables()); - } - } - - /** - * @inheritDoc - */ - public function getProceedURL() - { - return LinkHandler::getInstance()->getLink('RebuildData'); - } - - /** - * @inheritDoc - */ - public function validate() - { - WCF::getSession()->checkPermissions(['admin.management.canRebuildData']); - } - - /** - * @inheritDoc - */ - public function execute() - { - $tables = $this->getTables(); - - $sql = "SELECT LOWER(ENGINE) - FROM INFORMATION_SCHEMA.TABLES - WHERE TABLE_NAME = ? - AND TABLE_SCHEMA = ?"; - $checkStatement = WCF::getDB()->prepareStatement($sql); - - $convertTables = \array_slice($tables, $this->limit * $this->loopCount, $this->limit); - foreach ($convertTables as $table) { - $checkStatement->execute([ - $table, - WCF::getDB()->getDatabaseName(), - ]); - - $engine = $checkStatement->fetchSingleColumn(); - if ($engine !== false && $engine !== 'innodb') { - $sql = "ALTER TABLE " . $table . " ENGINE = InnoDB"; - $statement = WCF::getDB()->prepareStatement($sql); - $statement->execute(); - } - } - } - - /** - * Returns the list of known database tables. - * - * @return string[] - */ - protected function getTables() - { - $objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.searchableObjectType'); - $tableNames = []; - foreach ($objectTypes as $objectType) { - $tableNames[] = SearchIndexManager::getTableName($objectType->objectType); - } - - return $tableNames; - } -} -- 2.20.1