Skip to content

Accumulate delete Documents outside transaction #539

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
abnegate merged 4 commits into from
Mar 19, 2025
Merged

Accumulate delete Documents outside transaction #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d90f89
move while loop
fogelito Mar 18, 2025
14b2eae
Remove return
fogelito Mar 18, 2025
20af618
$id typo
fogelito Mar 18, 2025
7f6486d
short select
fogelito Mar 18, 2025
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
104 changes: 51 additions & 53 deletions src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5418,71 +5418,71 @@ public function deleteDocuments(string $collection, array $queries = [], int $ba
throw new DatabaseException("Cursor document must be from the same Collection.");
}

$documents = $this->withTransaction(function () use ($collection, $queries, $batchSize, $limit, $cursor, $skipAuth, $authorization) {
$documents = [];
$originalLimit = $limit;
$lastDocument = $cursor;

while (true) {
if ($limit && $limit < $batchSize && $limit > 0) {
$batchSize = $limit;
} elseif (!empty($limit)) {
$limit -= $batchSize;
}

$new = [
Query::limit($batchSize)
];

if (! empty($lastDocument)) {
$new[] = Query::cursorAfter($lastDocument);
}
$documents = [];
$originalLimit = $limit;
$lastDocument = $cursor;

while (true) {
if ($limit && $limit < $batchSize && $limit > 0) {
$batchSize = $limit;
} elseif (!empty($limit)) {
$limit -= $batchSize;
}

$affectedDocuments = $this->silent(fn () => $this->find(
$collection->getId(),
array_merge($new, $queries),
forPermission: Database::PERMISSION_DELETE
));
$new = [
Query::limit($batchSize)
];

if (empty($affectedDocuments)) {
break;
}
if (! empty($lastDocument)) {
$new[] = Query::cursorAfter($lastDocument);
}

$documents = \array_merge($affectedDocuments, $documents);
$affectedDocuments = $this->silent(fn () => $this->find(
$collection->getId(),
array_merge($new, $queries),
forPermission: Database::PERMISSION_DELETE
));

foreach ($affectedDocuments as $document) {
if ($this->resolveRelationships) {
$document = $this->silent(fn () => $this->deleteDocumentRelationships(
$collection,
$document
));
}
if (empty($affectedDocuments)) {
break;
}

// Check if document was updated after the request timestamp
try {
$oldUpdatedAt = new \DateTime($document->getUpdatedAt());
} catch (Exception $e) {
throw new DatabaseException($e->getMessage(), $e->getCode(), $e);
}
$documents = \array_merge($affectedDocuments, $documents);

if (!\is_null($this->timestamp) && $oldUpdatedAt > $this->timestamp) {
throw new ConflictException('Document was updated after the request timestamp');
}
foreach ($affectedDocuments as $document) {
if ($this->resolveRelationships) {
$document = $this->silent(fn () => $this->deleteDocumentRelationships(
$collection,
$document
));
}

if (count($affectedDocuments) < $batchSize) {
break;
} elseif ($originalLimit && count($documents) == $originalLimit) {
break;
// Check if document was updated after the request timestamp
try {
$oldUpdatedAt = new \DateTime($document->getUpdatedAt());
} catch (Exception $e) {
throw new DatabaseException($e->getMessage(), $e->getCode(), $e);
}

$lastDocument = end($affectedDocuments);
if (!\is_null($this->timestamp) && $oldUpdatedAt > $this->timestamp) {
throw new ConflictException('Document was updated after the request timestamp');
}
}

if (empty($documents)) {
return [];
if (count($affectedDocuments) < $batchSize) {
break;
} elseif ($originalLimit && count($documents) == $originalLimit) {
break;
}

$lastDocument = end($affectedDocuments);
}

if (empty($documents)) {
return [];
}

$this->withTransaction(function () use ($documents, $collection, $batchSize, $skipAuth, $authorization) {
foreach (\array_chunk($documents, $batchSize) as $chunk) {
$getResults = fn () => $this->adapter->deleteDocuments(
$collection->getId(),
Expand All @@ -5491,8 +5491,6 @@ public function deleteDocuments(string $collection, array $queries = [], int $ba

$skipAuth ? $authorization->skip($getResults) : $getResults();
}

return $documents;
});

foreach ($documents as $document) {
Expand Down
13 changes: 12 additions & 1 deletion tests/e2e/Adapter/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16517,8 +16517,19 @@ public function testDeleteBulkDocuments(): void
$docs = static::getDatabase()->find('bulk_delete');
$this->assertCount(10, $docs);

/**
* Test Short select query
*/
$this->assertCount(2, static::getDatabase()->deleteDocuments(
'bulk_delete',
[
Query::select(['$internalId', '$id', '$permissions', '$updatedAt']),
Query::limit(2)
]
));

// TEST: Bulk Delete All Documents
$this->assertCount(10, static::getDatabase()->deleteDocuments('bulk_delete'));
$this->assertCount(8, static::getDatabase()->deleteDocuments('bulk_delete'));

$docs = static::getDatabase()->find('bulk_delete');
$this->assertCount(0, $docs);
Expand Down