Skip to content

With transactions optimization #677

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 2 commits into from
Sep 1, 2025
Merged

With transactions optimization #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48e299b
with transactions
fogelito Aug 31, 2025
18a2875
with transactions
fogelito Aug 31, 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
31 changes: 26 additions & 5 deletions src/Database/Adapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@

use Exception;
use Utopia\Database\Exception as DatabaseException;
use Utopia\Database\Exception\Authorization as AuthorizationException;
use Utopia\Database\Exception\Conflict as ConflictException;
use Utopia\Database\Exception\Duplicate as DuplicateException;
use Utopia\Database\Exception\Limit as LimitException;
use Utopia\Database\Exception\Relationship as RelationshipException;
use Utopia\Database\Exception\Restricted as RestrictedException;
use Utopia\Database\Exception\Timeout as TimeoutException;
use Utopia\Database\Exception\Transaction as TransactionException;

Expand Down Expand Up @@ -371,7 +376,10 @@ public function inTransaction(): bool
*/
public function withTransaction(callable $callback): mixed
{
for ($attempts = 0; $attempts < 3; $attempts++) {
$sleep = 50_000; // 50 milliseconds
$retries = 2;

for ($attempts = 0; $attempts <= $retries; $attempts++) {
try {
$this->startTransaction();
$result = $callback();
Expand All @@ -380,18 +388,31 @@ public function withTransaction(callable $callback): mixed
} catch (\Throwable $action) {
try {
$this->rollbackTransaction();

if (
$action instanceof DuplicateException ||
$action instanceof RestrictedException ||
$action instanceof AuthorizationException ||
$action instanceof RelationshipException ||
$action instanceof ConflictException ||
$action instanceof LimitException
) {
$this->inTransaction = 0;
throw $action;
}

} catch (\Throwable $rollback) {
if ($attempts < 2) {
\usleep(5000); // 5ms
if ($attempts < $retries) {
\usleep($sleep * ($attempts + 1));
continue;
}

$this->inTransaction = 0;
throw $rollback;
}

if ($attempts < 2) {
\usleep(5000); // 5ms
if ($attempts < $retries) {
\usleep($sleep * ($attempts + 1));
continue;
}

Expand Down
21 changes: 7 additions & 14 deletions src/Database/Adapter/SQL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use Utopia\Database\Exception\NotFound as NotFoundException;
use Utopia\Database\Exception\Transaction as TransactionException;
use Utopia\Database\Query;
use Utopia\Database\Validator\Spatial;

abstract class SQL extends Adapter
{
Expand Down Expand Up @@ -66,19 +65,17 @@ public function startTransaction(): bool
$this->getPDO()->prepare('ROLLBACK')->execute();
}

$result = $this->getPDO()->beginTransaction();
$this->getPDO()->beginTransaction();

} else {
$result = $this->getPDO()->exec('SAVEPOINT transaction' . $this->inTransaction);
$this->getPDO()->exec('SAVEPOINT transaction' . $this->inTransaction);
}
} catch (PDOException $e) {
throw new TransactionException('Failed to start transaction: ' . $e->getMessage(), $e->getCode(), $e);
}

if (!$result) {
throw new TransactionException('Failed to start transaction');
}

$this->inTransaction++;

return true;
}

Expand Down Expand Up @@ -124,21 +121,17 @@ public function rollbackTransaction(): bool

try {
if ($this->inTransaction > 1) {
$result = $this->getPDO()->exec('ROLLBACK TO transaction' . ($this->inTransaction - 1));
$this->getPDO()->exec('ROLLBACK TO transaction' . ($this->inTransaction - 1));
$this->inTransaction--;
} else {
$result = $this->getPDO()->rollBack();
$this->getPDO()->rollBack();
$this->inTransaction = 0;
}
} catch (PDOException $e) {
throw new DatabaseException('Failed to rollback transaction: ' . $e->getMessage(), $e->getCode(), $e);
}

if (!$result) {
throw new TransactionException('Failed to rollback transaction');
}

return $result;
return true;
}

/**
Expand Down