Truncate tables and rename documents folder on reset #5918
Conversation
mejo-
force-pushed
the
fix/reset_sessions
branch
from
b909a3a
to
d74e0ed
Compare
mejo-
changed the title
mejo-
force-pushed
the
fix/reset_sessions
branch
from
d74e0ed
to
e2f2244
Compare
lib/Command/ResetDocument.php
Outdated
| $fileIds = array_map(static function (Document $document) { | ||
| return $document->getId(); | ||
| }, $this->documentService->getAll()); | ||
| $fileIds = $this->documentService->getAll(); |
There was a problem hiding this comment.
@juliushaertl I don't understand this change. DocumentService->getAll() returns an array of Document objects, not the file IDs. How is this supposed to work?
There was a problem hiding this comment.
Tested and indeed it broke with your current approach. The old approach didn't work either as array_map() cannot be run against a Generator. I pushed a fix:
$fileIds = [];
$documents = $this->documentService->getAll();
foreach ($documents as $document) {
$fileIds[] = $document->getId();
}
mejo-
force-pushed
the
fix/reset_sessions
branch
3 times, most recently
from
29cd087
to
fe9a94f
Compare
Signed-off-by: Julius Härtl <[email protected]>
mejo-
force-pushed
the
fix/reset_sessions
branch
from
fe9a94f
to
7305078
Compare
Apart from the commented part, your changes look good to me @juliushaertl Could you review my changes another time, given that I implemented the logic to rename the directory and clean up old directories after your last review? |
This is way more performant than iterating over all existing sessions. Signed-off-by: Jonas <[email protected]>
Signed-off-by: Jonas <[email protected]>
mejo-
force-pushed
the
fix/reset_sessions
branch
from
7305078
to
cd83e36
Compare
|
|
||
| public function clearAll(): void { | ||
| $qb = $this->db->getQueryBuilder(); | ||
| $qb->delete($this->getTableName()) |
There was a problem hiding this comment.
truncate and delete are different things. Truncate might be faster than delete, but not all DB engines support it afaik. Not sure what is the current state in doctrine. OK for now.
There was a problem hiding this comment.
I tested with 120.000 entries and it was super fast. So I guess it's ok for now 😬
| @@ -137,6 +148,12 @@ public function deleteByDocumentId(int $documentId): int { | |||
| return $qb->executeStatement(); | |||
| } | |||
|
|
|||
| public function clearAll(): void { | |||
| $qb = $this->db->getQueryBuilder(); | |||
| $qb->delete($this->getTableName()) | |||
| @@ -62,6 +62,12 @@ public function deleteAll(int $documentId): void { | |||
| ->executeStatement(); | |||
| } | |||
|
|
|||
| public function clearAll(): void { | |||
| $qb = $this->db->getQueryBuilder(); | |||
| $qb->delete($this->getTableName()) | |||
|
/backport to stable29 |
|
/backport to stable28 |
|
/backport to stable27 |
|
Runner 9 was green before, Runner 1 is a known Flaky test → Merging. |
📝 Summary
🏁 Checklist
npm run lint/npm run stylelint/composer run cs:check)