POC

Dockerfile

@@ -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

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\Event\Realtime;
@@ -37,6 +35,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';
@@ -154,10 +156,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;
 });
@@ -166,16 +179,19 @@ $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)
+        ->withTimeout(1)
+    );
 
     return $pool;
 });
@@ -485,23 +501,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 */

composer.lock

@@ -4819,6 +4819,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-09-28T06:45:17+00:00"
         },
         {

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 $pdo, Redis $redis)
     {
-        $this->register = $register;
+        $this->pdo = $pdo;
+        $this->redis = $redis;
     }
 
     /**
@@ -935,16 +941,16 @@ class MySQL extends Adapter
      */
     protected function getPDO(): PDO
     {
-        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;
     }
 }

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;
     }
 
     /**

src/Appwrite/Database/Pool/PDOPool.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace Appwrite\Database\Pool;
-
-use Appwrite\Database\Pool;
-use Appwrite\Extend\PDO;
-use Swoole\Coroutine\Channel;
-
-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 Channel($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->push($pdo);
-        }
-    }
-
-    public function put(PDO $pdo)
-    {
-        $this->pool->push($pdo);
-    }
-
-    public function get(): PDO
-    {
-        if ($this->available && !$this->pool->isEmpty()) {
-            return $this->pool->pop();
-        }
-        sleep(0.01);
-        return $this->get();
-    }
-}

src/Appwrite/Database/Pool/RedisPool.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Appwrite\Database\Pool;
-
-use Appwrite\Database\Pool;
-use Redis;
-use Swoole\Coroutine\Channel;
-
-class RedisPool extends Pool
-{
-    public function __construct(int $size, string $host, int $port, array $auth = [])
-    {
-        $this->pool = new Channel($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->push($redis);
-        }
-    }
-
-    public function put(Redis $redis)
-    {
-        $this->pool->push($redis);
-    }
-
-    public function get(): Redis
-    {
-        if ($this->available && !$this->pool->isEmpty()) {
-            return $this->pool->pop();
-        }
-        sleep(0.1);
-        return $this->get();
-    }
-}