From fc8bd0be436fcc4fea795b7e324f5734243be0da Mon Sep 17 00:00:00 2001 From: Simounet Date: Thu, 27 May 2021 13:04:48 +0200 Subject: [PATCH] Fix Oracle query limit compliance in Comments Signed-off-by: Simounet --- lib/private/Comments/Manager.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 1cc82b5c2c..8cd8fc57b3 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -634,6 +634,7 @@ class Manager implements ICommentsManager { * @since 21.0.0 */ public function getNumberOfUnreadCommentsForObjects(string $objectType, array $objectIds, IUser $user, $verb = ''): array { + $unreadComments = []; $query = $this->dbConn->getQueryBuilder(); $query->select('c.object_id', $query->func()->count('c.id', 'num_comments')) ->from('comments', 'c') @@ -643,7 +644,7 @@ class Manager implements ICommentsManager { $query->expr()->eq('c.object_id', 'm.object_id') )) ->where($query->expr()->eq('c.object_type', $query->createNamedParameter($objectType))) - ->andWhere($query->expr()->in('c.object_id', $query->createNamedParameter($objectIds, IQueryBuilder::PARAM_STR_ARRAY))) + ->andWhere($query->expr()->in('c.object_id', $query->createParameter('ids'))) ->andWhere($query->expr()->orX( $query->expr()->gt('c.creation_timestamp', 'm.marker_datetime'), $query->expr()->isNull('m.marker_datetime') @@ -654,10 +655,14 @@ class Manager implements ICommentsManager { $query->andWhere($query->expr()->eq('c.verb', $query->createNamedParameter($verb))); } - $result = $query->execute(); - $unreadComments = array_fill_keys($objectIds, 0); - while ($row = $result->fetch()) { - $unreadComments[$row['object_id']] = (int) $row['num_comments']; + foreach (array_chunk($objectIds, 1000) as $chunk) { + $query->setParameter('ids', $chunk, IQueryBuilder::PARAM_INT_ARRAY); + $result = $query->execute(); + + $unreadComments += array_fill_keys($objectIds, 0); + while ($row = $result->fetch()) { + $unreadComments[$row['object_id']] = (int) $row['num_comments']; + } } $result->closeCursor();