fixup! fix(db): also chunk MariaDB deletes

nextcloud · Sep 12, 2023 · 21b5fe6 · 21b5fe6
1 parent e613bbe
commit 21b5fe6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -59,6 +59,7 @@
 use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
+use Psr\Log\LoggerInterface;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'activity';
@@ -110,7 +111,8 @@ public function register(IRegistrationContext $context): void {
 		$context->registerService(Data::class, function (ContainerInterface $c) {
 			return new Data(
 				$c->get(IManager::class),
-				$c->get('ActivityConnectionAdapter')
+				$c->get('ActivityConnectionAdapter'),
+				$c->get(LoggerInterface::class),
 			);
 		});
 

diff --git a/lib/Data.php b/lib/Data.php
@@ -480,8 +480,8 @@ public function getActivitySince(string $user, int $since, bool $byOthers) {
 	 * @return void
 	 */
 	private function deleteActivitiesForMySQL(array $conditions): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('activity_id')
+		$subQuery = $this->connection->getQueryBuilder();
+		$subQuery->select('activity_id')
 			->from('activity');
 
 		foreach ($conditions as $column => $comparison) {
@@ -492,11 +492,11 @@ private function deleteActivitiesForMySQL(array $conditions): void {
 				$operation = '=';
 				$value = $comparison;
 			}
-			$query->where($query->expr()->comparison($column, $operation, $query->createNamedParameter($value)));
+			$subQuery->where($subQuery->expr()->comparison($column, $operation, $subQuery->createNamedParameter($value)));
 		}
 
-		$query->setMaxResults(10000);
-		$result = $query->executeQuery();
+		$subQuery->setMaxResults(10000);
+		$result = $subQuery->executeQuery();
 		$count = $result->rowCount();
 		if($count === 0) {
 			return;