Optimize relationship fetching

bin/cli.php

@@ -3,6 +3,7 @@
 require_once '/usr/src/code/vendor/autoload.php';
 
 use Utopia\CLI\CLI;
+use Utopia\CLI\Console;
 
 ini_set('memory_limit', '-1');
 
@@ -11,5 +12,13 @@
 include 'tasks/load.php';
 include 'tasks/index.php';
 include 'tasks/query.php';
+include 'tasks/relationships.php';
+
+$cli
+    ->error()
+    ->inject('error')
+    ->action(function ($error) {
+        Console::error($error->getMessage());
+    });
 
 $cli->run();

bin/relationships

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/bin/cli.php relationships $@

bin/tasks/index.php

@@ -10,105 +10,103 @@
 use Utopia\CLI\CLI;
 use Utopia\CLI\Console;
 use Utopia\Database\Adapter\MariaDB;
-use Utopia\Database\Adapter\Mongo;
 use Utopia\Database\Adapter\MySQL;
+use Utopia\Database\Adapter\Postgres;
 use Utopia\Database\Database;
 use Utopia\Database\PDO;
-use Utopia\Mongo\Client;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 
 /**
  * @Example
  * docker compose exec tests bin/index --adapter=mysql --name=testing
  */
-
 $cli
     ->task('index')
     ->desc('Index mock data for testing queries')
     ->param('adapter', '', new Text(0), 'Database adapter')
     ->param('name', '', new Text(0), 'Name of created database.')
-    ->action(function ($adapter, $name) {
+    ->param('sharedTables', false, new Boolean(true), 'Whether to use shared tables', true)
+    ->action(function (string $adapter, string $name, bool $sharedTables) {
         $namespace = '_ns';
         $cache = new Cache(new NoCache());
 
-        switch ($adapter) {
-            case 'mongodb':
-                $client = new Client(
-                    $name,
-                    'mongo',
-                    27017,
-                    'root',
-                    'example',
-                    false
-                );
-
-                $database = new Database(new Mongo($client), $cache);
-                break;
-
-            case 'mariadb':
-                $dbHost = 'mariadb';
-                $dbPort = '3306';
-                $dbUser = 'root';
-                $dbPass = 'password';
-
-                $pdo = new PDO("mysql:host={$dbHost};port={$dbPort};charset=utf8mb4", $dbUser, $dbPass, MariaDB::getPDOAttributes());
-
-                $database = new Database(new MariaDB($pdo), $cache);
-                break;
-
-            case 'mysql':
-                $dbHost = 'mysql';
-                $dbPort = '3307';
-                $dbUser = 'root';
-                $dbPass = 'password';
-
-                $pdo = new PDO("mysql:host={$dbHost};port={$dbPort};charset=utf8mb4", $dbUser, $dbPass, MySQL::getPDOAttributes());
+        $dbAdapters = [
+            'mariadb' => [
+                'host' => 'mariadb',
+                'port' => 3306,
+                'user' => 'root',
+                'pass' => 'password',
+                'dsn' => static fn (string $host, int $port) => "mysql:host={$host};port={$port};charset=utf8mb4",
+                'adapter' => MariaDB::class,
+                'pdoAttr' => MariaDB::getPDOAttributes(),
+            ],
+            'mysql' => [
+                'host' => 'mysql',
+                'port' => 3307,
+                'user' => 'root',
+                'pass' => 'password',
+                'dsn' => static fn (string $host, int $port) => "mysql:host={$host};port={$port};charset=utf8mb4",
+                'adapter' => MySQL::class,
+                'pdoAttr' => MySQL::getPDOAttributes(),
+            ],
+            'postgres' => [
+                'host' => 'postgres',
+                'port' => 5432,
+                'user' => 'postgres',
+                'pass' => 'password',
+                'dsn' => static fn (string $host, int $port) => "pgsql:host={$host};port={$port}",
+                'adapter' => Postgres::class,
+                'pdoAttr' => Postgres::getPDOAttributes(),
+            ],
+        ];
+
+        if (!isset($dbAdapters[$adapter])) {
+            Console::error("Adapter '{$adapter}' not supported");
+            return;
+        }
 
-                $database = new Database(new MySQL($pdo), $cache);
-                break;
+        $cfg = $dbAdapters[$adapter];
 
-            default:
-                Console::error('Adapter not supported');
-                return;
-        }
+        $pdo = new PDO(
+            ($cfg['dsn'])($cfg['host'], $cfg['port']),
+            $cfg['user'],
+            $cfg['pass'],
+            $cfg['pdoAttr']
+        );
 
-        $database->setDatabase($name);
-        $database->setNamespace($namespace);
+        $database = (new Database(new ($cfg['adapter'])($pdo), $cache))
+            ->setDatabase($name)
+            ->setNamespace($namespace)
+            ->setSharedTables($sharedTables);
 
-        Console::info("greaterThan('created', ['2010-01-01 05:00:00']), equal('genre', ['travel'])");
+        Console::info("Creating key index 'createdGenre' on 'articles' for created > '2010-01-01 05:00:00' and genre = 'travel'");
         $start = microtime(true);
         $database->createIndex('articles', 'createdGenre', Database::INDEX_KEY, ['created', 'genre'], [], [Database::ORDER_DESC, Database::ORDER_DESC]);
         $time = microtime(true) - $start;
-        Console::success("{$time} seconds");
+        Console::success("Index 'createdGenre' created in {$time} seconds");
 
-        Console::info("equal('genre', ['fashion', 'finance', 'sports'])");
+        Console::info("Creating key index 'genre' on 'articles' for genres: fashion, finance, sports");
         $start = microtime(true);
         $database->createIndex('articles', 'genre', Database::INDEX_KEY, ['genre'], [], [Database::ORDER_ASC]);
         $time = microtime(true) - $start;
-        Console::success("{$time} seconds");
+        Console::success("Index 'genre' created in {$time} seconds");
 
-        Console::info("greaterThan('views', 100000)");
+        Console::info("Creating key index 'views' on 'articles' for views > 100000");
         $start = microtime(true);
         $database->createIndex('articles', 'views', Database::INDEX_KEY, ['views'], [], [Database::ORDER_DESC]);
         $time = microtime(true) - $start;
-        Console::success("{$time} seconds");
+        Console::success("Index 'views' created in {$time} seconds");
 
-        Console::info("search('text', 'Alice')");
+        Console::info("Creating fulltext index 'fulltextsearch' on 'articles' for search term 'Alice'");
         $start = microtime(true);
         $database->createIndex('articles', 'fulltextsearch', Database::INDEX_FULLTEXT, ['text']);
         $time = microtime(true) - $start;
-        Console::success("{$time} seconds");
+        Console::success("Index 'fulltextsearch' created in {$time} seconds");
 
-        Console::info("contains('tags', ['tag1'])");
+        Console::info("Creating key index 'tags' on 'articles' for tags containing 'tag1'");
         $start = microtime(true);
         $database->createIndex('articles', 'tags', Database::INDEX_KEY, ['tags']);
         $time = microtime(true) - $start;
-        Console::success("{$time} seconds");
-    });
-
-$cli
-    ->error()
-    ->inject('error')
-    ->action(function (Exception $error) {
-        Console::error($error->getMessage());
+        Console::success("Index 'tags' created in {$time} seconds");
     });