Skip to content

[stable27] fix: Delete inactive sessions in one query #4472

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 10, 2023
Merged

[stable27] fix: Delete inactive sessions in one query #4472

Show file tree
Hide file tree
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
33 changes: 16 additions & 17 deletions lib/Db/SessionMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,27 +99,26 @@ public function findAllInactive() {
return $this->findEntities($qb);
}

public function deleteInactiveWithoutSteps($documentId = -1) {
$qb = $this->db->getQueryBuilder();
$qb->select('session_id')
->from('text_steps');
public function deleteInactiveWithoutSteps(?int $documentId = null): int {
$selectSubQuery = $this->db->getQueryBuilder();
$selectSubQuery->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'));
if ($documentId !== null) {
$qb->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId)));
$selectSubQuery->andWhere($selectSubQuery->expr()->eq('s.document_id', $selectSubQuery->createParameter('documentId')));
}
$result = $qb
->groupBy('session_id')
->execute();
$activeSessions = $result->fetchAll(\PDO::FETCH_COLUMN);
$result->closeCursor();

$qb = $this->db->getQueryBuilder();
$qb->delete($this->getTableName());
$qb->where($qb->expr()->lt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME)));
if ($documentId !== null) {
$qb->andWhere($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId)));
}
$qb->andWhere($qb->expr()->notIn('id', $qb->createNamedParameter($activeSessions, IQueryBuilder::PARAM_INT_ARRAY)));
return $qb->execute();
$qb->delete($this->getTableName())
->where($qb->expr()->in('id', $qb->createFunction($selectSubQuery->getSQL())));
$qb->setParameters([
'lastContact' => time() - SessionService::SESSION_VALID_TIME,
'documentId' => $documentId,
]);

return $qb->executeStatement();
}

public function deleteByDocumentId($documentId) {
Expand Down
101 changes: 101 additions & 0 deletions tests/unit/Db/SessionMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?php

namespace OCA\Text\Db;

/**
* @group DB
*/
class SessionMapperTest extends \Test\TestCase {

private SessionMapper $sessionMapper;
private StepMapper $stepMapper;

public function setUp(): void {
parent::setUp();
$this->sessionMapper = \OCP\Server::get(SessionMapper::class);
$this->stepMapper = \OCP\Server::get(StepMapper::class);

}

public function testDeleteInactiveWithoutSteps() {
$this->sessionMapper->deleteByDocumentId(1);
$this->sessionMapper->deleteByDocumentId(2);
$this->sessionMapper->insert(Session::fromParams([
'userId' => 'admin',
'documentId' => 1,
'lastContact' => 1337,
'token' => uniqid(),
'color' => '00ff00',
]));
$this->sessionMapper->insert(Session::fromParams([
'userId' => 'admin',
'documentId' => 2,
'lastContact' => 1337,
'token' => uniqid(),
'color' => '00ff00',
]));
$this->sessionMapper->deleteInactiveWithoutSteps(1);
self::assertCount(0, $this->sessionMapper->findAll(1));
self::assertCount(1, $this->sessionMapper->findAll(2));
$this->sessionMapper->deleteInactiveWithoutSteps();
self::assertCount(0, $this->sessionMapper->findAll(2));
}

public function testDeleteInactiveWithoutStepsKeep() {
$this->stepMapper->deleteAll(1);
$this->sessionMapper->deleteByDocumentId(1);
$this->sessionMapper->deleteByDocumentId(2);

$s1 = $this->sessionMapper->insert(Session::fromParams([
'userId' => 'admin',
'documentId' => 1,
'lastContact' => 1337,
'token' => uniqid(),
'color' => '00ff00',
]));
$s2 = $this->sessionMapper->insert(Session::fromParams([
'userId' => 'admin',
'documentId' => 2,
'lastContact' => 1337,
'token' => uniqid(),
'color' => '00ff00',
]));
$this->stepMapper->insert(Step::fromParams([
'sessionId' => $s1->getId(),
'documentId' => 1,
'data' => 'YJSDATA',
'version' => 1,
]));
self::assertCount(1, $this->sessionMapper->findAll(1));

$this->sessionMapper->deleteInactiveWithoutSteps(1);
self::assertCount(1, $this->sessionMapper->findAll(1));
self::assertCount(1, $this->sessionMapper->findAll(2));

$this->sessionMapper->deleteInactiveWithoutSteps();
self::assertCount(1, $this->sessionMapper->findAll(1));
self::assertCount(0, $this->sessionMapper->findAll(2));
}

public function testDeleteInactiveWithoutStepsMultiple() {
$this->sessionMapper->deleteByDocumentId(1);

$count = 1010;
for ($i = 0;$i < $count;$i++) {
$this->sessionMapper->insert(Session::fromParams([
'userId' => 'admin',
'documentId' => 1,
'lastContact' => 1337,
'token' => uniqid(),
'color' => '00ff00',
]));
}

self::assertCount($count, $this->sessionMapper->findAll(1));

$deleted = $this->sessionMapper->deleteInactiveWithoutSteps();
self::assertEquals($count, $deleted);

self::assertCount(0, $this->sessionMapper->findAll(1));
}
}