fixup! Add missing index

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Author: rullzer

apps/settings/lib/Controller/CheckSetupController.php

@@ -110,6 +110,8 @@ class CheckSetupController extends Controller {
 	private $iniGetWrapper;
 	/** @var IDBConnection */
 	private $connection;
+	/** @var OC\AppFramework\Maintenance\OptionalIndexManager */
+	private $indexManager;
 
 	public function __construct($AppName,
 								IRequest $request,
@@ -126,7 +128,8 @@ public function __construct($AppName,
 								MemoryInfo $memoryInfo,
 								ISecureRandom $secureRandom,
 								IniGetWrapper $iniGetWrapper,
-								IDBConnection $connection) {
+								IDBConnection $connection,
+								OC\AppFramework\Maintenance\OptionalIndexManager $indexManager) {
 		parent::__construct($AppName, $request);
 		$this->config = $config;
 		$this->clientService = $clientService;
@@ -142,6 +145,7 @@ public function __construct($AppName,
 		$this->secureRandom = $secureRandom;
 		$this->iniGetWrapper = $iniGetWrapper;
 		$this->connection = $connection;
+		$this->indexManager = $indexManager;
 	}
 
 	/**
@@ -466,6 +470,11 @@ protected function hasMissingIndexes(): array {
 		$event = new GenericEvent($indexInfo);
 		$this->dispatcher->dispatch(IDBConnection::CHECK_MISSING_INDEXES_EVENT, $event);
 
+		$indexes = $this->indexManager->getPending();
+		foreach ($indexes as $index) {
+			$indexInfo->addHintForMissingSubject($index->getTable(), $index->getName());
+		}
+
 		return $indexInfo->getListOfMissingIndexes();
 	}
 

core/Command/Db/AddMissingIndices.php

@@ -33,6 +33,7 @@
 
 namespace OC\Core\Command\Db;
 
+use OC\AppFramework\Maintenance\OptionalIndexManager;
 use OC\DB\Connection;
 use OC\DB\SchemaWrapper;
 use OCP\IDBConnection;
@@ -58,11 +59,17 @@ class AddMissingIndices extends Command {
 	/** @var EventDispatcherInterface */
 	private $dispatcher;
 
-	public function __construct(Connection $connection, EventDispatcherInterface $dispatcher) {
+	/** @var OptionalIndexManager */
+	private $indexManager;
+
+	public function __construct(Connection $connection,
+								EventDispatcherInterface $dispatcher,
+								OptionalIndexManager $indexManager) {
 		parent::__construct();
 
 		$this->connection = $connection;
 		$this->dispatcher = $dispatcher;
+		$this->indexManager = $indexManager;
 	}
 
 	protected function configure() {
@@ -77,9 +84,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		// Dispatch event so apps can also update indexes if needed
 		$event = new GenericEvent($output);
 		$this->dispatcher->dispatch(IDBConnection::ADD_MISSING_INDEXES_EVENT, $event);
+
+		$this->addOptionalIndexed($output);
+
 		return 0;
 	}
 
+	private function addOptionalIndexed(OutputInterface $output): void {
+		$indexes = $this->indexManager->getPending();
+
+		foreach ($indexes as $index) {
+			$output->writeln('<info>Adding additonal ' . $index->getName() . ' index to the ' . $index->getTable() . ' this can take some time..</info>');
+			$index->add();
+		}
+	}
+
 	/**
 	 * add missing indices to the share table
 	 *

lib/public/AppFramework/Maintenance/IOptionalIndex.php

@@ -38,6 +38,14 @@ interface IOptionalIndex {
 	 */
 	public function getName(): string;
 
+	/**
+	 * Get the name of the table this operates on
+	 *
+	 * @since 22.0.0
+	 * @return string
+	 */
+	public function getTable(): string;
+
 	/**
 	 * Does the optional index already exist
 	 *