MAGETWO-39942: Low quick search performance(MySql)

igrybkov · igrybkov · commit 3ba59890e61c · 2015-07-10T17:43:45.000+03:00
- Fix unit tests
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/MapperTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/MapperTest.php
@@ -20,6 +20,7 @@
 class MapperTest extends \PHPUnit_Framework_TestCase
 {
     const INDEX_NAME = 'test_index_fulltext';
+    private $matchBuilder;
 
     /**
      * @var \Magento\Framework\Search\RequestInterface|MockObject
@@ -56,11 +57,6 @@ class MapperTest extends \PHPUnit_Framework_TestCase
      */
     private $filterBuilder;
 
-    /**
-     * @var \Magento\Framework\Search\Request\FilterInterface|MockObject
-     */
-    private $filter;
-
     /**
      * @var Mapper
      */
@@ -71,7 +67,7 @@ protected function setUp()
         $helper = new ObjectManager($this);
 
         $this->select = $this->getMockBuilder('Magento\Framework\DB\Select')
-            ->setMethods(['group', 'limit', 'where', 'columns', 'from'])
+            ->setMethods(['group', 'limit', 'where', 'columns', 'from', 'join'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->select->expects($this->any())
@@ -108,7 +104,7 @@ protected function setUp()
             ->getMockForAbstractClass();
 
         $this->queryContainer = $this->getMockBuilder('Magento\Framework\Search\Adapter\Mysql\Query\QueryContainer')
-            ->setMethods(['addMatchQuery'])
+            ->setMethods(['addMatchQuery', 'getDerivedQueries'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->queryContainer->expects($this->any())
@@ -124,14 +120,18 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->queryContainer);
 
-        $this->filter = $this->getMockBuilder('Magento\Framework\Search\Request\FilterInterface')
+        $this->filterBuilder = $this->getMockBuilder('Magento\Framework\Search\Adapter\Mysql\Filter\Builder')
+            ->setMethods(['build'])
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
 
-        $this->filterBuilder = $this->getMockBuilder('Magento\Framework\Search\Adapter\Mysql\Filter\Builder')
+        $this->matchBuilder = $this->getMockBuilder('\Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match')
             ->setMethods(['build'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->matchBuilder->expects($this->any())
+            ->method('build')
+            ->willReturnArgument(1);
 
         /** @var MockObject|\Magento\Framework\Search\Adapter\Mysql\IndexBuilderInterface $indexBuilder */
         $indexBuilder = $this->getMockBuilder('\Magento\Framework\Search\Adapter\Mysql\IndexBuilderInterface')
@@ -154,7 +154,8 @@ protected function setUp()
                 'scoreBuilderFactory' => $this->scoreBuilderFactory,
                 'queryContainerFactory' => $queryContainerFactory,
                 'filterBuilder' => $this->filterBuilder,
-                'indexProviders' => [$index => $indexBuilder]
+                'matchBuilder' => $this->matchBuilder,
+                'indexProviders' => [$index => $indexBuilder],
             ]
         );
     }
@@ -163,6 +164,10 @@ public function testBuildMatchQuery()
     {
         $query = $this->createMatchQuery();
 
+        $this->queryContainer->expects($this->once())
+            ->method('getDerivedQueries')
+            ->willReturn([]);
+
         $this->queryContainer->expects($this->any())->method('addMatchQuery')
             ->with(
                 $this->equalTo($this->select),
@@ -173,7 +178,7 @@ public function testBuildMatchQuery()
 
         $this->request->expects($this->once())->method('getQuery')->will($this->returnValue($query));
 
-        $this->select->expects($this->once())->method('columns')->will($this->returnValue($this->select));
+        $this->select->expects($this->any())->method('columns')->will($this->returnValue($this->select));
 
         $response = $this->mapper->buildQuery($this->request);
 
@@ -182,11 +187,13 @@ public function testBuildMatchQuery()
 
     public function testBuildFilterQuery()
     {
-        $query = $this->createFilterQuery();
-        $query->expects($this->once())->method('getReferenceType')->will($this->returnValue(Filter::REFERENCE_FILTER));
-        $query->expects($this->once())->method('getReference')->will($this->returnValue($this->filter));
+        $query = $this->createFilterQuery(Filter::REFERENCE_FILTER, $this->createFilter());
+
+        $this->queryContainer->expects($this->once())
+            ->method('getDerivedQueries')
+            ->willReturn([]);
 
-        $this->select->expects($this->once())->method('columns')->will($this->returnValue($this->select));
+        $this->select->expects($this->any())->method('columns')->will($this->returnValue($this->select));
 
         $this->request->expects($this->once())->method('getQuery')->will($this->returnValue($query));
 
@@ -197,64 +204,84 @@ public function testBuildFilterQuery()
         $this->assertEquals($this->select, $response);
     }
 
-    public function testBuildBoolQuery()
+    /**
+     * @param $query
+     * @throws \Exception
+     * @dataProvider buildQueryDataProvider
+     */
+    public function testBuildQuery($query, $derivedQueries = [])
     {
-        $query = $this->createBoolQuery();
-        $this->request->expects($this->once())->method('getQuery')->will($this->returnValue($query));
+        $this->filterBuilder->expects($this->any())->method('build')->will($this->returnValue('(1)'));
 
-        $matchQuery = $this->createMatchQuery();
-        $filterMatchQuery = $this->createFilterQuery();
-        $filterMatchQuery->expects($this->once())->method('getReferenceType')
-            ->will($this->returnValue(Filter::REFERENCE_QUERY));
-        $filterMatchQuery->expects($this->once())->method('getReference')->will($this->returnValue($matchQuery));
+        $this->queryContainer->expects($this->any())
+            ->method('getDerivedQueries')
+            ->willReturn($derivedQueries);
 
-        $filterQuery = $this->createFilterQuery();
-        $filterQuery->expects($this->once())->method('getReferenceType')
-            ->will($this->returnValue(Filter::REFERENCE_FILTER));
-        $filterQuery->expects($this->once())->method('getReference')->will($this->returnValue($this->filter));
+        $this->select->expects($this->any())->method('columns')->will($this->returnValue($this->select));
 
         $this->request->expects($this->once())->method('getQuery')->will($this->returnValue($query));
 
-        $this->filterBuilder->expects($this->once())->method('build')->will($this->returnValue('(1)'));
+        $response = $this->mapper->buildQuery($this->request);
 
-        $this->select->expects($this->once())->method('columns')->will($this->returnValue($this->select));
+        $this->assertEquals($this->select, $response);
+    }
 
-        $query->expects($this->once())
-            ->method('getMust')
-            ->will(
-                $this->returnValue(
+    public function buildQueryDataProvider()
+    {
+        return [
+            [
+                $this->createBoolQuery(
                     [
                         $this->createMatchQuery(),
-                        $this->createFilterQuery(),
-                    ]
-                )
-            );
-
-        $query->expects($this->once())
-            ->method('getShould')
-            ->will(
-                $this->returnValue(
+                        $this->createFilterQuery(Filter::REFERENCE_QUERY, $this->createMatchQuery()),
+                    ],
                     [
                         $this->createMatchQuery(),
-                        $filterMatchQuery,
-                    ]
-                )
-            );
-
-        $query->expects($this->once())
-            ->method('getMustNot')
-            ->will(
-                $this->returnValue(
+                        $this->createFilterQuery(Filter::REFERENCE_FILTER, $this->createFilter()),
+                    ],
                     [
                         $this->createMatchQuery(),
-                        $filterQuery,
+                        $this->createFilterQuery(Filter::REFERENCE_FILTER, $this->createFilter()),
                     ]
-                )
-            );
-
-        $response = $this->mapper->buildQuery($this->request);
-
-        $this->assertEquals($this->select, $response);
+                ),
+            ],
+            [
+                $this->createBoolQuery(
+                    [
+                        $this->createMatchQuery(),
+                        $this->createMatchQuery(),
+                    ],
+                    [],
+                    []
+                ),
+                [
+                    $this->createMatchContainer(
+                        $this->createMatchQuery(),
+                        'mustNot'
+                    ),
+                ],
+            ],
+            [
+                $this->createBoolQuery(
+                    [
+                        $this->createMatchQuery(),
+                        $this->createMatchQuery(),
+                    ],
+                    [],
+                    []
+                ),
+                [
+                    $this->createMatchContainer(
+                        $this->createMatchQuery(),
+                        'mustNot'
+                    ),
+                    $this->createMatchContainer(
+                        $this->createMatchQuery(),
+                        'must'
+                    ),
+                ],
+            ],
+        ];
     }
 
     /**
@@ -291,9 +318,11 @@ private function createMatchQuery()
     }
 
     /**
+     * @param string $referenceType
+     * @param mixed $reference
      * @return MockObject
      */
-    private function createFilterQuery()
+    private function createFilterQuery($referenceType, $reference)
     {
         $query = $this->getMockBuilder('Magento\Framework\Search\Request\Query\Filter')
             ->setMethods(['getType', 'getReferenceType', 'getReference'])
@@ -302,13 +331,17 @@ private function createFilterQuery()
         $query->expects($this->exactly(1))
             ->method('getType')
             ->will($this->returnValue(QueryInterface::TYPE_FILTER));
+        $query->expects($this->once())->method('getReferenceType')
+            ->will($this->returnValue($referenceType));
+        $query->expects($this->once())->method('getReference')
+            ->will($this->returnValue($reference));
         return $query;
     }
 
     /**
      * @return MockObject
      */
-    private function createBoolQuery()
+    private function createBoolQuery(array $must, array $should, array $mustNot)
     {
         $query = $this->getMockBuilder('Magento\Framework\Search\Request\Query\Bool')
             ->setMethods(['getMust', 'getShould', 'getMustNot', 'getType'])
@@ -317,6 +350,44 @@ private function createBoolQuery()
         $query->expects($this->exactly(1))
             ->method('getType')
             ->will($this->returnValue(QueryInterface::TYPE_BOOL));
+        $query->expects($this->once())
+            ->method('getMust')
+            ->will($this->returnValue($must));
+        $query->expects($this->once())
+            ->method('getShould')
+            ->will($this->returnValue($should));
+        $query->expects($this->once())
+            ->method('getMustNot')
+            ->will($this->returnValue($mustNot));
         return $query;
     }
+
+    /**
+     * @return MockObject
+     */
+    private function createFilter()
+    {
+        return $this->getMockBuilder('Magento\Framework\Search\Request\FilterInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+    }
+
+    /**
+     * @param $request
+     * @param $conditionType
+     */
+    private function createMatchContainer($request, $conditionType)
+    {
+        $matchContainer = $this->getMockBuilder('\Magento\Framework\Search\Adapter\Mysql\Query\MatchContainer')
+            ->setMethods(['getRequest', 'getConditionType'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $matchContainer->expects($this->any())
+            ->method('getRequest')
+            ->willReturn($request);
+        $matchContainer->expects($this->any())
+            ->method('getConditionType')
+            ->willReturn($conditionType);
+        return $matchContainer;
+    }
 }
