summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSimounet <contact@simounet.net>2021-05-27 13:04:48 +0200
committerSimounet <contact@simounet.net>2021-05-28 08:48:01 +0200
commita50eba16adbee809ce69806ee5baee30707b8cca (patch)
tree6937e0470bcaa4d5a28668150e240878502ca695 /lib
parent54f8d48c620f7b7464a04597f8cd1bbe79795004 (diff)
downloadnextcloud-server-a50eba16adbee809ce69806ee5baee30707b8cca.tar.gz
nextcloud-server-a50eba16adbee809ce69806ee5baee30707b8cca.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.php15
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php
index 1cc82b5c2ce..8cd8fc57b3d 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();