RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6820 from plfort/#6819-pagination-optim

Browse Source 
#6819 Optimize LimitSubqueryWalker
This commit is contained in:
Guilherme Blanco 2017-12-10 19:56:31 -05:00 committed by GitHub
commit e149f89cfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php
View File

@ -69,18 +69,8 @@ class LimitSubqueryWalker extends TreeWalkerAdapter
$fromRoot = reset($from); $fromRoot = reset($from);
$rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable; $rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable;
$rootClass = $queryComponents[$rootAlias]['metadata']; $rootClass = $queryComponents[$rootAlias]['metadata'];
$selectExpressions = [];
$this->validate($AST); $this->validate($AST);
foreach ($queryComponents as $dqlAlias => $qComp) {
// Preserve mixed data in query for ordering.
if (isset($qComp['resultVariable'])) {
$selectExpressions[] = new SelectExpression($qComp['resultVariable'], $dqlAlias);
continue;
}
}
$identifier = $rootClass->getSingleIdentifierFieldName(); $identifier = $rootClass->getSingleIdentifierFieldName();
if (isset($rootClass->associationMappings[$identifier])) { if (isset($rootClass->associationMappings[$identifier])) {
@ -100,20 +90,25 @@ class LimitSubqueryWalker extends TreeWalkerAdapter
$pathExpression->type = PathExpression::TYPE_STATE_FIELD; $pathExpression->type = PathExpression::TYPE_STATE_FIELD;
array_unshift($selectExpressions, new SelectExpression($pathExpression, '_dctrn_id')); $AST->selectClause->selectExpressions = array(new SelectExpression($pathExpression, '_dctrn_id'));
$AST->selectClause->selectExpressions = $selectExpressions;
if (isset($AST->orderByClause)) { if (isset($AST->orderByClause)) {
foreach ($AST->orderByClause->orderByItems as $item) { foreach ($AST->orderByClause->orderByItems as $item) {
if ( ! $item->expression instanceof PathExpression) { if ( ! $item->expression instanceof PathExpression) {
continue; if(is_string($item->expression) && isset($queryComponents[$item->expression])) {
$qComp = $queryComponents[$item->expression];
if (isset($qComp['resultVariable'])) {
$AST->selectClause->selectExpressions[] = new SelectExpression($qComp['resultVariable'], $item->expression);
}
}
} else {
$AST->selectClause->selectExpressions[] = new SelectExpression(
$this->createSelectExpressionItem($item->expression),
'_dctrn_ord' . $this->_aliasCounter++
);
} }
$AST->selectClause->selectExpressions[] = new SelectExpression(
$this->createSelectExpressionItem($item->expression),
'_dctrn_ord' . $this->_aliasCounter++
);
} }
} }

45
tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php
View File

@ -38,6 +38,21 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
); );
} }
public function testLimitSubqueryWithSortFunction()
{
$dql = 'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN p.category c GROUP BY p.id ORDER BY COUNT(c.id)';
$query = $this->entityManager->createQuery($dql);
$limitQuery = clone $query;
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]);
$this->assertEquals(
"SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id GROUP BY m0_.id ORDER BY COUNT(c1_.id) ASC",
$limitQuery->getSQL()
);
}
public function testCountQuery_MixedResultsWithName() public function testCountQuery_MixedResultsWithName()
{ {
$dql = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a'; $dql = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a';
@ -47,7 +62,35 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]); $limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]);
$this->assertEquals( $this->assertEquals(
"SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_", "SELECT DISTINCT a0_.id AS id_0 FROM Author a0_",
$limitQuery->getSQL()
);
}
public function testAggQuery_MixedResultsWithNameAndSort()
{
$dql = 'SELECT a, sum(a.name) as foo FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY foo DESC';
$query = $this->entityManager->createQuery($dql);
$limitQuery = clone $query;
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]);
$this->assertEquals(
"SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_ ORDER BY sclr_1 DESC",
$limitQuery->getSQL()
);
}
public function testAggQuery_MultipleMixedResultsWithSort()
{
$dql = 'SELECT a, sum(a.name) as foo, (SELECT count(subA.id) FROM Doctrine\Tests\ORM\Tools\Pagination\Author subA WHERE subA.id = a.id ) as bar FROM Doctrine\Tests\ORM\Tools\Pagination\Author a ORDER BY foo DESC, bar ASC';
$query = $this->entityManager->createQuery($dql);
$limitQuery = clone $query;
$limitQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [LimitSubqueryWalker::class]);
$this->assertEquals(
"SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1, (SELECT count(a1_.id) AS sclr_3 FROM Author a1_ WHERE a1_.id = a0_.id) AS sclr_2 FROM Author a0_ ORDER BY sclr_1 DESC, sclr_2 ASC",
$limitQuery->getSQL() $limitQuery->getSQL()
); );
} }