Skip to content

Commit

Permalink
Merge pull request #27203 from nextcloud/backport/27187/stable21
Browse files Browse the repository at this point in the history
[stable21] Fix Oracle query limit compliance in Comments
  • Loading branch information
blizzz authored Sep 27, 2021
2 parents 4009b3c + 1297b04 commit 62a5d27
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions lib/private/Comments/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ public function getNumberOfCommentsForObject($objectType, $objectId, \DateTime $
* @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')
Expand All @@ -642,7 +643,7 @@ public function getNumberOfUnreadCommentsForObjects(string $objectType, array $o
$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')
Expand All @@ -653,12 +654,16 @@ public function getNumberOfUnreadCommentsForObjects(string $objectType, array $o
$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();
while ($row = $result->fetch()) {
$unreadComments[$row['object_id']] = (int) $row['num_comments'];
}
$result->closeCursor();
}
$result->closeCursor();

return $unreadComments;
}
Expand Down

0 comments on commit 62a5d27

Please sign in to comment.