Skip to content

[stable26] fix: Use simple query and chunk in PHP to delete inactive sessions #4552

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
juliusknorr merged 1 commit into from
Jul 19, 2023
Merged

[stable26] fix: Use simple query and chunk in PHP to delete inactive sessions #4552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix: Use simple query and chunk in PHP 
reverts #4339 and #4539 except for the added tests and moves to plain
PHP chunking to avoid issues with MySQL 8

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @backportbot-nextcloud
juliusknorr authored and backportbot-nextcloud[bot] committed Jul 19, 2023
commit 2fb60874fcf89db62bfed8864911f52234700673
44 changes: 25 additions & 19 deletions lib/Db/SessionMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,30 +100,36 @@ public function findAllInactive() {
}

public function deleteInactiveWithoutSteps(?int $documentId = null): int {
$selectSubQuery = $this->db->getQueryBuilder();
$selectSubQuery->select('s.id')
$lastContact = time() - SessionService::SESSION_VALID_TIME;

$inactiveSessionBuilder = $this->db->getQueryBuilder();
$inactiveSessionBuilder->select('s.id')
->from('text_sessions', 's')
->leftJoin('s', 'text_steps', 'st', $selectSubQuery->expr()->eq('st.session_id', 's.id'))
->where($selectSubQuery->expr()->lt('last_contact', $selectSubQuery->createParameter('lastContact')))
->andWhere($selectSubQuery->expr()->isNull('st.id'));
->leftJoin('s', 'text_steps', 'st', $inactiveSessionBuilder->expr()->eq('st.session_id', 's.id'))
->where($inactiveSessionBuilder->expr()->lt('last_contact', $inactiveSessionBuilder->createNamedParameter($lastContact)))
->andWhere($inactiveSessionBuilder->expr()->isNull('st.id'));
if ($documentId !== null) {
$selectSubQuery->andWhere($selectSubQuery->expr()->eq('s.document_id', $selectSubQuery->createParameter('documentId')));
$inactiveSessionBuilder->andWhere($inactiveSessionBuilder->expr()->eq('s.document_id', $inactiveSessionBuilder->createNamedParameter($documentId)));
}
$result = $inactiveSessionBuilder->executeQuery();
$documentIds = array_map(function ($row) {
return (int)$row['id'];
}, $result->fetchAll());
$result->closeCursor();

$qb = $this->db->getQueryBuilder();
$qb->delete($this->getTableName());
if ($documentId !== null) {
$qb->where($selectSubQuery->expr()->eq('document_id', $selectSubQuery->createParameter('documentId')));
$qb->andWhere($qb->expr()->in('id', $qb->createFunction($selectSubQuery->getSQL())));
} else {
$qb->where($qb->expr()->in('id', $qb->createFunction($selectSubQuery->getSQL())));
}
$qb->setParameters([
'lastContact' => time() - SessionService::SESSION_VALID_TIME,
'documentId' => $documentId,
]);
$chunks = array_chunk($documentIds, 500);

$deleteBuilder = $this->db->getQueryBuilder();
$deleteBuilder->delete($this->getTableName())
->where($deleteBuilder->expr()->in('id', $deleteBuilder->createParameter('ids'), IQueryBuilder::PARAM_INT_ARRAY));

return $qb->executeStatement();
$deletedCount = 0;
foreach ($chunks as $ids) {
$deleteBuilder->setParameter('ids', $ids, IQueryBuilder::PARAM_INT_ARRAY);

$deletedCount += $deleteBuilder->executeStatement();
}
return $deletedCount;
}

public function deleteByDocumentId($documentId) {
Expand Down