Skip to content

[stable21] Fix Oracle query limit compliance in Comments #27203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Sep 27, 2021
Merged

[stable21] Fix Oracle query limit compliance in Comments #27203

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f325a4a
Fix Oracle query limit compliance in Comments
Simounet May 27, 2021
8e7eea9
Fix populating the array and closing the cursors
nickvergessen Jun 1, 2021
1297b04
Use legacy execute method
artonge Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix Oracle query limit compliance in Comments 
Signed-off-by: Simounet <[email protected]>
  • Loading branch information
@Simounet @szaimen
Simounet authored and szaimen committed Sep 23, 2021
commit f325a4ae60de112a8449faf33f62a916bbcdea28
15 changes: 10 additions & 5 deletions lib/private/Comments/Manager.php
View file
Open in desktop
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,10 +654,14 @@ 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();

$unreadComments += array_fill_keys($objectIds, 0);
Copy link
Member

@nickvergessen nickvergessen May 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this uses $objectIds instead of $chunk it would have been enough to do it once before the loop even starts?

Copy link
Member

@Simounet Simounet May 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. Do you want me to make a new PR?

Copy link
Member

@nickvergessen nickvergessen May 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can fix it here and do a new PR for master only

Copy link
Member

@Simounet Simounet Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, let me know if I can do anything.

Copy link
Member

@nickvergessen nickvergessen Jun 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed it, master PR in #27316

while ($row = $result->fetch()) {
$unreadComments[$row['object_id']] = (int) $row['num_comments'];
}
}
$result->closeCursor();

Expand Down