Merge pull request #1330 from TorstenDittmann/feat-improved-connection-pools

feat(db): improved connection pools
2024-05-06 05:42:35 +12:00 · 2021-06-29 11:05:59 +03:00 · 2021-06-29 11:05:59 +03:00 · 5eeceeba20
parent 862f6721e8 dd47f195a0
commit 5eeceeba20
19 changed files with 173 additions and 257 deletions
--- a/2
+++ b/2
@ -15,7 +15,7 @@ RUN composer update --ignore-platform-reqs --optimize-autoloader \
 FROM php:8.0-cli-alpine as step1

 ENV PHP_REDIS_VERSION=5.3.4 \
-    PHP_SWOOLE_VERSION=v4.6.6 \
+    PHP_SWOOLE_VERSION=v4.6.7 \
    PHP_IMAGICK_VERSION=master \
    PHP_YAML_VERSION=2.2.1 \
    PHP_MAXMINDDB_VERSION=v1.10.1
--- a/app/cli.php
+++ b/app/cli.php
@ -1,6 +1,6 @@
 <?php

-require_once __DIR__.'/init.php';
+require_once __DIR__.'/workers.php';

 use Utopia\App;
 use Utopia\CLI\CLI;
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@ -914,19 +914,20 @@ App::get('/v1/account/logs')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->inject('response')
-    ->inject('register')
    ->inject('project')
    ->inject('user')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function ($response, $register, $project, $user, $locale, $geodb) {
+    ->inject('app')
+    ->action(function ($response, $project, $user, $locale, $geodb, $app) {
        /** @var Appwrite\Utopia\Response $response */
        /** @var Appwrite\Database\Document $project */
        /** @var Appwrite\Database\Document $user */
        /** @var Utopia\Locale\Locale $locale */
        /** @var MaxMind\Db\Reader $geodb */
+        /** @var Utopia\App $app */

-        $adapter = new AuditAdapter($register->get('db'));
+        $adapter = new AuditAdapter($app->getResource('db'));
        $adapter->setNamespace('app_'.$project->getId());

        $audit = new Audit($adapter);
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@ -42,12 +42,11 @@ App::get('/v1/health/db')
    ->label('sdk.method', 'getDB')
    ->label('sdk.description', '/docs/references/health/get-db.md')
    ->inject('response')
-    ->inject('register')
-    ->action(function ($response, $register) {
+    ->inject('app')
+    ->action(function ($response, $app) {
        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Registry\Registry $register */
-
-        $register->get('db'); /* @var $db PDO */
+        /** @var Utopia\App $app */
+        $app->getResource('db');

        $response->json(['status' => 'OK']);
    });
@ -61,11 +60,11 @@ App::get('/v1/health/cache')
    ->label('sdk.method', 'getCache')
    ->label('sdk.description', '/docs/references/health/get-cache.md')
    ->inject('response')
-    ->inject('register')
-    ->action(function ($response, $register) {
+    ->inject('app')
+    ->action(function ($response, $app) {
        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Registry\Registry $register */
-        $register->get('cache'); /* @var $cache Predis\Client */
+        /** @var Utopia\App $register */
+        $app->getResource('cache');

        $response->json(['status' => 'OK']);
    });
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@ -232,18 +232,18 @@ App::get('/v1/users/:userId/logs')
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->param('userId', '', new UID(), 'User unique ID.')
    ->inject('response')
-    ->inject('register')
    ->inject('project')
    ->inject('projectDB')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function ($userId, $response, $register, $project, $projectDB, $locale, $geodb) {
+    ->inject('app')
+    ->action(function ($userId, $response, $project, $projectDB, $locale, $geodb, $app) {
        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Registry\Registry $register */
        /** @var Appwrite\Database\Document $project */
        /** @var Appwrite\Database\Database $projectDB */
        /** @var Utopia\Locale\Locale $locale */
        /** @var MaxMind\Db\Reader $geodb */
+        /** @var Utopia\App $app */
        
        $user = $projectDB->getDocument($userId);

@ -251,7 +251,7 @@ App::get('/v1/users/:userId/logs')
            throw new Exception('User not found', 404);
        }

-        $adapter = new AuditAdapter($register->get('db'));
+        $adapter = new AuditAdapter($app->getResource('db'));
        $adapter->setNamespace('app_'.$project->getId());

        $audit = new Audit($adapter);
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@ -9,7 +9,7 @@ use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;

-App::init(function ($utopia, $request, $response, $project, $user, $register, $events, $audits, $usage, $deletes) {
+App::init(function ($utopia, $request, $response, $project, $user, $register, $events, $audits, $usage, $deletes, $db) {
    /** @var Utopia\App $utopia */
    /** @var Utopia\Swoole\Request $request */
    /** @var Appwrite\Utopia\Response $response */
@ -34,9 +34,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
    /*
     * Abuse Check
     */
-    $timeLimit = new TimeLimit($route->getLabel('abuse-key', 'url:{url},ip:{ip}'), $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600), function () use ($register) {
-        return $register->get('db');
-    });
+    $timeLimit = new TimeLimit($route->getLabel('abuse-key', 'url:{url},ip:{ip}'), $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600), $db);
    $timeLimit->setNamespace('app_'.$project->getId());
    $timeLimit
        ->setParam('{userId}', $user->getId())
@ -111,7 +109,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
        ->setParam('projectId', $project->getId())
    ;

-}, ['utopia', 'request', 'response', 'project', 'user', 'register', 'events', 'audits', 'usage', 'deletes'], 'api');
+}, ['utopia', 'request', 'response', 'project', 'user', 'register', 'events', 'audits', 'usage', 'deletes', 'db'], 'api');


 App::init(function ($utopia, $request, $response, $project, $user) {
--- a/app/http.php
+++ b/app/http.php
@ -3,8 +3,6 @@
 require_once __DIR__.'/../vendor/autoload.php';

 use Appwrite\Database\Validator\Authorization;
-use Utopia\Swoole\Files;
-use Utopia\Swoole\Request;
 use Appwrite\Utopia\Response;
 use Swoole\Process;
 use Swoole\Http\Server;
@ -12,6 +10,8 @@ use Swoole\Http\Request as SwooleRequest;
 use Swoole\Http\Response as SwooleResponse;
 use Utopia\App;
 use Utopia\CLI\Console;
+use Utopia\Swoole\Files;
+use Utopia\Swoole\Request;

 $http = new Server("0.0.0.0", App::getEnv('PORT', 80));

@ -75,18 +75,22 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
        return;
    }

+    $app = new App('UTC');
+
    $db = $register->get('dbPool')->get();
    $redis = $register->get('redisPool')->get();

-    $register->set('db', function () use (&$db) {
+    App::setResource('db', function () use (&$db) {
        return $db;
    });

-    $register->set('cache', function () use (&$redis) {
+    App::setResource('cache', function () use (&$redis) {
        return $redis;
    });

-    $app = new App('UTC');
+    App::setResource('app', function() use (&$app) {
+        return $app;
+    });
    
    try {
        Authorization::cleanRoles();
--- a/app/init.php
+++ b/app/init.php
@ -24,8 +24,6 @@ use Appwrite\Database\Database;
 use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
 use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Document;
-use Appwrite\Database\Pool\PDOPool;
-use Appwrite\Database\Pool\RedisPool;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Event\Event;
 use Appwrite\OpenSSL\OpenSSL;
@ -36,6 +34,10 @@ use Utopia\Locale\Locale;
 use Utopia\Registry\Registry;
 use MaxMind\Db\Reader;
 use PHPMailer\PHPMailer\PHPMailer;
+use Swoole\Database\PDOConfig;
+use Swoole\Database\PDOPool;
+use Swoole\Database\RedisConfig;
+use Swoole\Database\RedisPool;

 const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
@ -153,10 +155,21 @@ Database::addFilter('encrypt',
 */
 $register->set('dbPool', function () { // Register DB connection
    $dbHost = App::getEnv('_APP_DB_HOST', '');
+    $dbPort = App::getEnv('_APP_DB_PORT', '');
    $dbUser = App::getEnv('_APP_DB_USER', '');
    $dbPass = App::getEnv('_APP_DB_PASS', '');
    $dbScheme = App::getEnv('_APP_DB_SCHEMA', '');
-    $pool = new PDOPool(10, $dbHost, $dbScheme, $dbUser, $dbPass);
+
+
+    $pool = new PDOPool((new PDOConfig())
+        ->withHost($dbHost)
+        ->withPort($dbPort)
+        // ->withUnixSocket('/tmp/mysql.sock')
+        ->withDbName($dbScheme)
+        ->withCharset('utf8mb4')
+        ->withUsername($dbUser)
+        ->withPassword($dbPass)
+    );

    return $pool;
 });
@ -165,16 +178,18 @@ $register->set('redisPool', function () {
    $redisPort = App::getEnv('_APP_REDIS_PORT', '');
    $redisUser = App::getEnv('_APP_REDIS_USER', '');
    $redisPass = App::getEnv('_APP_REDIS_PASS', '');
-    $redisAuth = [];
+    $redisAuth = '';

-    if ($redisUser) {
-        $redisAuth[] = $redisUser;
-    }
-    if ($redisPass) {
-        $redisAuth[] = $redisPass;
+    if ($redisUser && $redisPass) {
+        $redisAuth = $redisUser.':'.$redisPass;
    }

-    $pool = new RedisPool(10, $redisHost, $redisPort, $redisAuth);
+    $pool = new RedisPool((new RedisConfig)
+        ->withHost($redisHost)
+        ->withPort($redisPort)
+        ->withAuth($redisAuth)
+        ->withDbIndex(0)
+    );

    return $pool;
 });
@ -479,23 +494,23 @@ App::setResource('console', function($consoleDB) {
    return $consoleDB->getDocument('console');
 }, ['consoleDB']);

-App::setResource('consoleDB', function($register) {
+App::setResource('consoleDB', function($db, $cache) {
    $consoleDB = new Database();
-    $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
+    $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
    $consoleDB->setNamespace('app_console'); // Should be replaced with param if we want to have parent projects
    $consoleDB->setMocks(Config::getParam('collections', []));

    return $consoleDB;
-}, ['register']);
+}, ['db', 'cache']);

-App::setResource('projectDB', function($register, $project) {
+App::setResource('projectDB', function($db, $cache, $project) {
    $projectDB = new Database();
-    $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
+    $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
    $projectDB->setNamespace('app_'.$project->getId());
    $projectDB->setMocks(Config::getParam('collections', []));

    return $projectDB;
-}, ['register', 'project']);
+}, ['db', 'cache', 'project']);

 App::setResource('mode', function($request) {
    /** @var Utopia\Swoole\Request $request */
--- a/app/workers/certificates.php
+++ b/app/workers/certificates.php
@ -28,8 +28,11 @@ class CertificatesV1 extends Worker
    {
        global $register;

+        $db = $register->get('db');
+        $cache = $register->get('cache');
+
        $consoleDB = new Database();
-        $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
+        $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
        $consoleDB->setNamespace('app_console'); // Main DB
        $consoleDB->setMocks(Config::getParam('collections', []));

--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@ -176,9 +176,7 @@ class DeletesV1 extends Worker
            throw new Exception('Failed to delete audit logs. No timestamp provided');
        }

-        $timeLimit = new TimeLimit("", 0, 1, function () use ($register) {
-            return $register->get('db');
-        });
+        $timeLimit = new TimeLimit("", 0, 1, $register->get('db'));

        $this->deleteForProjectIds(function($projectId) use ($timeLimit, $timestamp){
            $timeLimit->setNamespace('app_'.$projectId);
@ -358,9 +356,12 @@ class DeletesV1 extends Worker
    {
        global $register;

+        $db = $register->get('db');
+        $cache = $register->get('cache');
+
        if($this->consoleDB === null) {
            $this->consoleDB = new Database();
-            $this->consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
+            $this->consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));;
            $this->consoleDB->setNamespace('app_console'); // Main DB
            $this->consoleDB->setMocks(Config::getParam('collections', []));
        }
@ -374,9 +375,12 @@ class DeletesV1 extends Worker
    protected function getProjectDB($projectId): Database
    {
        global $register;
-        
+
+        $db = $register->get('db');
+        $cache = $register->get('cache');
+
        $projectDB = new Database();
-        $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
+        $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
        $projectDB->setNamespace('app_'.$projectId); // Main DB
        $projectDB->setMocks(Config::getParam('collections', []));

--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@ -7,6 +7,7 @@ use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Event\Event;
 use Appwrite\Resque\Worker;
+use Appwrite\Utopia\Response\Model\Execution;
 use Cron\CronExpression;
 use Swoole\Runtime;
 use Utopia\App;
@ -137,6 +138,9 @@ class FunctionsV1 extends Worker
    {
        global $register;

+        $db = $register->get('db');
+        $cache = $register->get('cache');
+
        $projectId = $this->args['projectId'] ?? '';
        $functionId = $this->args['functionId'] ?? '';
        $webhooks = $this->args['webhooks'] ?? [];
@ -150,7 +154,7 @@ class FunctionsV1 extends Worker
        $jwt = $this->args['jwt'] ?? '';

        $database = new Database();
-        $database->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
+        $database->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
        $database->setNamespace('app_'.$projectId);
        $database->setMocks(Config::getParam('collections', []));

@ -477,6 +481,7 @@ class FunctionsV1 extends Worker
            throw new Exception('Failed saving execution to DB', 500);
        }

+        $executionModel = new Execution();
        $executionUpdate = new Event('v1-webhooks', 'WebhooksV1');

        $executionUpdate
@ -484,17 +489,7 @@ class FunctionsV1 extends Worker
            ->setParam('userId', $userId)
            ->setParam('webhooks', $webhooks)
            ->setParam('event', 'functions.executions.update')
-            ->setParam('eventData', [
-                '$id' => $execution['$id'],
-                'functionId' => $execution['functionId'],
-                'dateCreated' => $execution['dateCreated'],
-                'trigger' => $execution['trigger'],
-                'status' => $execution['status'],
-                'exitCode' => $execution['exitCode'],
-                'stdout' => $execution['stdout'],
-                'stderr' => $execution['stderr'],
-                'time' => $execution['time']
-            ]);
+            ->setParam('eventData', $execution->getArrayCopy(array_keys($executionModel->getRules())));

        $executionUpdate->trigger();

--- a/app/workers/tasks.php
+++ b/app/workers/tasks.php
@ -30,8 +30,11 @@ class TasksV1 extends Worker
    {
        global $register;

+        $db = $register->get('db');
+        $cache = $register->get('cache');
+
        $consoleDB = new Database();
-        $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
+        $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
        $consoleDB->setNamespace('app_console'); // Main DB
        $consoleDB->setMocks(Config::getParam('collections', []));

--- a/composer.json
+++ b/composer.json
@ -39,7 +39,7 @@
        "appwrite/php-runtimes": "0.3.*",

        "utopia-php/framework": "0.14.*",
-        "utopia-php/abuse": "0.4.*",
+        "utopia-php/abuse": "0.5.*",
        "utopia-php/analytics": "0.2.*",
        "utopia-php/audit": "0.5.*",
        "utopia-php/cache": "0.2.*",
@ -53,18 +53,18 @@
        "utopia-php/storage": "0.5.*",
        "utopia-php/image": "0.5.*",
        "resque/php-resque": "1.3.6",
-        "matomo/device-detector": "4.2.2",
+        "matomo/device-detector": "4.2.3",
        "dragonmantank/cron-expression": "3.1.0",
        "influxdb/influxdb-php": "1.15.2",
        "phpmailer/phpmailer": "6.5.0",
        "chillerlan/php-qrcode": "4.3.0",
        "adhocore/jwt": "1.1.2",
-        "slickdeals/statsd": "3.0.2"
+        "slickdeals/statsd": "3.1.0"
    },
    "require-dev": {
        "appwrite/sdk-generator": "0.10.11",
-        "swoole/ide-helper": "4.6.6",
-        "phpunit/phpunit": "9.5.4",
+        "swoole/ide-helper": "4.6.7",
+        "phpunit/phpunit": "9.5.6",
        "vimeo/psalm": "4.7.2"
    },
    "provide": {
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "ba882fb2e25e5d4304a6574986a6a7e9",
+    "content-hash": "f0045a975cc1e8215cdfef44472b702f",
    "packages": [
        {
            "name": "adhocore/jwt",
@ -115,16 +115,16 @@
        },
        {
            "name": "appwrite/php-runtimes",
-            "version": "dev-main",
+            "version": "0.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/appwrite/php-runtimes.git",
-                "reference": "cc7090a67d8824c779190b38873f0f8154f906b2"
+                "reference": "39be003cdff22c8447de151921001eb5d3bf2319"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/php-runtimes/zipball/cc7090a67d8824c779190b38873f0f8154f906b2",
-                "reference": "cc7090a67d8824c779190b38873f0f8154f906b2",
+                "url": "https://api.github.com/repos/appwrite/php-runtimes/zipball/39be003cdff22c8447de151921001eb5d3bf2319",
+                "reference": "39be003cdff22c8447de151921001eb5d3bf2319",
                "shasum": ""
            },
            "require": {
@ -136,7 +136,6 @@
                "utopia-php/cli": "0.11.*",
                "vimeo/psalm": "4.0.1"
            },
-            "default-branch": true,
            "type": "library",
            "autoload": {
                "psr-4": {
@ -145,7 +144,7 @@
            },
            "notification-url": "https://packagist.org/downloads/",
            "license": [
-                "BSD-3-Clause"
+                "BSD-3"
            ],
            "authors": [
                {
@ -165,9 +164,9 @@
            ],
            "support": {
                "issues": "https://github.com/appwrite/php-runtimes/issues",
-                "source": "https://github.com/appwrite/php-runtimes/tree/main"
+                "source": "https://github.com/appwrite/php-runtimes/tree/0.3.0"
            },
-            "time": "2021-06-23T07:17:12+00:00"
+            "time": "2021-06-15T07:52:43+00:00"
        },
        {
            "name": "chillerlan/php-qrcode",
@ -716,16 +715,16 @@
        },
        {
            "name": "matomo/device-detector",
-            "version": "4.2.2",
+            "version": "4.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/matomo-org/device-detector.git",
-                "reference": "dc270e7645d286d6f01d516a6634aba8b31ad668"
+                "reference": "d879f07496d6e6ee89cef5bcd925383d9b0c2cc0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/dc270e7645d286d6f01d516a6634aba8b31ad668",
-                "reference": "dc270e7645d286d6f01d516a6634aba8b31ad668",
+                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/d879f07496d6e6ee89cef5bcd925383d9b0c2cc0",
+                "reference": "d879f07496d6e6ee89cef5bcd925383d9b0c2cc0",
                "shasum": ""
            },
            "require": {
@ -781,7 +780,7 @@
                "source": "https://github.com/matomo-org/matomo",
                "wiki": "https://dev.matomo.org/"
            },
-            "time": "2021-02-26T07:31:42+00:00"
+            "time": "2021-05-12T14:14:25+00:00"
        },
        {
            "name": "mustangostang/spyc",
@ -1193,31 +1192,33 @@
        },
        {
            "name": "slickdeals/statsd",
-            "version": "3.0.2",
+            "version": "3.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/Slickdeals/statsd-php.git",
-                "reference": "393c6565efbfb23c8296ae3099a62fb6366c6ce3"
+                "reference": "225588a0a079e145359049f6e5e23eedb1b4c17f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Slickdeals/statsd-php/zipball/393c6565efbfb23c8296ae3099a62fb6366c6ce3",
-                "reference": "393c6565efbfb23c8296ae3099a62fb6366c6ce3",
+                "url": "https://api.github.com/repos/Slickdeals/statsd-php/zipball/225588a0a079e145359049f6e5e23eedb1b4c17f",
+                "reference": "225588a0a079e145359049f6e5e23eedb1b4c17f",
                "shasum": ""
            },
            "require": {
-                "php": ">= 7.2"
+                "php": ">= 7.3 || ^8"
+            },
+            "replace": {
+                "domnikl/statsd": "self.version"
            },
            "require-dev": {
-                "flyeralarm/php-code-validator": "^2.2",
-                "phpunit/phpunit": "~8.0",
-                "vimeo/psalm": "^3.4"
+                "friendsofphp/php-cs-fixer": "^3.0",
+                "phpunit/phpunit": "^9",
+                "vimeo/psalm": "^4.6"
            },
            "type": "library",
            "autoload": {
                "psr-4": {
-                    "Domnikl\\Statsd\\": "src/",
-                    "Domnikl\\Test\\Statsd\\": "tests/unit"
+                    "Domnikl\\Statsd\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@ -1231,7 +1232,7 @@
                }
            ],
            "description": "a PHP client for statsd",
-            "homepage": "https://domnikl.github.com/statsd-php",
+            "homepage": "https://github.com/Slickdeals/statsd-php",
            "keywords": [
                "Metrics",
                "monitoring",
@ -1240,9 +1241,10 @@
                "udp"
            ],
            "support": {
-                "source": "https://github.com/Slickdeals/statsd-php/tree/3.0.2"
+                "issues": "https://github.com/Slickdeals/statsd-php/issues",
+                "source": "https://github.com/Slickdeals/statsd-php/tree/3.1.0"
            },
-            "time": "2020-01-03T14:24:58+00:00"
+            "time": "2021-06-04T20:33:46+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@ -1325,16 +1327,16 @@
        },
        {
            "name": "utopia-php/abuse",
-            "version": "0.4.2",
+            "version": "0.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/abuse.git",
-                "reference": "286b52209818e5033573e6441d65adbc48a6f715"
+                "reference": "339c1720e5aa5314276128170463594b81f84760"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/286b52209818e5033573e6441d65adbc48a6f715",
-                "reference": "286b52209818e5033573e6441d65adbc48a6f715",
+                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/339c1720e5aa5314276128170463594b81f84760",
+                "reference": "339c1720e5aa5314276128170463594b81f84760",
                "shasum": ""
            },
            "require": {
@ -1371,9 +1373,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/abuse/issues",
-                "source": "https://github.com/utopia-php/abuse/tree/0.4.2"
+                "source": "https://github.com/utopia-php/abuse/tree/0.5.0"
            },
-            "time": "2021-06-23T15:04:44+00:00"
+            "time": "2021-06-28T10:11:01+00:00"
        },
        {
            "name": "utopia-php/analytics",
@ -3818,16 +3820,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "9.5.4",
+            "version": "9.5.6",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741"
+                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741",
-                "reference": "c73c6737305e779771147af66c96ca6a7ed8a741",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
+                "reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
                "shasum": ""
            },
            "require": {
@ -3857,7 +3859,7 @@
                "sebastian/global-state": "^5.0.1",
                "sebastian/object-enumerator": "^4.0.3",
                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3",
+                "sebastian/type": "^2.3.4",
                "sebastian/version": "^3.0.2"
            },
            "require-dev": {
@ -3905,7 +3907,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.4"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
            },
            "funding": [
                {
@ -3917,7 +3919,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-03-23T07:16:29+00:00"
+            "time": "2021-06-23T05:14:38+00:00"
        },
        {
            "name": "psr/container",
@ -4933,16 +4935,16 @@
        },
        {
            "name": "swoole/ide-helper",
-            "version": "4.6.6",
+            "version": "4.6.7",
            "source": {
                "type": "git",
                "url": "https://github.com/swoole/ide-helper.git",
-                "reference": "d29d71267f8ed4e4993dc057ca53ffdb5d2703b7"
+                "reference": "0d1409b8274117addfe64d3ea412812a69807411"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/swoole/ide-helper/zipball/d29d71267f8ed4e4993dc057ca53ffdb5d2703b7",
-                "reference": "d29d71267f8ed4e4993dc057ca53ffdb5d2703b7",
+                "url": "https://api.github.com/repos/swoole/ide-helper/zipball/0d1409b8274117addfe64d3ea412812a69807411",
+                "reference": "0d1409b8274117addfe64d3ea412812a69807411",
                "shasum": ""
            },
            "require-dev": {
@ -4965,7 +4967,7 @@
            "description": "IDE help files for Swoole.",
            "support": {
                "issues": "https://github.com/swoole/ide-helper/issues",
-                "source": "https://github.com/swoole/ide-helper/tree/4.6.6"
+                "source": "https://github.com/swoole/ide-helper/tree/4.6.7"
            },
            "funding": [
                {
@ -4981,7 +4983,7 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2021-04-22T16:38:11+00:00"
+            "time": "2021-05-14T16:05:16+00:00"
        },
        {
            "name": "symfony/console",
@ -6004,9 +6006,7 @@
    ],
    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": {
-        "appwrite/php-runtimes": 20
-    },
+    "stability-flags": [],
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
--- a/src/Appwrite/Database/Adapter/MySQL.php
+++ b/src/Appwrite/Database/Adapter/MySQL.php
@ -2,13 +2,12 @@

 namespace Appwrite\Database\Adapter;

-use Utopia\Registry\Registry;
 use Appwrite\Database\Adapter;
 use Appwrite\Database\Exception\Duplicate;
 use Appwrite\Database\Validator\Authorization;
 use Exception;
 use PDO;
-use Redis as Client;
+use Redis;

 class MySQL extends Adapter
 {
@ -23,11 +22,6 @@ class MySQL extends Adapter

    const OPTIONS_LIMIT_ATTRIBUTES = 1000;

-    /**
-     * @var Registry
-     */
-    protected $register;
-
    /**
     * Last modified.
     *
@ -42,16 +36,28 @@ class MySQL extends Adapter
     */
    protected $debug = [];

+    /**
+     * @var PDO
+     */
+    protected $pdo;
+
+    /**
+     * @var Redis
+     */
+    protected $redis;
+
    /**
     * Constructor.
     *
     * Set connection and settings
     *
-     * @param Registry $register
+     * @param PDO $pdo
+     * @param Redis $redis
     */
-    public function __construct(Registry $register)
+    public function __construct($pdo, Redis $redis)
    {
-        $this->register = $register;
+        $this->pdo = $pdo;
+        $this->redis = $redis;
    }

    /**
@ -87,8 +93,8 @@ class MySQL extends Adapter
              ORDER BY `order`
        ');

-        $st->bindParam(':documentUid', $document['uid'], PDO::PARAM_STR);
-        $st->bindParam(':documentRevision', $document['revision'], PDO::PARAM_STR);
+        $st->bindParam(':documentUid', $document['uid'], PDO::PARAM_STR, 32);
+        $st->bindParam(':documentRevision', $document['revision'], PDO::PARAM_STR, 32);

        $st->execute();

@ -116,8 +122,8 @@ class MySQL extends Adapter
              ORDER BY `order`
        ');

-        $st->bindParam(':start', $document['uid'], PDO::PARAM_STR);
-        $st->bindParam(':revision', $document['revision'], PDO::PARAM_STR);
+        $st->bindParam(':start', $document['uid'], PDO::PARAM_STR, 32);
+        $st->bindParam(':revision', $document['revision'], PDO::PARAM_STR, 32);

        $st->execute();

@ -933,18 +939,18 @@ class MySQL extends Adapter
     *
     * @throws Exception
     */
-    protected function getPDO(): PDO
+    protected function getPDO()
    {
-        return $this->register->get('db');
+        return $this->pdo;
    }

    /**
     * @throws Exception
     *
-     * @return Client
+     * @return Redis
     */
-    protected function getRedis(): Client
+    protected function getRedis(): Redis
    {
-        return $this->register->get('cache');
+        return $this->redis;
    }
-}
+}
--- a/src/Appwrite/Database/Adapter/Redis.php
+++ b/src/Appwrite/Database/Adapter/Redis.php
@ -2,7 +2,6 @@

 namespace Appwrite\Database\Adapter;

-use Utopia\Registry\Registry;
 use Appwrite\Database\Adapter;
 use Exception;
 use Redis as Client;
@ -10,9 +9,9 @@ use Redis as Client;
 class Redis extends Adapter
 {
    /**
-     * @var Registry
+     * @var Client
     */
-    protected $register;
+    protected $redis;

    /**
     * @var Adapter
@ -23,11 +22,11 @@ class Redis extends Adapter
     * Redis constructor.
     *
     * @param Adapter  $adapter
-     * @param Registry $register
+     * @param Client $redis
     */
-    public function __construct(Adapter $adapter, Registry $register)
+    public function __construct(Adapter $adapter, Client $redis)
    {
-        $this->register = $register;
+        $this->redis = $redis;
        $this->adapter = $adapter;
    }

@ -261,7 +260,7 @@ class Redis extends Adapter
     */
    protected function getRedis(): Client
    {
-        return $this->register->get('cache');
+        return $this->redis;
    }

    /**
@ -281,4 +280,4 @@ class Redis extends Adapter

        return parent::setNamespace($namespace);
    }
-}
+}
--- a/src/Appwrite/Database/Pool.php
+++ b/src/Appwrite/Database/Pool.php
@ -1,20 +0,0 @@
-<?php
-
-namespace Appwrite\Database;
-
-abstract class Pool
-{
-    protected $available = true;
-    protected $pool;
-    protected $size = 5;
-
-    abstract public function get();
-
-    public function destruct()
-    {
-        $this->available = false;
-        while (!$this->pool->isEmpty()) {
-            $this->pool->pop();
-        }
-    }
-}
--- a/src/Appwrite/Database/Pool/PDOPool.php
+++ b/src/Appwrite/Database/Pool/PDOPool.php
@ -1,49 +0,0 @@
-<?php
-
-namespace Appwrite\Database\Pool;
-
-use Appwrite\Database\Pool;
-use Appwrite\Extend\PDO;
-use SplQueue;
-
-class PDOPool extends Pool
-{
-    public function __construct(int $size, string $host = 'localhost', string $schema = 'appwrite', string $user = '', string $pass = '', string $charset = 'utf8mb4')
-    {
-        $this->pool = new SplQueue;
-        $this->size = $size;
-        for ($i = 0; $i < $this->size; $i++) {
-            $pdo = new PDO(
-                "mysql:" .
-                    "host={$host};" .
-                    "dbname={$schema};" .
-                    "charset={$charset}",
-                $user,
-                $pass,
-                [
-                    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
-                    PDO::ATTR_TIMEOUT => 3, // Seconds
-                    PDO::ATTR_PERSISTENT => true,
-                    PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-                    PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
-                    PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true
-                ]
-            );
-            $this->pool->enqueue($pdo);
-        }
-    }
-
-    public function put(PDO $pdo)
-    {
-        $this->pool->enqueue($pdo);
-    }
-
-    public function get(): PDO
-    {
-        if ($this->available && count($this->pool) > 0) {
-            return $this->pool->dequeue();
-        }
-        sleep(0.01);
-        return $this->get();
-    }
-}
--- a/src/Appwrite/Database/Pool/RedisPool.php
+++ b/src/Appwrite/Database/Pool/RedisPool.php
@ -1,42 +0,0 @@
-<?php
-
-namespace Appwrite\Database\Pool;
-
-use Appwrite\Database\Pool;
-use SplQueue;
-
-use Redis;
-
-class RedisPool extends Pool
-{
-    public function __construct(int $size, string $host, int $port, array $auth = [])
-    {
-        $this->pool = new SplQueue;
-        $this->size = $size;
-        for ($i = 0; $i < $this->size; $i++) {
-            $redis = new Redis();
-            $redis->pconnect($host, $port);
-            $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
-
-            if ($auth) {
-                $redis->auth($auth);
-            }
-
-            $this->pool->enqueue($redis);
-        }
-    }
-
-    public function put(Redis $redis)
-    {
-        $this->pool->enqueue($redis);
-    }
-
-    public function get(): Redis
-    {
-        if ($this->available && !$this->pool->isEmpty()) {
-            return $this->pool->dequeue();
-        }
-        sleep(0.1);
-        return $this->get();
-    }
-}