MAGETWO-68808: catalog_product_attribute is slow

Author: kandy

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Action/FullTest.php

@@ -55,4 +55,104 @@ public function testExecuteWithAdapterErrorThrowsException()
 
         $model->execute();
     }
+
+    public function testExecute()
+    {
+        $eavDecimalFactory = $this->getMock(
+            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory::class,
+            ['create'],
+            [],
+            '',
+            false
+        );
+        $eavSourceFactory = $this->getMock(
+            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory::class,
+            ['create'],
+            [],
+            '',
+            false
+        );
+
+        $ids = [1, 2, 3];
+        $connectionMock = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)
+            ->getMockForAbstractClass();
+
+        $connectionMock->expects($this->atLeastOnce())->method('describeTable')->willReturn(['id' => []]);
+        $eavSource = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Source::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $eavDecimal = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $eavSource->expects($this->once())->method('getRelationsByChild')->with($ids)->willReturn([]);
+        $eavSource->expects($this->never())->method('getRelationsByParent')->with($ids)->willReturn([]);
+
+        $eavDecimal->expects($this->once())->method('getRelationsByChild')->with($ids)->willReturn([]);
+        $eavDecimal->expects($this->never())->method('getRelationsByParent')->with($ids)->willReturn([]);
+
+        $eavSource->expects($this->atLeastOnce())->method('getConnection')->willReturn($connectionMock);
+        $eavDecimal->expects($this->atLeastOnce())->method('getConnection')->willReturn($connectionMock);
+
+
+        $eavDecimal->expects($this->once())
+            ->method('reindexEntities')
+            ->with($ids);
+
+        $eavSource->expects($this->once())
+            ->method('reindexEntities')
+            ->with($ids);
+
+        $eavDecimalFactory->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($eavSource));
+
+        $eavSourceFactory->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($eavDecimal));
+
+        $metadataMock = $this->getMock(\Magento\Framework\EntityManager\MetadataPool::class, [], [], '', false);
+        $entityMetadataMock = $this->getMockBuilder(\Magento\Framework\EntityManager\EntityMetadataInterface::class)
+            ->getMockForAbstractClass();
+
+        $metadataMock->expects($this->atLeastOnce())
+            ->method('getMetadata')
+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->willReturn($entityMetadataMock);
+
+        $batchProviderMock = $this->getMock(\Magento\Framework\Indexer\BatchProviderInterface::class);
+        $batchProviderMock->expects($this->atLeastOnce())
+            ->method('getBatches')
+            ->willReturn([['from' =>10, 'to' => 100]]);
+        $batchProviderMock->expects($this->atLeastOnce())
+            ->method('getBatchIds')
+            ->willReturn($ids);
+
+        $batchManagementMock = $this->getMock(
+            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator::class,
+            [],
+            [],
+            '',
+            false
+        );
+        $selectMock =  $this->getMockBuilder(\Magento\Framework\DB\Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $connectionMock->method('select')->willReturn($selectMock);
+        $selectMock->expects($this->atLeastOnce())->method('distinct')->willReturnSelf();
+        $selectMock->expects($this->atLeastOnce())->method('from')->willReturnSelf();
+
+        $model = new \Magento\Catalog\Model\Indexer\Product\Eav\Action\Full(
+            $eavDecimalFactory,
+            $eavSourceFactory,
+            $metadataMock,
+            $batchProviderMock,
+            $batchManagementMock,
+            []
+        );
+
+        $model->execute();
+    }
 }

lib/internal/Magento/Framework/Indexer/BatchProvider.php

@@ -58,7 +58,7 @@ public function getBatchIds(
             $connection->quote($batch['to'])
         );
 
-        $ids = $connection->fetchCol($select->where($betweenCondition)->limit($batch['from'] - $batch['to'] + 1));
+        $ids = $connection->fetchCol($select->where($betweenCondition)->limit($batch['to'] - $batch['from'] + 1));
         return array_map('intval', $ids);
     }
 }

lib/internal/Magento/Framework/Indexer/Test/Unit/BatchProviderTest.php

@@ -57,4 +57,18 @@ public function getBatchesDataProvider()
             [200, 0, []],
         ];
     }
+
+    public function testGetBatchIds()
+    {
+        $selectMock = $this->getMock(Select::class, [], [], '', false);
+        $adapterMock = $this->getMock(AdapterInterface::class);
+
+        $selectMock->expects($this->once())->method('where')->with('(entity_id BETWEEN 10 AND 100)')->willReturnSelf();
+        $selectMock->expects($this->once())->method('limit')->with(91)->willReturnSelf();
+
+        $adapterMock->expects($this->atLeastOnce())->method('quote')->willReturnArgument(0);
+        $adapterMock->expects($this->once())->method('fetchCol')->with($selectMock, [])->willReturn([1,2,3]);
+        $this->assertEquals([1,2,3], $this->model->getBatchIds($adapterMock, $selectMock, ['from' => 10, 'to' => 100]));
+
+    }
 }