From 56aa30fd523224e34553d39f47b8897ed4bab726 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Mon, 12 Jun 2023 20:55:01 +0530 Subject: [PATCH] feat: use static array for console db --- app/workers/deletes.php | 6 +----- src/Appwrite/Resque/Worker.php | 13 +++++++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/workers/deletes.php b/app/workers/deletes.php index 1fb3a57c59..9321d5bfa4 100644 --- a/app/workers/deletes.php +++ b/app/workers/deletes.php @@ -618,10 +618,6 @@ class DeletesV1 extends Worker $executionStart = \microtime(true); - var_dump("Collection : $collection"); - var_dump("Database : {$database->getDefaultDatabase()}"); - var_dump("Namespace : {$database->getNamespace()}"); - while ($sum === $limit) { $chunk++; @@ -629,7 +625,7 @@ class DeletesV1 extends Worker $sum = count($results); - Console::info('Deleting chunk #' . $chunk . '. Found ' . $sum . ' documents'); + Console::info('Deleting chunk #' . $chunk . '. Found ' . $sum . ' documents in collection ' . '_' . $database->getNamespace() . '_' . $collection); foreach ($results as $document) { $this->deleteById($document, $database, $callback); diff --git a/src/Appwrite/Resque/Worker.php b/src/Appwrite/Resque/Worker.php index 6d528be51a..a075c15690 100644 --- a/src/Appwrite/Resque/Worker.php +++ b/src/Appwrite/Resque/Worker.php @@ -172,6 +172,7 @@ abstract class Worker * @return Database */ protected static $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools + protected function getProjectDB(Document $project): Database { global $register; @@ -186,8 +187,6 @@ abstract class Worker $databaseName = $project->getAttribute('database'); - var_dump(array_keys(self::$databases)); - if (isset(self::$databases[$databaseName])) { $database = self::$databases[$databaseName]; $database->setNamespace('_' . $project->getInternalId()); @@ -219,6 +218,14 @@ abstract class Worker $pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */ + $databaseName = 'console'; + + if (isset(self::$databases[$databaseName])) { + $database = self::$databases[$databaseName]; + $database->setNamespace('console'); + return $database; + } + $dbAdapter = $pools ->get('console') ->pop() @@ -227,6 +234,8 @@ abstract class Worker $database = new Database($dbAdapter, $this->getCache()); + self::$databases[$databaseName] = $database; + $database->setNamespace('console'); return $database;