Skip to content

Group DB queries on pushing multiple notifications until we flush() #1161

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
nickvergessen merged 4 commits into from
Mar 15, 2022
Merged

Group DB queries on pushing multiple notifications until we flush() #1161

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d1394b
Only load the user status once per user
nickvergessen Feb 28, 2022
b8ccba1
Only query the devices of a user once
nickvergessen Feb 28, 2022
61fc126
Defer preparing of payloads when we don't push anyway
nickvergessen Feb 28, 2022
7024894
Preload devices and statuses with a single query in case of flushing
nickvergessen Feb 28, 2022
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
120 changes: 113 additions & 7 deletions lib/Push.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,24 @@ class Push {
protected $output;
/** @var array */
protected $payloadsToSend = [];

/** @var bool */
protected $deferPreparing = false;
/** @var bool */
protected $deferPayloads = false;
/** @var array[] */
protected $deletesToPush = [];
/** @var INotification[] */
protected $notificationsToPush = [];

/** @var null[]|IUserStatus[] */
protected $userStatuses = [];
/** @var array[] */
protected $userDevices = [];
/** @var string[] */
protected $loadDevicesForUsers = [];
/** @var string[] */
protected $loadStatusForUsers = [];

public function __construct(IDBConnection $connection,
INotificationManager $notificationManager,
Expand Down Expand Up @@ -112,10 +128,47 @@ public function isDeferring(): bool {
}

public function deferPayloads(): void {
$this->deferPreparing = true;
$this->deferPayloads = true;
}

public function flushPayloads(): void {
$this->deferPreparing = false;

if (!empty($this->loadDevicesForUsers)) {
$this->loadDevicesForUsers = array_unique($this->loadDevicesForUsers);
$missingDevicesFor = array_diff($this->loadDevicesForUsers, array_keys($this->userDevices));
$newUserDevices = $this->getDevicesForUsers($missingDevicesFor);
foreach ($missingDevicesFor as $userId) {
$this->userDevices[$userId] = $newUserDevices[$userId] ?? [];
}
$this->loadDevicesForUsers = [];
}

if (!empty($this->loadStatusForUsers)) {
$this->loadStatusForUsers = array_unique($this->loadStatusForUsers);
$missingStatusFor = array_diff($this->loadStatusForUsers, array_keys($this->userStatuses));
$newUserStatuses = $this->userStatusManager->getUserStatuses($missingStatusFor);
foreach ($missingStatusFor as $userId) {
$this->userStatuses[$userId] = $newUserStatuses[$userId] ?? null;
}
$this->loadStatusForUsers = [];
}

if (!empty($this->notificationsToPush)) {
foreach ($this->notificationsToPush as $id => $notification) {
$this->pushToDevice($id, $notification);
}
$this->notificationsToPush = [];
}

if (!empty($this->deletesToPush)) {
foreach ($this->deletesToPush as $id => $data) {
$this->pushDeleteToDevice($data['userId'], $id, $data['app']);
}
$this->deletesToPush = [];
}

$this->deferPayloads = false;
$this->sendNotificationsToProxies();
}
Expand Down Expand Up @@ -154,21 +207,38 @@ public function pushToDevice(int $id, INotification $notification, ?OutputInterf
return;
}

if ($this->deferPreparing) {
$this->notificationsToPush[$id] = clone $notification;
$this->loadDevicesForUsers[] = $notification->getUser();
$this->loadStatusForUsers[] = $notification->getUser();
return;
}

$user = $this->createFakeUserObject($notification->getUser());

$userStatus = $this->userStatusManager->getUserStatuses([
$notification->getUser(),
]);
if (!array_key_exists($notification->getUser(), $this->userStatuses)) {
$userStatus = $this->userStatusManager->getUserStatuses([
$notification->getUser(),
]);

if (isset($userStatus[$notification->getUser()])) {
$userStatus = $userStatus[$notification->getUser()];
$this->userStatuses[$notification->getUser()] = $userStatus[$notification->getUser()] ?? null;
}

if (isset($this->userStatuses[$notification->getUser()])) {
$userStatus = $this->userStatuses[$notification->getUser()];
if ($userStatus->getStatus() === IUserStatus::DND) {
$this->printInfo('<error>User status is set to DND - no push notifications will be sent</error>');
return;
}
}

$devices = $this->getDevicesForUser($notification->getUser());
if (!array_key_exists($notification->getUser(), $this->userDevices)) {
$devices = $this->getDevicesForUser($notification->getUser());
$this->userDevices[$notification->getUser()] = $devices;
} else {
$devices = $this->userDevices[$notification->getUser()];
}

if (empty($devices)) {
$this->printInfo('No devices found for user');
return;
Expand Down Expand Up @@ -237,9 +307,21 @@ public function pushDeleteToDevice(string $userId, int $notificationId, string $
return;
}

if ($this->deferPreparing) {
$this->deletesToPush[$notificationId] = ['userId' => $userId, 'app' => $app];
$this->loadDevicesForUsers[] = $userId;
return;
}

$user = $this->createFakeUserObject($userId);

$devices = $this->getDevicesForUser($userId);
if (!array_key_exists($userId, $this->userDevices)) {
$devices = $this->getDevicesForUser($userId);
$this->userDevices[$userId] = $devices;
} else {
$devices = $this->userDevices[$userId];
}

if ($notificationId !== 0 && $app !== '') {
// Only filter when it's not a single delete
$devices = $this->filterDeviceList($devices, $app);
Expand Down Expand Up @@ -516,6 +598,30 @@ protected function getDevicesForUser(string $uid): array {
return $devices;
}

/**
* @param string[] $userIds
* @return array[]
*/
protected function getDevicesForUsers(array $userIds): array {
$query = $this->db->getQueryBuilder();
$query->select('*')
->from('notifications_pushhash')
->where($query->expr()->in('uid', $query->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));

$devices = [];
$result = $query->executeQuery();
while ($row = $result->fetch()) {
if (!isset($devices[$row['uid']])) {
$devices[$row['uid']] = [];
}
$devices[$row['uid']][] = $row;
}

$result->closeCursor();

return $devices;
}

/**
* @param int $tokenId
* @return bool
Expand Down