diff options
| author | Simounet <contact@simounet.net> | 2021-05-27 13:04:48 +0200 |
|---|---|---|
| committer | szaimen (Rebase PR Action) <szaimen@e.mail.de> | 2021-09-23 08:37:51 +0000 |
| commit | f325a4ae60de112a8449faf33f62a916bbcdea28 (patch) | |
| tree | e75416b04140b98ae2f6842a68c448877ab5df2d /lib | |
| parent | 88858812c2c4bf74f41bea25037217b70d304f9f (diff) | |
| download | nextcloud-server-f325a4ae60de112a8449faf33f62a916bbcdea28.tar.gz nextcloud-server-f325a4ae60de112a8449faf33f62a916bbcdea28.zip | |
Fix Oracle query limit compliance in Comments
Signed-off-by: Simounet <contact@simounet.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Comments/Manager.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php index 64941f55453..ea8f6ea6da4 100644 --- a/lib/private/Comments/Manager.php +++ b/lib/private/Comments/Manager.php @@ -633,6 +633,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') @@ -642,7 +643,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') @@ -653,10 +654,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(); |