Merge pull request #4539 from nextcloud/bugfix/noid/prevent-delete-deadlock

Author: juliusknorr

lib/Db/SessionMapper.php

@@ -111,8 +111,13 @@ public function deleteInactiveWithoutSteps(?int $documentId = null): int {
 		}
 
 		$qb = $this->db->getQueryBuilder();
-		$qb->delete($this->getTableName())
-			->where($qb->expr()->in('id', $qb->createFunction($selectSubQuery->getSQL())));
+		$qb->delete($this->getTableName());
+		if ($documentId !== null) {
+			$qb->where($selectSubQuery->expr()->eq('document_id', $selectSubQuery->createParameter('documentId')));
+			$qb->andWhere($qb->expr()->in('id', $qb->createFunction($selectSubQuery->getSQL())));
+		} else {
+			$qb->where($qb->expr()->in('id', $qb->createFunction($selectSubQuery->getSQL())));
+		}
 		$qb->setParameters([
 			'lastContact' => time() - SessionService::SESSION_VALID_TIME,
 			'documentId' => $documentId,