Merge pull request #1322 from nextcloud/fix/repair-duplicate-face-detections

fix: Repair duplicate face detections

Author: marcelklehr

appinfo/info.xml

@@ -101,8 +101,10 @@ The app does not send any sensitive data to cloud providers or similar services.
 	<repair-steps>
 		<post-migration>
 			<step>OCA\Recognize\Migration\InstallDeps</step>
-			<step>OCA\Recognize\Migration\RemoveDuplicateFaceDetections</step>
 		</post-migration>
+		<live-migration>
+			<step>OCA\Recognize\Migration\RemoveDuplicateFaceDetections</step>
+		</live-migration>
 		<install>
 			<step>OCA\Recognize\Migration\InstallDeps</step>
 		</install>

lib/Migration/RemoveDuplicateFaceDetections.php

@@ -44,13 +44,21 @@ public function getName(): string {
 	public function run(IOutput $output): void {
 		try {
 			$subQuery = $this->db->getQueryBuilder();
-			$subQuery->select($subQuery->func()->min('id'))
+			$subQuery->selectAlias($subQuery->func()->min('id'), 'id')
 				->from('recognize_face_detections')
 				->groupBy('file_id', 'user_id', 'x', 'y', 'height', 'width');
 
+			if ($this->db->getDatabaseProvider() === IDBConnection::PLATFORM_MYSQL) {
+				$secondSubQuery = $this->db->getQueryBuilder();
+				$secondSubQuery->select('id')->from($secondSubQuery->createFunction('(' . $subQuery->getSQL() .')'), 'x');
+				$sql = $secondSubQuery->getSQL();
+			} else {
+				$sql = $subQuery->getSQL();
+			}
+
 			$qb = $this->db->getQueryBuilder();
 			$qb->delete('recognize_face_detections')
-				->where($qb->expr()->notIn('id', $qb->createFunction('(' . $subQuery->getSQL() .')')));
+				->where($qb->expr()->notIn('id', $qb->createFunction('(' . $sql .')')));
 
 			$qb->executeStatement();
 		} catch (\Throwable $e) {

tests/RemoveDuplicateFaceDetectionsTest.php

@@ -22,11 +22,8 @@ public function setUp(): void {
 		$qb = $this->db->getQueryBuilder();
 		$qb->delete('recognize_face_detections')->executeStatement();
 
-		// Generate 11 face detections per file (1000 files per user; 100 users)
-		// = 1.100.000 face detections out of which 900.000 are superfluous duplicates to be removed
-		// After the repair step there should be 200.000 left
-		for ($k = 0; $k < 100; $k++) {
-			for ($j = 0; $j < 1000; $j++) {
+		for ($k = 0; $k < 10; $k++) {
+			for ($j = 0; $j < 10; $j++) {
 				$user = 'user' . $k;
 				$x = rand(0, 100) / 100;
 				$y = rand(0, 100) / 100;
@@ -66,14 +63,14 @@ public function testRepairStep() : void {
 		// Check
 		$qb = $this->db->getQueryBuilder();
 		$count = $qb->select($qb->func()->count('*'))->from('recognize_face_detections')->executeQuery()->fetchOne();
-		$this->assertEquals(1100000, (int)$count);
+		$this->assertEquals(10 * 10 * 11, (int)$count); // 1100
 
 		// Run
 		$repairStep->run($output);
 
 		// Assert
 		$qb = $this->db->getQueryBuilder();
 		$count = $qb->select($qb->func()->count('*'))->from('recognize_face_detections')->executeQuery()->fetchOne();
-		$this->assertEquals(200000, (int)$count);
+		$this->assertEquals(10 * 10 * 11 - 10 * 10 * 9, (int)$count); // 200
 	}
 }