QueryFactory: Cache compute result for findFrom and findFromRaw

Author: homersimpsons

src/QueryFactory/FindObjectsFromRawSqlQueryFactory.php

@@ -3,6 +3,7 @@
 
 namespace TheCodingMachine\TDBM\QueryFactory;
 
+use Doctrine\Common\Cache\Cache;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use TheCodingMachine\TDBM\TDBMException;
@@ -39,20 +40,17 @@ class FindObjectsFromRawSqlQueryFactory implements QueryFactory
      * @var string
      */
     private $mainTable;
-
     /**
-     * FindObjectsFromRawSqlQueryFactory constructor.
-     * @param TDBMService $tdbmService
-     * @param Schema $schema
-     * @param string $mainTable
-     * @param string $sql
-     * @param string $sqlCount
+     * @var Cache
      */
-    public function __construct(TDBMService $tdbmService, Schema $schema, string $mainTable, string $sql, string $sqlCount = null)
+    private $cache;
+
+    public function __construct(TDBMService $tdbmService, Schema $schema, string $mainTable, string $sql, ?string $sqlCount, Cache $cache)
     {
         $this->tdbmService = $tdbmService;
         $this->schema = $schema;
         $this->mainTable = $mainTable;
+        $this->cache = $cache;
 
         [$this->processedSql, $this->processedSqlCount, $this->columnDescriptors] = $this->compute($sql, $sqlCount);
     }
@@ -85,6 +83,10 @@ public function getColumnDescriptors(): array
      */
     private function compute(string $sql, ?string $sqlCount): array
     {
+        $key = 'FindObjectsFromRawSqlQueryFactory_' . dechex(crc32(var_export($sqlCount, true) . $sql));
+        if ($this->cache->contains($key)) {
+            return $this->cache->fetch($key);
+        }
         $parser = new PHPSQLParser();
         $parsedSql = $parser->parse($sql);
 
@@ -95,7 +97,7 @@ private function compute(string $sql, ?string $sqlCount): array
         } else {
             throw new TDBMException('Unable to analyze query "'.$sql.'"');
         }
-
+        $this->cache->save($key, [$processedSql, $processedSqlCount, $columnDescriptors]);
         return [$processedSql, $processedSqlCount, $columnDescriptors];
     }
 

src/QueryFactory/FindObjectsFromSqlQueryFactory.php

@@ -36,6 +36,17 @@ public function __construct(string $mainTable, string $from, $filterString, $ord
 
     protected function compute(): void
     {
+        $key = 'FindObjectsFromSqlQueryFactory_' . dechex(crc32($this->mainTable.'__'.$this->from.'__'.$this->filterString.'__'.$this->orderBy));
+        if ($this->cache->contains($key)) {
+            [
+                $this->magicSql,
+                $this->magicSqlCount,
+                $this->magicSqlSubQuery,
+                $this->columnDescList
+            ] = $this->cache->fetch($key);
+            return;
+        }
+
         // We quote in MySQL because of MagicQuery that will be applied.
         $mySqlPlatform = new MySqlPlatform();
 
@@ -104,6 +115,13 @@ protected function compute(): void
         $this->magicSqlCount = $countSql;
         $this->magicSqlSubQuery = $subQuery;
         $this->columnDescList = $columnDescList;
+
+        $this->cache->save($key, [
+            $this->magicSql,
+            $this->magicSqlCount,
+            $this->magicSqlSubQuery,
+            $this->columnDescList,
+        ]);
     }
 
     /**
@@ -161,12 +179,10 @@ private function getChildrenRelationshipForeignKeysWithoutCache(string $tableNam
                 return $this->getChildrenRelationshipForeignKeys($fk->getLocalTableName());
             }, $children);
 
-            $fks = array_merge($children, call_user_func_array('array_merge', $fksTables));
-
-            return $fks;
-        } else {
-            return [];
+            return array_merge($children, ...$fksTables);
         }
+
+        return [];
     }
 
     /**

src/TDBMService.php

@@ -23,7 +23,6 @@
 
 use Doctrine\Common\Cache\Cache;
 use Doctrine\Common\Cache\ClearableCache;
-use Doctrine\Common\Cache\VoidCache;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -1083,9 +1082,11 @@ private function exploreChildrenTablesRelationships(SchemaAnalyzer $schemaAnalyz
         $tables = [$table];
         $keys = $schemaAnalyzer->getChildrenRelationships($table);
 
+        $tmpTables = [];
         foreach ($keys as $key) {
-            $tables = array_merge($tables, $this->exploreChildrenTablesRelationships($schemaAnalyzer, $key->getLocalTableName()));
+            $tmpTables[] = $this->exploreChildrenTablesRelationships($schemaAnalyzer, $key->getLocalTableName());
         }
+        $tables = array_merge($tables, ...$tmpTables);
 
         return $tables;
     }
@@ -1349,7 +1350,7 @@ public function findObjectsFromRawSql(string $mainTable, string $sql, array $par
 
         $mode = $mode ?: $this->mode;
 
-        $queryFactory = new FindObjectsFromRawSqlQueryFactory($this, $this->tdbmSchemaAnalyzer->getSchema(), $mainTable, $sql, $sqlCount);
+        $queryFactory = new FindObjectsFromRawSqlQueryFactory($this, $this->tdbmSchemaAnalyzer->getSchema(), $mainTable, $sql, $sqlCount, $this->cache);
 
         return $resultIteratorClass::createResultIterator($queryFactory, $parameters, $this->objectStorage, $className, $this, $this->magicQuery, $mode, $this->logger);
     }

tests/QueryFactory/FindObjectsFromRawSqlQueryFactoryTest.php

@@ -2,22 +2,22 @@
 
 namespace TheCodingMachine\TDBM\QueryFactory;
 
-use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Common\Cache\VoidCache;
 use TheCodingMachine\TDBM\TDBMAbstractServiceTest;
 use TheCodingMachine\TDBM\TDBMException;
 
 class FindObjectsFromRawSqlQueryFactoryTest extends TDBMAbstractServiceTest
 {
     public function testGetSubQueryColumnDescriptors(): void
     {
-        $queryFactory = new FindObjectsFromRawSqlQueryFactory($this->tdbmService, $this->tdbmService->getConnection()->getSchemaManager()->createSchema(), 'country', 'SELECT country.* FROM country');
+        $queryFactory = new FindObjectsFromRawSqlQueryFactory($this->tdbmService, $this->tdbmService->getConnection()->getSchemaManager()->createSchema(), 'country', 'SELECT country.* FROM country', null, new VoidCache());
         $this->expectException(TDBMException::class);
         $queryFactory->getSubQueryColumnDescriptors();
     }
 
     public function testGetMagicSqlSubQuery(): void
     {
-        $queryFactory = new FindObjectsFromRawSqlQueryFactory($this->tdbmService, $this->tdbmService->getConnection()->getSchemaManager()->createSchema(), 'country', 'SELECT country.* FROM country');
+        $queryFactory = new FindObjectsFromRawSqlQueryFactory($this->tdbmService, $this->tdbmService->getConnection()->getSchemaManager()->createSchema(), 'country', 'SELECT country.* FROM country', null, new VoidCache());
         $this->expectException(TDBMException::class);
         $queryFactory->getMagicSqlSubQuery();
     }